solidus_core 2.4.2 → 2.5.0.beta1

data/lib/spree/core/environment.rb

@@ -1,4 +1,4 @@
-require 'spree/config'
+require 'spree/core/environment_extension'
 
 module Spree
   module Core
@@ -10,9 +10,9 @@ module Spree
 
       attr_accessor :calculators, :preferences, :promotions
 
-      def initialize
+      def initialize(spree_config)
         @calculators = Calculators.new
-        @preferences = Spree::Config
+        @preferences = spree_config
         @promotions = Spree::Promo::Environment.new
       end
     end

data/lib/spree/core/importer/order.rb

@@ -69,7 +69,6 @@ module Spree
               # trying to view these units. Note the Importer might not be
               # able to find the line item if line_item.variant_id |= iu.variant_id
               shipment.inventory_units.new(
-                order: order,
                 variant_id: iu[:variant_id],
                 line_item: line_item
               )

data/lib/spree/core/permalinks.rb

@@ -1,5 +1,3 @@
-require 'stringex'
-
 module Spree
   module Core
     module Permalinks
@@ -48,24 +46,20 @@ module Spree
       end
 
       def save_permalink(permalink_value = to_param)
-        with_lock do
-          permalink_value ||= generate_permalink
+        permalink_value ||= generate_permalink
+        permalink_field = self.class.permalink_field
+
+        loop do
+          other = self.class.where(permalink_field => permalink_value)
+          break unless other.exists?
 
-          field = self.class.permalink_field
-          # Do other links exist with this permalink?
-          other = self.class.where("#{self.class.table_name}.#{field} LIKE ?", "#{permalink_value}%")
-          if other.any?
-            # Find the existing permalink with the highest number, and increment that number.
-            # (If none of the existing permalinks have a number, this will evaluate to 1.)
-            number = other.map { |o| o.send(field)[/-(\d+)$/, 1].to_i }.max + 1
-            permalink_value += "-#{number}"
-          end
-          write_attribute(field, permalink_value)
+          # Try again with a new value
+          permalink_value = generate_permalink
         end
+        write_attribute(permalink_field, permalink_value)
       end
     end
   end
 end
 
 ActiveRecord::Base.send :include, Spree::Core::Permalinks
-ActiveRecord::Relation.send :include, Spree::Core::Permalinks

data/lib/spree/core/product_filters.rb

@@ -67,13 +67,13 @@ module Spree
 
       def self.price_filter
         v = Spree::Price.arel_table
-        conds = [[Spree.t(:under_price, price: format_price(10)), v[:amount].lteq(10)],
+        conds = [[I18n.t('spree.under_price', price: format_price(10)), v[:amount].lteq(10)],
                  ["#{format_price(10)} - #{format_price(15)}", v[:amount].in(10..15)],
                  ["#{format_price(15)} - #{format_price(18)}", v[:amount].in(15..18)],
                  ["#{format_price(18)} - #{format_price(20)}", v[:amount].in(18..20)],
-                 [Spree.t(:or_over_price, price: format_price(20)), v[:amount].gteq(20)]]
+                 [I18n.t('spree.or_over_price', price: format_price(20)), v[:amount].gteq(20)]]
         {
-          name:   Spree.t(:price_range),
+          name:   I18n.t('spree.price_range'),
           scope:  :price_range_any,
           conds:  Hash[*conds.flatten],
           labels: conds.map { |k, _v| [k, k] }
@@ -164,6 +164,7 @@ module Spree
       # This scope selects products in any of the active taxons or their children.
       #
       def self.taxons_below(taxon)
+        Spree::Deprecation.warn "taxons_below is deprecated in solidus_core. Please add it to your own application to continue using it."
         return Spree::Core::ProductFilters.all_taxons if taxon.nil?
         {
           name:   'Taxons under ' + taxon.name,
@@ -180,6 +181,7 @@ module Spree
       #
       # idea: expand the format to allow nesting of labels?
       def self.all_taxons
+        Spree::Deprecation.warn "all_taxons is deprecated in solidus_core. Please add it to your own application to continue using it."
         taxons = Spree::Taxonomy.all.map { |t| [t.root] + t.root.descendants }.flatten
         {
           name:   'All taxons',

data/lib/spree/core/role_configuration.rb

@@ -1,4 +1,5 @@
 require 'singleton'
+require 'spree/core/class_constantizer'
 
 module Spree
   # A class responsible for associating {Spree::Role} with a list of permission sets.
@@ -16,15 +17,30 @@ module Spree
   class RoleConfiguration
     # An internal structure for the association between a role and a
     # set of permissions.
-    Role = Struct.new(:name, :permission_sets)
+    class Role
+      attr_reader :name, :permission_sets
+
+      def initialize(name, permission_sets)
+        @name = name
+        @permission_sets = Spree::Core::ClassConstantizer::Set.new
+        @permission_sets.concat permission_sets
+      end
+    end
 
-    include Singleton
     attr_accessor :roles
 
-    # Yields the instance of the singleton, used for configuration
-    # @yield_param instance [Spree::RoleConfiguration]
-    def self.configure
-      yield(instance)
+    class << self
+      def instance
+        Spree::Deprecation.warn "Spree::RoleConfiguration.instance is DEPRECATED use Spree::Config.roles instead"
+        Spree::Config.roles
+      end
+
+      # Yields the instance of the singleton, used for configuration
+      # @yield_param instance [Spree::RoleConfiguration]
+      def configure
+        Spree::Deprecation.warn "Spree::RoleConfiguration.configure is deprecated. Call Spree::Config.roles.assign_permissions instead"
+        yield(Spree::Config.roles)
+      end
     end
 
     # Given a CanCan::Ability, and a user, determine what permissions sets can
@@ -63,7 +79,7 @@ module Spree
     def assign_permissions(role_name, permission_sets)
       name = role_name.to_s
 
-      roles[name].permission_sets |= permission_sets
+      roles[name].permission_sets.concat permission_sets
       roles[name]
     end
   end

data/lib/spree/core/search/base.rb

@@ -27,16 +27,17 @@ module Spree
 
         def retrieve_products
           @products = get_base_scope
-          curr_page = page || 1
+          curr_page = @properties[:page] || 1
 
           unless Spree::Config.show_products_without_price
             @products = @products.joins(:prices).merge(Spree::Price.where(pricing_options.search_arguments)).distinct
           end
-          @products = @products.page(curr_page).per(per_page)
+          @products = @products.page(curr_page).per(@properties[:per_page])
         end
 
         def method_missing(name)
-          if @properties.key? name
+          if @properties.key?(name)
+            Spree::Deprecation.warn "Accessing Searcher's #{name} property using #{self.class.name}##{name} is deprecated without replacement"
             @properties[name]
           else
             super
@@ -47,8 +48,8 @@ module Spree
 
         def get_base_scope
           base_scope = Spree::Product.display_includes.available
-          base_scope = base_scope.in_taxon(taxon) unless taxon.blank?
-          base_scope = get_products_conditions_for(base_scope, keywords)
+          base_scope = base_scope.in_taxon(@properties[:taxon]) unless @properties[:taxon].blank?
+          base_scope = get_products_conditions_for(base_scope, @properties[:keywords])
           base_scope = add_search_scopes(base_scope)
           base_scope = add_eagerload_scopes(base_scope)
           base_scope
@@ -71,19 +72,21 @@ module Spree
           # `where` constraints affecting joined tables are added to the search;
           # which is the case as soon as a taxon is added to the base scope.
           scope = scope.preload(master: :currently_valid_prices)
-          scope = scope.preload(master: :images) if include_images
+          scope = scope.preload(master: :images) if @properties[:include_images]
           scope
         end
 
         def add_search_scopes(base_scope)
-          search.each do |name, scope_attribute|
-            scope_name = name.to_sym
-            if base_scope.respond_to?(:search_scopes) && base_scope.search_scopes.include?(scope_name.to_sym)
-              base_scope = base_scope.send(scope_name, *scope_attribute)
-            else
-              base_scope = base_scope.merge(Spree::Product.ransack({ scope_name => scope_attribute }).result)
+          if @properties[:search]
+            @properties[:search].each do |name, scope_attribute|
+              scope_name = name.to_sym
+              if base_scope.respond_to?(:search_scopes) && base_scope.search_scopes.include?(scope_name.to_sym)
+                base_scope = base_scope.send(scope_name, *scope_attribute)
+              else
+                base_scope = base_scope.merge(Spree::Product.ransack({ scope_name => scope_attribute }).result)
+              end
             end
-          end if search
+          end
           base_scope
         end
 

data/lib/spree/core/version.rb

@@ -1,6 +1,6 @@
 module Spree
   def self.solidus_version
-    "2.4.2"
+    "2.5.0.beta1"
   end
 
   def self.solidus_gem_version

data/lib/spree/paranoia_deprecations.rb

@@ -0,0 +1,19 @@
+module Spree
+  module ParanoiaDeprecations
+    def paranoia_destroy
+      Spree::Deprecation.warn <<-WARN.strip_heredoc, caller
+        Calling #destroy (or #paranoia_destroy) on a #{self.class} currently performs a soft-destroy using the paranoia gem.
+        In Solidus 3.0, paranoia will be removed, and this will perform a HARD destroy instead. To continue soft-deleting, use #discard instead.
+      WARN
+      super
+    end
+
+    def paranoia_delete
+      Spree::Deprecation.warn <<-WARN.strip_heredoc, caller
+        Calling #delete (or #paranoia_delete) on a #{self.class} currently performs a soft-destroy using the paranoia gem.
+        In Solidus 3.0, paranoia will be removed, and this will perform a HARD destroy instead. To continue soft-deleting, use #discard instead.
+      WARN
+      super
+    end
+  end
+end

data/lib/spree/permission_sets.rb

@@ -12,12 +12,8 @@ require 'spree/permission_sets/promotion_management'
 require 'spree/permission_sets/report_display'
 require 'spree/permission_sets/restricted_stock_display'
 require 'spree/permission_sets/restricted_stock_management'
-require 'spree/permission_sets/restricted_stock_transfer_display'
-require 'spree/permission_sets/restricted_stock_transfer_management'
 require 'spree/permission_sets/stock_display'
 require 'spree/permission_sets/stock_management'
-require 'spree/permission_sets/stock_transfer_display'
-require 'spree/permission_sets/stock_transfer_management'
 require 'spree/permission_sets/super_user'
 require 'spree/permission_sets/user_display'
 require 'spree/permission_sets/user_management'

data/lib/spree/permitted_attributes.rb

@@ -27,7 +27,6 @@ module Spree
       :store_attributes,
       :taxon_attributes,
       :taxonomy_attributes,
-      :transfer_item_attributes,
       :user_attributes,
       :variant_attributes
     ]
@@ -116,8 +115,6 @@ module Spree
       :meta_description, :meta_keywords, :meta_title, :child_index
     ]
 
-    @@transfer_item_attributes = [:variant_id, :expected_quantity, :received_quantity]
-
     # intentionally leaving off email here to prevent privilege escalation
     # by changing a user with higher priveleges' email to one a lower-priveleged
     # admin owns. creating a user with an email is handled separate at the

data/lib/spree/preferences/preferable.rb

@@ -1,43 +1,55 @@
-# 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
+    # 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!
+    #
+    # Each preference gets rendered as a form field in Solidus backend.
+    #
+    # As not all supported preference types are representable as a form field, only
+    # some of them get rendered per default. Arrays and Hashes for instance are
+    # supported preference field types, but do not represent well as a form field.
+    #
+    # Overwrite +allowed_admin_form_preference_types+ in your class if you want to
+    # provide more fields. If you do so, you also need to provide a preference field
+    # partial that lives in:
+    #
+    # +app/views/spree/admin/shared/preference_fields/+
+    #
     module Preferable
       extend ActiveSupport::Concern
 
@@ -101,6 +113,30 @@ module Spree
         ]
       end
 
+      # Preference names representable as form fields in Solidus backend
+      #
+      # Not all preferences are representable as a form field.
+      #
+      # Arrays and Hashes for instance are supported preference field types,
+      # but do not represent well as a form field.
+      #
+      # As these kind of preferences are mostly developer facing
+      # and not admin facing we should not render them.
+      #
+      # Overwrite +allowed_admin_form_preference_types+ in your class that
+      # includes +Spree::Preferable+ if you want to provide more fields.
+      # If you do so, you also need to provide a preference field partial
+      # that lives in:
+      #
+      # +app/views/spree/admin/shared/preference_fields/+
+      #
+      # @return [Array]
+      def admin_form_preference_names
+        defined_preferences.keep_if do |type|
+          preference_type(type).in? self.class.allowed_admin_form_preference_types
+        end
+      end
+
       private
 
       def convert_preference_value(value, type)

data/lib/spree/preferences/preferable_class_methods.rb

@@ -1,5 +1,14 @@
 module Spree::Preferences
   module PreferableClassMethods
+    DEFAULT_ADMIN_FORM_PREFERENCE_TYPES = %i(
+      boolean
+      decimal
+      integer
+      password
+      string
+      text
+    )
+
     def defined_preferences
       []
     end
@@ -60,5 +69,18 @@ module Spree::Preferences
     def preference_type_getter_method(name)
       "preferred_#{name}_type".to_sym
     end
+
+    # List of preference types allowed as form fields in the Solidus admin
+    #
+    # Overwrite this method in your class that includes +Spree::Preferable+
+    # if you want to provide more fields. If you do so, you also need to provide
+    # a preference field partial that lives in:
+    #
+    # +app/views/spree/admin/shared/preference_fields/+
+    #
+    # @return [Array]
+    def allowed_admin_form_preference_types
+      DEFAULT_ADMIN_FORM_PREFERENCE_TYPES
+    end
   end
 end

data/lib/spree/testing_support/authorization_helpers.rb

@@ -1,3 +1,5 @@
+require 'cancan'
+
 module Spree
   module TestingSupport
     module AuthorizationHelpers

data/lib/spree/testing_support/common_rake.rb

@@ -4,7 +4,6 @@ end
 
 require 'generators/spree/dummy/dummy_generator'
 
-desc "Generates a dummy app for testing"
 namespace :common do
   task :test_app, :user_class do |_t, args|
     args.with_defaults(user_class: "Spree::LegacyUser")