spree_api 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31009b464b6105afeae033af555ebf099230ff51
-  data.tar.gz: 9a6294c2ddcfa6044efede92b4821544acfbf82e
+  metadata.gz: f6416ddb13bbe8f04930a3af747fecd032eb9bfa
+  data.tar.gz: fda21f8c9d73dc334d9826e01d6e362da9dc3526
 SHA512:
-  metadata.gz: e8bccb730f13c6867b1e46a175b52edfb128445f0c81aaa25580eb4d08781d0b63102cd179854d22c5017dc8ef4536a3f869aac7614e5048ff801d2688e759a8
-  data.tar.gz: 9b2e19265e60d63e04a3ff1380955cebd8c751eed12ce4ab4e34afafa62de307b17e8de50eb3c34942afd4321bad45f4eb78666974c8d7bd6bea0d87c527c5d0
+  metadata.gz: a17ad20ff0392f2ae1ce3cf51baf5b7d224d6890e0d279d9dc77b46070b415ba71f40d04ec55352069c616c270eb2b99787685cc32cfea5f0e2d51f12e5b31e5
+  data.tar.gz: 132136db66a648b0457fe9c2063586c126f28654327441457da85b800cac154b2a694a622a15cb892450a7efb244534172f55d3aab85521c625bef696bebc1bf

data/CHANGELOG.md

@@ -1,17 +1,14 @@
-## Spree 2.0.7 (unreleased) ##
+## Spree 2.0.8 (unreleased) ##
 
-*For all commits, please see [the GitHub compare view](https://github.com/spree/spree/compare/v2.0.6...v2.0.7).*
-
-*   Admin users can set the order channel when importing orders. By sing the
-    channel attribute on Order model
+* When line items are added after the delivery state, the shipments are now recreated. #3914
 
     Washington Luiz
 
-*   Added missing per_page node to products/index
+* State names are now persisted on addresses when using `ensure_state_from_api`, even if the state does not exist as a `Spree::State`. e976a3bbd603ea981499f440fa69f2e6d0d930d7
 
-    Ryan Bigg
+    Washington Luiz
 
-*   `ship_total` is now returned on order results.
+* Times are now returned with millisecond precision. (Note: this patch is not in the 2-1-stable or master branches because Rails 4 does this by default.)
 
     Washington Luiz
     

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

@@ -26,9 +26,28 @@ module Spree
       def create
         authorize! :create, Product
         params[:product][:available_on] ||= Time.now
+
+        variants_attributes = params[:product].delete(:variants_attributes) || []
+        option_type_attributes = params[:product].delete(:option_types) || []
+        set_up_shipping_category
+
         @product = Product.new(params[:product])
         begin
           if @product.save
+            variants_attributes.each do |variant_attribute|
+              variant = @product.variants.new
+              variant.update_attributes(variant_attribute)
+            end
+
+            option_type_attributes.each do |name|
+              option_type = OptionType.where(name: name).first_or_initialize do |option_type|
+                option_type.presentation = name
+                option_type.save!
+              end
+
+              @product.option_types << option_type unless @product.option_types.include?(option_type)
+            end
+
             respond_with(@product, :status => 201, :default_template => :show)
           else
             invalid_resource!(@product)
@@ -56,6 +75,14 @@ module Spree
         @product.variants_including_master.update_all(:deleted_at => Time.now)
         respond_with(@product, :status => 204)
       end
+
+      private
+        def set_up_shipping_category
+          if shipping_category = params[:product].delete(:shipping_category)
+            id = ShippingCategory.find_or_create_by_name(shipping_category).id
+            params[:product][:shipping_category_id] = id
+          end
+        end
     end
   end
 end

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

@@ -4,7 +4,9 @@ node(:total_count) { @taxons.total_count }
 node(:current_page) { params[:page] ? params[:page].to_i : 1 }
 node(:per_page) { params[:per_page] || Kaminari.config.default_per_page }
 node(:pages) { @taxons.num_pages }
-child(@taxons) do
+child @taxons => :taxons do
   attributes *taxon_attributes
-  extends "spree/api/taxons/taxons"
+  unless params[:without_children]
+    extends "spree/api/taxons/taxons"
+  end
 end

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

@@ -44,16 +44,6 @@ module Spree
         assert_unauthorized!
       end
 
-      it "will return an error if the recently created order cannot transition from cart to address" do
-        order.state.should eq "cart"
-        order.update_column(:email, nil) # email is necessary to transition from cart to address
-
-        api_put :update, :id => order.to_param, :order_token => order.token
-
-        # Order has not transitioned
-        json_response['state'].should == 'cart'
-      end
-
       it "should transition a recently created order from cart to address" do
         order.state.should eq "cart"
         order.email.should_not be_nil
@@ -220,6 +210,7 @@ module Spree
 
       it "cannot transition if order email is blank" do
         order.update_column(:email, nil)
+        order.update_column(:state, 'address')
 
         api_put :next, :id => order.to_param, :order_token => order.token
         response.status.should == 422

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

@@ -8,6 +8,11 @@ module Spree
     let!(:product) { create(:product) }
     let!(:inactive_product) { create(:product, :available_on => Time.now.tomorrow, :name => "inactive") }
     let(:attributes) { [:id, :name, :description, :price, :available_on, :permalink, :meta_description, :meta_keywords, :shipping_category_id, :taxon_ids] }
+    let(:product_hash) do
+      { :name => "The Other Product",
+        :price => 19.99,
+        :shipping_category_id => create(:shipping_category).id }
+    end
 
     before do
       stub_authentication!
@@ -180,13 +185,163 @@ module Spree
       end
 
       it "can create a new product" do
-        api_post :create, :product => { :name => "The Other Product",
-                                        :price => 19.99,
-                                        :shipping_category_id => create(:shipping_category).id }
+        api_post :create, :product => product_hash
         json_response.should have_attributes(attributes)
         response.status.should == 201
       end
 
+      describe "creating products with" do
+        it "embedded variants" do
+          def attributes_for_variant
+            h = attributes_for(:variant).except(:is_master, :product)
+            h.delete(:option_values)
+            h.merge({
+              options: [
+                { name: "size", value: "small" },
+                { name: "color", value: "black" }
+              ]
+            })
+          end
+
+          attributes = product_hash
+
+          attributes.merge!({
+            shipping_category_id: 1,
+
+            option_types: ['size', 'color'],
+
+            variants_attributes: [
+              attributes_for_variant,
+              attributes_for_variant
+            ]
+          })
+
+          api_post :create, :product => attributes
+
+          expect(json_response['variants'].count).to eq(3) # 1 master + 2 variants
+          expect(json_response['variants'][1]['option_values'][0]['name']).to eq('small')
+          expect(json_response['variants'][1]['option_values'][0]['option_type_name']).to eq('size')
+
+          expect(json_response['option_types'].count).to eq(2) # size, color
+        end
+
+        it "embedded product_properties" do
+          attributes = product_hash
+
+          attributes.merge!({
+            shipping_category_id: 1,
+
+            product_properties_attributes: [{
+              property_name: "fabric",
+              value: "cotton"
+            }]
+          })
+
+          api_post :create, :product => attributes
+
+          expect(json_response['product_properties'][0]['property_name']).to eq('fabric')
+          expect(json_response['product_properties'][0]['value']).to eq('cotton')
+        end
+
+        it "option_types even if without variants" do
+          attributes = product_hash
+
+          attributes.merge!({
+            shipping_category_id: 1,
+
+            option_types: ['size', 'color']
+          })
+
+          api_post :create, :product => attributes
+
+          expect(json_response['option_types'].count).to eq(2)
+        end
+
+        it "creates with shipping categories" do
+          hash = { :name => "The Other Product",
+                   :price => 19.99,
+                   :shipping_category => "Free Ships" }
+
+          api_post :create, :product => hash
+          expect(response.status).to eq 201
+
+          shipping_id = ShippingCategory.find_by_name("Free Ships").id
+          expect(json_response['shipping_category_id']).to eq shipping_id
+        end
+      end
+
+      describe "creating products with" do
+        it "embedded variants" do
+          def attributes_for_variant
+            h = attributes_for(:variant).except(:is_master, :product)
+            h.delete(:option_values)
+            h.merge({
+              options: [
+                { name: "size", value: "small" },
+                { name: "color", value: "black" }
+              ]
+            })
+          end
+
+          product_hash.merge!({
+            variants_attributes: [
+              attributes_for_variant,
+              attributes_for_variant
+            ]
+          })
+
+          api_post :create, :product => product_hash
+          expect(response.status).to eq 201
+          expect(json_response['variants'].count).to eq(3) # 1 master + 2 variants
+
+          variants = json_response['variants'].select { |v| !v['is_master'] }
+          expect(variants.first['option_values'][0]['name']).to eq('small')
+          expect(variants.first['option_values'][0]['option_type_name']).to eq('size')
+
+          expect(json_response['option_types'].count).to eq(2) # size, color
+        end
+
+        it "embedded product_properties" do
+          product_hash.merge!({
+            shipping_category_id: 1,
+
+            product_properties_attributes: [{
+              property_name: "fabric",
+              value: "cotton"
+            }]
+          })
+
+          api_post :create, :product => product_hash
+
+          expect(json_response['product_properties'][0]['property_name']).to eq('fabric')
+          expect(json_response['product_properties'][0]['value']).to eq('cotton')
+        end
+
+        it "option_types even if without variants" do
+          product_hash.merge!({
+            shipping_category_id: 1,
+
+            option_types: ['size', 'color']
+          })
+
+          api_post :create, :product => product_hash
+
+          expect(json_response['option_types'].count).to eq(2)
+        end
+
+        it "creates with shipping categories" do
+          hash = { :name => "The Other Product",
+                   :price => 19.99,
+                   :shipping_category => "Free Ships" }
+
+          api_post :create, :product => hash
+          expect(response.status).to eq 201
+
+          shipping_id = ShippingCategory.find_by_name("Free Ships").id
+          expect(json_response['shipping_category_id']).to eq shipping_id
+        end
+      end
+
       # Regression test for #2140
       context "with authentication_required set to false" do
         before do

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

@@ -27,6 +27,14 @@ module Spree
         children.first['taxons'].count.should eq 1
       end
 
+      # Regression test for #4112
+      it "does not include children when asked not to" do
+        api_get :index, :taxonomy_id => taxonomy.id, :without_children => 1
+
+        json_response['taxons'].first['name'].should eq(taxon.name)
+        json_response['taxons'].first['taxons'].should be_nil
+      end
+
       it "paginates through taxons" do
         new_taxon = create(:taxon, :name => "Go", :taxonomy => taxonomy)
         taxonomy.root.children << new_taxon
@@ -39,21 +47,42 @@ module Spree
         expect(json_response["pages"]).to eql(2)
       end
 
-      it "gets all taxons" do
-        api_get :index
-
-        json_response['taxons'].first['name'].should eq taxonomy.root.name
-        children = json_response['taxons'].first['taxons']
-        children.count.should eq 1
-        children.first['name'].should eq taxon.name
-        children.first['taxons'].count.should eq 1
-      end
-
-      it "can search for a single taxon" do
-        api_get :index, :q => { :name_cont => "Ruby" }
-
-        json_response['taxons'].count.should == 1
-        json_response['taxons'].first['name'].should eq "Ruby"
+      describe 'searching' do
+        context 'with a name' do
+          before do
+            api_get :index, :q => { :name_cont => name }
+          end
+
+          context 'with one result' do
+            let(:name) { "Ruby" }
+
+            it "returns an array including the matching taxon" do
+              json_response['taxons'].count.should == 1
+              json_response['taxons'].first['name'].should eq "Ruby"
+            end
+          end
+
+          context 'with no results' do
+            let(:name) { "Imaginary" }
+
+            it 'returns an empty array of taxons' do
+              json_response.keys.should include('taxons')
+              json_response['taxons'].count.should == 0
+            end
+          end
+        end
+
+        context 'with no filters' do
+          it "gets all taxons" do
+            api_get :index
+
+            json_response['taxons'].first['name'].should eq taxonomy.root.name
+            children = json_response['taxons'].first['taxons']
+            children.count.should eq 1
+            children.first['name'].should eq taxon.name
+            children.first['taxons'].count.should eq 1
+          end
+        end
       end
 
       it "gets a single taxon" do

data/spec/spec_helper.rb

@@ -13,7 +13,13 @@ end
 
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../dummy/config/environment", __FILE__)
+
+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 'rspec/rails'
 require 'rspec/autorun'
 require 'database_cleaner'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2014-01-22 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.0.7
+        version: 2.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.0.8
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -236,17 +236,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.1.0
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Spree's API