solidus_core 2.3.1 → 2.4.0.beta1

data/{app/models → lib}/spree/preferences/configuration.rb

@@ -1,3 +1,5 @@
+require 'spree/preferences/preferable'
+
 module Spree::Preferences
   # This takes the preferrable methods and adds some
   # syntatic sugar to access the preferences
@@ -31,10 +33,10 @@ module Spree::Preferences
     end
 
     # @!attribute preference_store
-    # Storage method for preferences. Default is {ScopedStore}
+    # Storage method for preferences.
     attr_writer :preference_store
     def preference_store
-      @preference_store ||= ScopedStore.new(self.class.name.underscore)
+      @preference_store ||= default_preferences
     end
 
     # Replace the default legacy preference store, which stores preferences in
@@ -50,6 +52,12 @@ module Spree::Preferences
       @preference_store = default_preferences
     end
 
+    # Replace the new static preference store with the legacy store which
+    # fetches preferences from the DB.
+    def use_legacy_db_preferences!
+      @preference_store = ScopedStore.new(self.class.name.underscore)
+    end
+
     alias_method :preferences, :preference_store
 
     # Reset all preferences to their default values.
@@ -74,5 +82,24 @@ module Spree::Preferences
       alias_method name.to_s, "preferred_#{name}"
       alias_method "#{name}=", "preferred_#{name}="
     end
+
+    def self.class_name_attribute(name, default:)
+      ivar = :"@#{name}"
+
+      define_method("#{name}=") do |class_name|
+        # If this is a named class constant, we should store it as a string to
+        # allow code reloading.
+        class_name = class_name.name if class_name.is_a?(Class) && class_name.name
+
+        instance_variable_set(ivar, class_name)
+      end
+
+      define_method(name) do
+        class_name = instance_variable_get(ivar)
+        class_name ||= default
+        class_name = class_name.constantize if class_name.is_a?(String)
+        class_name
+      end
+    end
   end
 end

data/lib/spree/preferences/preferable.rb

@@ -0,0 +1,142 @@
+# Preferable allows defining preference accessor methods.
+#
+# A class including Preferable must implement #preferences which should return
+# an object responding to .fetch(key), []=(key, val), and .delete(key).
+#
+# The generated writer method performs typecasting before assignment into the
+# preferences object.
+#
+# Examples:
+#
+#   # Spree::Base includes Preferable and defines preferences as a serialized
+#   # column.
+#   class Settings < Spree::Base
+#     preference :color,       :string,  default: 'red'
+#     preference :temperature, :integer, default: 21
+#   end
+#
+#   s = Settings.new
+#   s.preferred_color # => 'red'
+#   s.preferred_temperature # => 21
+#
+#   s.preferred_color = 'blue'
+#   s.preferred_color # => 'blue'
+#
+#   # Typecasting is performed on assignment
+#   s.preferred_temperature = '24'
+#   s.preferred_color # => 24
+#
+#   # Modifications have been made to the .preferences hash
+#   s.preferences #=> {color: 'blue', temperature: 24}
+#
+#   # Save the changes. All handled by activerecord
+#   s.save!
+
+require 'spree/preferences/preferable_class_methods'
+require 'active_support/concern'
+require 'active_support/core_ext/hash/keys'
+
+module Spree
+  module Preferences
+    module Preferable
+      extend ActiveSupport::Concern
+
+      included do
+        extend Spree::Preferences::PreferableClassMethods
+      end
+
+      # Get a preference
+      # @param name [#to_sym] name of preference
+      # @return [Object] The value of preference +name+
+      def get_preference(name)
+        has_preference! name
+        send self.class.preference_getter_method(name)
+      end
+
+      # Set a preference
+      # @param name [#to_sym] name of preference
+      # @param value [Object] new value for preference +name+
+      def set_preference(name, value)
+        has_preference! name
+        send self.class.preference_setter_method(name), value
+      end
+
+      # @param name [#to_sym] name of preference
+      # @return [Symbol] The type of preference +name+
+      def preference_type(name)
+        has_preference! name
+        send self.class.preference_type_getter_method(name)
+      end
+
+      # @param name [#to_sym] name of preference
+      # @return [Object] The default for preference +name+
+      def preference_default(name)
+        has_preference! name
+        send self.class.preference_default_getter_method(name)
+      end
+
+      # Raises an exception if the +name+ preference is not defined on this class
+      # @param name [#to_sym] name of preference
+      def has_preference!(name)
+        raise NoMethodError.new "#{name} preference not defined" unless has_preference? name
+      end
+
+      # @param name [#to_sym] name of preference
+      # @return [Boolean] if preference exists on this class
+      def has_preference?(name)
+        defined_preferences.include?(name.to_sym)
+      end
+
+      # @return [Array<Symbol>] All preferences defined on this class
+      def defined_preferences
+        self.class.defined_preferences
+      end
+
+      # @return [Hash{Symbol => Object}] Default for all preferences defined on this class
+      def default_preferences
+        Hash[
+          defined_preferences.map do |preference|
+            [preference, preference_default(preference)]
+          end
+        ]
+      end
+
+      private
+
+      def convert_preference_value(value, type)
+        return nil if value.nil?
+        case type
+        when :string, :text
+          value.to_s
+        when :password
+          value.to_s
+        when :decimal
+          begin
+            value.to_s.to_d
+          rescue ArgumentError
+            BigDecimal.new(0)
+          end
+        when :integer
+          value.to_i
+        when :boolean
+          if !value ||
+             value == 0 ||
+             value =~ /\A(f|false|0)\Z/i ||
+             (value.respond_to?(:empty?) && value.empty?)
+            false
+          else
+            true
+          end
+        when :array
+          raise TypeError, "Array expected got #{value.inspect}" unless value.is_a?(Array)
+          value
+        when :hash
+          raise TypeError, "Hash expected got #{value.inspect}" unless value.is_a?(Hash)
+          value
+        else
+          value
+        end
+      end
+    end
+  end
+end

data/lib/spree/promo/environment.rb

@@ -5,6 +5,7 @@ module Spree
 
       add_class_set :rules
       add_class_set :actions
+      add_class_set :shipping_actions
     end
   end
 end

data/lib/spree/testing_support/ability_helpers.rb

@@ -1,4 +1,4 @@
-shared_examples_for 'access granted' do
+RSpec.shared_examples_for 'access granted' do
   it 'should allow read' do
     expect(ability).to be_able_to(:read, resource, token) if token
     expect(ability).to be_able_to(:read, resource) unless token
@@ -15,7 +15,7 @@ shared_examples_for 'access granted' do
   end
 end
 
-shared_examples_for 'access denied' do
+RSpec.shared_examples_for 'access denied' do
   it 'should not allow read' do
     expect(ability).to_not be_able_to(:read, resource)
   end
@@ -29,32 +29,32 @@ shared_examples_for 'access denied' do
   end
 end
 
-shared_examples_for 'admin granted' do
+RSpec.shared_examples_for 'admin granted' do
   it 'should allow admin' do
     expect(ability).to be_able_to(:admin, resource, token) if token
     expect(ability).to be_able_to(:admin, resource) unless token
   end
 end
 
-shared_examples_for 'admin denied' do
+RSpec.shared_examples_for 'admin denied' do
   it 'should not allow admin' do
     expect(ability).to_not be_able_to(:admin, resource)
   end
 end
 
-shared_examples_for 'index allowed' do
+RSpec.shared_examples_for 'index allowed' do
   it 'should allow index' do
     expect(ability).to be_able_to(:index, resource)
   end
 end
 
-shared_examples_for 'no index allowed' do
+RSpec.shared_examples_for 'no index allowed' do
   it 'should not allow index' do
     expect(ability).to_not be_able_to(:index, resource)
   end
 end
 
-shared_examples_for 'create only' do
+RSpec.shared_examples_for 'create only' do
   it 'should allow create' do
     expect(ability).to be_able_to(:create, resource)
   end
@@ -72,7 +72,7 @@ shared_examples_for 'create only' do
   end
 end
 
-shared_examples_for 'read only' do
+RSpec.shared_examples_for 'read only' do
   it 'should not allow create' do
     expect(ability).to_not be_able_to(:create, resource)
   end
@@ -86,7 +86,7 @@ shared_examples_for 'read only' do
   end
 end
 
-shared_examples_for 'update only' do
+RSpec.shared_examples_for 'update only' do
   it 'should not allow create' do
     expect(ability).to_not be_able_to(:create, resource)
   end

data/lib/spree/testing_support/factories/address_factory.rb

@@ -1,9 +1,8 @@
 require 'spree/testing_support/factories/state_factory'
 require 'spree/testing_support/factories/country_factory'
-require 'twitter_cldr'
 
 FactoryGirl.define do
-  factory :address, class: Spree::Address do
+  factory :address, class: 'Spree::Address' do
     transient do
       # There's `Spree::Address#country_iso=`, prohibiting me from using `country_iso` here
       country_iso_code 'US'
@@ -16,7 +15,7 @@ FactoryGirl.define do
     address1 '10 Lovely Street'
     address2 'Northwest'
     city 'Herndon'
-    zipcode { TwitterCldr::Shared::PostalCodes.for_territory(country_iso_code).sample.first }
+    zipcode { FFaker::AddressUS.zip_code }
     phone '555-555-0199'
     alternative_phone '555-555-0199'
 

data/lib/spree/testing_support/factories/adjustment_factory.rb

@@ -5,7 +5,7 @@ require 'spree/testing_support/factories/tax_rate_factory'
 require 'spree/testing_support/factories/zone_factory'
 
 FactoryGirl.define do
-  factory :adjustment, class: Spree::Adjustment do
+  factory :adjustment, class: 'Spree::Adjustment' do
     order
     adjustable { order }
     amount 100.0
@@ -35,7 +35,7 @@ FactoryGirl.define do
             adjustment.source.tax_categories = []
           end
           adjustment.source.save
-          adjustment.update!
+          adjustment.recalculate
         end
       end
     end

data/lib/spree/testing_support/factories/adjustment_reason_factory.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :adjustment_reason, class: Spree::AdjustmentReason do
+  factory :adjustment_reason, class: 'Spree::AdjustmentReason' do
     sequence(:name) { |n| "Refund for return ##{n}" }
     sequence(:code) { |n| "Code #{n}" }
   end

data/lib/spree/testing_support/factories/calculator_factory.rb

@@ -1,24 +1,24 @@
 FactoryGirl.define do
-  factory :calculator, aliases: [:flat_rate_calculator], class: Spree::Calculator::FlatRate do
+  factory :calculator, aliases: [:flat_rate_calculator], class: 'Spree::Calculator::FlatRate' do
     preferred_amount 10.0
   end
 
-  factory :no_amount_calculator, class: Spree::Calculator::FlatRate do
+  factory :no_amount_calculator, class: 'Spree::Calculator::FlatRate' do
     preferred_amount 0
   end
 
-  factory :default_tax_calculator, class: Spree::Calculator::DefaultTax do
+  factory :default_tax_calculator, class: 'Spree::Calculator::DefaultTax' do
   end
 
-  factory :shipping_calculator, class: Spree::Calculator::Shipping::FlatRate do
+  factory :shipping_calculator, class: 'Spree::Calculator::Shipping::FlatRate' do
     preferred_amount 10.0
   end
 
-  factory :shipping_no_amount_calculator, class: Spree::Calculator::Shipping::FlatRate do
+  factory :shipping_no_amount_calculator, class: 'Spree::Calculator::Shipping::FlatRate' do
     preferred_amount 0
   end
 
-  factory :percent_on_item_calculator, class: Spree::Calculator::PercentOnLineItem do
+  factory :percent_on_item_calculator, class: 'Spree::Calculator::PercentOnLineItem' do
     preferred_percent 10
   end
 end

data/lib/spree/testing_support/factories/carton_factory.rb

@@ -2,7 +2,7 @@ require 'spree/testing_support/factories/shipment_factory'
 require 'spree/testing_support/factories/inventory_unit_factory'
 
 FactoryGirl.define do
-  factory :carton, class: Spree::Carton do
+  factory :carton, class: 'Spree::Carton' do
     address
     stock_location
     shipping_method

data/lib/spree/testing_support/factories/country_factory.rb

@@ -1,7 +1,7 @@
 require 'carmen'
 
 FactoryGirl.define do
-  factory :country, class: Spree::Country do
+  factory :country, class: 'Spree::Country' do
     iso 'US'
 
     transient do

data/lib/spree/testing_support/factories/credit_card_factory.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :credit_card, class: Spree::CreditCard do
+  factory :credit_card, class: 'Spree::CreditCard' do
     verification_value 123
     month 12
     year { 1.year.from_now.year }

data/lib/spree/testing_support/factories/customer_return_factory.rb

@@ -3,7 +3,7 @@ require 'spree/testing_support/factories/order_factory'
 require 'spree/testing_support/factories/return_item_factory'
 
 FactoryGirl.define do
-  factory :customer_return, class: Spree::CustomerReturn do
+  factory :customer_return, class: 'Spree::CustomerReturn' do
     association(:stock_location, factory: :stock_location)
 
     transient do

data/lib/spree/testing_support/factories/image_factory.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :image, class: Spree::Image do
+  factory :image, class: 'Spree::Image' do
     attachment { File.new(Spree::Core::Engine.root + 'spec/fixtures/thinking-cat.jpg') }
   end
 end

data/lib/spree/testing_support/factories/inventory_unit_factory.rb

@@ -4,7 +4,7 @@ require 'spree/testing_support/factories/order_factory'
 require 'spree/testing_support/factories/shipment_factory'
 
 FactoryGirl.define do
-  factory :inventory_unit, class: Spree::InventoryUnit do
+  factory :inventory_unit, class: 'Spree::InventoryUnit' do
     variant
     order
     line_item { build(:line_item, order: order, variant: variant) }

data/lib/spree/testing_support/factories/line_item_factory.rb

@@ -2,7 +2,7 @@ require 'spree/testing_support/factories/order_factory'
 require 'spree/testing_support/factories/product_factory'
 
 FactoryGirl.define do
-  factory :line_item, class: Spree::LineItem do
+  factory :line_item, class: 'Spree::LineItem' do
     quantity 1
     price { BigDecimal.new('10.00') }
     order

data/lib/spree/testing_support/factories/option_type_factory.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :option_type, class: Spree::OptionType do
+  factory :option_type, class: 'Spree::OptionType' do
     sequence(:name) { |n| "foo-size-#{n}" }
     presentation 'Size'
   end

data/lib/spree/testing_support/factories/option_value_factory.rb

@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :option_value, class: Spree::OptionValue do
+  factory :option_value, class: 'Spree::OptionValue' do
     sequence(:name) { |n| "Size-#{n}" }
 
     presentation 'S'