spree_api 3.0.0.rc1 → 3.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 918a64814abd45ead2005fbface150d6703b4038
-  data.tar.gz: b51dc9c832ad061af1e1b7d54095df7ad9648471
+  metadata.gz: ce116e8fb4a30f1ccbe401442ea8f6d467b664ad
+  data.tar.gz: f3eb5f31fafbc8481803e6054228fda895d9d747
 SHA512:
-  metadata.gz: c2bcc152d0e4d1db8f0c60c706d53c35192c5875ddef8d4c5dbb24ee1b35fbe6a4a0b0943d4addb35f71c2d46df492705ff61f1c60fe943f3e20681b4dcfa4b5
-  data.tar.gz: e2385d91a7c65706135ea244d3920fa0ede5a6f60204a5f9e1072a2468f756ef6f4ca841e959a040aa222afd57029a27bd01f06d1a6a0969b3c92dd76a7508aa
+  metadata.gz: 235a1081a4cb779a5e78879937479474f14630355b3c080b404a79ea0958e3f137d02a7f9cfee2aa6e8b6863e76f0beaf3727d41b150967e637e227bbdcebef0
+  data.tar.gz: 537fe799160cebcd7bb91609e57f7e547bcc19b2be169264156247b2b5e0f8d62318bf6f4a9a5c6064d29d5c40aa6cc0f1f88c790f9797d24eda3ba544edac16

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

@@ -35,7 +35,7 @@ module Spree
 
           return if after_update_attributes
 
-          if @order.next || @order.completed?  
+          if @order.completed? || @order.next
             state_callback(:after)
             respond_with(@order, default_template: 'spree/api/orders/show')
           else

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

@@ -9,12 +9,11 @@ module Spree
     let(:variant) { create(:variant) }
     let(:line_item) { create(:line_item) }
 
-    let(:attributes) { [:number, :item_total, :display_total, :total,
-                        :state, :adjustment_total,
-                        :user_id, :created_at, :updated_at,
-                        :completed_at, :payment_total, :shipment_state,
-                        :payment_state, :email, :special_instructions,
-                        :total_quantity, :display_item_total, :currency] }
+    let(:attributes) do
+      [:number, :item_total, :display_total, :total, :state, :adjustment_total, :user_id,
+       :created_at, :updated_at, :completed_at, :payment_total, :shipment_state, :payment_state,
+       :email, :special_instructions, :total_quantity, :display_item_total, :currency]
+    end
 
     let(:address_params) { { :country_id => Country.first.id, :state_id => State.first.id } }
 
@@ -230,7 +229,7 @@ module Spree
     end
 
     it "can create an order" do
-      api_post :create, :order => { :line_items => { "0" => { :variant_id => variant.to_param, :quantity => 5 } } }
+      api_post :create, order: { line_items: [{ variant_id: variant.to_param, quantity: 5 }] }
       expect(response.status).to eq(201)
 
       order = Order.last
@@ -260,23 +259,15 @@ module Spree
       expect(line_item).to receive(:update_attributes!).with("special" => true)
 
       allow(controller).to receive_messages(permitted_line_item_attributes: [:id, :variant_id, :quantity, :special])
-      api_post :create, :order => {
-        :line_items => {
-          "0" => {
-            :variant_id => variant.to_param, :quantity => 5, :special => true
-          }
-        }
+      api_post :create, order: {
+        line_items: [{ variant_id: variant.to_param, quantity: 5, special: true }]
       }
       expect(response.status).to eq(201)
     end
 
     it "cannot arbitrarily set the line items price" do
-      api_post :create, :order => {
-        :line_items => {
-          "0" => {
-            :price => 33.0, :variant_id => variant.to_param, :quantity => 5
-          }
-        }
+      api_post :create, order: {
+        line_items: [{ price: 33.0, variant_id: variant.to_param, quantity: 5 }]
       }
 
       expect(response.status).to eq 201
@@ -302,13 +293,7 @@ module Spree
       allow(order).to receive(:associate_user!)
       allow(order).to receive_message_chain(:contents, :add).and_return(line_item = double('LineItem'))
       expect(line_item).not_to receive(:update_attributes)
-      api_post :create, :order => {
-        :line_items => {
-          "0" => {
-            :variant_id => variant.to_param, :quantity => 5
-          }
-        }
-      }
+      api_post :create, order: { line_items: [{ variant_id: variant.to_param, quantity: 5 }] }
     end
 
     it "can create an order without any parameters" do
@@ -683,12 +668,8 @@ module Spree
         end
 
         it "can arbitrarily set the line items price" do
-          api_post :create, :order => {
-            :line_items => {
-              "0" => {
-                :price => 33.0, :variant_id => variant.to_param, :quantity => 5
-              }
-            }
+          api_post :create, order: {
+            line_items: [{ price: 33.0, variant_id: variant.to_param, quantity: 5 }]
           }
           expect(response.status).to eq 201
           expect(Order.last.line_items.first.price.to_f).to eq(33.0)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc1
+  version: 3.0.0.rc3
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2015-02-23 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.0.rc1
+        version: 3.0.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
+        version: 3.0.0.rc3
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement