From 5d6f265c0adc8b7a96ddb7a78de229509277fd2b Mon Sep 17 00:00:00 2001
From: Rob Harrington <oeoeaio@gmail.com>
Date: Wed, 22 Apr 2015 12:15:45 +1000
Subject: [PATCH] Moving spree namespaced serializers into admin

---
 app/controllers/spree/api/products_controller_decorator.rb  | 2 +-
 app/helpers/admin/injection_helper.rb                       | 2 +-
 .../{spree/api => api/admin}/product_serializer.rb          | 6 +++---
 .../{spree/api => api/admin}/variant_serializer.rb          | 2 +-
 spec/serializers/spree/product_serializer_spec.rb           | 6 +++---
 spec/serializers/spree/variant_serializer_spec.rb           | 6 +++---
 6 files changed, 12 insertions(+), 12 deletions(-)
 rename app/serializers/{spree/api => api/admin}/product_serializer.rb (76%)
 rename app/serializers/{spree/api => api/admin}/variant_serializer.rb (88%)

diff --git a/app/controllers/spree/api/products_controller_decorator.rb b/app/controllers/spree/api/products_controller_decorator.rb
index 0186c6e8df..6e9799c86d 100644
--- a/app/controllers/spree/api/products_controller_decorator.rb
+++ b/app/controllers/spree/api/products_controller_decorator.rb
@@ -65,7 +65,7 @@ Spree::Api::ProductsController.class_eval do
   end
 
   def render_paged_products(products)
-    render text: { products: ActiveModel::ArraySerializer.new(products, each_serializer: Spree::Api::ProductSerializer), pages: products.num_pages }.to_json
+    render text: { products: ActiveModel::ArraySerializer.new(products, each_serializer: Api::Admin::ProductSerializer), pages: products.num_pages }.to_json
   end
 
 end
diff --git a/app/helpers/admin/injection_helper.rb b/app/helpers/admin/injection_helper.rb
index 14c4f9c20d..36ddccdb9a 100644
--- a/app/helpers/admin/injection_helper.rb
+++ b/app/helpers/admin/injection_helper.rb
@@ -47,7 +47,7 @@ module Admin
     end
 
     def admin_inject_products
-      admin_inject_json_ams_array "ofn.admin", "products", @products, Spree::Api::ProductSerializer
+      admin_inject_json_ams_array "ofn.admin", "products", @products, Api::Admin::ProductSerializer
     end
 
     def admin_inject_taxons
diff --git a/app/serializers/spree/api/product_serializer.rb b/app/serializers/api/admin/product_serializer.rb
similarity index 76%
rename from app/serializers/spree/api/product_serializer.rb
rename to app/serializers/api/admin/product_serializer.rb
index 8c1a331936..d980013674 100644
--- a/app/serializers/spree/api/product_serializer.rb
+++ b/app/serializers/api/admin/product_serializer.rb
@@ -1,12 +1,12 @@
-class Spree::Api::ProductSerializer < ActiveModel::Serializer
+class Api::Admin::ProductSerializer < ActiveModel::Serializer
   attributes :id, :name, :variant_unit, :variant_unit_scale, :variant_unit_name, :on_demand
 
   attributes :on_hand, :price, :available_on, :permalink_live
 
   has_one :supplier, key: :producer_id, embed: :id
   has_one :primary_taxon, key: :category_id, embed: :id
-  has_many :variants, key: :variants, serializer: Spree::Api::VariantSerializer # embed: ids
-  has_one :master, serializer: Spree::Api::VariantSerializer
+  has_many :variants, key: :variants, serializer: Api::Admin::VariantSerializer # embed: ids
+  has_one :master, serializer: Api::Admin::VariantSerializer
 
   def on_hand
     object.on_hand.nil? ? 0 : object.on_hand.to_f.finite? ? object.on_hand : "On demand"
diff --git a/app/serializers/spree/api/variant_serializer.rb b/app/serializers/api/admin/variant_serializer.rb
similarity index 88%
rename from app/serializers/spree/api/variant_serializer.rb
rename to app/serializers/api/admin/variant_serializer.rb
index a2342de6e4..26ad2d7f37 100644
--- a/app/serializers/spree/api/variant_serializer.rb
+++ b/app/serializers/api/admin/variant_serializer.rb
@@ -1,4 +1,4 @@
-class Spree::Api::VariantSerializer < ActiveModel::Serializer
+class Api::Admin::VariantSerializer < ActiveModel::Serializer
   attributes :id, :options_text, :unit_value, :unit_description, :unit_to_display, :on_demand, :display_as, :display_name, :name_to_display
   attributes :on_hand, :price
 
diff --git a/spec/serializers/spree/product_serializer_spec.rb b/spec/serializers/spree/product_serializer_spec.rb
index bbb65c1c7e..ab6883f9c5 100644
--- a/spec/serializers/spree/product_serializer_spec.rb
+++ b/spec/serializers/spree/product_serializer_spec.rb
@@ -1,7 +1,7 @@
-describe Spree::Api::ProductSerializer do
+describe Api::Admin::ProductSerializer do
   let(:product) { create(:simple_product) }
   it "serializes a product" do
-    serializer = Spree::Api::ProductSerializer.new product
+    serializer = Api::Admin::ProductSerializer.new product
     serializer.to_json.should match product.name
   end
-end
\ No newline at end of file
+end
diff --git a/spec/serializers/spree/variant_serializer_spec.rb b/spec/serializers/spree/variant_serializer_spec.rb
index e0f26d3423..8f6b1e0bf5 100644
--- a/spec/serializers/spree/variant_serializer_spec.rb
+++ b/spec/serializers/spree/variant_serializer_spec.rb
@@ -1,7 +1,7 @@
-describe Spree::Api::VariantSerializer do
+describe Api::Admin::VariantSerializer do
   let(:variant) { create(:variant) }
   it "serializes a variant" do
-    serializer = Spree::Api::VariantSerializer.new variant
+    serializer = Api::Admin::VariantSerializer.new variant
     serializer.to_json.should match variant.options_text
   end
-end
\ No newline at end of file
+end