spree_api 2.0.13 → 2.1.0

data/spec/models/spree/order_spec.rb

@@ -2,25 +2,22 @@ require 'spec_helper'
 
 module Spree
   describe Order do
-    let!(:country) { create(:country) }
-    let!(:state) { country.states.first || create(:state, :country => country) }
-    let!(:stock_location) { create(:stock_location) }
+    let!(:country) { FactoryGirl.create(:country) }
+    let!(:state) { country.states.first || FactoryGirl.create(:state, :country => country) }
+    let!(:stock_location) { FactoryGirl.create(:stock_location) }
 
     let(:user) { stub_model(LegacyUser, :email => 'fox@mudler.com') }
     let(:shipping_method) { create(:shipping_method) }
     let(:payment_method) { create(:payment_method) }
-
     let(:product) { product = Spree::Product.create(:name => 'Test',
                                            :sku => 'TEST-1',
                                            :price => 33.22)
-                    product.shipping_category = create(:shipping_category)
+                    product.shipping_category = FactoryGirl.create(:shipping_category)
                     product.save
                     product }
-
     let(:variant) { variant = product.master
                     variant.stock_items.each { |si| si.update_attribute(:count_on_hand, 10) }
                     variant }
-
     let(:sku) { variant.sku }
     let(:variant_id) { variant.id }
 
@@ -52,23 +49,15 @@ module Spree
       order.state.should eq 'complete'
     end
 
-    context "build order with line items" do
-      let(:attributes) do
-        { :variant_id => variant.id, :quantity => 5, :price => 33.77 }
-      end
-
-      it 'can build an order from API with just line items' do
-        params = { :line_items_attributes => { "0" => attributes } }
-        Order.should_receive(:ensure_variant_id_from_api)
-        order = Order.build_from_api(user, params)
-
-        order.user.should == nil
-        line_item = order.line_items.first
+    it 'can build an order from API with just line items' do
+      params = { :line_items_attributes => line_items }
 
-        expect(line_item.quantity).to eq attributes[:quantity]
-        expect(line_item.variant_id).to eq attributes[:variant_id]
-        expect(line_item.price).to eq attributes[:price]
-      end
+      Order.should_receive(:ensure_variant_id_from_api)
+      order = Order.build_from_api(user, params)
+      order.user.should == nil
+      line_item = order.line_items.first
+      line_item.quantity.should == 5
+      line_item.variant_id.should == variant_id
     end
 
     it 'handles line_item building exceptions' do
@@ -130,7 +119,7 @@ module Spree
 
     it 'can build an order from API with state attributes' do
       ship_address.delete(:state_id)
-      ship_address[:state] = { 'name' => state.name }
+      ship_address[:state] = { 'name' => 'Alabama' }
       params = { :ship_address_attributes => ship_address,
                  :line_items_attributes => line_items }
 
@@ -138,33 +127,15 @@ module Spree
       order.ship_address.state.name.should eq 'Alabama'
     end
 
-    context "state passed is not associated with country" do
-      let(:params) do
-        params = { :ship_address_attributes => ship_address,
-                   :line_items_attributes => line_items }
-      end
-
-      let(:other_state) { create(:state, name: "Uhuhuh", country: create(:country)) }
-
-      before do
-        ship_address.delete(:state_id)
-        ship_address[:state] = { 'name' => other_state.name }
-      end
-
-      it 'sets states name instead of state id' do
-        order = Order.build_from_api(user, params)
-        expect(order.ship_address.state_name).to eq other_state.name
-      end
-    end
-
-    it 'sets state name if state record not found' do
+    it 'handles state lookup exceptions' do
       ship_address.delete(:state_id)
       ship_address[:state] = { 'name' => 'XXX' }
       params = { :ship_address_attributes => ship_address,
                  :line_items_attributes => line_items }
 
-      order = Order.build_from_api(user, params)
-      expect(order.ship_address.state_name).to eq 'XXX'
+      expect {
+        order = Order.build_from_api(user, params)
+      }.to raise_error /XXX/
     end
 
     context 'variant not deleted' do
@@ -193,16 +164,9 @@ module Spree
       end
     end
 
-    it "raises with proper message when cant find country" do
-      address = { :country => { "name" => "NoNoCountry" } }
-      expect {
-        Order.ensure_country_id_from_api(address)
-      }.to raise_error /NoNoCountry/
-    end
-
     it 'ensures_state_id for state fields' do
       [:name, :abbr].each do |field|
-        address = { country_id: country.id, :state => { field => state.send(field) }}
+        address = { :state => { field => state.send(field) }}
         Order.ensure_state_id_from_api(address)
         address[:state_id].should eq state.id
       end
@@ -214,7 +178,6 @@ module Spree
             { :tracking => '123456789',
               :cost => '4.99',
               :shipping_method => shipping_method.name,
-              :stock_location => stock_location.name,
               :inventory_units => [{ :sku => sku }]
             }
         ] }
@@ -231,27 +194,7 @@ module Spree
         shipment = order.shipments.first
         shipment.inventory_units.first.variant_id.should eq product.master.id
         shipment.tracking.should eq '123456789'
-        rate = shipment.selected_shipping_rate
-        rate.shipping_method.name.should == shipping_method.name
-        rate.cost.should == 4.99
-      end
-
-      it 'handles shipment building exceptions' do
-        params = { :shipments_attributes => [{ :tracking => '123456789',
-                                               :cost => '4.99',
-                                               :shipping_method => 'XXX',
-                                               :inventory_units => [{ :sku => sku }]
-                                             }] }
-        expect {
-          order = Order.build_from_api(user, params)
-        }.to raise_error /XXX/
-      end
-
-      it "raises if cant find stock location" do
-        params[:shipments_attributes][0][:stock_location] = "doesnt exist"
-        expect {
-          order = Order.build_from_api(user, params)
-        }.to raise_error
+        shipment.shipping_rates.first.cost.should eq 4.99
       end
     end
 
@@ -301,40 +244,5 @@ module Spree
         order = Order.build_from_api(user, params)
       }.to raise_error /XXX/
     end
-
-    context "raises error" do
-      it "clears out order from db" do
-        params = { :payments_attributes => [{ payment_method: "XXX" }] }
-        count = Order.count
-
-        expect { order = Order.build_from_api(user, params) }.to raise_error
-        expect(Order.count).to eq count
-      end
-    end
-
-    context "import param and tax adjustments" do
-      let!(:tax_rate) { create(:tax_rate, amount: 0.05, calculator: Calculator::DefaultTax.create) }
-      let(:other_variant) { create(:variant) }
-
-      let(:line_item_attributes) do
-        line_items.merge({ "1" => { :variant_id => other_variant.id, :quantity => 5 }})
-      end
-
-      before { Zone.stub default_tax: tax_rate.zone }
-
-      it "doesnt create any tax ajustments when importing order" do
-        params = { import: true, line_items_attributes: line_item_attributes }
-        expect {
-          Order.build_from_api(user, params)
-        }.not_to change { Adjustment.count }
-      end
-
-      it "does create tax adjustments if not importing order" do
-        params = { import: false, line_items_attributes: line_item_attributes }
-        expect {
-          Order.build_from_api(user, params)
-        }.to change { Adjustment.count }
-      end
-    end
   end
 end

data/spec/spec_helper.rb

@@ -13,16 +13,9 @@ end
 
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
-
-begin
-  require File.expand_path("../dummy/config/environment", __FILE__)
-rescue LoadError
-  puts "Could not load dummy application. Please ensure you have run `bundle exec rake test_app`"
-end
-
+require File.expand_path("../dummy/config/environment", __FILE__)
 require 'rspec/rails'
 require 'rspec/autorun'
-require 'database_cleaner'
 require 'ffaker'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
@@ -50,22 +43,5 @@ RSpec.configure do |config|
     Spree::Api::Config[:requires_authentication] = true
   end
 
-  # Using truncation to prevent Ruby 1.9.3 specific error:
-  # SQLite3::SQLException: cannot start a transaction within a transaction: begin transaction
-  # http://stackoverflow.com/questions/12220901/sqlite3sqlexception-when-using-database-cleaner-with-rails-spork-rspec
-  unless RUBY_VERSION >= '2.0.0'
-    # If you're not using ActiveRecord, or you'd prefer not to run each of your
-    # examples within a transaction, comment the following line or assign false
-    # instead of true.
-    config.use_transactional_fixtures = false
-
-    config.before do
-      DatabaseCleaner.strategy = :truncation
-      DatabaseCleaner.start
-    end
-
-    config.after do
-      DatabaseCleaner.clean
-    end
-  end
+  config.use_transactional_fixtures = true
 end

data/spec/support/controller_hacks.rb

@@ -18,7 +18,7 @@ module ControllerHacks
 
   def api_process(action, params={}, session=nil, flash=nil, method="get")
     scoping = respond_to?(:resource_scoping) ? resource_scoping : {}
-    process(action, params.merge(scoping).reverse_merge!(:use_route => :spree, :format => :json), session, flash, method)
+    process(action, method, params.merge(scoping).reverse_merge!(:use_route => :spree, :format => :json), session, flash)
   end
 end
 

data/spree_api.gemspec

@@ -16,6 +16,6 @@ Gem::Specification.new do |gem|
   gem.version       = version
 
   gem.add_dependency 'spree_core', version
-  gem.add_dependency 'rabl', '0.9.3'
+  gem.add_dependency 'rabl', '0.8.4'
   gem.add_dependency 'versioncake', '~> 1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 2.0.13
+  version: 2.1.0
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.13
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: versioncake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
 description: Spree's API
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -67,6 +67,7 @@ files:
 - app/controllers/spree/api/addresses_controller.rb
 - app/controllers/spree/api/base_controller.rb
 - app/controllers/spree/api/checkouts_controller.rb
+- app/controllers/spree/api/config_controller.rb
 - app/controllers/spree/api/countries_controller.rb
 - app/controllers/spree/api/images_controller.rb
 - app/controllers/spree/api/inventory_units_controller.rb
@@ -91,7 +92,6 @@ files:
 - app/controllers/spree/api/zones_controller.rb
 - app/helpers/spree/api/api_helpers.rb
 - app/models/spree/api_configuration.rb
-- app/models/spree/line_item_decorator.rb
 - app/models/spree/option_value_decorator.rb
 - app/models/spree/order_decorator.rb
 - app/models/spree/user_decorator.rb
@@ -99,6 +99,8 @@ files:
 - app/views/spree/admin/users/_api_fields.html.erb
 - app/views/spree/api/addresses/show.v1.rabl
 - app/views/spree/api/adjustments/show.v1.rabl
+- app/views/spree/api/config/money.v1.rabl
+- app/views/spree/api/config/show.v1.rabl
 - app/views/spree/api/countries/index.v1.rabl
 - app/views/spree/api/countries/show.v1.rabl
 - app/views/spree/api/credit_cards/show.v1.rabl
@@ -125,13 +127,13 @@ files:
 - app/views/spree/api/orders/delivery.v1.rabl
 - app/views/spree/api/orders/index.v1.rabl
 - app/views/spree/api/orders/invalid_shipping_method.v1.rabl
+- app/views/spree/api/orders/order.v1.rabl
 - app/views/spree/api/orders/payment.v1.rabl
 - app/views/spree/api/orders/show.v1.rabl
 - app/views/spree/api/payments/credit_over_limit.v1.rabl
 - app/views/spree/api/payments/index.v1.rabl
 - app/views/spree/api/payments/new.v1.rabl
 - app/views/spree/api/payments/show.v1.rabl
-- app/views/spree/api/payments/update_forbidden.v1.rabl
 - app/views/spree/api/product_properties/index.v1.rabl
 - app/views/spree/api/product_properties/new.v1.rabl
 - app/views/spree/api/product_properties/show.v1.rabl
@@ -148,6 +150,7 @@ files:
 - app/views/spree/api/shared/stock_location_required.v1.rabl
 - app/views/spree/api/shipments/cannot_ready_shipment.v1.rabl
 - app/views/spree/api/shipments/show.v1.rabl
+- app/views/spree/api/shipping_rates/show.v1.rabl
 - app/views/spree/api/states/index.v1.rabl
 - app/views/spree/api/states/show.v1.rabl
 - app/views/spree/api/stock_items/index.v1.rabl
@@ -181,7 +184,6 @@ files:
 - db/migrate/20100107141738_add_api_key_to_spree_users.rb
 - db/migrate/20120411123334_resize_api_key_field.rb
 - db/migrate/20120530054546_rename_api_key_to_spree_api_key.rb
-- db/migrate/20131017162334_add_index_to_user_spree_api_key.rb
 - lib/spree/api.rb
 - lib/spree/api/controller_setup.rb
 - lib/spree/api/engine.rb
@@ -195,6 +197,7 @@ files:
 - spec/controllers/spree/api/addresses_controller_spec.rb
 - spec/controllers/spree/api/base_controller_spec.rb
 - spec/controllers/spree/api/checkouts_controller_spec.rb
+- spec/controllers/spree/api/config_controller_spec.rb
 - spec/controllers/spree/api/countries_controller_spec.rb
 - spec/controllers/spree/api/images_controller_spec.rb
 - spec/controllers/spree/api/inventory_units_controller_spec.rb
@@ -236,17 +239,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.1.0
 signing_key: 
 specification_version: 4
 summary: Spree's API
@@ -254,6 +257,7 @@ test_files:
 - spec/controllers/spree/api/addresses_controller_spec.rb
 - spec/controllers/spree/api/base_controller_spec.rb
 - spec/controllers/spree/api/checkouts_controller_spec.rb
+- spec/controllers/spree/api/config_controller_spec.rb
 - spec/controllers/spree/api/countries_controller_spec.rb
 - spec/controllers/spree/api/images_controller_spec.rb
 - spec/controllers/spree/api/inventory_units_controller_spec.rb

data/app/models/spree/line_item_decorator.rb

@@ -1,3 +0,0 @@
-Spree::LineItem.class_eval do
-  attr_accessible :quantity, :variant_id, :price, :sku, :as => :api
-end

data/app/views/spree/api/payments/update_forbidden.v1.rabl

@@ -1,2 +0,0 @@
-object false
-node(:error) { I18n.t(:update_forbidden, :state => @payment.state, :scope => 'spree.api.payment') }

data/db/migrate/20131017162334_add_index_to_user_spree_api_key.rb

@@ -1,7 +0,0 @@
-class AddIndexToUserSpreeApiKey < ActiveRecord::Migration
-  def change
-    unless defined?(User)
-      add_index :spree_users, :spree_api_key
-    end
-  end
-end