solidus_api 1.2.3 → 1.3.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 393d0d36bfd016ad4bd491a6e5e7f809a3bd8d33
-  data.tar.gz: 075176b4df3486e9c0da4b27da75e987b26a8b1f
+  metadata.gz: 1660d14deff32b5456115f64d5eb3defa14e6f9e
+  data.tar.gz: a949a6bf3dceabc39885d44a83a7b3d4f9663e8a
 SHA512:
-  metadata.gz: 1e1fe525cdf4e7fa9f8f4f6430f79e7c3688ce94e525f3cc5a312836908b8889014a9f5e9d6082f4cb776b16a59f07e4d7f67435944f2878a08394119c044f73
-  data.tar.gz: b98daeb6709274fd64bef47c3b69c3251d5d91d84dff7bb973e53476d6e4c9a279ae13a58e1cccaa6cf8bf1a1edf231209ec37410653e4c03af493ea9cc94cb8
+  metadata.gz: e54a0c3abaed5e939daf3e9b09506125701abaf78e99a06d523850e8c58a2565e7526021c0351a588583e765aace4310d4bbec044c52ac755e1bdf1b05fe5a7c
+  data.tar.gz: ce1839a1b058a1b42259c0951201390fbab247ad05e095e059dfe384ca1f79ce1a0940cad12cd06c8992cd0fd95be724352596c405729339d956c97bdc1c80ba

data/Gemfile

@@ -1,5 +1,5 @@
-eval(File.read(File.dirname(__FILE__) + '/../common_spree_dependencies.rb'))
+eval_gemfile File.expand_path('../../common_spree_dependencies.rb', __FILE__)
 
-gem 'solidus_core', :path => '../core'
+gem 'solidus_core', path: '../core'
 
 gemspec

data/Rakefile

@@ -7,7 +7,7 @@ require 'rails/all'
 
 RSpec::Core::RakeTask.new
 
-task :default => :spec
+task default: :spec
 
 desc "Generates a dummy app for testing"
 task :test_app do

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

@@ -13,9 +13,9 @@ module Spree
         authorize! :update, @order, order_token
         find_address
 
-        if @order.update_attributes({"#{@order_source}_attributes" => address_params})
+        if @order.update_attributes({ "#{@order_source}_attributes" => address_params })
           @address = @order.send(@order_source)
-          respond_with(@address, :default_template => :show)
+          respond_with(@address, default_template: :show)
         else
           @address = @order.send(@order_source)
           invalid_resource!(@address)
@@ -23,6 +23,7 @@ module Spree
       end
 
       private
+
       def address_params
         params.require(:address).permit(permitted_address_attributes)
       end

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

@@ -8,6 +8,7 @@ module Spree
 
       include CanCan::ControllerAdditions
       include Spree::Core::ControllerHelpers::Store
+      include Spree::Core::ControllerHelpers::Pricing
       include Spree::Core::ControllerHelpers::StrongParameters
 
       class_attribute :admin_line_item_attributes
@@ -18,7 +19,7 @@ module Spree
       class_attribute :error_notifier
 
       before_action :load_user
-      before_action :authorize_for_order, if: Proc.new { order_token.present? }
+      before_action :authorize_for_order, if: proc { order_token.present? }
       before_action :authenticate_user
       before_action :load_user_roles
 
@@ -47,9 +48,9 @@ module Spree
       def authenticate_user
         unless @current_api_user
           if requires_authentication? && api_key.blank? && order_token.blank?
-            render "spree/api/errors/must_specify_api_key", :status => 401
+            render "spree/api/errors/must_specify_api_key", status: 401
           elsif order_token.blank? && (requires_authentication? || api_key.present?)
-            render "spree/api/errors/invalid_api_key", :status => 401
+            render "spree/api/errors/invalid_api_key", status: 401
           end
         end
       end
@@ -93,15 +94,10 @@ module Spree
         Spree::Ability.new(current_api_user)
       end
 
-      def current_currency
-        Spree::Config[:currency]
-      end
-      helper_method :current_currency
-
       def invalid_resource!(resource)
         Rails.logger.error "invalid_resouce_errors=#{resource.errors.full_messages}"
         @resource = resource
-        render "spree/api/errors/invalid_resource", :status => 422
+        render "spree/api/errors/invalid_resource", status: 422
       end
 
       def api_key
@@ -127,7 +123,7 @@ module Spree
             scope = scope.not_deleted
           end
         else
-          scope = Product.accessible_by(current_ability, :read).active.includes(*product_includes)
+          scope = Product.accessible_by(current_ability, :read).available.includes(*product_includes)
         end
 
         scope
@@ -138,7 +134,7 @@ module Spree
       end
 
       def product_includes
-        [ :option_types, :taxons, product_properties: :property, variants: variants_associations, master: variants_associations ]
+        [:option_types, :taxons, product_properties: :property, variants: variants_associations, master: variants_associations]
       end
 
       def order_id
@@ -160,13 +156,12 @@ module Spree
         logger.error "insufficient_stock_error #{exception.inspect}"
         render(
           json: {
-            errors: [I18n.t(:quantity_is_not_available, :scope => "spree.api.order")],
-            type: 'insufficient_stock',
+            errors: [I18n.t(:quantity_is_not_available, scope: "spree.api.order")],
+            type: 'insufficient_stock'
           },
-          status: 422,
+          status: 422
         )
       end
-
     end
   end
 end

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

@@ -76,78 +76,79 @@ module Spree
       end
 
       private
-        def user_id
-          params[:order][:user_id] if params[:order]
-        end
 
-        def update_params
-          if update_params = massaged_params[:order]
-            update_params.permit(permitted_checkout_attributes)
-          else
-            # We current allow update requests without any parameters in them.
-            {}
-          end
+      def user_id
+        params[:order][:user_id] if params[:order]
+      end
+
+      def update_params
+        if update_params = massaged_params[:order]
+          update_params.permit(permitted_checkout_attributes)
+        else
+          # We current allow update requests without any parameters in them.
+          {}
         end
+      end
 
-        def massaged_params
-          massaged_params = params.deep_dup
+      def massaged_params
+        massaged_params = params.deep_dup
 
-          if params[:payment_source].present?
-            ActiveSupport::Deprecation.warn("Passing payment_source is deprecated. Send source parameters inside payments_attributes[:source_attributes].", caller)
-            move_payment_source_into_payments_attributes(massaged_params)
-          end
+        if params[:payment_source].present?
+          ActiveSupport::Deprecation.warn("Passing payment_source is deprecated. Send source parameters inside payments_attributes[:source_attributes].", caller)
+          move_payment_source_into_payments_attributes(massaged_params)
+        end
 
-          if params[:order] && params[:order][:existing_card].present?
-            ActiveSupport::Deprecation.warn("Passing order[:existing_card] is deprecated. Send existing_card_id inside of payments_attributes[:source_attributes].", caller)
-            move_existing_card_into_payments_attributes(massaged_params)
-          end
+        if params[:order] && params[:order][:existing_card].present?
+          ActiveSupport::Deprecation.warn("Passing order[:existing_card] is deprecated. Send existing_card_id inside of payments_attributes[:source_attributes].", caller)
+          move_existing_card_into_payments_attributes(massaged_params)
+        end
 
-          set_payment_parameters_amount(massaged_params, @order)
+        set_payment_parameters_amount(massaged_params, @order)
 
-          massaged_params
-        end
+        massaged_params
+      end
 
-        # Should be overriden if you have areas of your checkout that don't match
-        # up to a step within checkout_steps, such as a registration step
-        def skip_state_validation?
-          false
-        end
+      # Should be overriden if you have areas of your checkout that don't match
+      # up to a step within checkout_steps, such as a registration step
+      def skip_state_validation?
+        false
+      end
 
-        def load_order
-          @order = Spree::Order.find_by!(number: params[:id])
-        end
+      def load_order
+        @order = Spree::Order.find_by!(number: params[:id])
+      end
 
-        def update_order_state
-          @order.state = params[:state] if params[:state]
-          state_callback(:before)
-        end
+      def update_order_state
+        @order.state = params[:state] if params[:state]
+        state_callback(:before)
+      end
 
-        def state_callback(before_or_after = :before)
-          method_name = :"#{before_or_after}_#{@order.state}"
-          send(method_name) if respond_to?(method_name, true)
-        end
+      def state_callback(before_or_after = :before)
+        method_name = :"#{before_or_after}_#{@order.state}"
+        send(method_name) if respond_to?(method_name, true)
+      end
 
-        def after_update_attributes
-          if params[:order] && params[:order][:coupon_code].present?
-            handler = PromotionHandler::Coupon.new(@order).apply
+      def after_update_attributes
+        if params[:order] && params[:order][:coupon_code].present?
+          handler = PromotionHandler::Coupon.new(@order).apply
 
-            if handler.error.present?
-              @coupon_message = handler.error
-              respond_with(@order, default_template: 'spree/api/orders/could_not_apply_coupon')
-              return true
-            end
+          if handler.error.present?
+            @coupon_message = handler.error
+            respond_with(@order, default_template: 'spree/api/orders/could_not_apply_coupon')
+            return true
           end
-          false
         end
+        false
+      end
 
-        def order_id
-          super || params[:id]
-        end
+      def order_id
+        super || params[:id]
+      end
 
-        def expected_total_ok?(expected_total)
-          return true if expected_total.blank?
-          @order.total == BigDecimal(expected_total)
-        end
+      def expected_total_ok?(expected_total)
+        return true if expected_total.blank?
+        @order.total == BigDecimal(expected_total)
+      end
     end
   end
 end

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

@@ -5,14 +5,14 @@ module Spree
         authorize! :update, Product
         authorize! :update, Taxon
         classification = Spree::Classification.find_by(
-          :product_id => params[:product_id],
-          :taxon_id => params[:taxon_id]
+          product_id: params[:product_id],
+          taxon_id: params[:taxon_id]
         )
         # Because position we get back is 0-indexed.
         # acts_as_list is 1-indexed.
         classification.insert_at(params[:position].to_i + 1)
-        render :nothing => true
+        render nothing: true
       end
     end
   end
-end
+end

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

@@ -1,6 +1,11 @@
 module Spree
   module Api
     class ConfigController < Spree::Api::BaseController
+      def show
+      end
+
+      def money
+      end
     end
   end
-end
+end

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

@@ -23,20 +23,20 @@ module Spree
 
       private
 
-        def user
-          if params[:user_id].present?
-            @user ||= Spree::user_class.accessible_by(current_ability, :read).find(params[:user_id])
-          end
+      def user
+        if params[:user_id].present?
+          @user ||= Spree.user_class.accessible_by(current_ability, :read).find(params[:user_id])
         end
+      end
 
-        def find_credit_card
-          @credit_card = Spree::CreditCard.find(params[:id])
-          authorize! :update, @credit_card
-        end
+      def find_credit_card
+        @credit_card = Spree::CreditCard.find(params[:id])
+        authorize! :update, @credit_card
+      end
 
-        def credit_card_update_params
-          params.require(:credit_card).permit(permitted_credit_card_update_attributes)
-        end
+      def credit_card_update_params
+        params.require(:credit_card).permit(permitted_credit_card_update_attributes)
+      end
     end
   end
 end

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

@@ -1,7 +1,6 @@
 module Spree
   module Api
     class ImagesController < Spree::Api::BaseController
-
       def index
         @images = scope.images.accessible_by(current_ability, :read)
         respond_with(@images)
@@ -15,33 +14,34 @@ module Spree
       def create
         authorize! :create, Image
         @image = scope.images.create(image_params)
-        respond_with(@image, :status => 201, :default_template => :show)
+        respond_with(@image, status: 201, default_template: :show)
       end
 
       def update
         @image = scope.images.accessible_by(current_ability, :update).find(params[:id])
         @image.update_attributes(image_params)
-        respond_with(@image, :default_template => :show)
+        respond_with(@image, default_template: :show)
       end
 
       def destroy
         @image = scope.images.accessible_by(current_ability, :destroy).find(params[:id])
         @image.destroy
-        respond_with(@image, :status => 204)
+        respond_with(@image, status: 204)
       end
 
       private
-        def image_params
-          params.require(:image).permit(permitted_image_attributes)
-        end
 
-        def scope
-          if params[:product_id]
-            scope = Spree::Product.friendly.find(params[:product_id])
-          elsif params[:variant_id]
-            scope = Spree::Variant.find(params[:variant_id])
-          end
+      def image_params
+        params.require(:image).permit(permitted_image_attributes)
+      end
+
+      def scope
+        if params[:product_id]
+          Spree::Product.friendly.find(params[:product_id])
+        elsif params[:variant_id]
+          Spree::Variant.find(params[:variant_id])
         end
+      end
     end
   end
 end

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

@@ -14,7 +14,7 @@ module Spree
         inventory_unit.transaction do
           if inventory_unit.update_attributes(inventory_unit_params)
             fire
-            render :show, :status => 200
+            render :show, status: 200
           else
             invalid_resource!(inventory_unit)
           end
@@ -34,8 +34,8 @@ module Spree
 
         unless inventory_unit.respond_to?(can_event) &&
                inventory_unit.send(can_event)
-          render :text => { :exception => "cannot transition to #{@event}" }.to_json,
-                 :status => 200
+          render text: { exception: "cannot transition to #{@event}" }.to_json,
+                 status: 200
           false
         end
       end
@@ -43,7 +43,7 @@ module Spree
       def fire
         inventory_unit.send("#{@event}!") if @event
       end
-      
+
       def inventory_unit_params
         params.require(:inventory_unit).permit(permitted_inventory_unit_attributes)
       end

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

@@ -8,6 +8,9 @@ module Spree
       before_filter :load_order, only: [:create, :update, :destroy]
       around_filter :lock_order, only: [:create, :update, :destroy]
 
+      def new
+      end
+
       def create
         variant = Spree::Variant.find(params[:line_item][:variant_id])
         @line_item = @order.contents.add(
@@ -42,32 +45,33 @@ module Spree
       end
 
       private
-        def load_order
-          @order ||= Spree::Order.includes(:line_items).find_by!(number: order_id)
-          authorize! :update, @order, order_token
-        end
 
-        def find_line_item
-          id = params[:id].to_i
-          @order.line_items.detect { |line_item| line_item.id == id } or
-              raise ActiveRecord::RecordNotFound
-        end
+      def load_order
+        @order ||= Spree::Order.includes(:line_items).find_by!(number: order_id)
+        authorize! :update, @order, order_token
+      end
 
-        def line_items_attributes
-          {line_items_attributes: {
-              id: params[:id],
-              quantity: params[:line_item][:quantity],
-              options: line_item_params[:options] || {}
-          }}
-        end
+      def find_line_item
+        id = params[:id].to_i
+        @order.line_items.detect { |line_item| line_item.id == id } ||
+          raise(ActiveRecord::RecordNotFound)
+      end
 
-        def line_item_params
-          params.require(:line_item).permit(
-              :quantity,
-              :variant_id,
-              options: line_item_options
-          )
-        end
+      def line_items_attributes
+        { line_items_attributes: {
+            id: params[:id],
+            quantity: params[:line_item][:quantity],
+            options: line_item_params[:options] || {}
+        } }
+      end
+
+      def line_item_params
+        params.require(:line_item).permit(
+          :quantity,
+            :variant_id,
+            options: line_item_options
+        )
+      end
     end
   end
 end

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

@@ -19,7 +19,7 @@ module Spree
         authorize! :create, Spree::OptionType
         @option_type = Spree::OptionType.new(option_type_params)
         if @option_type.save
-          render :show, :status => 201
+          render :show, status: 201
         else
           invalid_resource!(@option_type)
         end
@@ -37,13 +37,14 @@ module Spree
       def destroy
         @option_type = Spree::OptionType.accessible_by(current_ability, :destroy).find(params[:id])
         @option_type.destroy
-        render :text => nil, :status => 204
+        render text: nil, status: 204
       end
 
       private
-        def option_type_params
-          params.require(:option_type).permit(permitted_option_type_attributes)
-        end
+
+      def option_type_params
+        params.require(:option_type).permit(permitted_option_type_attributes)
+      end
     end
   end
 end

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

@@ -3,7 +3,7 @@ module Spree
     class OptionValuesController < Spree::Api::BaseController
       def index
         if params[:ids]
-          @option_values = scope.where(:id => params[:ids])
+          @option_values = scope.where(id: params[:ids])
         else
           @option_values = scope.ransack(params[:q]).result.distinct
         end
@@ -19,7 +19,7 @@ module Spree
         authorize! :create, Spree::OptionValue
         @option_value = scope.new(option_value_params)
         if @option_value.save
-          render :show, :status => 201
+          render :show, status: 201
         else
           invalid_resource!(@option_value)
         end
@@ -37,22 +37,22 @@ module Spree
       def destroy
         @option_value = scope.accessible_by(current_ability, :destroy).find(params[:id])
         @option_value.destroy
-        render :text => nil, :status => 204
+        render text: nil, status: 204
       end
 
       private
 
-        def scope
-          if params[:option_type_id]
-            @scope ||= Spree::OptionType.find(params[:option_type_id]).option_values.accessible_by(current_ability, :read)
-          else
-            @scope ||= Spree::OptionValue.accessible_by(current_ability, :read).load
-          end
+      def scope
+        if params[:option_type_id]
+          @scope ||= Spree::OptionType.find(params[:option_type_id]).option_values.accessible_by(current_ability, :read)
+        else
+          @scope ||= Spree::OptionValue.accessible_by(current_ability, :read).load
         end
+      end
 
-        def option_value_params
-          params.require(:option_value).permit(permitted_option_value_attributes)
-        end
+      def option_value_params
+        params.require(:option_value).permit(permitted_option_value_attributes)
+      end
     end
   end
 end

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

@@ -2,7 +2,7 @@ module Spree
   module Api
     class OrdersController < Spree::Api::BaseController
       class_attribute :admin_shipment_attributes
-      self.admin_shipment_attributes = [:shipping_method, :stock_location, :inventory_units => [:variant_id, :sku]]
+      self.admin_shipment_attributes = [:shipping_method, :stock_location, inventory_units: [:variant_id, :sku]]
 
       class_attribute :admin_order_attributes
       self.admin_order_attributes = [:import, :number, :completed_at, :locked_at, :channel, :user_id, :created_at]
@@ -21,25 +21,14 @@ module Spree
 
       def cancel
         authorize! :update, @order, params[:token]
-        @order.cancel!
-        respond_with(@order, :default_template => :show)
+        @order.canceled_by(current_api_user)
+        respond_with(@order, default_template: :show)
       end
 
       def create
         authorize! :create, Order
-
-        if can?(:admin, Order)
-          @order = Spree::Core::Importer::Order.import(determine_order_user, order_params)
-          respond_with(@order, default_template: :show, status: 201)
-        else
-          @order = Spree::Order.create!(user: current_api_user, store: current_store)
-          if OrderUpdateAttributes.new(@order, order_params).apply
-            @order.update!
-            respond_with(@order, default_template: :show, status: 201)
-          else
-            invalid_resource!(@order)
-          end
-        end
+        @order = Spree::Core::Importer::Order.import(determine_order_user, order_params)
+        respond_with(@order, default_template: :show, status: 201)
       end
 
       def empty
@@ -141,7 +130,7 @@ module Spree
         end
       end
 
-      def find_order(lock = false)
+      def find_order(_lock = false)
         @order = Spree::Order.find_by!(number: params[:id])
       end