active_scaffold 3.4.43 → 3.5.0

data/lib/active_scaffold/extensions/left_outer_joins.rb

@@ -1,73 +1,68 @@
-module ActiveScaffold
-  module OuterJoins
-    extend ActiveSupport::Concern
-    attr_accessor :outer_joins_values
+if Rails.version < '5.0.0'
+  module ActiveScaffold
+    module OuterJoins
+      extend ActiveSupport::Concern
 
-    if Rails::VERSION::MAJOR < 4
-      included do
-        const_get(:MULTI_VALUE_METHODS) << :outer_joins
+      def left_outer_joins_values
+        @values[:left_outer_joins] || []
       end
 
-      def outer_joins(*args)
-        return self if args.compact.blank?
-
-        relation = clone
-
-        args.flatten!
-        relation.joins_values += [''] # HACK: for using outer_joins in update_all/delete_all
-        relation.outer_joins_values += args
-
-        relation
-      end
-    else
-      def outer_joins_values
-        @values[:outer_joins] || []
+      def left_outer_joins_values=(values)
+        raise ImmutableRelation if @loaded
+        @values[:left_outer_joins] = values
       end
 
-      def outer_joins_values=(values)
-        raise ImmutableRelation if @loaded
-        @values[:outer_joins] = values
+      def left_outer_joins(*args)
+        check_if_method_has_arguments!('left_outer_joins', args)
+        spawn.left_outer_joins!(*args.compact.flatten)
       end
+      alias left_joins left_outer_joins
 
       def outer_joins(*args)
-        check_if_method_has_arguments!('outer_joins', args)
-        spawn.outer_joins!(*args.compact.flatten)
+        ActiveSupport::Deprecation.warn 'use left_outer_joins or left_joins which is added to Rails 5.0.0'
+        left_outer_joins(*args)
       end
 
-      def outer_joins!(*args)
-        self.joins_values += [''] # HACK: for using outer_joins in update_all/delete_all
-        self.outer_joins_values += args
+      def left_outer_joins!(*args)
+        self.joins_values += [''] # HACK: for using left_outer_joins in update_all/delete_all
+        self.left_outer_joins_values += args
         self
       end
-    end
+      alias left_joins! left_outer_joins!
+
+      def outer_joins!(*args)
+        ActiveSupport::Deprecation.warn 'use left_outer_joins! or left_joins! which is added to Rails 5.0.0'
+        left_outer_joins!(*args)
+      end
 
-    if Rails.version < '4.1'
-      def build_arel
-        if outer_joins_values.empty?
-          super
-        else
-          relation = except(:outer_joins)
-          join_dependency = ActiveRecord::Associations::JoinDependency.new(@klass, outer_joins_values, [])
-          join_dependency.join_associations.each do |association|
-            relation = association.join_relation(relation)
+      if Rails.version < '4.1'
+        def build_arel
+          if left_outer_joins_values.empty?
+            super
+          else
+            relation = except(:left_outer_joins)
+            join_dependency = ActiveRecord::Associations::JoinDependency.new(@klass, left_outer_joins_values, [])
+            join_dependency.join_associations.each do |association|
+              relation = association.join_relation(relation)
+            end
+            relation.build_arel
           end
-          relation.build_arel
         end
-      end
-    else
-      def build_arel
-        if outer_joins_values.empty?
-          super
-        else
-          relation = except(:outer_joins)
-          relation.joins! ActiveRecord::Associations::JoinDependency.new(@klass, outer_joins_values, [])
-          relation.build_arel
+      else
+        def build_arel
+          if left_outer_joins_values.empty?
+            super
+          else
+            relation = except(:left_outer_joins)
+            relation.joins! ActiveRecord::Associations::JoinDependency.new(@klass, left_outer_joins_values, [])
+            relation.build_arel
+          end
         end
       end
     end
   end
-end
-ActiveRecord::Relation.send :include, ActiveScaffold::OuterJoins
-module ActiveRecord::Querying
-  delegate :outer_joins, :to => Rails::VERSION::MAJOR < 4 ? :scoped : :all
+  ActiveRecord::Relation.send :include, ActiveScaffold::OuterJoins
+  module ActiveRecord::Querying
+    delegate :left_outer_joins, :left_joins, :outer_joins, :to => :all
+  end
 end

data/lib/active_scaffold/extensions/localize.rb

@@ -1,10 +1,9 @@
 class Object
   def as_(key, options = {})
-    unless key.blank?
-      text = I18n.translate("#{key}", {:scope => [:active_scaffold, *options.delete(:scope)], :default => key.is_a?(String) ? key : key.to_s.titleize}.merge(options)).html_safe
+    if key.present?
+      text = I18n.translate(key.to_s, {:scope => [:active_scaffold, *options.delete(:scope)], :default => key.is_a?(String) ? key : key.to_s.titleize}.merge(options)).html_safe
       # text = nil if text.include?('translation missing:')
     end
-    text ||= key
-    text
+    text || key
   end
 end

data/lib/active_scaffold/extensions/name_option_for_datetime.rb

@@ -1,17 +1,13 @@
 module ActiveScaffold
   module DateSelectExtension
-    def datetime_selector_with_name(options, html_options)
-      options.merge!(:prefix => options[:name].gsub(/\[[^\[]*\]$/, '')) if options[:name]
-      datetime_selector_without_name(options, html_options)
-    end
-    def self.included(base)
-      base.class_eval do
-        alias_method_chain :datetime_selector, :name
-        private :datetime_selector_without_name, :datetime_selector_with_name, :datetime_selector
-      end
+    private
+
+    def datetime_selector(options, html_options)
+      options[:prefix] = options[:name].gsub(/\[[^\[]*\]$/, '') if options[:name]
+      super(options, html_options)
     end
   end
 end
-(defined?(ActionView::Helpers::Tags::DateSelect) ? ActionView::Helpers::Tags::DateSelect : ActionView::Helpers::InstanceTag).class_eval do
-  include ActiveScaffold::DateSelectExtension
+ActionView::Helpers::Tags::DateSelect.class_eval do
+  prepend ActiveScaffold::DateSelectExtension
 end

data/lib/active_scaffold/extensions/paginator_extensions.rb

@@ -1,35 +1,37 @@
 require 'active_scaffold/paginator'
 
-class Paginator
-  # Total number of pages
-  def number_of_pages_with_infinite
-    number_of_pages_without_infinite if @count
-  end
-  alias_method_chain :number_of_pages, :infinite
+module ActiveScaffold
+  module Paginator
+    # Total number of pages
+    def number_of_pages
+      super if @count
+    end
 
-  # Is this an "infinite" paginator
-  def infinite?
-    @count.nil?
-  end
+    # Is this an "infinite" paginator
+    def infinite?
+      @count.nil?
+    end
 
-  def count
-    @count || first.items.size
+    def count
+      @count || first.items.size
+    end
   end
 
-  class Page
+  module Page
     # Checks to see if there's a page after this one
-    def next_with_infinite?
-      return true if @pager.infinite?
-      next_without_infinite?
+    def next?
+      @pager.infinite? || super
     end
-    alias_method_chain :next?, :infinite
 
     def empty?
       if @pager.infinite?
         items.to_a.empty?
       else
-        @pager.count == 0
+        @pager.count.zero?
       end
     end
   end
 end
+
+Paginator.class_eval { prepend ActiveScaffold::Paginator }
+Paginator::Page.class_eval { prepend ActiveScaffold::Page }

data/lib/active_scaffold/extensions/routing_mapper.rb

@@ -1,73 +1,137 @@
-module ActionDispatch
+module ActiveScaffold
   module Routing
     ACTIVE_SCAFFOLD_CORE_ROUTING = {
       :collection => {:show_search => :get, :render_field => :post, :mark => :post},
-      :member => {:update_column => :post, :render_field => [:get, :post], :mark => :post}
-    }
+      :member => {:update_column => :post, :render_field => %i[get post], :mark => :post}
+    }.freeze
     ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING = {
       :collection => {:edit_associated => :get, :new_existing => :get, :add_existing => :post},
       :member => {:edit_associated => :get, :destroy_existing => :delete}
-    }
+    }.freeze
+
+    class Association
+      def default_actions(actions_hash)
+        (actions_hash[:collection].keys + actions_hash[:member].keys).uniq
+      end
+
+      def get_actions(actions_hash, options)
+        default_actions = default_actions(actions_hash)
+        if only = options[:only]
+          Array(only).map(&:to_sym)
+        elsif except = options[:except]
+          default_actions - Array(except).map(&:to_sym)
+        else
+          default_actions
+        end
+      end
+
+      def call(mapper, options = {})
+        actions = get_actions(ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING, options)
+
+        mapper.collection do
+          ActionDispatch::Routing::ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING[:collection].each do |name, type|
+            mapper.match(name, via: type) if actions.include? name
+          end
+        end
+
+        mapper.member do
+          ActionDispatch::Routing::ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING[:member].each do |name, type|
+            mapper.match(name, via: type) if actions.include? name
+          end
+        end
+      end
+    end
+
+    class Basic < Association
+      def initialize(defaults = {})
+        @defaults = defaults
+      end
+
+      def call(mapper, options = {})
+        options = @defaults.merge(options)
+        actions = get_actions(ACTIVE_SCAFFOLD_CORE_ROUTING, options)
+
+        mapper.collection do
+          ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection].each do |name, type|
+            mapper.match(name, via: type) if actions.include? name
+          end
+        end
+
+        mapper.member do
+          ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:member].each do |name, type|
+            mapper.match(name, via: type) if actions.include? name
+          end
+          mapper.get 'list', action: :index if mapper.send(:parent_resource).actions.include? :index
+        end
+
+        super if options[:association]
+      end
+    end
+  end
+end
+
+module ActionDispatch
+  module Routing
+    ACTIVE_SCAFFOLD_CORE_ROUTING = ActiveScaffold::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING
+    ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING = ActiveScaffold::Routing::ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING
 
     class Mapper
       module Resources
-        class ActiveScaffold < Resource
-          def default_actions
-            @default_actions ||= (ACTIVE_SCAFFOLD_CORE_ROUTING[:collection].keys + ACTIVE_SCAFFOLD_CORE_ROUTING[:member].keys).uniq
+        def parent_options
+          opts = parent_resource.instance_variable_get(:@options)
+          if Rails.version >= '5.0.0'
+            opts.merge(
+              only: parent_resource.instance_variable_get(:@only),
+              except: parent_resource.instance_variable_get(:@except)
+            )
           end
+          opts
         end
-        class ActiveScaffoldAssociation < Resource
-          def default_actions
-            @default_actions ||= (ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING[:collection].keys + ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING[:member].keys).uniq
-          end
+
+        def define_active_scaffold_concern
+          ActiveSupport::Deprecation.warn 'Add concern :active_scaffold, ActiveScaffold::Routing::Basic.new(association: true) to your routes file.'
+          concern :active_scaffold, ActiveScaffold::Routing::Basic.new(association: true)
         end
 
-        def as_routes(opts = {:association => true})
-          resource = parent_resource
-          resource_scope(:resource, ActiveScaffold.new(parent_resource.name, parent_resource.options)) do
-            collection do
-              ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:collection].each do |name, type|
-                match(name, :via => type) if parent_resource.actions.include? name
-              end
-            end
-            member do
-              ActionDispatch::Routing::ACTIVE_SCAFFOLD_CORE_ROUTING[:member].each do |name, type|
-                match(name, :via => type) if parent_resource.actions.include? name
-              end
-              get 'list', :action => :index if resource.actions.include? :index
-            end
+        def define_active_scaffold_association_concern
+          ActiveSupport::Deprecation.warn 'Add concern :active_scaffold_association, ActiveScaffold::Routing::Association.new to your routes file.'
+          concern :active_scaffold_association, ActiveScaffold::Routing::Association.new
+        end
+
+        def as_routes(opts = {association: true})
+          define_active_scaffold_concern unless @concerns[:active_scaffold]
+          if opts[:association] && !@concerns[:active_scaffold_association]
+            define_active_scaffold_association_concern
           end
-          as_association_routes if opts[:association]
+          ActiveSupport::Deprecation.warn 'Use concerns: :active_scaffold in resources instead of as_routes, or concerns :active_scaffold in resources block if want to disable association routes or restrict routes with only or except options.'
+          concerns :active_scaffold, parent_options.merge(association: opts[:association])
         end
 
         def as_association_routes
-          resource_scope(:resource, ActiveScaffoldAssociation.new(parent_resource.name, parent_resource.options)) do
-            collection do
-              ActionDispatch::Routing::ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING[:collection].each do |name, type|
-                match(name, :via => type) if parent_resource.actions.include? name
-              end
-            end
-            member do
-              ActionDispatch::Routing::ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING[:member].each do |name, type|
-                match(name, :via => type) if parent_resource.actions.include? name
-              end
-            end
-          end
+          define_active_scaffold_association_concern unless @concerns[:active_scaffold_association]
+          ActiveSupport::Deprecation.warn 'Use concerns: :active_scaffold_association in resources instead of as_association_routes, or concerns :active_scaffold_association in resources block if want to restrict routes with only or except options.'
+          concerns :active_scaffold_association, parent_options
         end
 
         def as_nested_resources(*resources)
           options = resources.extract_options!
+          nested_options = options.merge(parent_scaffold: parent_scaffold)
           resources.each do |resource|
-            resources(resource, options.merge(:parent_scaffold => merge_module_scope(@scope[:module], parent_resource.plural), :association => resource)) { yield if block_given? }
+            resources(resource, nested_options.merge(association: resource)) { yield if block_given? }
           end
         end
 
         def as_scoped_routes(*scopes)
           options = scopes.extract_options!
+          scoped_options = options.merge(parent_scaffold: parent_scaffold, association: parent_resource.plural)
           scopes.each do |scope|
-            resources(scope, options.merge(:parent_scaffold => merge_module_scope(@scope[:module], parent_resource.plural), :named_scope => scope, :controller => parent_resource.plural)) { yield if block_given? }
+            resources(scope, scoped_options.merge(named_scope: scope)) { yield if block_given? }
           end
         end
+
+        def parent_scaffold
+          merge_module_scope(@scope[:module], parent_resource.plural)
+        end
       end
     end
   end

data/lib/active_scaffold/extensions/to_label.rb

@@ -1,7 +1,7 @@
 # the ever-useful to_label method
 class ActiveRecord::Base
   def to_label
-    [:name, :label, :title, :to_s].each do |attribute|
+    %i[name label title to_s].each do |attribute|
       return send(attribute).to_s if respond_to?(attribute)
     end
   end

data/lib/active_scaffold/extensions/unsaved_associated.rb

@@ -13,20 +13,11 @@ class ActiveRecord::Base
   end
 
   def save_associated!
-    save_associated || raise(ActiveRecord::RecordNotSaved)
+    save_associated || raise(ActiveRecord::RecordNotSaved, "Fail saving associations for #{inspect}")
   end
 
   def no_errors_in_associated?
-    with_unsaved_associated { |a| a.errors.count == 0 && a.no_errors_in_associated? }
-  end
-
-  def keeping_errors
-    old_errors = errors.dup if errors.present?
-    yield.tap do
-      (old_errors || []).each do |attr|
-        old_errors[attr].each { |msg| errors.add(attr, msg) unless errors.added?(attr, msg) }
-      end
-    end
+    with_unsaved_associated { |a| a.errors.count.zero? && a.no_errors_in_associated? }
   end
 
   protected
@@ -42,9 +33,9 @@ class ActiveRecord::Base
   #
   # Otherwise the default behaviour of traversing all associations will be preserved.
   def associations_for_update
-    if self.respond_to?(:scaffold_update_nofollow)
+    if respond_to?(:scaffold_update_nofollow)
       self.class.reflect_on_all_associations.reject { |association| scaffold_update_nofollow.include?(association.name) }
-    elsif self.respond_to?(:scaffold_update_follow)
+    elsif respond_to?(:scaffold_update_follow)
       self.class.reflect_on_all_associations.select { |association| scaffold_update_follow.include?(association.name) }
     else
       self.class.reflect_on_all_associations

data/lib/active_scaffold/extensions/unsaved_record.rb

@@ -2,7 +2,7 @@
 module ActiveScaffold::UnsavedRecord
   # acts like a dirty? flag, manually thrown during update_record_from_params.
   def unsaved=(val)
-    @unsaved = (val) ? true : false
+    @unsaved = val ? true : false
   end
 
   # whether the unsaved? flag has been thrown
@@ -14,5 +14,16 @@ module ActiveScaffold::UnsavedRecord
   def save(*)
     super.tap { self.unsaved = false }
   end
+
+  def keeping_errors
+    old_errors = errors.dup if errors.present?
+    result = yield
+    if old_errors
+      old_errors.each do |attr|
+        old_errors[attr].each { |msg| errors.add(attr, msg) unless errors.added?(attr, msg) }
+      end
+    end
+    result && old_errors.blank?
+  end
 end
 ActiveRecord::Base.class_eval { include ActiveScaffold::UnsavedRecord }