spree_api 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab9505bfe7982709e648940a6685e64804a59525
-  data.tar.gz: 33f82a1d56bca7c62d7992b90f7db61f37c1a853
+  metadata.gz: ef00fcd9a6f5ff3573c20c99509035edf9b49e66
+  data.tar.gz: 8b036132ce0f23d36d5cb58e283187ee17519066
 SHA512:
-  metadata.gz: 078ed12604797d085834aebea70d5934c8af84c54aa61c05a1989c21f25d65520b37c331a4dd313dec0a121785aa9528b42fbab8ec9f55935319c689e68fe1e3
-  data.tar.gz: b1a7ee95d0bc92cbbe1626a3732f074504f1589e1ea1d4bb1eda07b73d5417618ff4195b47ea55157ba248598d2bb7bd4afc63a18ecb7dd207b4d967a99fc7d3
+  metadata.gz: 70a31fa7caf0a0107ad2141582fa3ee166666789ff1202bf6082d72e7b8509af7a4f014cc1c7efc4985cf9e8bda1dbacaf93df443746b59b1ffca76d78865d5b
+  data.tar.gz: ce8f5e35409bb3593a2db354456761ab3dfdea846a454c94e1590039d8ef1a249f183f6ff48e0773112a2fd6cea7e5f8122f13285c7aa82690ee89e10f0e0514

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

@@ -42,15 +42,18 @@ module Spree
         end
       end
 
-      private
-
-      def set_content_type
-        content_type = case params[:format]
+      def content_type
+        case params[:format]
         when "json"
           "application/json; charset=utf-8"
         when "xml"
           "text/xml; charset=utf-8"
         end
+      end
+
+      private
+
+      def set_content_type
         headers["Content-Type"] = content_type
       end
 

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

@@ -52,7 +52,7 @@ module Spree
         end
 
         def nested_params
-          map_nested_attributes_keys Order, params[:order] || {}
+          map_nested_attributes_keys Spree::Order, params[:order] || {}
         end
 
         # Should be overriden if you have areas of your checkout that don't match
@@ -79,7 +79,7 @@ module Spree
 
         def after_update_attributes
           if nested_params && nested_params[:coupon_code].present?
-            handler = PromotionHandler::Coupon.new(@order).apply
+            handler = Spree::PromotionHandler::Coupon.new(@order).apply
 
             if handler.error.present?
               @coupon_message = handler.error

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

@@ -5,17 +5,17 @@ module Spree
       skip_before_action :authenticate_user
 
       def index
-        @countries = Country.accessible_by(current_ability, :read).ransack(params[:q]).result.
+        @countries = Spree::Country.accessible_by(current_ability, :read).ransack(params[:q]).result.
                      includes(:states).order('name ASC').
                      page(params[:page]).per(params[:per_page])
-        country = Country.order("updated_at ASC").last
+        country = Spree::Country.order("updated_at ASC").last
         if stale?(country)
           respond_with(@countries)
         end
       end
 
       def show
-        @country = Country.accessible_by(current_ability, :read).find(params[:id])
+        @country = Spree::Country.accessible_by(current_ability, :read).find(params[:id])
         respond_with(@country)
       end
     end

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

@@ -8,12 +8,12 @@ module Spree
       end
 
       def show
-        @image = Image.accessible_by(current_ability, :read).find(params[:id])
+        @image = Spree::Image.accessible_by(current_ability, :read).find(params[:id])
         respond_with(@image)
       end
 
       def create
-        authorize! :create, Image
+        authorize! :create, Spree::Image
         @image = scope.images.create(image_params)
         respond_with(@image, :status => 201, :default_template => :show)
       end

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

@@ -24,7 +24,7 @@ module Spree
       private
 
       def inventory_unit
-        @inventory_unit ||= InventoryUnit.accessible_by(current_ability, :read).find(params[:id])
+        @inventory_unit ||= Spree::InventoryUnit.accessible_by(current_ability, :read).find(params[:id])
       end
 
       def prepare_event

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

@@ -7,7 +7,7 @@ module Spree
       before_action :find_order, except: [:create, :mine, :current, :index, :update]
 
       # Dynamically defines our stores checkout steps to ensure we check authorization on each step.
-      Order.checkout_steps.keys.each do |step|
+      Spree::Order.checkout_steps.keys.each do |step|
         define_method step do
           find_order
           authorize! :update, @order, params[:token]
@@ -21,7 +21,7 @@ module Spree
       end
 
       def create
-        authorize! :create, Order
+        authorize! :create, Spree::Order
         order_user = if @current_user_roles.include?('admin') && order_params[:user_id]
           Spree.user_class.find(order_params[:user_id])
         else
@@ -46,7 +46,7 @@ module Spree
 
       def index
         authorize! :index, Order
-        @orders = Order.ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
+        @orders = Spree::Order.ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
         respond_with(@orders)
       end
 
@@ -91,7 +91,7 @@ module Spree
         find_order
         authorize! :update, @order, order_token
         @order.coupon_code = params[:coupon_code]
-        @handler = PromotionHandler::Coupon.new(@order).apply
+        @handler = Spree::PromotionHandler::Coupon.new(@order).apply
         status = @handler.successful? ? 200 : 422
         render "spree/api/promotions/handler", :status => status
       end

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

@@ -67,7 +67,7 @@ module Spree
         end
 
         def perform_payment_action(action, *args)
-          authorize! action, Payment
+          authorize! action, Spree::Payment
           @payment.send("#{action}!", *args)
           respond_with(@payment, default_template: :show)
         end

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

@@ -20,7 +20,7 @@ module Spree
       end
 
       def create
-        authorize! :create, ProductProperty
+        authorize! :create, Spree::ProductProperty
         @product_property = @product.product_properties.new(product_property_params)
         if @product_property.save
           respond_with(@product_property, status: 201, default_template: :show)

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

@@ -57,12 +57,12 @@ module Spree
       #   }
       #
       def create
-        authorize! :create, Product
+        authorize! :create, Spree::Product
         params[:product][:available_on] ||= Time.now
         set_up_shipping_category
 
         options = { variants_attrs: variants_params, options_attrs: option_types_params }
-        @product = Core::Importer::Product.new(nil, product_params, options).create
+        @product = Spree::Core::Importer::Product.new(nil, product_params, options).create
 
         if @product.persisted?
           respond_with(@product, :status => 201, :default_template => :show)
@@ -76,7 +76,7 @@ module Spree
         authorize! :update, @product
 
         options = { variants_attrs: variants_params, options_attrs: option_types_params }
-        @product = Core::Importer::Product.new(@product, product_params, options).update
+        @product = Spree::Core::Importer::Product.new(@product, product_params, options).update
 
         if @product.errors.empty?
           respond_with(@product.reload, :status => 200, :default_template => :show)
@@ -119,7 +119,7 @@ module Spree
 
         def set_up_shipping_category
           if shipping_category = params[:product].delete(:shipping_category)
-            id = ShippingCategory.find_or_create_by(name: shipping_category).id
+            id = Spree::ShippingCategory.find_or_create_by(name: shipping_category).id
             params[:product][:shipping_category_id] = id
           end
         end

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

@@ -25,7 +25,7 @@ module Spree
       end
 
       def create
-        authorize! :create, Property
+        authorize! :create, Spree::Property
         @property = Spree::Property.new(property_params)
         if @property.save
           respond_with(@property, status: 201, default_template: :show)

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

@@ -3,7 +3,7 @@ module Spree
     class ReturnAuthorizationsController < Spree::Api::BaseController
 
       def create
-        authorize! :create, ReturnAuthorization
+        authorize! :create, Spree::ReturnAuthorization
         @return_authorization = order.return_authorizations.build(return_authorization_params)
         if @return_authorization.save
           respond_with(@return_authorization, status: 201, default_template: :show)
@@ -19,7 +19,7 @@ module Spree
       end
 
       def index
-        authorize! :admin, ReturnAuthorization
+        authorize! :admin, Spree::ReturnAuthorization
         @return_authorizations = order.return_authorizations.accessible_by(current_ability, :read).
                                  ransack(params[:q]).result.
                                  page(params[:page]).per(params[:per_page])
@@ -27,11 +27,11 @@ module Spree
       end
 
       def new
-        authorize! :admin, ReturnAuthorization
+        authorize! :admin, Spree::ReturnAuthorization
       end
 
       def show
-        authorize! :admin, ReturnAuthorization
+        authorize! :admin, Spree::ReturnAuthorization
         @return_authorization = order.return_authorizations.accessible_by(current_ability, :read).find(params[:id])
         respond_with(@return_authorization)
       end

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

@@ -27,10 +27,10 @@ module Spree
       private
         def scope
           if params[:country_id]
-            @country = Country.accessible_by(current_ability, :read).find(params[:country_id])
+            @country = Spree::Country.accessible_by(current_ability, :read).find(params[:country_id])
             return @country.states.accessible_by(current_ability, :read)
           else
-            return State.accessible_by(current_ability, :read)
+            return Spree::State.accessible_by(current_ability, :read)
           end
         end
     end

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

@@ -14,7 +14,7 @@ module Spree
       end
 
       def create
-        authorize! :create, StockItem
+        authorize! :create, Spree::StockItem
 
         count_on_hand = 0
         if params[:stock_item].has_key?(:count_on_hand)
@@ -31,7 +31,7 @@ module Spree
       end
 
       def update
-        @stock_item = StockItem.accessible_by(current_ability, :update).find(params[:id])
+        @stock_item = Spree::StockItem.accessible_by(current_ability, :update).find(params[:id])
 
         count_on_hand = 0
         if params[:stock_item].has_key?(:count_on_hand)
@@ -50,7 +50,7 @@ module Spree
       end
 
       def destroy
-        @stock_item = StockItem.accessible_by(current_ability, :destroy).find(params[:id])
+        @stock_item = Spree::StockItem.accessible_by(current_ability, :destroy).find(params[:id])
         @stock_item.destroy
         respond_with(@stock_item, status: 204)
       end
@@ -59,7 +59,7 @@ module Spree
 
       def stock_location
         render 'spree/api/shared/stock_location_required', status: 422 and return unless params[:stock_location_id]
-        @stock_location ||= StockLocation.accessible_by(current_ability, :read).find(params[:stock_location_id])
+        @stock_location ||= Spree::StockLocation.accessible_by(current_ability, :read).find(params[:stock_location_id])
       end
 
       def scope

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

@@ -2,8 +2,8 @@ module Spree
   module Api
     class StockLocationsController < Spree::Api::BaseController
       def index
-        authorize! :read, StockLocation
-        @stock_locations = StockLocation.accessible_by(current_ability, :read).order('name ASC').ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
+        authorize! :read, Spree::StockLocation
+        @stock_locations = Spree::StockLocation.accessible_by(current_ability, :read).order('name ASC').ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
         respond_with(@stock_locations)
       end
 
@@ -12,8 +12,8 @@ module Spree
       end
 
       def create
-        authorize! :create, StockLocation
-        @stock_location = StockLocation.new(stock_location_params)
+        authorize! :create, Spree::StockLocation
+        @stock_location = Spree::StockLocation.new(stock_location_params)
         if @stock_location.save
           respond_with(@stock_location, status: 201, default_template: :show)
         else
@@ -39,7 +39,7 @@ module Spree
       private
 
       def stock_location
-        @stock_location ||= StockLocation.accessible_by(current_ability, :read).find(params[:id])
+        @stock_location ||= Spree::StockLocation.accessible_by(current_ability, :read).find(params[:id])
       end
 
       def stock_location_params

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

@@ -4,7 +4,7 @@ module Spree
       before_action :stock_location, except: [:update, :destroy]
 
       def index
-        authorize! :read, StockMovement
+        authorize! :read, Spree::StockMovement
         @stock_movements = scope.ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
         respond_with(@stock_movements)
       end
@@ -15,7 +15,7 @@ module Spree
       end
 
       def create
-        authorize! :create, StockMovement
+        authorize! :create, Spree::StockMovement
         @stock_movement = scope.new(stock_movement_params)
         if @stock_movement.save
           respond_with(@stock_movement, status: 201, default_template: :show)
@@ -28,7 +28,7 @@ module Spree
 
       def stock_location
         render 'spree/api/shared/stock_location_required', status: 422 and return unless params[:stock_location_id]
-        @stock_location ||= StockLocation.accessible_by(current_ability, :read).find(params[:stock_location_id])
+        @stock_location ||= Spree::StockLocation.accessible_by(current_ability, :read).find(params[:stock_location_id])
       end
 
       def scope

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

@@ -5,14 +5,14 @@ module Spree
       before_filter :get_store, except: [:index, :create]
 
       def index
-        authorize! :read, Store
-        @stores = Store.accessible_by(current_ability, :read).all
+        authorize! :read, Spree::Store
+        @stores = Spree::Store.accessible_by(current_ability, :read).all
         respond_with(@stores)
       end
 
       def create
-        authorize! :create, Store
-        @store = Store.new(store_params)
+        authorize! :create, Spree::Store
+        @store = Spree::Store.new(store_params)
         @store.code = params[:store][:code]
         if @store.save
           respond_with(@store, status: 201, default_template: :show)
@@ -44,7 +44,7 @@ module Spree
       private
 
       def get_store
-        @store = Store.find(params[:id])
+        @store = Spree::Store.find(params[:id])
       end
 
       def store_params

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

@@ -16,8 +16,8 @@ module Spree
       end
 
       def create
-        authorize! :create, Taxonomy
-        @taxonomy = Taxonomy.new(taxonomy_params)
+        authorize! :create, Spree::Taxonomy
+        @taxonomy = Spree::Taxonomy.new(taxonomy_params)
         if @taxonomy.save
           respond_with(@taxonomy, :status => 201, :default_template => :show)
         else
@@ -43,13 +43,13 @@ module Spree
       private
 
       def taxonomies
-        @taxonomies = Taxonomy.accessible_by(current_ability, :read).order('name').includes(:root => :children).
+        @taxonomies = Spree::Taxonomy.accessible_by(current_ability, :read).order('name').includes(:root => :children).
                       ransack(params[:q]).result.
                       page(params[:page]).per(params[:per_page])
       end
 
       def taxonomy
-        @taxonomy ||= Taxonomy.accessible_by(current_ability, :read).find(params[:id])
+        @taxonomy ||= Spree::Taxonomy.accessible_by(current_ability, :read).find(params[:id])
       end
 
       def taxonomy_params

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

@@ -26,7 +26,7 @@ module Spree
       end
 
       def create
-        authorize! :create, Taxon
+        authorize! :create, Spree::Taxon
         @taxon = Spree::Taxon.new(taxon_params)
         @taxon.taxonomy_id = params[:taxonomy_id]
         taxonomy = Spree::Taxonomy.find_by(id: params[:taxonomy_id])

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

@@ -4,7 +4,7 @@ module Spree
       before_action :product
 
       def create
-        authorize! :create, Variant
+        authorize! :create, Spree::Variant
         @variant = scope.new(variant_params)
         if @variant.save
           respond_with(@variant, status: 201, default_template: :show)
@@ -55,10 +55,10 @@ module Spree
           if @product
             variants = @product.variants_including_master
           else
-            variants = Variant
+            variants = Spree::Variant
           end
 
-          if current_ability.can?(:manage, Variant) && params[:show_deleted]
+          if current_ability.can?(:manage, Spree::Variant) && params[:show_deleted]
             variants = variants.with_deleted
           end
 

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

@@ -3,8 +3,8 @@ module Spree
     class ZonesController < Spree::Api::BaseController
 
       def create
-        authorize! :create, Zone
-        @zone = Zone.new(map_nested_attributes_keys(Spree::Zone, zone_params))
+        authorize! :create, Spree::Zone
+        @zone = Spree::Zone.new(map_nested_attributes_keys(Spree::Zone, zone_params))
         if @zone.save
           respond_with(@zone, :status => 201, :default_template => :show)
         else
@@ -19,7 +19,7 @@ module Spree
       end
 
       def index
-        @zones = Zone.accessible_by(current_ability, :read).order('name ASC').ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
+        @zones = Spree::Zone.accessible_by(current_ability, :read).order('name ASC').ransack(params[:q]).result.page(params[:page]).per(params[:per_page])
         respond_with(@zones)
       end
 

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

@@ -1,15 +1,9 @@
 object @variant
-attributes *variant_attributes
 
 cache [I18n.locale, @current_user_roles.include?('admin'), 'big_variant', root_object]
 
 extends "spree/api/variants/small"
 
-node :total_on_hand do
-  root_object.total_on_hand
-end
-
-
 child(:stock_items => :stock_items) do
   attributes :id, :count_on_hand, :stock_location_id, :backorderable
   attribute :available? => :available

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

@@ -28,7 +28,7 @@ module Spree
         # This method can be overriden (with a let block) inside a context
         # For instance, if you wanted to have an admin user instead.
         def current_api_user
-          @current_api_user ||= stub_model(Spree::LegacyUser, email: "spree@example.com")
+          @current_api_user ||= stub_model(Spree.user_class, email: "spree@example.com")
         end
 
         def image(filename)

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

@@ -4,7 +4,7 @@ module Spree
       module Setup
         def sign_in_as_admin!
           let!(:current_api_user) do
-            user = stub_model(Spree::LegacyUser)
+            user = stub_model(Spree.user_class)
             allow(user).to receive_message_chain(:spree_roles, :pluck).and_return(["admin"])
             allow(user).to receive(:has_spree_role?).with("admin").and_return(true)
             user

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

@@ -326,6 +326,13 @@ module Spree
           expect(json_response['option_types'].count).to eq(2)
         end
 
+        it "creates product with option_types ids" do
+          option_type = create(:option_type)
+          product_data.merge!(option_type_ids: [option_type.id])
+          api_post :create, product: product_data
+          expect(json_response['option_types'].first['id']).to eq option_type.id
+        end
+
         it "creates with shipping categories" do
           hash = { :name => "The Other Product",
                    :price => 19.99,

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

@@ -4,7 +4,7 @@ module Spree
   describe Api::UsersController, :type => :controller do
     render_views
 
-    let(:user) { create(:user, spree_api_key: rand) }
+    let(:user) { create(:user, spree_api_key: rand.to_s) }
     let(:stranger) { create(:user, :email => 'stranger@example.com') }
     let(:attributes) { [:id, :email, :created_at, :updated_at] }
 

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

@@ -4,10 +4,11 @@ module Spree
   describe Api::VariantsController, :type => :controller do
     render_views
 
+    let(:option_value) { create(:option_value) }
     let!(:product) { create(:product) }
     let!(:variant) do
       variant = product.master
-      variant.option_values << create(:option_value)
+      variant.option_values << option_value
       variant
     end
 
@@ -166,10 +167,20 @@ module Spree
       end
 
       it "can create a new variant" do
-        api_post :create, :variant => { :sku => "12345" }
+        other_value = create(:option_value)
+        api_post :create, variant: {
+          sku: "12345",
+          price: "20",
+          option_value_ids: [option_value.id, other_value.id]
+        }
+
         expect(json_response).to have_attributes(new_attributes)
         expect(response.status).to eq(201)
         expect(json_response["sku"]).to eq("12345")
+        expect(json_response["price"]).to match "20"
+
+        option_value_ids = json_response["option_values"].map { |o| o['id'] }
+        expect(option_value_ids).to match_array [option_value.id, other_value.id]
 
         expect(variant.product.variants.count).to eq(1)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_api
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Ryan Bigg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-05-05 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
+        version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: rabl
   requirement: !ruby/object:Gem::Requirement