spree_api 1.2.0 → 1.2.2

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

@@ -20,8 +20,23 @@ module Spree
       it "gets all taxonomies" do
         api_get :index
 
-        json_response.first['taxonomy']['name'].should eq taxonomy.name
-        json_response.first['taxonomy']['root']['taxons'].count.should eq 1
+        json_response["taxonomies"].first['taxonomy']['name'].should eq taxonomy.name
+        json_response["taxonomies"].first['taxonomy']['root']['taxons'].count.should eq 1
+      end
+
+      it 'can control the page size through a parameter' do
+        create(:taxonomy)
+        api_get :index, :per_page => 1
+        json_response['count'].should == 1
+        json_response['current_page'].should == 1
+        json_response['pages'].should == 2
+      end
+
+      it 'can query the results through a paramter' do
+        expected_result = create(:taxonomy, :name => 'Style')
+        api_get :index, :q => { :name_cont => 'style' }
+        json_response['count'].should == 1
+        json_response['taxonomies'].first['taxonomy']['name'].should eq expected_result.name
       end
 
       it "gets a single taxonomy" do
@@ -82,7 +97,11 @@ module Spree
         json_response["error"].should == "Invalid resource. Please fix errors and try again."
         errors = json_response["errors"]
       end
-    end
 
+      it "can destroy" do
+        api_delete :destroy, :id => taxonomy.id
+        response.status.should == 204
+      end
+    end
   end
 end

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

@@ -4,9 +4,9 @@ module Spree
   describe Api::V1::TaxonsController do
     render_views
 
-    let(:taxonomy) { Factory(:taxonomy) }
-    let(:taxon) { Factory(:taxon, :name => "Ruby", :taxonomy => taxonomy) }
-    let(:taxon2) { Factory(:taxon, :name => "Rails", :taxonomy => taxonomy) }
+    let(:taxonomy) { create(:taxonomy) }
+    let(:taxon) { create(:taxon, :name => "Ruby", :taxonomy => taxonomy) }
+    let(:taxon2) { create(:taxon, :name => "Rails", :taxonomy => taxonomy) }
     let(:attributes) { ["id", "name", "permalink", "position", "parent_id", "taxonomy_id"] }
 
     before do
@@ -76,6 +76,11 @@ module Spree
 
         taxon.reload.children.count.should eq 1
       end
+
+      it "can destroy" do
+        api_delete :destroy, :taxonomy_id => taxonomy.id, :id => taxon.id
+        response.status.should == 204
+      end
     end
 
   end

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

@@ -0,0 +1,26 @@
+require 'shared_examples/protect_product_actions'
+require 'spec_helper'
+
+module Spree
+  describe Spree::Api::V1::ProductsController do
+    render_views
+
+    let!(:product) { create(:product) }
+    let(:attributes) { [:id, :name, :description, :price, :available_on, :permalink, :count_on_hand, :meta_description, :meta_keywords, :taxon_ids] }
+
+    context "without authentication" do
+      before { Spree::Api::Config[:requires_authentication] = false }
+
+      it "retreives a list of products" do
+        api_get :index
+        json_response["products"].first.should have_attributes(attributes)
+        json_response["count"].should == 1
+        json_response["current_page"].should == 1
+        json_response["pages"].should == 1
+      end
+
+      it_behaves_like "modifying product actions are restricted"
+    end
+  end
+end
+

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

@@ -20,16 +20,68 @@ module Spree
       stub_authentication!
     end
 
-    it "can see a list of all variants" do
+    it "can see a paginated list of variants" do
       api_get :index
-      json_response.first.should have_attributes(attributes)
-      option_values = json_response.last["variant"]["option_values"]
+      json_response["variants"].first.should have_attributes(attributes)
+      json_response["count"].should == 1
+      json_response["current_page"].should == 1
+      json_response["pages"].should == 1
+    end
+
+    it 'can control the page size through a parameter' do
+      create(:variant)
+      api_get :index, :per_page => 1
+      json_response['count'].should == 1
+      json_response['current_page'].should == 1
+      json_response['pages'].should == 3
+    end
+
+    it 'can query the results through a paramter' do
+      expected_result = create(:variant, :sku => 'FOOBAR')
+      api_get :index, :q => { :sku_cont => 'FOO' }
+      json_response['count'].should == 1
+      json_response['variants'].first['variant']['sku'].should eq expected_result.sku
+    end
+
+    it "variants returned contain option values data" do
+      api_get :index
+      option_values = json_response["variants"].last["variant"]["option_values"]
       option_values.first.should have_attributes([:name,
                                                  :presentation,
                                                  :option_type_name,
                                                  :option_type_id])
     end
 
+    # Regression test for #2141
+    context "a deleted variant" do
+      before do
+        variant.update_column(:deleted_at, Time.now)
+      end
+
+      it "is not returned in the results" do
+        api_get :index
+        json_response["variants"].count.should == 0
+      end
+
+      it "is not returned even when show_deleted is passed" do
+        api_get :index, :show_deleted => true
+        json_response["variants"].count.should == 0
+      end
+    end
+
+    context "pagination" do
+      default_per_page(1)
+
+      it "can select the next page of variants" do
+        second_variant = create(:variant)
+        api_get :index, :page => 2
+        json_response["variants"].first.should have_attributes(attributes)
+        json_response["total_count"].should == 3
+        json_response["current_page"].should == 2
+        json_response["pages"].should == 3
+      end
+    end
+
     it "can see a single variant" do
       api_get :show, :id => variant.to_param
       json_response.should have_attributes(attributes)
@@ -66,6 +118,18 @@ module Spree
       sign_in_as_admin!
       let(:resource_scoping) { { :product_id => variant.product.to_param } }
 
+      # Test for #2141
+      context "deleted variants" do
+        before do
+          variant.update_column(:deleted_at, Time.now)
+        end
+
+        it "are visible by admin" do
+          api_get :index, :show_deleted => 1
+          json_response["variants"].count.should == 1
+        end
+      end
+
       it "can create a new variant" do
         api_post :create, :variant => { :sku => "12345" }
         json_response.should have_attributes(attributes)
@@ -81,7 +145,7 @@ module Spree
 
       it "can delete a variant" do
         api_delete :destroy, :id => variant.to_param
-        response.status.should == 200
+        response.status.should == 204
         lambda { variant.reload }.should raise_error(ActiveRecord::RecordNotFound)
       end
     end

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

@@ -13,7 +13,22 @@ module Spree
 
     it "gets list of zones" do
       api_get :index
-      json_response.first.should have_attributes(attributes)
+      json_response['zones'].first.should have_attributes(attributes)
+    end
+
+    it 'can control the page size through a parameter' do
+      create(:zone)
+      api_get :index, :per_page => 1
+      json_response['count'].should == 1
+      json_response['current_page'].should == 1
+      json_response['pages'].should == 2
+    end
+
+    it 'can query the results through a paramter' do
+      expected_result = create(:zone, :name => 'South America')
+      api_get :index, :q => { :name_cont => 'south' }
+      json_response['count'].should == 1
+      json_response['zones'].first['zone']['name'].should eq expected_result.name
     end
 
     it "gets a zone" do
@@ -27,26 +42,46 @@ module Spree
       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 }] }
+        params = {
+          :zone => {
+            :name => "North Pole",
+            :zone_members => [
+              {
+                :zoneable_type => "Spree::Country",
+                :zoneable_id => 1
+              }
+            ]
+          }
+        }
+
+        api_post :create, params
         response.status.should == 201
         json_response.should have_attributes(attributes)
+        json_response["zone"]["zone_members"].should_not be_empty
       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 }]}
+        params = { :id => @zone.id,
+          :zone => {
+            :name => "North Pole",
+            :zone_members => [
+              {
+                :zoneable_type => "Spree::Country",
+                :zoneable_id => 1
+              }
+            ]
+          }
+        }
+
+        api_put :update, params
         response.status.should == 200
-        json_response['zone']['name'].should eq 'Americas'
+        json_response['zone']['name'].should eq 'North Pole'
+        json_response['zone']['zone_members'].should_not be_blank
       end
 
       it "can delete a zone" do
         api_delete :destroy, :id => @zone.id
-        response.status.should == 200
+        response.status.should == 204
         lambda { @zone.reload }.should raise_error(ActiveRecord::RecordNotFound)
       end
     end

data/spec/shared_examples/protect_product_actions.rb

@@ -0,0 +1,17 @@
+shared_examples "modifying product actions are restricted" do
+  it "cannot create a new product if not an admin" do
+    api_post :create, :product => { :name => "Brand new product!" }
+    assert_unauthorized!
+  end
+
+  it "cannot update a product" do
+    api_put :update, :id => product.to_param, :product => { :name => "I hacked your store!" }
+    assert_unauthorized!
+  end
+
+  it "cannot delete a product" do
+    api_delete :destroy, :id => product.to_param
+    assert_unauthorized!
+  end
+end
+

data/spec/spec_helper.rb

@@ -19,4 +19,9 @@ RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
   config.include Spree::Api::TestingSupport::Helpers, :type => :controller
   config.extend Spree::Api::TestingSupport::Setup, :type => :controller
+  config.include Spree::Core::TestingSupport::Preferences, :type => :controller
+
+  config.before do
+    Spree::Api::Config[:requires_authentication] = true
+  end
 end

data/spree_api.gemspec

@@ -16,7 +16,6 @@ Gem::Specification.new do |gem|
   gem.version       = version
 
   gem.add_dependency 'spree_core', version
-  gem.add_dependency 'rabl', '0.6.5'
 
   gem.add_development_dependency 'rspec-rails', '2.9.0'
   gem.add_development_dependency 'database_cleaner'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000Z
+date: 2012-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
-  requirement: &70196103586700 !ruby/object:Gem::Requirement
+  requirement: &70185208786720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70196103586700
-- !ruby/object:Gem::Dependency
-  name: rabl
-  requirement: &70196103585920 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 0.6.5
-  type: :runtime
-  prerelease: false
-  version_requirements: *70196103585920
+  version_requirements: *70185208786720
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70196103585220 !ruby/object:Gem::Requirement
+  requirement: &70185208785040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +32,10 @@ dependencies:
         version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *70196103585220
+  version_requirements: *70185208785040
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &70196103584480 !ruby/object:Gem::Requirement
+  requirement: &70185208804960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196103584480
+  version_requirements: *70185208804960
 description: Spree's API
 email:
 - ryan@spreecommerce.com
@@ -73,13 +62,16 @@ files:
 - app/controllers/spree/api/v1/line_items_controller.rb
 - app/controllers/spree/api/v1/orders_controller.rb
 - app/controllers/spree/api/v1/payments_controller.rb
+- app/controllers/spree/api/v1/product_properties_controller.rb
 - app/controllers/spree/api/v1/products_controller.rb
+- app/controllers/spree/api/v1/return_authorizations_controller.rb
 - app/controllers/spree/api/v1/shipments_controller.rb
 - 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/api_configuration.rb
 - app/models/spree/line_item_decorator.rb
 - app/models/spree/option_value_decorator.rb
 - app/models/spree/order_decorator.rb
@@ -112,10 +104,16 @@ files:
 - app/views/spree/api/v1/payments/index.rabl
 - app/views/spree/api/v1/payments/new.rabl
 - app/views/spree/api/v1/payments/show.rabl
+- app/views/spree/api/v1/product_properties/index.rabl
+- app/views/spree/api/v1/product_properties/new.rabl
+- app/views/spree/api/v1/product_properties/show.rabl
 - app/views/spree/api/v1/products/index.rabl
 - app/views/spree/api/v1/products/new.rabl
 - app/views/spree/api/v1/products/product.rabl
 - app/views/spree/api/v1/products/show.rabl
+- app/views/spree/api/v1/return_authorizations/index.rabl
+- app/views/spree/api/v1/return_authorizations/new.rabl
+- app/views/spree/api/v1/return_authorizations/show.rabl
 - app/views/spree/api/v1/shipments/show.rabl
 - app/views/spree/api/v1/taxonomies/index.rabl
 - app/views/spree/api/v1/taxonomies/nested.rabl
@@ -152,15 +150,19 @@ files:
 - spec/controllers/spree/api/v1/line_items_controller_spec.rb
 - spec/controllers/spree/api/v1/orders_controller_spec.rb
 - spec/controllers/spree/api/v1/payments_controller_spec.rb
+- spec/controllers/spree/api/v1/product_properties_controller_spec.rb
 - spec/controllers/spree/api/v1/products_controller_spec.rb
+- spec/controllers/spree/api/v1/return_authorizations_controller_spec.rb
 - spec/controllers/spree/api/v1/shipments_controller_spec.rb
 - spec/controllers/spree/api/v1/taxonomies_controller_spec.rb
 - spec/controllers/spree/api/v1/taxons_controller_spec.rb
+- spec/controllers/spree/api/v1/unauthenticated_products_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/legacy_user_spec.rb
 - spec/models/spree/order_spec.rb
+- spec/shared_examples/protect_product_actions.rb
 - spec/spec_helper.rb
 - spec/support/controller_hacks.rb
 - spec/support/database_cleaner.rb
@@ -180,7 +182,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1643031983782340233
+      hash: 2313245839499120062
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -189,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1643031983782340233
+      hash: 2313245839499120062
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -204,15 +206,19 @@ test_files:
 - spec/controllers/spree/api/v1/line_items_controller_spec.rb
 - spec/controllers/spree/api/v1/orders_controller_spec.rb
 - spec/controllers/spree/api/v1/payments_controller_spec.rb
+- spec/controllers/spree/api/v1/product_properties_controller_spec.rb
 - spec/controllers/spree/api/v1/products_controller_spec.rb
+- spec/controllers/spree/api/v1/return_authorizations_controller_spec.rb
 - spec/controllers/spree/api/v1/shipments_controller_spec.rb
 - spec/controllers/spree/api/v1/taxonomies_controller_spec.rb
 - spec/controllers/spree/api/v1/taxons_controller_spec.rb
+- spec/controllers/spree/api/v1/unauthenticated_products_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/legacy_user_spec.rb
 - spec/models/spree/order_spec.rb
+- spec/shared_examples/protect_product_actions.rb
 - spec/spec_helper.rb
 - spec/support/controller_hacks.rb
 - spec/support/database_cleaner.rb