spree_api 3.0.0.rc3 → 3.0.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce116e8fb4a30f1ccbe401442ea8f6d467b664ad
-  data.tar.gz: f3eb5f31fafbc8481803e6054228fda895d9d747
+  metadata.gz: 289fb29c93471320f7597347942a3e5977c44376
+  data.tar.gz: f7286dcb7c91f8a12a0ea037629c87ed10acc163
 SHA512:
-  metadata.gz: 235a1081a4cb779a5e78879937479474f14630355b3c080b404a79ea0958e3f137d02a7f9cfee2aa6e8b6863e76f0beaf3727d41b150967e637e227bbdcebef0
-  data.tar.gz: 537fe799160cebcd7bb91609e57f7e547bcc19b2be169264156247b2b5e0f8d62318bf6f4a9a5c6064d29d5c40aa6cc0f1f88c790f9797d24eda3ba544edac16
+  metadata.gz: f51b957333c99f66c04f1552caaae42ab3c07dd130c915e592fec07b758f60a47d52eb033898dfb8812b2de6ec3ed92be28987b76f5f489da7bb0105b4d1038a
+  data.tar.gz: e86dd63722a692e1271acb5bd198ec1b694e792811d3abb13d7786358dbd01724b7cc2e1d8ea03e162ea9779cc834a59e36f08932bb35bc3162fea8737f61ec3

data/CHANGELOG.md

@@ -1 +1,3 @@
-## Spree 2.4.0 (unreleased) ##
+## Spree 3.0.0 (unreleased) ##
+
+* Deprecate the Spree::Api::ConfigController

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

@@ -64,7 +64,7 @@ module Spree
       end
 
       def load_user
-        @current_api_user = (try_spree_current_user || Spree.user_class.find_by(spree_api_key: api_key.to_s))
+        @current_api_user = Spree.user_class.find_by(spree_api_key: api_key.to_s)
       end
 
       def authenticate_user

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

@@ -4,6 +4,7 @@ attributes *variant_attributes
 
 node(:display_price) { |p| p.display_price.to_s }
 node(:options_text) { |v| v.options_text }
+node(:track_inventory) { |v| v.should_track_inventory? }
 node(:in_stock) { |v| v.in_stock? }
 node(:is_backorderable) { |v| v.is_backorderable? }
 node(:total_on_hand) { |v| v.total_on_hand }

data/config/routes.rb

@@ -118,9 +118,6 @@ Spree::Core::Engine.add_routes do
     resources :stock_items, only: [:index, :update, :destroy]
     resources :stores
 
-    get '/config/money', to: 'config#money'
-    get '/config', to: 'config#show'
-
     put '/classifications', to: 'classifications#update', as: :classifications
     get '/taxons/products', to: 'taxons#products', as: :taxon_products
   end

data/lib/spree/api/testing_support/helpers.rb

@@ -22,7 +22,7 @@ module Spree
         end
 
         def stub_authentication!
-          allow(Spree::LegacyUser).to receive(:find_by).with(hash_including(:spree_api_key)) { current_api_user }
+          allow(Spree.user_class).to receive(:find_by).with(hash_including(:spree_api_key)) { current_api_user }
         end
 
         # This method can be overriden (with a let block) inside a context

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

@@ -17,20 +17,6 @@ describe Spree::Api::BaseController, :type => :controller do
     end
   end
 
-  context "signed in as a user using an authentication extension" do
-    before do
-      user = double(:email => "spree@example.com")
-      allow(user).to receive_message_chain :spree_roles, pluck: []
-      allow(controller).to receive_messages :try_spree_current_user => user
-    end
-
-    it "can make a request" do
-      api_get :index
-      expect(json_response).to eq({ "products" => [] })
-      expect(response.status).to eq(200)
-    end
-  end
-
   context "when validating based on an order token" do
     let!(:order) { create :order }
 
@@ -123,7 +109,7 @@ describe Spree::Api::BaseController, :type => :controller do
     before do
       user = double(email: "spree@example.com")
       allow(user).to receive_message_chain :spree_roles, pluck: []
-      allow(controller).to receive_messages try_spree_current_user: user
+      allow(Spree.user_class).to receive_messages find_by: user
       @routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
         r.draw { get 'foo' => 'fakes#foo' }
       end
@@ -131,7 +117,7 @@ describe Spree::Api::BaseController, :type => :controller do
 
     it 'should notify notify_error_during_processing' do
       expect(MockHoneybadger).to receive(:notify_or_ignore).once.with(kind_of(Exception), rack_env: kind_of(Hash))
-      api_get :foo
+      api_get :foo, token: 123
       expect(response.status).to eq(422)
     end
   end

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

@@ -21,8 +21,11 @@ module Spree
     let(:attributes) { [:id, :quantity, :price, :variant, :total, :display_amount, :single_display_amount] }
     let(:resource_scoping) { { :order_id => order.to_param } }
 
+    before do
+      stub_authentication!
+    end
+
     it "can learn how to create a new line item" do
-      allow(controller).to receive_messages :try_spree_current_user => current_api_user
       api_get :new
       expect(json_response["attributes"]).to eq(["quantity", "price", "variant_id"])
       required_attributes = json_response["required_attributes"]
@@ -48,7 +51,6 @@ module Spree
 
     context "as the order owner" do
       before do
-        allow(controller).to receive_messages :try_spree_current_user => current_api_user
         allow_any_instance_of(Order).to receive_messages :user => current_api_user
       end
 
@@ -157,7 +159,6 @@ module Spree
     context "as just another user" do
       before do
         user = create(:user)
-        allow(controller).to receive_messages :try_spree_current_user => user
       end
 
       it "cannot add a new line item to the order" do

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

@@ -215,7 +215,7 @@ module Spree
         allow(user).to receive_message_chain(:spree_roles, :pluck).and_return(["bar"])
         allow(user).to receive(:has_spree_role?).with('bar').and_return(true)
         allow(user).to receive(:has_spree_role?).with('admin').and_return(false)
-        allow(controller).to receive_messages try_spree_current_user: user
+        allow(Spree.user_class).to receive_messages find_by: user
         api_get :show, :id => order.to_param
         expect(response.status).to eq(200)
       end

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

@@ -4,42 +4,40 @@ module Spree
   describe Api::UsersController, :type => :controller do
     render_views
 
-    let(:user) { create(:user) }
+    let(:user) { create(:user, spree_api_key: rand) }
     let(:stranger) { create(:user, :email => 'stranger@example.com') }
     let(:attributes) { [:id, :email, :created_at, :updated_at] }
 
-    before { stub_authentication! }
-
     context "as a normal user" do
-      before do
-        allow(controller).to receive_messages :try_spree_current_user => user
-      end
-
       it "can get own details" do
-        api_get :show, :id => user.id
+        api_get :show, id: user.id, token: user.spree_api_key
 
         expect(json_response['email']).to eq user.email
       end
 
       it "cannot get other users details" do
-        api_get :show, :id => stranger.id
+        api_get :show, id: stranger.id, token: user.spree_api_key
 
         assert_not_found!
       end
 
       it "can learn how to create a new user" do
-        api_get :new
+        api_get :new, token: user.spree_api_key
         expect(json_response["attributes"]).to eq(attributes.map(&:to_s))
       end
 
       it "can create a new user" do
-        api_post :create, :user => { :email => 'new@example.com', :password => 'spree123', :password_confirmation => 'spree123' }
+        user_params = {
+          :email => 'new@example.com', :password => 'spree123', :password_confirmation => 'spree123'
+        }
+
+        api_post :create, :user => user_params, token: user.spree_api_key
         expect(json_response['email']).to eq 'new@example.com'
       end
 
       # there's no validations on LegacyUser?
       xit "cannot create a new user with invalid attributes" do
-        api_post :create, :user => {}
+        api_post :create, :user => {}, token: user.spree_api_key
         expect(response.status).to eq(422)
         expect(json_response["error"]).to eq("Invalid resource. Please fix errors and try again.")
         errors = json_response["errors"]
@@ -47,7 +45,7 @@ module Spree
 
       it "can update own details" do
         country = create(:country)
-        api_put :update, id: user.id, user: {
+        api_put :update, id: user.id, token: user.spree_api_key, user: {
           email: "mine@example.com",
           bill_address_attributes: {
             first_name: 'First',
@@ -76,23 +74,23 @@ module Spree
       end
 
       it "cannot update other users details" do
-        api_put :update, :id => stranger.id, :user => { :email => "mine@example.com" }
+        api_put :update, id: stranger.id, token: user.spree_api_key, user: { :email => "mine@example.com" }
         assert_not_found!
       end
 
       it "can delete itself" do
-        api_delete :destroy, :id => user.id
+        api_delete :destroy, id: user.id, token: user.spree_api_key
         expect(response.status).to eq(204)
       end
 
       it "cannot delete other user" do
-        api_delete :destroy, :id => stranger.id
+        api_delete :destroy, id: stranger.id, token: user.spree_api_key
         assert_not_found!
       end
 
       it "should only get own details on index" do
         2.times { create(:user) }
-        api_get :index
+        api_get :index, token: user.spree_api_key
 
         expect(Spree.user_class.count).to eq 3
         expect(json_response['count']).to eq 1
@@ -101,6 +99,8 @@ module Spree
     end
 
     context "as an admin" do
+      before { stub_authentication! }
+
       sign_in_as_admin!
 
       it "gets all users" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 3.0.0.rc3
+  version: 3.0.0.rc4
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-23 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc3
+        version: 3.0.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc3
+        version: 3.0.0.rc4
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement
@@ -68,7 +68,6 @@ files:
 - app/controllers/spree/api/base_controller.rb
 - app/controllers/spree/api/checkouts_controller.rb
 - app/controllers/spree/api/classifications_controller.rb
-- app/controllers/spree/api/config_controller.rb
 - app/controllers/spree/api/countries_controller.rb
 - app/controllers/spree/api/credit_cards_controller.rb
 - app/controllers/spree/api/images_controller.rb
@@ -210,7 +209,6 @@ files:
 - spec/controllers/spree/api/base_controller_spec.rb
 - spec/controllers/spree/api/checkouts_controller_spec.rb
 - spec/controllers/spree/api/classifications_controller_spec.rb
-- spec/controllers/spree/api/config_controller_spec.rb
 - spec/controllers/spree/api/countries_controller_spec.rb
 - spec/controllers/spree/api/credit_cards_controller_spec.rb
 - spec/controllers/spree/api/images_controller_spec.rb
@@ -276,7 +274,6 @@ test_files:
 - spec/controllers/spree/api/base_controller_spec.rb
 - spec/controllers/spree/api/checkouts_controller_spec.rb
 - spec/controllers/spree/api/classifications_controller_spec.rb
-- spec/controllers/spree/api/config_controller_spec.rb
 - spec/controllers/spree/api/countries_controller_spec.rb
 - spec/controllers/spree/api/credit_cards_controller_spec.rb
 - spec/controllers/spree/api/images_controller_spec.rb

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

@@ -1,6 +0,0 @@
-module Spree
-  module Api
-    class ConfigController < Spree::Api::BaseController
-    end
-  end
-end

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

@@ -1,23 +0,0 @@
-require 'spec_helper'
-
-module Spree
-  describe Api::ConfigController, :type => :controller do
-    render_views
-
-    before do
-      stub_authentication!
-    end
-
-    it "returns Spree::Money settings" do
-      api_get :money
-      expect(response).to be_success
-      expect(json_response["symbol"]).to eq("$")
-    end
-
-    it "returns some configuration settings" do
-      api_get :show
-      expect(response).to be_success
-      expect(json_response["default_country_id"]).to eq(Spree::Config[:default_country_id])
-    end
-  end
-end