spree_api 2.2.11 → 2.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ff260b616c251dba5224a5fe2fdf911596fade7
-  data.tar.gz: c575c8571b0e883b95ff1f71570c1e1503e1bc7a
+  metadata.gz: 7c82df8c8bf25d14da8c58e1eca3ddeceba500a1
+  data.tar.gz: cfd8010ad17c0e023831dfb687c1b4dfafec2f7b
 SHA512:
-  metadata.gz: 7c83992f15eec1cf04aa7adfeb92f3805f2845d422dc23b49514735d2e79b2bfe75aae047d536b9352c97653ebf3b617668acba0b00ed40ea0c709b1dd8c19ad
-  data.tar.gz: 7ab3450b8d301c6ade86486b7ddc7e514b14c07561a0919c7cad3ad120ea1d071c7ffeb6a40191022040b74b0316969bc4b1c165f17a71be2c124b64f16529ee
+  metadata.gz: f320a4ef5695007ee32028b06fc4bce5fe5c044818984d612a46b19a45cbe54086a04c262bd71397b242d912ae8c01f7b7de7b282e034a06cc3083b169f49de6
+  data.tar.gz: 2611228601a1b147e6dc777f0b0946f6b774db8c925939f8b12791777069877b539a6cf6c1ceeb8d2c8948d0429242932d7ec9239896ad546f4a02ff60227577

data/lib/spree/api/responders/rabl_template.rb

@@ -14,7 +14,7 @@ module Spree
         end
 
         def template
-          request.headers['X-Spree-Template'] || controller.params[:template] || options[:default_template]
+          options[:default_template]
         end
 
         def api_behavior(error)

data/spec/controllers/spree/api/products_controller_spec.rb

@@ -67,34 +67,6 @@ module Spree
         json_response["per_page"].should == Kaminari.config.default_per_page
       end
 
-      context "specifying a rabl template for a custom action" do
-        before do
-          Spree::Api::ProductsController.class_eval do
-            def custom_show
-              @product = find_product(params[:id])
-              respond_with(@product)
-            end
-          end
-        end
-
-        it "uses the specified custom template through the request header" do
-          request.headers['X-Spree-Template'] = 'show'
-          api_get :custom_show, :id => product.id
-          response.should render_template('spree/api/products/show')
-        end
-
-        it "uses the specified custom template through the template URL parameter" do
-          api_get :custom_show, :id => product.id, :template => 'show'
-          response.should render_template('spree/api/products/show')
-        end
-
-        it "falls back to the default template if the specified template does not exist" do
-          request.headers['X-Spree-Template'] = 'invoice'
-          api_get :show, :id => product.id
-          response.should render_template('spree/api/products/show')
-        end
-      end
-
       context "product has more than one price" do
         before { product.master.prices.create currency: "EUR", amount: 22 }
 

data/spec/controllers/spree/api/zones_controller_spec.rb

@@ -38,28 +38,6 @@ module Spree
       json_response['zone_members'].size.should eq @zone.zone_members.count
     end
 
-    context "specifying a rabl template to use" do
-      before do
-        Spree::Api::ZonesController.class_eval do
-          def custom_show
-            respond_with(zone)
-          end
-        end
-      end
-
-      it "uses the specified template" do
-        request.headers['X-Spree-Template'] = 'show'
-        api_get :custom_show, :id => @zone.id
-        response.should render_template('spree/api/zones/show')
-      end
-
-      it "falls back to the default template if the specified template does not exist" do
-        request.headers['X-Spree-Template'] = 'invoice'
-        api_get :show, :id => @zone.id
-        response.should render_template('spree/api/zones/show')
-      end
-    end
-
     context "as an admin" do
       sign_in_as_admin!
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 2.2.11
+  version: 2.2.12
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.11
+        version: 2.2.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.2.11
+        version: 2.2.12
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement