spree_api 1.1.1 → 1.1.2.rc1

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

@@ -59,7 +59,7 @@ module Spree
 
         def find_product(id)
           begin
-            product_scope.find_by_permalink!(id)
+            product_scope.find_by_permalink!(id.to_s)
           rescue ActiveRecord::RecordNotFound
             product_scope.find(id)
           end
@@ -68,9 +68,13 @@ module Spree
         def product_scope
           if current_api_user.has_role?("admin")
             scope = Product
+            unless params[:show_deleted]
+              scope = scope.not_deleted
+            end
           else
             scope = Product.active
           end
+
           scope.includes(:master)
         end
 

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

@@ -3,6 +3,7 @@ module Spree
     module V1
       class OrdersController < Spree::Api::V1::BaseController
         before_filter :map_nested_attributes, :only => [:create, :update]
+        before_filter :authorize_read!, :except => [:index, :search, :create]
 
         def index
           # should probably look at turning this into a CanCan step
@@ -11,11 +12,10 @@ module Spree
         end
 
         def show
-          authorize! :read, order
         end
 
         def search
-          @orders = Order.search(params[:q]).result.page(params[:page])
+          @orders = Order.ransack(params[:q]).result.page(params[:page])
           render :index
         end
 
@@ -55,6 +55,13 @@ module Spree
           render :show
         end
 
+        def empty
+          authorize! :read, order
+          order.line_items.destroy_all
+          order.update!
+          render :text => nil, :status => 200
+        end
+
         private
 
         def map_nested_attributes
@@ -72,6 +79,10 @@ module Spree
             render :could_not_transition, :status => 422
           end
         end
+
+        def authorize_read!
+          authorize! :read, order
+        end
       end
     end
   end

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

@@ -7,7 +7,7 @@ module Spree
         end
 
         def search
-          @products = product_scope.search(params[:q]).result.page(params[:page])
+          @products = product_scope.ransack(params[:q]).result.page(params[:page])
           render :index
         end
 

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

@@ -6,24 +6,29 @@ module Spree
         before_filter :find_and_update_shipment, :only => [:ship, :ready]
 
         def ready
-          @shipment.ready!
+          unless @shipment.ready?
+            @shipment.ready!
+          end
           render :show
         end
 
         def ship
-          @shipment.ship!
+          unless @shipment.shipped?
+            @shipment.ship!
+          end
           render :show
         end
 
         private
 
         def find_order
-          @order = Order.find_by_number!(params[:order_id])
+          @order = Spree::Order.find_by_number!(params[:order_id])
         end
 
         def find_and_update_shipment
           @shipment = @order.shipments.find_by_number!(params[:id])
           @shipment.update_attributes(params[:shipment])
+          @shipment.reload
         end
       end
     end

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

@@ -0,0 +1,45 @@
+module Spree
+  module Api
+    module V1
+      class ZonesController < Spree::Api::V1::BaseController
+        def index
+          @zones = Zone.order('name ASC')
+        end
+
+        def show
+          zone
+        end
+
+        def create
+          authorize! :create, Zone
+          @zone = Zone.new(map_nested_attributes_keys(Spree::Zone, params[:zone]))
+          if @zone.save
+            render :show, :status => 201
+          else
+            invalid_resource!(@zone)
+          end
+        end
+
+        def update
+          authorize! :update, Zone
+          if zone.update_attributes(map_nested_attributes_keys(Spree::Zone, params[:zone]))
+            render :show, :status => 200
+          else
+            invalid_resource!(@zone)
+          end
+        end
+
+        def destroy
+          authorize! :delete, Zone
+          zone.destroy
+          render :text => nil, :status => 200
+        end
+
+        private
+        def zone
+          @zone ||= Spree::Zone.find(params[:id])
+        end
+      end
+    end
+  end
+end

data/app/helpers/spree/api/api_helpers.rb

@@ -16,6 +16,10 @@ module Spree
           :count_on_hand, :meta_description, :meta_keywords, :taxon_ids]
       end
 
+      def product_property_attributes
+        [:id, :product_id, :property_id, :value, :property_name]
+      end
+
       def variant_attributes
         [:id, :name, :count_on_hand, :sku, :price, :weight, :height, :width, :depth, :is_master, :cost_price, :permalink]
       end

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

@@ -19,3 +19,7 @@ child :option_types => :option_types do
     attributes *option_value_attributes
   end
 end
+
+child :product_properties => :product_properties do
+  attributes *product_property_attributes
+end

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

@@ -0,0 +1,2 @@
+collection @zones
+extends 'spree/api/v1/zones/show'

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

@@ -0,0 +1,6 @@
+object @zone
+attributes :id, :name, :description
+
+child :zone_members => :zone_members do
+  attributes :id, :name, :zoneable_type, :zoneable_id
+end

data/config/routes.rb

@@ -31,6 +31,7 @@ Spree::Core::Engine.routes.prepend do
           put :address
           put :delivery
           put :cancel
+          put :empty
         end
 
         resources :line_items
@@ -51,6 +52,7 @@ Spree::Core::Engine.routes.prepend do
         end
       end
 
+      resources :zones
       resources :countries, :only => [:index, :show]
       resources :addresses, :only => [:show, :update]
       resources :taxonomies do

data/script/rails

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 # This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
 
-ENGINE_PATH = File.expand_path('../..',  __FILE__)
-load File.expand_path('../../spec/dummy/script/rails',  __FILE__)
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/spree/api/engine', __FILE__)
+
+require 'rails/all'
+require 'rails/engine/commands'

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

@@ -34,6 +34,23 @@ module Spree
       assert_unauthorized!
     end
 
+    it "cannot cancel an order that doesn't belong to them" do
+      order.update_attribute(:completed_at, Time.now)
+      order.update_attribute(:shipment_state, "ready")
+      api_put :cancel, :id => order.to_param
+      assert_unauthorized!
+    end
+
+    it "cannot add address information to an order that doesn't belong to them" do
+      api_put :address, :id => order.to_param
+      assert_unauthorized!
+    end
+
+    it "cannot change delivery information on an order that doesn't belong to them" do
+      api_put :delivery, :id => order.to_param
+      assert_unauthorized!
+    end
+
     it "can create an order" do
       variant = create(:variant)
       api_post :create, :order => { :line_items => [{ :variant_id => variant.to_param, :quantity => 5 }] }
@@ -47,6 +64,7 @@ module Spree
 
     context "working with an order" do
       before do
+        Order.any_instance.stub :user => current_api_user
         create(:payment_method)
         order.next # Switch from cart to address
         order.ship_address.should be_nil
@@ -128,6 +146,12 @@ module Spree
             json_response["errors"].should include("Invalid shipping method specified.")
           end
         end
+
+        it "can empty an order" do
+          api_put :empty, :id => order.to_param
+          response.status.should == 200
+          order.reload.line_items.should be_empty
+        end
       end
     end
 

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

@@ -48,6 +48,7 @@ module Spree
 
       it "gets a single product" do
         product.master.images.create!(:attachment => image("thinking-cat.jpg"))
+        product.set_property("spree", "rocks")
         api_get :show, :id => product.to_param
         json_response.should have_attributes(attributes)
         product_json = json_response["product"]
@@ -60,6 +61,10 @@ module Spree
                                                             :attachment_width,
                                                             :attachment_height,
                                                             :attachment_content_type])
+
+        product_json["product_properties"].first.should have_attributes([:value,
+                                                                         :product_id,
+                                                                         :property_name])
       end
 
 
@@ -127,6 +132,23 @@ module Spree
         json_response["pages"].should == 1
       end
 
+      # Regression test for #1626
+      context "deleted products" do
+        before do
+          create(:product, :deleted_at => Time.now)
+        end
+
+        it "does not include deleted products" do
+          api_get :index
+          json_response["products"].count.should == 2
+        end
+
+        it "can include deleted products" do
+          api_get :index, :show_deleted => 1
+          json_response["products"].count.should == 3
+        end
+      end
+
       it "can create a new product" do
         api_post :create, :product => { :name => "The Other Product",
                                         :price => 19.99 }

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

@@ -5,7 +5,7 @@ describe Spree::Api::V1::ShipmentsController do
   let!(:attributes) { [:id, :tracking, :number, :cost, :shipped_at] }
 
   before do
-    shipment.order.payment_state == 'paid'
+    Spree::Order.any_instance.stub(:paid? => true)
     stub_authentication!
   end
 
@@ -16,12 +16,13 @@ describe Spree::Api::V1::ShipmentsController do
       api_put :ready
       json_response.should have_attributes(attributes)
       json_response["shipment"]["state"].should == "ready"
+      shipment.reload.state.should == "ready"
     end
 
     context "can transition a shipment from ready to ship" do
       before do
-        shipment.order.update_attribute(:payment_state, 'paid')
         shipment.update!(shipment.order)
+        shipment.state.should == "ready"
       end
 
       it "can transition a shipment from ready to ship" do

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

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+module Spree
+  describe Api::V1::ZonesController do
+    render_views
+
+    let!(:attributes) { [:id, :name, :zone_members] }
+
+    before do
+      stub_authentication!
+      @zone = create(:zone, :name => 'Europe')
+    end
+
+    it "gets list of zones" do
+      api_get :index
+      json_response.first.should have_attributes(attributes)
+    end
+
+    it "gets a zone" do
+      api_get :show, :id => @zone.id
+      json_response.should have_attributes(attributes)
+      json_response['zone']['name'].should eq @zone.name
+      json_response['zone']['zone_members'].size.should eq @zone.zone_members.count
+    end
+
+    context "as an admin" do
+      sign_in_as_admin!
+
+      it "can create a new zone" do
+        api_post :create, :zone => { :name => "North Pole",
+                                     :zone_members => [ :zone_member => {
+                                                        :zoneable_id => 1 }] }
+        response.status.should == 201
+        json_response.should have_attributes(attributes)
+      end
+
+      it "updates a zone" do
+        api_put :update, :id => @zone.id,
+                         :zone => { :name => "Americas",
+                                    :zone_members => [ :zone_member => {
+                                                       :zoneable_type => 'Spree::Country',
+                                                       :zoneable_id => 1 }]}
+        response.status.should == 200
+        json_response['zone']['name'].should eq 'Americas'
+      end
+
+      it "can delete a zone" do
+        api_delete :destroy, :id => @zone.id
+        response.status.should == 200
+        lambda { @zone.reload }.should raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+  end
+end

data/spec/models/spree/order_spec.rb

@@ -5,14 +5,14 @@ module Spree
     let(:user) { stub_model(User) }
 
     it 'can build an order from API parameters' do
-
-      Spree::Variant.should_receive(:find).and_return(stub_model(Variant, :id => 1))
-      order = Order.build_from_api(user, { :line_items_attributes => [{ :variant_id => 1, :quantity => 5 }]})
+      product = Spree::Product.create!(:name => 'Test', :sku => 'TEST-1', :price => 33.22)
+      variant_id = product.master.id
+      order = Order.build_from_api(user, { :line_items_attributes => [{ :variant_id => variant_id, :quantity => 5 }]})
 
       order.user.should == user
       line_item = order.line_items.first
       line_item.quantity.should == 5
-      line_item.variant_id.should == 1
+      line_item.variant_id.should == variant_id
     end
   end
 end

metadata

@@ -1,41 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 1.1.2.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-16 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &70243020240540 !ruby/object:Gem::Requirement
+  requirement: &70220783785700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.2.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *70243020240540
+  version_requirements: *70220783785700
 - !ruby/object:Gem::Dependency
   name: spree_auth
-  requirement: &70243020240060 !ruby/object:Gem::Requirement
+  requirement: &70220783782780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.2.rc1
   type: :runtime
   prerelease: false
-  version_requirements: *70243020240060
+  version_requirements: *70220783782780
 - !ruby/object:Gem::Dependency
   name: rabl
-  requirement: &70243020239600 !ruby/object:Gem::Requirement
+  requirement: &70220783780280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.6.5
   type: :runtime
   prerelease: false
-  version_requirements: *70243020239600
+  version_requirements: *70220783780280
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70243020238960 !ruby/object:Gem::Requirement
+  requirement: &70220783772020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +54,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70243020238960
+  version_requirements: *70220783772020
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70243020238580 !ruby/object:Gem::Requirement
+  requirement: &70220783768740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70243020238580
+  version_requirements: *70220783768740
 description: Spree's API
 email:
 - ryan@spreecommerce.com
@@ -90,6 +90,7 @@ files:
 - app/controllers/spree/api/v1/taxonomies_controller.rb
 - app/controllers/spree/api/v1/taxons_controller.rb
 - app/controllers/spree/api/v1/variants_controller.rb
+- app/controllers/spree/api/v1/zones_controller.rb
 - app/helpers/spree/api/api_helpers.rb
 - app/models/spree/line_item_decorator.rb
 - app/models/spree/option_value_decorator.rb
@@ -141,6 +142,8 @@ files:
 - app/views/spree/api/v1/variants/new.rabl
 - app/views/spree/api/v1/variants/show.rabl
 - app/views/spree/api/v1/variants/variant.rabl
+- app/views/spree/api/v1/zones/index.rabl
+- app/views/spree/api/v1/zones/show.rabl
 - config/initializers/metal_load_paths.rb
 - config/locales/en.yml
 - config/routes.rb
@@ -166,6 +169,7 @@ files:
 - spec/controllers/spree/api/v1/taxonomies_controller_spec.rb
 - spec/controllers/spree/api/v1/taxons_controller_spec.rb
 - spec/controllers/spree/api/v1/variants_controller_spec.rb
+- spec/controllers/spree/api/v1/zones_controller_spec.rb
 - spec/fixtures/thinking-cat.jpg
 - spec/models/spree/order_spec.rb
 - spec/models/spree/user_spec.rb
@@ -188,16 +192,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3593481641416743509
+      hash: -1105458712086829155
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3593481641416743509
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -217,6 +218,7 @@ test_files:
 - spec/controllers/spree/api/v1/taxonomies_controller_spec.rb
 - spec/controllers/spree/api/v1/taxons_controller_spec.rb
 - spec/controllers/spree/api/v1/variants_controller_spec.rb
+- spec/controllers/spree/api/v1/zones_controller_spec.rb
 - spec/fixtures/thinking-cat.jpg
 - spec/models/spree/order_spec.rb
 - spec/models/spree/user_spec.rb