spree_api 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef00fcd9a6f5ff3573c20c99509035edf9b49e66
-  data.tar.gz: 8b036132ce0f23d36d5cb58e283187ee17519066
+  metadata.gz: 4dd12818d3a505303fcaeea073d198b09e8a21b5
+  data.tar.gz: d0dcafde824a488a304aae6e1b3c2401b09c98e9
 SHA512:
-  metadata.gz: 70a31fa7caf0a0107ad2141582fa3ee166666789ff1202bf6082d72e7b8509af7a4f014cc1c7efc4985cf9e8bda1dbacaf93df443746b59b1ffca76d78865d5b
-  data.tar.gz: ce8f5e35409bb3593a2db354456761ab3dfdea846a454c94e1590039d8ef1a249f183f6ff48e0773112a2fd6cea7e5f8122f13285c7aa82690ee89e10f0e0514
+  metadata.gz: f9bb3abab9f4bb837f665ff4f73f889e3b18f692eea3573c1f9a95fe887c10f7863b40a38fbbdb86238a35ed575e2e0667e45897a6e03e199d712fade6ce468e
+  data.tar.gz: 22801dae757bcfc7bdce03f9fc77b6cefb3d1ef20bc8dbb19cde12527e731399ad9a0351a8d5a3d2030c17c3e714c41188389ca83079d3a8da465af486e8b8c2

data/app/controllers/spree/api/payments_controller.rb

@@ -26,7 +26,7 @@ module Spree
 
       def update
         authorize! params[:action], @payment
-        if ! @payment.pending?
+        if !@payment.editable?
           render 'update_forbidden', status: 403
         elsif @payment.update_attributes(payment_params)
           respond_with(@payment, default_template: :show)

data/app/controllers/spree/api/products_controller.rb

@@ -94,11 +94,7 @@ module Spree
 
       private
         def product_params
-          product_params = params.require(:product).permit(permitted_product_attributes)
-          if product_params[:taxon_ids].present?
-            product_params[:taxon_ids] = product_params[:taxon_ids].split(',')
-          end
-          product_params
+          params.require(:product).permit(permitted_product_attributes)
         end
 
         def variants_params

data/app/views/spree/api/orders/show.v1.rabl

@@ -25,9 +25,8 @@ child :payments => :payments do
   end
 
   child :source => :source do
-    attributes *payment_source_attributes
     if @current_user_roles.include?('admin')
-      attributes *payment_source_attributes.concat([:gateway_customer_profile_id, :gateway_payment_profile_id])
+      attributes *payment_source_attributes + [:gateway_customer_profile_id, :gateway_payment_profile_id]
     else
       attributes *payment_source_attributes
     end

data/lib/spree/api/engine.rb

@@ -1,4 +1,5 @@
 require 'rails/engine'
+require 'versioncake'
 
 module Spree
   module Api
@@ -16,8 +17,8 @@ module Spree
         config.json_engine = ActiveSupport::JSON
       end
 
-      config.view_versions = [1]
-      config.view_version_extraction_strategy = :http_header
+      config.versioncake.supported_version_numbers = [1]
+      config.versioncake.extraction_strategy = :http_header
 
       initializer "spree.api.environment", :before => :load_config_initializers do |app|
         Spree::Api::Config = Spree::ApiConfiguration.new

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

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

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

@@ -105,26 +105,37 @@ module Spree
 
       context "for a given payment" do
         context "updating" do
-          it "can update" do
-            payment.update_attributes(:state => 'pending')
-            api_put :update, :id => payment.to_param, :payment => { :amount => 2.01 }
-            expect(response.status).to eq(200)
-            expect(payment.reload.amount).to eq(2.01)
+          context "when the state is checkout" do
+            it "can update" do
+              payment.update_attributes(state: 'checkout')
+              api_put(:update, id: payment.to_param, payment: { amount: 2.01 })
+              expect(response.status).to be(200)
+              expect(payment.reload.amount).to eq(2.01)
+            end
+          end
+
+          context "when the state is pending" do
+            it "can update" do
+              payment.update_attributes(state: 'pending')
+              api_put(:update, id: payment.to_param, payment: { amount: 2.01 })
+              expect(response.status).to be(200)
+              expect(payment.reload.amount).to eq(2.01)
+            end
           end
 
           context "update fails" do
             it "returns a 422 status when the amount is invalid" do
-              payment.update_attributes(:state => 'pending')
-              api_put :update, :id => payment.to_param, :payment => { :amount => 'invalid' }
-              expect(response.status).to eq(422)
-              expect(json_response["error"]).to eq("Invalid resource. Please fix errors and try again.")
+              payment.update_attributes(state: 'pending')
+              api_put(:update, id: payment.to_param, payment: { amount: 'invalid' })
+              expect(response.status).to be(422)
+              expect(json_response['error']).to eql('Invalid resource. Please fix errors and try again.')
             end
 
             it "returns a 403 status when the payment is not pending" do
-              payment.update_attributes(:state => 'completed')
-              api_put :update, :id => payment.to_param, :payment => { :amount => 2.01 }
-              expect(response.status).to eq(403)
-              expect(json_response["error"]).to eq("This payment cannot be updated because it is completed.")
+              payment.update_attributes(state: 'completed')
+              api_put(:update, id: payment.to_param, payment: { amount: 2.01 })
+              expect(response.status).to be(403)
+              expect(json_response['error']).to eql('This payment cannot be updated because it is completed.')
             end
           end
         end

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

@@ -67,45 +67,6 @@ module Spree
         expect(json_response["per_page"]).to eq(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
-
-        def set_custom_route
-          @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
-            r.draw { get 'custom_show' => 'spree/api/products#custom_show' }
-          end
-        end
-
-        it "uses the specified custom template through the request header" do
-          set_custom_route
-
-          request.headers['X-Spree-Template'] = 'show'
-          api_get :custom_show, :id => product.id
-          expect(response).to render_template('spree/api/products/show')
-        end
-
-        it "uses the specified custom template through the template URL parameter" do
-          set_custom_route
-
-          api_get :custom_show, :id => product.id, :template => 'show'
-          expect(response).to 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
-          expect(response).to 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 }
 
@@ -345,16 +306,9 @@ module Spree
           expect(json_response['shipping_category_id']).to eq shipping_id
         end
 
-        it "puts the created product in the given taxon" do
-          product_data[:taxon_ids] = taxon_1.id.to_s
-          api_post :create, :product => product_data
-          expect(json_response["taxon_ids"]).to eq([taxon_1.id,])
-        end
-
-        # Regression test for #4123
         it "puts the created product in the given taxons" do
-          product_data[:taxon_ids] = [taxon_1.id, taxon_2.id].join(',')
-          api_post :create, :product => product_data
+          product_data[:taxon_ids] = [taxon_1.id, taxon_2.id]
+          api_post :create, product: product_data
           expect(json_response["taxon_ids"]).to eq([taxon_1.id, taxon_2.id])
         end
 
@@ -438,16 +392,9 @@ module Spree
           expect(json_response["errors"]["name"]).to eq(["can't be blank"])
         end
 
-        # Regression test for #4123
-        it "puts the created product in the given taxon" do
-          api_put :update, :id => product.to_param, :product => {:taxon_ids => taxon_1.id.to_s}
-          expect(json_response["taxon_ids"]).to eq([taxon_1.id,])
-        end
-
-        # Regression test for #4123
-        it "puts the created product in the given taxons" do
-          api_put :update, :id => product.to_param, :product => {:taxon_ids => [taxon_1.id, taxon_2.id].join(',')}
-          expect(json_response["taxon_ids"]).to eq([taxon_1.id, taxon_2.id])
+        it "puts the updated product in the given taxons" do
+          api_put :update, id: product.to_param, product: { taxon_ids: [taxon_1.id, taxon_2.id] }
+          expect(json_response["taxon_ids"].to_set).to eql([taxon_1.id, taxon_2.id].to_set)
         end
       end
 

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

@@ -38,32 +38,6 @@ module Spree
       expect(json_response['zone_members'].size).to 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
-        @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
-          r.draw { get 'custom_show' => 'spree/api/zones#custom_show' }
-        end
-
-        request.headers['X-Spree-Template'] = 'show'
-        api_get :custom_show, :id => @zone.id
-        expect(response).to 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
-        expect(response).to 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: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 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: 3.0.1
+        version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement