spree_api 2.4.0.rc3 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b712d43706678d3c8d2bdc20f8d43fff8c97bd2e
-  data.tar.gz: cd84829e4d96b32d0da411588a7531b6855668a4
+  metadata.gz: 2bebe4795d7751605292a86a15274c44a7c09ffc
+  data.tar.gz: b062e7c4ab428d02d25ffdfaf5f18b25d046ddf1
 SHA512:
-  metadata.gz: ba4fb81a81896f4851cc69fd23a3816b77ef4b8ec7f484cb08dcfbc78a39a9ce136d3b64bcce8610a97b34a497e259b8a2e8724af4fad664d73bbf426acb1218
-  data.tar.gz: 8be64b301511026a1b6c22f938a1dc7d42b8ea651c65c70ba180a07437ae7be511decfdac3c5327d1480b0e8fe14bb2e081162fc59e10d027c79defd19bc432c
+  metadata.gz: 4f5db8d5263f27997792eb1e719df569caaa66cbb92f9a315df7fe545ffaffad417b1398d9f0051e2697dbe07f32edd1912fd16db16a3ed7e2ee7a992afb032c
+  data.tar.gz: 7570289fbe966a629e81c814e18c0a27205c25176e74df4b54794b2217041118d6cc3162f3d3e37797007ce4a72458f85464a72166666dd9eb1cacdc84d7df3e

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

@@ -101,8 +101,8 @@ module Spree
 
         error_notifier.call(exception, self) if error_notifier
 
-        render :text => { :exception => exception.message }.to_json,
-          :status => 422 and return
+        render text: { exception: exception.message }.to_json,
+          status: 422 and return
       end
 
       def gateway_error(exception)

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

@@ -24,7 +24,7 @@ module Spree
 
       def destroy
         @line_item = find_line_item
-        variant = Spree::Variant.find(@line_item.variant_id)
+        variant = Spree::Variant.unscoped.find(@line_item.variant_id)
         @order.contents.remove(variant, @line_item.quantity)
         respond_with(@line_item, status: 204)
       end
@@ -53,4 +53,4 @@ module Spree
         end
     end
   end
-end
+end

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

@@ -6,9 +6,9 @@ module Spree
           @taxons = taxonomy.root.children
         else
           if params[:ids]
-            @taxons = Spree::Taxon.includes(:children).accessible_by(current_ability, :read).where(id: params[:ids].split(','))
+            @taxons = Spree::Taxon.accessible_by(current_ability, :read).where(id: params[:ids].split(','))
           else
-            @taxons = Spree::Taxon.includes(:children).accessible_by(current_ability, :read).order(:taxonomy_id, :lft).ransack(params[:q]).result
+            @taxons = Spree::Taxon.accessible_by(current_ability, :read).order(:taxonomy_id, :lft).ransack(params[:q]).result
           end
         end
 

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

@@ -46,7 +46,3 @@ end
 node :permissions do
   { can_update: current_ability.can?(:update, root_object) }
 end
-
-child :valid_credit_cards => :credit_cards do
-  extends "spree/api/credit_cards/show"
-end

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

@@ -22,6 +22,10 @@ child :product_properties => :product_properties do
   attributes *product_property_attributes
 end
 
-child :taxons => :taxons do
-  extends "spree/api/taxons/show"
+child :classifications => :classifications do
+  attributes :taxon_id, :position
+
+  child(:taxon) do
+    extends "spree/api/taxons/show"
+  end
 end

data/app/views/spree/api/variants/small.v1.rabl

@@ -5,6 +5,9 @@ attributes *variant_attributes
 node(:display_price) { |p| p.display_price.to_s }
 node(:options_text) { |v| v.options_text }
 node(:in_stock) { |v| v.in_stock? }
+node(:is_backorderable) { |v| v.is_backorderable? }
+node(:total_on_hand) { |v| v.total_on_hand }
+node(:is_destroyed) { |v| v.destroyed? }
 
 child :option_values => :option_values do
   attributes *option_value_attributes

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

@@ -18,14 +18,6 @@ module Spree
 
     let(:address_params) { { :country_id => Country.first.id, :state_id => State.first.id } }
 
-    let(:billing_address) { { :firstname => "Tiago", :lastname => "Motta", :address1 => "Av Paulista",
-                              :city => "Sao Paulo", :zipcode => "35762", :phone => "12345678",
-                              :country_id => Country.first.id, :state_id => State.first.id} }
-
-    let(:shipping_address) { { :firstname => "Tiago", :lastname => "Motta", :address1 => "Av Paulista",
-                               :city => "Sao Paulo", :zipcode => "35762", :phone => "12345678",
-                               :country_id => Country.first.id, :state_id => State.first.id} }
-
     let(:current_api_user) do
       user = Spree.user_class.new(:email => "spree@example.com")
       user.generate_spree_api_key!
@@ -167,24 +159,42 @@ module Spree
       expect(json_response["adjustments"]).to be_empty
     end
 
-    context 'when shipment adjustments are present' do
+    describe 'GET #show' do
+      let(:order) { create :order_with_line_items }
       let(:adjustment) { FactoryGirl.create(:adjustment, order: order) }
 
+      subject { api_get :show, id: order.to_param }
+
       before do
         allow_any_instance_of(Order).to receive_messages :user => current_api_user
-        shipment = FactoryGirl.create(:shipment, order: order)
-        shipment.adjustments << adjustment
       end
 
-      subject { api_get :show, :id => order.to_param }
+      context 'when inventory information is present' do
+        it 'contains stock information on variant' do
+          subject
+          variant = json_response['line_items'][0]['variant']
+          expect(variant).to_not be_nil
+          expect(variant['in_stock']).to eq(false)
+          expect(variant['total_on_hand']).to eq(0)
+          expect(variant['is_backorderable']).to eq(true)
+          expect(variant['is_destroyed']).to eq(false)
+        end
+      end
 
-      it 'contains adjustments in JSON' do
-        subject
-        # Test to insure shipment has adjustments
-        shipment = json_response['shipments'][0]
-        expect(shipment).to_not be_nil
-        expect(shipment['adjustments'][0]).not_to be_empty
-        expect(shipment['adjustments'][0]['label']).to eq(adjustment.label)
+      context 'when shipment adjustments are present' do
+        before do
+          order.shipments.first.adjustments << adjustment
+        end
+
+        it 'contains adjustments on shipment' do
+          subject
+
+          # Test to insure shipment has adjustments
+          shipment = json_response['shipments'][0]
+          expect(shipment).to_not be_nil
+          expect(shipment['adjustments'][0]).not_to be_empty
+          expect(shipment['adjustments'][0]['label']).to eq(adjustment.label)
+        end
       end
     end
 
@@ -341,17 +351,17 @@ module Spree
       let!(:line_item) { order.contents.add(variant, 1) }
       let!(:payment_method) { create(:check_payment_method) }
 
-      let(:address_params) { { :country_id => Country.first.id, :state_id => State.first.id } }
+      let(:address_params) { { :country_id => country.id } }
       let(:billing_address) { { :firstname => "Tiago", :lastname => "Motta", :address1 => "Av Paulista",
-                                :city => "Sao Paulo", :zipcode => "35762", :phone => "12345678",
-                                :country_id => Country.first.id, :state_id => State.first.id} }
+                                :city => "Sao Paulo", :zipcode => "01310-300", :phone => "12345678",
+                                :country_id => country.id} }
       let(:shipping_address) { { :firstname => "Tiago", :lastname => "Motta", :address1 => "Av Paulista",
-                                 :city => "Sao Paulo", :zipcode => "35762", :phone => "12345678",
-                                 :country_id => Country.first.id, :state_id => State.first.id} }
+                                 :city => "Sao Paulo", :zipcode => "01310-300", :phone => "12345678",
+                                 :country_id => country.id} }
+      let(:country) { create(:country, {name: "Brazil", iso_name: "BRAZIL", iso: "BR", iso3: "BRA", numcode: 76 })}
 
       before do
-        allow(Spree::LineItem).to receive(:find_by_id).and_return(Spree::LineItem.new)
-        allow_any_instance_of(Order).to receive_messages :user => current_api_user
+        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

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

@@ -196,7 +196,8 @@ module Spree
                                                                          :product_id,
                                                                          :property_name])
 
-        expect(json_response["taxons"].first).to have_attributes([:id, :name, :pretty_name, :permalink, :taxonomy_id, :parent_id])
+        expect(json_response["classifications"].first).to have_attributes([:taxon_id, :position, :taxon])
+        expect(json_response["classifications"].first['taxon']).to have_attributes([:id, :name, :pretty_name, :permalink, :taxonomy_id, :parent_id])
       end
 
       context "tracking is disabled" do
@@ -372,7 +373,7 @@ module Spree
         end
 
         it "cannot create a new product with invalid attributes" do
-          api_post :create, :product => {}
+          api_post :create, product: {}
           expect(response.status).to eq(422)
           expect(json_response["error"]).to eq("Invalid resource. Please fix errors and try again.")
           errors = json_response["errors"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 2.4.0.rc3
+  version: 2.4.0
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0.rc3
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.0.rc3
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -257,9 +257,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2