spree_api 1.1.2 → 1.1.3

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

@@ -8,7 +8,7 @@ module Spree
         def index
           # should probably look at turning this into a CanCan step
           raise CanCan::AccessDenied unless current_api_user.has_role?("admin")
-          @orders = Order.page(params[:page])
+          @orders = Order.page(params[:page]).per(params[:per_page])
         end
 
         def show
@@ -27,6 +27,7 @@ module Spree
         def update
           authorize! :update, Order
           if order.update_attributes(@nested_params)
+            order.update!
             render :show
           else
             invalid_resource!(order)

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

@@ -20,6 +20,7 @@ module Spree
 
         def create
           authorize! :create, Product
+          params[:product][:available_on] ||= Time.now
           @product = Product.new(params[:product])
           if @product.save
             render :show, :status => 201

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

@@ -2,6 +2,6 @@ object false
 child(@orders) do
   attributes *order_attributes
 end
-node(:count) { @orders.total_count }
+node(:count) { @orders.count }
 node(:current_page) { params[:page] || 1 }
 node(:pages) { @orders.num_pages }

data/lib/spree/api/controller_setup.rb

@@ -16,6 +16,7 @@ module Spree
           include ActionController::MimeResponds
 
           include CanCan::ControllerAdditions
+          prepend_view_path Rails.root + "app/views"
           append_view_path File.expand_path("../../../app/views", File.dirname(__FILE__))
 
           respond_to :json

data/lib/spree/api/engine.rb

@@ -20,3 +20,5 @@ module Spree
     end
   end
 end
+
+

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

@@ -120,6 +120,13 @@ module Spree
         json_response["errors"]["bill_address.firstname"].should_not be_blank
       end
 
+      it "can add line items" do
+        api_put :update, :id => order.to_param, :order => { :line_items => [{:variant_id => create(:variant).id, :quantity => 2}] }
+
+        response.status.should == 200
+        json_response['order']['item_total'].to_f.should_not == order.item_total.to_f
+      end
+
       context "with a line item" do
         before do
           order.line_items << create(:line_item)
@@ -158,12 +165,26 @@ module Spree
     context "as an admin" do
       sign_in_as_admin!
 
-      it "can view all orders" do
-        api_get :index
-        json_response["orders"].first.should have_attributes(attributes)
-        json_response["count"].should == 1
-        json_response["current_page"].should == 1
-        json_response["pages"].should == 1
+      context "with two orders" do
+        before { create(:order) }
+
+        it "can view all orders" do
+          api_get :index
+          json_response["orders"].first.should have_attributes(attributes)
+          json_response["count"].should == 2
+          json_response["current_page"].should == 1
+          json_response["pages"].should == 1
+        end
+
+        # Test for #1763
+        it "can control the page size through a parameter" do
+          api_get :index, :per_page => 1
+          json_response["orders"].count.should == 1
+          json_response["orders"].first.should have_attributes(attributes)
+          json_response["count"].should == 1
+          json_response["current_page"].should == 1
+          json_response["pages"].should == 2
+        end
       end
 
       context "can cancel an order" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,33 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-07-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &70257645516340 !ruby/object:Gem::Requirement
+  requirement: &70233810562560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70257645516340
+  version_requirements: *70233810562560
 - !ruby/object:Gem::Dependency
   name: spree_auth
-  requirement: &70257647891920 !ruby/object:Gem::Requirement
+  requirement: &70233810547020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: 1.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *70257647891920
+  version_requirements: *70233810547020
 - !ruby/object:Gem::Dependency
   name: rabl
-  requirement: &70257647891460 !ruby/object:Gem::Requirement
+  requirement: &70233810543540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *70257647891460
+  version_requirements: *70233810543540
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70257647891000 !ruby/object:Gem::Requirement
+  requirement: &70233810540440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70257647891000
+  version_requirements: *70233810540440
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70257647890620 !ruby/object:Gem::Requirement
+  requirement: &70233810539000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70257647890620
+  version_requirements: *70233810539000
 description: Spree's API
 email:
 - ryan@spreecommerce.com
@@ -192,7 +192,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4073779173415813189
+      hash: 1403657834469964020
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4073779173415813189
+      hash: 1403657834469964020
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10