spree_api 1.1.0.rc2 → 1.1.0

data/app/controllers/spree/api/v1/orders_controller.rb

@@ -45,6 +45,11 @@ module Spree
           end
         end
 
+        def cancel
+          order.cancel!
+          render :show
+        end
+
         private
 
         def map_nested_attributes

data/config/routes.rb

@@ -18,6 +18,7 @@ Spree::Core::Engine.routes.prepend do
         member do
           put :address
           put :delivery
+          put :cancel
         end
 
         resources :line_items

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

@@ -129,8 +129,6 @@ module Spree
           end
         end
       end
-
-
     end
 
     context "as an admin" do
@@ -143,6 +141,20 @@ module Spree
         json_response["current_page"].should == 1
         json_response["pages"].should == 1
       end
+
+      context "can cancel an order" do
+        before do
+          order.completed_at = Time.now
+          order.state = 'complete'
+          order.shipment_state = 'ready'
+          order.save!
+        end
+
+        specify do
+          api_put :cancel, :id => order.to_param
+          json_response["order"]["state"].should == "canceled"
+        end
+      end
     end
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc2
-  prerelease: 6
+  version: 1.1.0
+  prerelease: 
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-20 00:00:00.000000000 Z
+date: 2012-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &70332729484720 !ruby/object:Gem::Requirement
+  requirement: &70116387070120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc2
+        version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70332729484720
+  version_requirements: *70116387070120
 - !ruby/object:Gem::Dependency
   name: spree_auth
-  requirement: &70332729479800 !ruby/object:Gem::Requirement
+  requirement: &70116387068680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc2
+        version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70332729479800
+  version_requirements: *70116387068680
 - !ruby/object:Gem::Dependency
   name: rabl
-  requirement: &70332729477860 !ruby/object:Gem::Requirement
+  requirement: &70116387015640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *70332729477860
+  version_requirements: *70116387015640
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70332729346420 !ruby/object:Gem::Requirement
+  requirement: &70116387011680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70332729346420
+  version_requirements: *70116387011680
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70332729344960 !ruby/object:Gem::Requirement
+  requirement: &70116387010380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70332729344960
+  version_requirements: *70116387010380
 description: Spree's API
 email:
 - ryan@spreecommerce.com
@@ -105,6 +105,7 @@ files:
 - app/views/spree/api/v1/line_items/new.rabl
 - app/views/spree/api/v1/line_items/show.rabl
 - app/views/spree/api/v1/orders/address.rabl
+- app/views/spree/api/v1/orders/canceled.rabl
 - app/views/spree/api/v1/orders/cart.rabl
 - app/views/spree/api/v1/orders/complete.rabl
 - app/views/spree/api/v1/orders/could_not_transition.rabl
@@ -169,13 +170,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1673968369250392994
+      hash: 618732053223266577
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 618732053223266577
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10