spree_api 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9c508f1db57c6d3162093a618db8ae73f80889e
-  data.tar.gz: c2d8de75c3961ac03fbc5bb4804d62890bdff4ca
+  metadata.gz: 0baeb34a841cbeec0a8b478e5412b14747e28433
+  data.tar.gz: 26e9a4951c2d5875a51bd4c3454c2b64b152116b
 SHA512:
-  metadata.gz: 0f2cf6539f49c45718e4af844d1f75bb92303ede18c9c829a99f87888d0cdc52993209a7cd86e624211dbffa2dc54fb4f76edd93b3d90aca42cf79882d3b9d6f
-  data.tar.gz: 1ba85f77edc9a122e4fdeef402ef96f9de6d936d3e58b8ebbba9b65cf755c68588cb59aea55946010480a25bdcf726adc942cc942e135b2ec57ef769045c4335
+  metadata.gz: 74cb502eefc6a43572559fee484fba1bd6f880d3d2d7bc8c835c63ad6685700adbd71b5f6002ff9cd011b450f682f8cfa44d1c702b1262d3e2e3dff55b57ce4a
+  data.tar.gz: d5f37aebf55c5d8efacdd9f6221cc67e0822e1d7201ed85c0229c85387f56e49ef4f092bcf54aa3d2a6f7b915ad76509db4a2de24720bab7950d3b69f32cc4b8

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

@@ -34,8 +34,13 @@ module Spree
           end
 
           return if after_update_attributes
-          state_callback(:after) if @order.next
-          respond_with(@order, default_template: 'spree/api/orders/show')
+
+          if @order.next || @order.completed?  
+            state_callback(:after)
+            respond_with(@order, default_template: 'spree/api/orders/show')
+          else
+            respond_with(@order, default_template: 'spree/api/orders/could_not_transition', status: 422)
+          end
         else
           invalid_resource!(@order)
         end

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

@@ -1,3 +1,3 @@
 object false
-node(:error) { I18n.t(:could_not_transition, :scope => "spree.api.order") }
+node(:error) { I18n.t(:could_not_transition, scope: "spree.api.order") }
 node(:errors) { @order.errors.to_hash }

data/config/routes.rb

@@ -62,7 +62,7 @@ Spree::Core::Engine.add_routes do
     end
 
     get '/orders/mine', to: 'orders#mine', as: 'my_orders'
-    get "/orders/current", to: "orders#current", to: "orders#current", as: "current_order"
+    get "/orders/current", to: "orders#current", as: "current_order"
 
     resources :orders, concerns: :order_routes
 

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

@@ -1,19 +1,19 @@
 require 'spec_helper'
 
 module Spree
-  describe Api::CheckoutsController, :type => :controller do
+  describe Api::CheckoutsController, type: :controller do
     render_views
 
     before(:each) do
       stub_authentication!
       Spree::Config[:track_inventory_levels] = false
-      country_zone = create(:zone, :name => 'CountryZone')
+      country_zone = create(:zone, name: 'CountryZone')
       @state = create(:state)
       @country = @state.country
-      country_zone.members.create(:zoneable => @country)
+      country_zone.members.create(zoneable: @country)
       create(:stock_location)
 
-      @shipping_method = create(:shipping_method, :zones => [country_zone])
+      @shipping_method = create(:shipping_method, zones: [country_zone])
       @payment_method = create(:credit_card_payment_method)
     end
 
@@ -31,14 +31,14 @@ module Spree
       end
 
       before(:each) do
-        allow_any_instance_of(Order).to receive_messages(:confirmation_required? => true)
-        allow_any_instance_of(Order).to receive_messages(:payment_required? => true)
+        allow_any_instance_of(Order).to receive_messages(confirmation_required?: true)
+        allow_any_instance_of(Order).to receive_messages(payment_required?: true)
       end
 
       it "should transition a recently created order from cart to address" do
         expect(order.state).to eq "cart"
         expect(order.email).not_to be_nil
-        api_put :update, :id => order.to_param, :order_token => order.guest_token
+        api_put :update, id: order.to_param, order_token: order.guest_token
         expect(order.reload.state).to eq "address"
       end
 
@@ -52,16 +52,16 @@ module Spree
 
       it "can take line_items_attributes as a parameter" do
         line_item = order.line_items.first
-        api_put :update, :id => order.to_param, :order_token => order.guest_token,
-                         :order => { :line_items_attributes => { 0 => { :id => line_item.id, :quantity => 1 } } }
+        api_put :update, id: order.to_param, order_token: order.guest_token,
+                         order: { line_items_attributes: { 0 => { id: line_item.id, quantity: 1 } } }
         expect(response.status).to eq(200)
         expect(order.reload.state).to eq "address"
       end
 
       it "can take line_items as a parameter" do
         line_item = order.line_items.first
-        api_put :update, :id => order.to_param, :order_token => order.guest_token,
-                         :order => { :line_items => { 0 => { :id => line_item.id, :quantity => 1 } } }
+        api_put :update, id: order.to_param, order_token: order.guest_token,
+                         order: { line_items: { 0 => { id: line_item.id, quantity: 1 } } }
         expect(response.status).to eq(200)
         expect(order.reload.state).to eq "address"
       end
@@ -71,7 +71,7 @@ module Spree
         order.bill_address = nil
         order.save
         order.update_column(:state, "address")
-        api_put :update, :id => order.to_param, :order_token => order.guest_token
+        api_put :update, id: order.to_param, order_token: order.guest_token
         # Order has not transitioned
         expect(response.status).to eq(422)
       end
@@ -83,38 +83,51 @@ module Spree
 
         let(:address) do
           {
-            :firstname  => 'John',
-            :lastname   => 'Doe',
-            :address1   => '7735 Old Georgetown Road',
-            :city       => 'Bethesda',
-            :phone      => '3014445002',
-            :zipcode    => '20814',
-            :state_id   => @state.id,
-            :country_id => @country.id
+            firstname:  'John',
+            lastname:   'Doe',
+            address1:   '7735 Old Georgetown Road',
+            city:       'Bethesda',
+            phone:      '3014445002',
+            zipcode:    '20814',
+            state_id:   @state.id,
+            country_id: @country.id
           }
         end
 
         it "can update addresses and transition from address to delivery" do
           api_put :update,
-                  :id => order.to_param, :order_token => order.guest_token,
-                  :order => {
-                    :bill_address_attributes => address,
-                    :ship_address_attributes => address
-                  }
+            id: order.to_param, order_token: order.guest_token,
+            order: {
+              bill_address_attributes: address,
+              ship_address_attributes: address
+            }
           expect(json_response['state']).to eq('delivery')
           expect(json_response['bill_address']['firstname']).to eq('John')
           expect(json_response['ship_address']['firstname']).to eq('John')
           expect(response.status).to eq(200)
         end
 
+        # Regression Spec for #5389 & #5880
+        it "can update addresses but not transition to delivery w/o shipping setup" do
+          Spree::ShippingMethod.destroy_all
+          api_put :update,
+            id: order.to_param, order_token: order.guest_token,
+            order: {
+              bill_address_attributes: address,
+              ship_address_attributes: address
+            }
+          expect(json_response['error']).to eq(I18n.t(:could_not_transition, scope: "spree.api.order"))
+          expect(response.status).to eq(422)
+        end
+
         # Regression test for #4498
         it "does not contain duplicate variant data in delivery return" do
           api_put :update,
-                  :id => order.to_param, :order_token => order.guest_token,
-                  :order => {
-                    :bill_address_attributes => address,
-                    :ship_address_attributes => address
-                  }
+            id: order.to_param, order_token: order.guest_token,
+            order: {
+              bill_address_attributes: address,
+              ship_address_attributes: address
+            }
           # Shipments manifests should not return the ENTIRE variant
           # This information is already present within the order's line items
           expect(json_response['shipments'].first['manifest'].first['variant']).to be_nil
@@ -124,11 +137,11 @@ module Spree
 
       it "can update shipping method and transition from delivery to payment" do
         order.update_column(:state, "delivery")
-        shipment = create(:shipment, :order => order)
+        shipment = create(:shipment, order: order)
         shipment.refresh_rates
-        shipping_rate = shipment.shipping_rates.where(:selected => false).first
-        api_put :update, :id => order.to_param, :order_token => order.guest_token,
-          :order => { :shipments_attributes => { "0" => { :selected_shipping_rate_id => shipping_rate.id, :id => shipment.id } } }
+        shipping_rate = shipment.shipping_rates.where(selected: false).first
+        api_put :update, id: order.to_param, order_token: order.guest_token,
+          order: { shipments_attributes: { "0" => { selected_shipping_rate_id: shipping_rate.id, id: shipment.id } } }
         expect(response.status).to eq(200)
         # Find the correct shipment...
         json_shipment = json_response['shipments'].detect { |s| s["id"] == shipment.id }
@@ -142,8 +155,8 @@ module Spree
 
       it "can update payment method and transition from payment to confirm" do
         order.update_column(:state, "payment")
-        api_put :update, :id => order.to_param, :order_token => order.guest_token,
-          :order => { :payments_attributes => [{ :payment_method_id => @payment_method.id }] }
+        api_put :update, id: order.to_param, order_token: order.guest_token,
+          order: { payments_attributes: [{ payment_method_id: @payment_method.id }] }
         expect(json_response['state']).to eq('confirm')
         expect(json_response['payments'][0]['payment_method']['name']).to eq(@payment_method.name)
         expect(json_response['payments'][0]['amount']).to eq(order.total.to_s)
@@ -153,16 +166,16 @@ module Spree
       it "can update payment method with source and transition from payment to confirm" do
         order.update_column(:state, "payment")
         source_attributes = {
-          "number" => "4111111111111111",
-          "month" => 1.month.from_now.month,
-          "year" => 1.month.from_now.year,
-          "verification_value" => "123",
-          "name" => "Spree Commerce"
+          number: "4111111111111111",
+          month: 1.month.from_now.month,
+          year: 1.month.from_now.year,
+          verification_value: "123",
+          name: "Spree Commerce"
         }
 
-        api_put :update, :id => order.to_param, :order_token => order.guest_token,
-          :order => { :payments_attributes => [{ :payment_method_id => @payment_method.id.to_s }],
-                      :payment_source => { @payment_method.id.to_s => source_attributes } }
+        api_put :update, id: order.to_param, order_token: order.guest_token,
+          order: { payments_attributes: [{ payment_method_id: @payment_method.id.to_s }],
+                      payment_source: { @payment_method.id.to_s => source_attributes } }
         expect(json_response['payments'][0]['payment_method']['name']).to eq(@payment_method.name)
         expect(json_response['payments'][0]['amount']).to eq(order.total.to_s)
         expect(response.status).to eq(200)
@@ -170,11 +183,11 @@ module Spree
 
       it "returns errors when source is missing attributes" do
         order.update_column(:state, "payment")
-        api_put :update, :id => order.to_param, :order_token => order.guest_token,
-          :order => {
-            :payments_attributes => [{ :payment_method_id => @payment_method.id }]
+        api_put :update, id: order.to_param, order_token: order.guest_token,
+          order: {
+            payments_attributes: [{ payment_method_id: @payment_method.id }]
           },
-          :payment_source => {
+          payment_source: {
             @payment_method.id.to_s => { name: "Spree" }
           }
 
@@ -190,24 +203,24 @@ module Spree
         order.update_column(:state, "payment")
         credit_card = create(:credit_card, user_id: order.user_id, payment_method_id: @payment_method.id)
 
-        api_put :update, :id => order.to_param, :order_token => order.guest_token,
-          :order => { :existing_card => credit_card.id }
+        api_put :update, id: order.to_param, order_token: order.guest_token,
+          order: { existing_card: credit_card.id }
 
         expect(response.status).to eq 200
         expect(order.credit_cards).to match_array [credit_card]
       end
 
       it "can transition from confirm to complete" do
-        order.update_column(:state, "confirm")
-        allow_any_instance_of(Spree::Order).to receive_messages(:payment_required? => false)
-        api_put :update, :id => order.to_param, :order_token => order.guest_token
+        order.update_columns(completed_at: Time.now, state: 'complete')
+        allow_any_instance_of(Spree::Order).to receive_messages(payment_required?: false)
+        api_put :update, id: order.to_param, order_token: order.guest_token
         expect(json_response['state']).to eq('complete')
         expect(response.status).to eq(200)
       end
 
       it "returns the order if the order is already complete" do
-        order.update_column(:state, "complete")
-        api_put :update, :id => order.to_param, :order_token => order.guest_token
+        order.update_columns(completed_at: Time.now, state: 'complete')
+        api_put :update, id: order.to_param, order_token: order.guest_token
         expect(json_response['number']).to eq(order.number)
         expect(response.status).to eq(200)
       end
@@ -215,8 +228,8 @@ module Spree
       # Regression test for #3784
       it "can update the special instructions for an order" do
         instructions = "Don't drop it. (Please)"
-        api_put :update, :id => order.to_param, :order_token => order.guest_token,
-          :order => { :special_instructions => instructions }
+        api_put :update, id: order.to_param, order_token: order.guest_token,
+          order: { special_instructions: instructions }
         expect(json_response['special_instructions']).to eql(instructions)
       end
 
@@ -225,16 +238,16 @@ module Spree
         it "can assign a user to the order" do
           user = create(:user)
           # Need to pass email as well so that validations succeed
-          api_put :update, :id => order.to_param, :order_token => order.guest_token,
-            :order => { :user_id => user.id, :email => "guest@spreecommerce.com" }
+          api_put :update, id: order.to_param, order_token: order.guest_token,
+            order: { user_id: user.id, email: "guest@spreecommerce.com" }
           expect(response.status).to eq(200)
           expect(json_response['user_id']).to eq(user.id)
         end
       end
 
       it "can assign an email to the order" do
-        api_put :update, :id => order.to_param, :order_token => order.guest_token,
-          :order => { :email => "guest@spreecommerce.com" }
+        api_put :update, id: order.to_param, order_token: order.guest_token,
+          order: { email: "guest@spreecommerce.com" }
         expect(json_response['email']).to eq("guest@spreecommerce.com")
         expect(response.status).to eq(200)
       end
@@ -244,8 +257,8 @@ module Spree
 
         order.update_column(:state, "payment")
         expect(PromotionHandler::Coupon).to receive(:new).with(order).and_call_original
-        expect_any_instance_of(PromotionHandler::Coupon).to receive(:apply).and_return({:coupon_applied? => true})
-        api_put :update, :id => order.to_param, :order_token => order.guest_token, :order => { :coupon_code => "foobar" }
+        expect_any_instance_of(PromotionHandler::Coupon).to receive(:apply).and_return({ coupon_applied?: true })
+        api_put :update, :id => order.to_param, order_token: order.guest_token, order: { coupon_code: "foobar" }
       end
     end
 
@@ -254,7 +267,7 @@ module Spree
       it "cannot transition to address without a line item" do
         order.line_items.delete_all
         order.update_column(:email, "spree@example.com")
-        api_put :next, :id => order.to_param, :order_token => order.guest_token
+        api_put :next, id: order.to_param, order_token: order.guest_token
         expect(response.status).to eq(422)
         expect(json_response["errors"]["base"]).to include(Spree.t(:there_are_no_items_for_this_order))
       end
@@ -262,7 +275,7 @@ module Spree
       it "can transition an order to the next state" do
         order.update_column(:email, "spree@example.com")
 
-        api_put :next, :id => order.to_param, :order_token => order.guest_token
+        api_put :next, id: order.to_param, order_token: order.guest_token
         expect(response.status).to eq(200)
         expect(json_response['state']).to eq('address')
       end
@@ -280,7 +293,7 @@ module Spree
 
       it "doesnt advance payment state if order has no payment" do
         order.update_column(:state, "payment")
-        api_put :next, :id => order.to_param, :order_token => order.guest_token, :order => {}
+        api_put :next, id: order.to_param, order_token: order.guest_token, order: {}
         expect(json_response["errors"]["base"]).to include(Spree.t(:no_payment_found))
       end
     end
@@ -290,11 +303,11 @@ module Spree
 
       it 'continues to advance advances an order while it can move forward' do
         expect_any_instance_of(Spree::Order).to receive(:next).exactly(3).times.and_return(true, true, false)
-        api_put :advance, :id => order.to_param, :order_token => order.guest_token
+        api_put :advance, id: order.to_param, order_token: order.guest_token
       end
 
       it 'returns the order' do
-        api_put :advance, :id => order.to_param, :order_token => order.guest_token
+        api_put :advance, id: order.to_param, order_token: order.guest_token
         expect(json_response['id']).to eq(order.id)
       end
     end

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

@@ -1,9 +1,10 @@
 require 'spec_helper'
 
 module Spree
-  describe Api::ClassificationsController, :type => :controller do
+  describe Api::ClassificationsController, type: :controller do
     let(:taxon) do
       taxon = create(:taxon)
+
       3.times do
         product = create(:product)
         product.taxons << taxon
@@ -17,7 +18,7 @@ module Spree
 
     context "as a user" do
       it "cannot change the order of a product" do
-        api_put :update, :taxon_id => taxon, :product_id => taxon.products.first, :position => 1
+        api_put :update, taxon_id: taxon, product_id: taxon.products.first, position: 1
         expect(response.status).to eq(401)
       end
     end
@@ -25,14 +26,23 @@ module Spree
     context "as an admin" do
       sign_in_as_admin!
 
+      let(:last_product) { taxon.products.last }
+
       it "can change the order a product" do
-        last_product = taxon.products.last
-        classification = taxon.classifications.find_by(:product_id => last_product.id)
+        classification = taxon.classifications.find_by(product_id: last_product.id)
         expect(classification.position).to eq(3)
-        api_put :update, :taxon_id => taxon, :product_id => last_product, :position => 0
+        api_put :update, taxon_id: taxon, product_id: last_product, position: 0
         expect(response.status).to eq(200)
         expect(classification.reload.position).to eq(1)
       end
+
+      it "should touch the taxon" do
+        taxon.update_attributes(updated_at: Time.now - 10.seconds)
+        taxon_last_updated_at = taxon.updated_at
+        api_put :update, taxon_id: taxon, product_id: last_product, position: 0
+        taxon.reload
+        expect(taxon_last_updated_at.to_i).to_not eq(taxon.updated_at.to_i)
+      end
     end
   end
-end
+end

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

@@ -35,7 +35,7 @@ module Spree
             "seo_title" => nil,
             "mail_from_address" => "spree@example.org",
             "default_currency" => nil,
-            "code" => "spree_1",
+            "code" => store.code,
             "default" => true
           },
           {
@@ -47,7 +47,7 @@ module Spree
             "seo_title" => nil,
             "mail_from_address" => "spree@example.org",
             "default_currency" => nil,
-            "code" => "spree_2",
+            "code" => non_default_store.code,
             "default" => false
           }
         ])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2015-02-04 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.4.2
+        version: 2.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.4.3
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -266,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Spree's API