solidus_api 1.0.0.pre → 1.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f7e1c99f480436edbb45f9d9e3d946879794a7f
-  data.tar.gz: 8cca45deec26d1b9f7dcbf03eb66f2dfb0f8ba01
+  metadata.gz: 3552a542c49a1c8586fe3765f8e477a4d267a8d8
+  data.tar.gz: 31fb98454ac818493d461e32d2a2a5357d3bdb14
 SHA512:
-  metadata.gz: 54ddece7d71fafe19fdb104acd90b823ca011dd2fdec6c0e6df56e3a396994336fa1d2adb973a18b51ef5b07ef5bc49ed3e32494ea2be31b1f99fc990bf9b5bc
-  data.tar.gz: a7ff37cb7e28ffe0a6bbedb442a79256997cbf504623ae0f48b98fdb8dcc261236aa0f153bbf20d328352cb582f90dd683cfea90cad8025034ae7794681c1c68
+  metadata.gz: 06ed20f3ea44a9015f32606e3192f4a8591568665c6211ea642e145437d751aa0ddc65ff720a4ffa8444f5105de0a4f92b8ae68331428676ac5c4373f7e87550
+  data.tar.gz: fa71e4ecc89775eda5afcb323faa90efcdccf9fa08e91ab2b67cbe05bb833c7ede57f714373cef706b299a9db377b6b8e623edb70293d37fa3f563eec8db1299

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

@@ -184,6 +184,16 @@ module Spree
         render text: e.message, status: 409
       end
 
+      def insufficient_stock_error(exception)
+        render(
+          json: {
+            errors: [I18n.t(:quantity_is_not_available, :scope => "spree.api.order")],
+            type: 'insufficient_stock',
+          },
+          status: 422,
+        )
+      end
+
     end
   end
 end

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

@@ -124,10 +124,6 @@ module Spree
           return true if expected_total.blank?
           @order.total == BigDecimal(expected_total)
         end
-
-        def insufficient_stock_error(exception)
-          render json: { errors: [I18n.t(:quantity_is_not_available, :scope => "spree.api.order")], type: 'insufficient_stock' }, status: 422
-        end
     end
   end
 end

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

@@ -4,6 +4,8 @@ module Spree
       before_filter :load_order
       around_filter :lock_order, only: [:create, :update, :destroy, :add, :receive, :cancel]
 
+      rescue_from Spree::Order::InsufficientStock, with: :insufficient_stock_error
+
       def create
         authorize! :create, ReturnAuthorization
         @return_authorization = @order.return_authorizations.build(return_authorization_params)

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

@@ -66,16 +66,20 @@ module Spree
         quantity = params[:quantity].to_i
 
         @shipment.order.contents.add(variant, quantity, {shipment: @shipment})
-
         respond_with(@shipment, default_template: :show)
       end
 
       def remove
         quantity = params[:quantity].to_i
 
-        @shipment.order.contents.remove(variant, quantity, {shipment: @shipment})
-        @shipment.reload if @shipment.persisted?
-        respond_with(@shipment, default_template: :show)
+        if @shipment.pending?
+          @shipment.order.contents.remove(variant, quantity, {shipment: @shipment})
+          @shipment.reload if @shipment.persisted?
+          respond_with(@shipment, default_template: :show)
+        else
+          @shipment.errors.add(:base, :cannot_remove_items_shipment_state, state: @shipment.state)
+          invalid_resource!(@shipment)
+        end
       end
 
       def transfer_to_location
@@ -85,7 +89,7 @@ module Spree
       end
 
       def transfer_to_shipment
-        @target_shipment  = Spree::Shipment.find_by!(number: params[:target_shipment_number])
+        @target_shipment = Spree::Shipment.find_by!(number: params[:target_shipment_number])
         @original_shipment.transfer_to_shipment(@variant, @quantity, @target_shipment)
         render json: {success: true, message: Spree.t(:shipment_transfer_success)}, status: 201
       end

data/lib/spree/api/responders/rabl_template.rb

@@ -8,22 +8,10 @@ module Spree
           else
             super
           end
-
-        rescue ActionView::MissingTemplate
-          api_behavior
         end
 
         def template
-          request.headers['X-Spree-Template'] || controller.params[:template] || options[:default_template]
-        end
-
-        def api_behavior
-          if controller.params[:action] == "destroy"
-            # Render a blank template
-            super
-          else
-            # Do nothing and fallback to the default template
-          end
+          options[:default_template]
         end
       end
     end

data/solidus_api.gemspec

@@ -4,9 +4,10 @@ version = File.read(File.expand_path("../../SOLIDUS_VERSION", __FILE__)).strip
 Gem::Specification.new do |gem|
   gem.author        = 'Solidus Team'
   gem.email         = 'contact@solidus.io'
-  gem.description   = %q{Spree's API}
-  gem.summary       = %q{Spree's API}
-  gem.homepage      = ""
+  gem.homepage      = 'http://solidus.io/'
+
+  gem.summary       = %q{REST API for the Solidus e-commerce framework.}
+  gem.description   = gem.summary
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

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

@@ -6,6 +6,8 @@ end
 describe Spree::Api::BaseController, :type => :controller do
   render_views
   controller(Spree::Api::BaseController) do
+    rescue_from Spree::Order::InsufficientStock, with: :insufficient_stock_error
+
     def index
       render :text => { "products" => [] }.to_json
     end
@@ -131,6 +133,24 @@ describe Spree::Api::BaseController, :type => :controller do
     end
   end
 
+  context 'insufficient stock' do
+    before do
+      subject.should_receive(:authenticate_user).and_return(true)
+      subject.should_receive(:index).and_raise(Spree::Order::InsufficientStock)
+      get :index, :token => "fake_key"
+    end
+
+    it "should return a 422" do
+      expect(response.status).to eq(422)
+    end
+
+    it "returns an error message" do
+      expect(json_response).to eq(
+        {"errors" => ["Quantity is not available for items in your order"], "type" => "insufficient_stock"}
+      )
+    end
+  end
+
   context 'lock_order' do
     let!(:order) { create :order }
 

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

@@ -347,26 +347,6 @@ module Spree
           end
         end
       end
-
-      context 'insufficient stock' do
-        let(:order) { create(:order_with_line_items) }
-        before do
-          expect_any_instance_of(Spree::Order).to receive(:next!).and_raise(Spree::Order::InsufficientStock)
-        end
-
-        subject { api_put :next, :id => order.to_param, :order_token => order.guest_token }
-
-        it "should return a 422" do
-          expect(subject.status).to eq(422)
-        end
-
-        it "returns an error message" do
-          subject
-          expect(JSON.parse(response.body)).to eq(
-            {"errors" => ["Quantity is not available for items in your order"], "type" => "insufficient_stock"}
-          )
-        end
-      end
     end
 
     context "PUT 'advance'" do

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

@@ -318,20 +318,7 @@ module Spree
                                  :country_id => country.id} }
       let(:country) { create(:country, {name: "Brazil", iso_name: "BRAZIL", iso: "BR", iso3: "BRA", numcode: 76 })}
 
-      before do
-        allow_any_instance_of(Order).to receive_messages user: current_api_user
-        order.next # Switch from cart to address
-        order.bill_address = nil
-        order.ship_address = nil
-        order.save
-        expect(order.state).to eq("address")
-      end
-
-      def clean_address(address)
-        address.delete(:state)
-        address.delete(:country)
-        address
-      end
+      before { allow_any_instance_of(Order).to receive_messages user: current_api_user }
 
       context "line_items hash not present in request" do
         it "responds successfully" do
@@ -401,15 +388,16 @@ module Spree
       end
 
       it "can add shipping address" do
-        expect(order.ship_address).to be_nil
-
-        api_put :update, :id => order.to_param, :order => { :ship_address_attributes => shipping_address }
+        order.update_attributes!(ship_address_id: nil)
 
-        expect(order.reload.ship_address).not_to be_nil
+        expect {
+          api_put :update, :id => order.to_param, :order => { :ship_address_attributes => shipping_address }
+        }.to change { order.reload.ship_address }.from(nil)
       end
 
       it "receives error message if trying to add shipping address with errors" do
-        expect(order.ship_address).to be_nil
+        order.update_attributes!(ship_address_id: nil)
+
         shipping_address[:firstname] = ""
 
         api_put :update, :id => order.to_param, :order => { :ship_address_attributes => shipping_address }
@@ -442,19 +430,15 @@ module Spree
       end
 
       context "with a line item" do
-        let(:order_with_line_items) do
-          order = create(:order_with_line_items)
-          create(:adjustment, order: order, adjustable: order)
-          order
-        end
+        let(:order) { create(:order_with_line_items) }
 
         it "can empty an order" do
-          expect(order_with_line_items.adjustments.count).to eq(1)
-          api_put :empty, :id => order_with_line_items.to_param
+          create(:adjustment, order: order, adjustable: order)
+          api_put :empty, :id => order.to_param
           expect(response.status).to eq(204)
-          order_with_line_items.reload
-          expect(order_with_line_items.line_items).to be_empty
-          expect(order_with_line_items.adjustments).to be_empty
+          order.reload
+          expect(order.line_items).to be_empty
+          expect(order.adjustments).to be_empty
         end
 
         it "can list its line items with images" do
@@ -516,8 +500,6 @@ module Spree
           end
 
           before do
-            order.bill_address = FactoryGirl.create(:address)
-            order.ship_address = FactoryGirl.create(:address)
             order.next!
             order.save
           end

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

@@ -67,44 +67,6 @@ module Spree
         expect(json_response["per_page"]).to eq(Kaminari.config.default_per_page)
       end
 
-      context "specifying a rabl template for a custom action" do
-        before do
-          Spree::Api::ProductsController.class_eval do
-            def custom_show
-              @product = find_product(params[:id])
-              respond_with(@product)
-            end
-          end
-        end
-
-        def set_custom_route
-          @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
-            r.draw { get 'custom_show' => 'spree/api/products#custom_show' }
-          end
-        end
-
-        it "uses the specified custom template through the request header" do
-          set_custom_route
-
-          request.headers['X-Spree-Template'] = 'show'
-          api_get :custom_show, :id => product.id
-          expect(response).to render_template('spree/api/products/show')
-        end
-
-        it "uses the specified custom template through the template URL parameter" do
-          set_custom_route
-
-          api_get :custom_show, :id => product.id, :template => 'show'
-          expect(response).to render_template('spree/api/products/show')
-        end
-
-        it "falls back to the default template if the specified template does not exist" do
-          request.headers['X-Spree-Template'] = 'invoice'
-          api_get :show, :id => product.id
-          expect(response).to render_template('spree/api/products/show')
-        end
-      end
-
       context "product has more than one price" do
         before { product.master.prices.create currency: "EUR", amount: 22 }
 
@@ -394,8 +356,8 @@ module Spree
           expect(json_response['variants'].count).to eq(2) # 2 variants
 
           variants = json_response['variants'].select { |v| !v['is_master'] }
-          expect(variants.last['option_values'][0]['name']).to eq('small')
-          expect(variants.last['option_values'][0]['option_type_name']).to eq('size')
+          size_option_value = variants.last['option_values'].detect{|x| x['option_type_name'] == 'size' }
+          expect(size_option_value['name']).to eq('small')
 
           expect(json_response['option_types'].count).to eq(2) # size, color
         end

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

@@ -17,9 +17,9 @@ module Spree
     shared_examples_for 'a return authorization creator' do
       it "can create a new return authorization" do
         stock_location = FactoryGirl.create(:stock_location)
-        reason = FactoryGirl.create(:return_authorization_reason)
+        reason = FactoryGirl.create(:return_reason)
         rma_params = { :stock_location_id => stock_location.id,
-                       :return_authorization_reason_id => reason.id,
+                       :return_reason_id => reason.id,
                        :memo => "Defective" }
         api_post :create, :order_id => order.number, :return_authorization => rma_params
         response.status.should == 201

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

@@ -91,7 +91,7 @@ describe Spree::Api::ShipmentsController, :type => :controller do
       expect(response.status).to eq(422)
     end
 
-    context 'for completed shipments' do
+    context 'for completed orders' do
       let(:order) { create :completed_order_with_totals }
       let!(:resource_scoping) { { id: order.shipments.first.to_param, shipment: { order_id: order.to_param } } }
 
@@ -119,6 +119,24 @@ describe Spree::Api::ShipmentsController, :type => :controller do
       end
     end
 
+    context "for shipped shipments" do
+      let(:order) { create :shipped_order }
+      let!(:resource_scoping) { { id: order.shipments.first.to_param, shipment: { order_id: order.to_param } } }
+
+      it 'adds a variant to a shipment' do
+        api_put :add, { variant_id: variant.to_param, quantity: 2 }
+        response.status.should == 200
+        json_response['manifest'].detect { |h| h['variant']['id'] == variant.id }["quantity"].should == 2
+      end
+
+      it 'cannot remove a variant from a shipment' do
+        api_put :remove, { variant_id: variant.to_param, quantity: 1 }
+        response.status.should == 422
+        expect(json_response['errors']['base'].join).to match /Cannot remove items/
+      end
+
+    end
+
     describe '#mine' do
       subject do
         api_get :mine, format: 'json', params: params

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

@@ -38,32 +38,6 @@ module Spree
       expect(json_response['zone_members'].size).to eq @zone.zone_members.count
     end
 
-    context "specifying a rabl template to use" do
-      before do
-        Spree::Api::ZonesController.class_eval do
-          def custom_show
-            respond_with(zone)
-          end
-        end
-      end
-
-      it "uses the specified template" do
-        @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
-          r.draw { get 'custom_show' => 'spree/api/zones#custom_show' }
-        end
-
-        request.headers['X-Spree-Template'] = 'show'
-        api_get :custom_show, :id => @zone.id
-        expect(response).to render_template('spree/api/zones/show')
-      end
-
-      it "falls back to the default template if the specified template does not exist" do
-        request.headers['X-Spree-Template'] = 'invoice'
-        api_get :show, :id => @zone.id
-        expect(response).to render_template('spree/api/zones/show')
-      end
-    end
-
     context "as an admin" do
       sign_in_as_admin!
 

data/spec/spec_helper.rb

@@ -57,4 +57,10 @@ RSpec.configure do |config|
   end
 
   config.use_transactional_fixtures = true
+
+  config.example_status_persistence_file_path = "./spec/examples.txt"
+
+  config.order = :random
+
+  Kernel.srand config.seed
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_api
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre
+  version: 1.0.0.pre2
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2015-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre
+        version: 1.0.0.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.pre
+        version: 1.0.0.pre2
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.3.1
-description: Spree's API
+description: REST API for the Solidus e-commerce framework.
 email: contact@solidus.io
 executables: []
 extensions: []
@@ -202,7 +202,6 @@ files:
 - app/views/spree/api/variants/small.v1.rabl
 - app/views/spree/api/zones/index.v1.rabl
 - app/views/spree/api/zones/show.v1.rabl
-- config/initializers/metal_load_paths.rb
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20100107141738_add_api_key_to_spree_users.rb
@@ -264,7 +263,7 @@ files:
 - spec/support/controller_hacks.rb
 - spec/support/database_cleaner.rb
 - spec/support/have_attributes_matcher.rb
-homepage: ''
+homepage: http://solidus.io/
 licenses: []
 metadata: {}
 post_install_message: 
@@ -283,10 +282,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Spree's API
+summary: REST API for the Solidus e-commerce framework.
 test_files:
 - spec/controllers/spree/api/addresses_controller_spec.rb
 - spec/controllers/spree/api/base_controller_spec.rb

data/config/initializers/metal_load_paths.rb

@@ -1 +0,0 @@
-Spree::Api::BaseController.append_view_path(ApplicationController.view_paths)