active_scaffold 3.4.17 → 3.4.18

data/lib/active_scaffold/config/form.rb

@@ -28,7 +28,7 @@ module ActiveScaffold::Config
 
     # show value of unauthorized columns instead of skip them
     attr_accessor :show_unauthorized_columns
-    
+
     # the ActionLink for this action
     attr_accessor :link
 
@@ -45,14 +45,14 @@ module ActiveScaffold::Config
     def columns
       unless @columns # lazy evaluation
         self.columns = @core.columns._inheritable
-        self.columns.exclude :created_on, :created_at, :updated_on, :updated_at, :as_marked
-        self.columns.exclude *@core.columns.collect{|c| c.name if c.polymorphic_association?}.compact
+        columns.exclude :created_on, :created_at, :updated_on, :updated_at, :as_marked
+        columns.exclude *@core.columns.collect { |c| c.name if c.polymorphic_association? }.compact
       end
       @columns
     end
-    
+
     public :columns=
-    
+
     # whether the form should be multipart
     attr_writer :multipart
     def multipart?

data/lib/active_scaffold/config/list.rb

@@ -9,7 +9,7 @@ module ActiveScaffold::Config
       @per_page = self.class.per_page
       @page_links_inner_window = self.class.page_links_inner_window
       @page_links_outer_window = self.class.page_links_outer_window
-      
+
       # originates here
       @sorting = ActiveScaffold::DataStructures::Sorting.new(@core.columns)
       @sorting.set_default_sorting(@core.model)
@@ -47,7 +47,7 @@ module ActiveScaffold::Config
     # how many page links around first and last page to show
     cattr_accessor :page_links_outer_window
     @@page_links_outer_window = 0
-    
+
     # what string to use when a field is empty
     cattr_accessor :empty_field_text
     @@empty_field_text = '-'
@@ -89,7 +89,7 @@ module ActiveScaffold::Config
     # Show search form in the list header instead of display the link
     cattr_accessor :always_show_search
     @@always_show_search = false
-    
+
     # Show create form in the list header instead of display the link
     cattr_accessor :always_show_create
     @@always_show_create = false
@@ -111,7 +111,7 @@ module ActiveScaffold::Config
       self.columns = @core.columns._inheritable unless @columns # lazy evaluation
       @columns
     end
-    
+
     public :columns=
 
     # include list header on refresh
@@ -125,7 +125,7 @@ module ActiveScaffold::Config
 
     # how many page links around current page to show
     attr_accessor :page_links_outer_window
-    
+
     # What kind of pagination to use:
     # * true: The usual pagination
     # * :infinite: Treat the source as having an infinite number of pages (i.e. don't count the records; useful for large tables where counting is slow and we don't really care anyway)
@@ -160,10 +160,11 @@ module ActiveScaffold::Config
       val = [val] if val.is_a? Hash
       sorting.set *val
     end
+
     def sorting
       @sorting ||= ActiveScaffold::DataStructures::Sorting.new(@core.columns)
     end
-    
+
     # overwrite the includes used for the count sql query
     attr_accessor :count_includes
 
@@ -182,25 +183,25 @@ module ActiveScaffold::Config
     def filtered_message
       @filtered_message ? @filtered_message : :filtered
     end
-    
+
     attr_writer :always_show_search
     def always_show_search
       @always_show_search && !search_partial.blank?
     end
-    
+
     def search_partial
       if @always_show_search == true
         auto_search_partial
       else
-        @always_show_search.to_s if @core.actions.include? @always_show_search 
+        @always_show_search.to_s if @core.actions.include? @always_show_search
       end
     end
-    
+
     def auto_search_partial
-      return "search" if @core.actions.include?(:search)
-      return "field_search" if @core.actions.include?(:field_search)
+      return 'search' if @core.actions.include?(:search)
+      return 'field_search' if @core.actions.include?(:field_search)
     end
-    
+
     # always show create
     attr_writer :always_show_create
     def always_show_create
@@ -212,11 +213,11 @@ module ActiveScaffold::Config
     def hide_nested_column
       @hide_nested_column.nil? ? true : @hide_nested_column
     end
-    
+
     # wrap normal cells (not inplace editable columns or with link) with a tag
     # it allows for more css styling
     attr_accessor :wrap_tag
-    
+
     # Enable auto select columns on list, so only columns needed for list columns are selected
     attr_accessor :auto_select_columns
 
@@ -229,7 +230,7 @@ module ActiveScaffold::Config
         super(conf, storage, params, :list)
         @sorting = nil
       end
-      
+
       attr_writer :label
       # This label has already been localized.
       def label
@@ -237,12 +238,12 @@ module ActiveScaffold::Config
       end
 
       def per_page
-        self['per_page'] = @params['limit'].to_i if @params.has_key? 'limit'
+        self['per_page'] = @params['limit'].to_i if @params.key? 'limit'
         self['per_page'] || @conf.per_page
       end
 
       def page
-        self['page'] = @params['page'] || 1 if @params.has_key?('page') || @conf.auto_pagination
+        self['page'] = @params['page'] || 1 if @params.key?('page') || @conf.auto_pagination
         self['page'] || 1
       end
 
@@ -268,7 +269,7 @@ module ActiveScaffold::Config
       def sorting
         if @sorting.nil?
           # we want to store as little as possible in the session, but we want to return a Sorting data structure. so we recreate it each page load based on session data.
-          self['sort'] = [@params['sort'], @params['sort_direction']] if @params['sort'] and @params['sort_direction']
+          self['sort'] = [@params['sort'], @params['sort_direction']] if @params['sort'] && @params['sort_direction']
           self['sort'] = nil if @params['sort_direction'] == 'reset'
 
           if self['sort']
@@ -284,7 +285,7 @@ module ActiveScaffold::Config
         end
         @sorting
       end
-      
+
       def count_includes
         @conf.count_includes
       end

data/lib/active_scaffold/config/mark.rb

@@ -9,16 +9,16 @@ module ActiveScaffold::Config
     @@mark_all_mode = :search
 
     attr_accessor :mark_all_mode
-    
+
     def initialize(core_config)
       @core = core_config
       @mark_all_mode = self.class.mark_all_mode
       @core.model.send(:include, ActiveScaffold::MarkedModel) unless @core.model < ActiveScaffold::MarkedModel
       add_mark_column
     end
-    
+
     protected
-    
+
     def add_mark_column
       @core.columns.add :as_marked
       @core.columns[:as_marked].label = 'M'

data/lib/active_scaffold/config/nested.rb

@@ -13,36 +13,37 @@ module ActiveScaffold::Config
     # --------------------------
     cattr_accessor :shallow_delete
     @@shallow_delete = true
-    
+
     cattr_accessor :ignore_order_from_association
 
     # instance-level configuration
     # ----------------------------
     attr_accessor :shallow_delete
-    
+
     attr_accessor :ignore_order_from_association
 
     # Add a nested ActionLink
     def add_link(attribute, options = {})
       column = @core.columns[attribute.to_sym]
       if column && column.association
-        label = if column.polymorphic_association?
-          column.label
-        else
-          column.association.klass.model_name.human({:count => column.singular_association? ? 1 : 2, :default => column.association.klass.name.pluralize})
-        end
+        label =
+          if column.polymorphic_association?
+            column.label
+          else
+            column.association.klass.model_name.human(:count => column.singular_association? ? 1 : 2, :default => column.association.klass.name.pluralize)
+          end
         options.reverse_merge! :security_method => :nested_authorized?, :label => label
         action_group = options.delete(:action_group) || self.action_group
         action_link = @core.link_for_association(column, options)
         @core.action_links.add_to_group(action_link, action_group) unless action_link.nil?
         action_link
       elsif column.nil?
-        raise ArgumentError.new("unknown column #{attribute}")
+        raise ArgumentError, "unknown column #{attribute}"
       elsif column.association.nil?
-        raise ArgumentError.new("column #{attribute} is not an association")
+        raise ArgumentError, "column #{attribute} is not an association"
       end
     end
-    
+
     def add_scoped_link(named_scope, options = {})
       action_link = @core.link_for_association_as_scope(named_scope.to_sym, options)
       @core.action_links.add_to_group(action_link, action_group) unless action_link.nil?

data/lib/active_scaffold/config/search.rb

@@ -9,7 +9,6 @@ module ActiveScaffold::Config
       @split_terms = self.class.split_terms
     end
 
-
     # global level configuration
     # --------------------------
     # the ActionLink for this action
@@ -32,7 +31,7 @@ module ActiveScaffold::Config
     end
 
     cattr_accessor :split_terms
-    @@split_terms = " "
+    @@split_terms = ' '
 
     # instance-level configuration
     # ----------------------------
@@ -41,7 +40,7 @@ module ActiveScaffold::Config
     def columns
       # we want to delay initializing to the @core.columns set for as long as possible. Too soon and .search_sql will not be available to .searchable?
       unless @columns
-        self.columns = @core.columns.collect{|c| c.name if @core.columns._inheritable.include?(c.name) and c.searchable? and c.association.nil? and c.text?}.compact
+        self.columns = @core.columns.collect { |c| c.name if @core.columns._inheritable.include?(c.name) && c.searchable? && c.association.nil? && c.text? }.compact
       end
       @columns
     end

data/lib/active_scaffold/config/show.rb

@@ -19,7 +19,7 @@ module ActiveScaffold::Config
       self.columns = @core.columns._inheritable unless @columns # lazy evaluation
       @columns
     end
-    
+
     public :columns=
   end
 end

data/lib/active_scaffold/config/update.rb

@@ -23,11 +23,10 @@ module ActiveScaffold::Config
     attr_accessor :nested_links
     cattr_accessor :nested_links
     @@nested_links = false
-    
+
     attr_writer :hide_nested_column
     def hide_nested_column
       @hide_nested_column.nil? ? true : @hide_nested_column
     end
- 
   end
 end

data/lib/active_scaffold/configurable.rb

@@ -7,22 +7,20 @@ module ActiveScaffold
   module Configurable
     def configure(&configuration_block)
       return unless configuration_block
-      @configuration_binding = eval("self", configuration_block.binding)
-      ret = instance_exec self, &configuration_block
+      @configuration_binding = configuration_block.binding.eval('self')
+      ret = instance_exec(self, &configuration_block)
       @configuration_binding = nil
-      return ret
+      ret
     end
 
     # this method will surely need tweaking. for example, i'm not sure if it should call super before or after it tries to eval with the binding.
     def method_missing(name, *args)
-      begin
-        super
-      rescue NoMethodError, NameError
-        if @configuration_binding.nil?
-          raise $!
-        else
-          @configuration_binding.send(name, *args)
-        end
+      super
+    rescue NoMethodError, NameError
+      if @configuration_binding.nil?
+        raise
+      else
+        @configuration_binding.send(name, *args)
       end
     end
   end

data/lib/active_scaffold/constraints.rb

@@ -17,7 +17,7 @@ module ActiveScaffold
     # If the constraint value is a Hash, then we assume the constraint is a multi-level association constraint (the reverse of a has_many :through) and we do NOT register the constraint column.
     def register_constraints_with_action_columns(constrained_fields = nil)
       constrained_fields ||= []
-      constrained_fields |= active_scaffold_constraints.reject{|k, v| v.is_a? Hash}.keys.collect(&:to_sym)
+      constrained_fields |= active_scaffold_constraints.reject { |_, v| v.is_a? Hash }.keys.collect(&:to_sym)
       exclude_actions = []
       [:list, :update].each do |action_name|
         if active_scaffold_config.actions.include? action_name
@@ -96,11 +96,12 @@ module ActiveScaffold
       #
       # please see the relevant tests for concrete examples.
 
-      field = if [:has_one, :has_many, :has_and_belongs_to_many].include?(association.macro)
-        association.klass.primary_key
-      else
-        association.options[:foreign_key] || association.name.to_s.foreign_key
-      end
+      field =
+        if [:has_one, :has_many, :has_and_belongs_to_many].include?(association.macro)
+          association.klass.primary_key
+        else
+          association.options[:foreign_key] || association.name.to_s.foreign_key
+        end
 
       table = case association.macro
         when :belongs_to then active_scaffold_config.model.table_name
@@ -141,7 +142,7 @@ module ActiveScaffold
 
       active_scaffold_constraints.each do |k, v|
         column = active_scaffold_config.columns[k]
-        if column and column.association
+        if column && column.association
           if column.plural_association?
             record.send("#{k}").send(:<<, column.association.klass.find(v))
           elsif column.association.options[:polymorphic]
@@ -156,7 +157,7 @@ module ActiveScaffold
             # note that we can't take the extra step to correct this unless we're permitted to
             # run operations where activerecord auto-saves the object.
             reverse = column.association.klass.reflect_on_association(column.association.reverse)
-            if reverse.macro == :has_one and options[:allow_autosave]
+            if reverse.macro == :has_one && options[:allow_autosave]
               record.send(k).send("#{column.association.reverse}=", record)
             end
           end

data/lib/active_scaffold/core.rb

@@ -11,7 +11,7 @@ module ActiveScaffold
     def active_scaffold_config_for(klass)
       self.class.active_scaffold_config_for(klass)
     end
-      
+
     module ClassMethods
       def active_scaffold(model_id = nil, &block)
         extend Prefixes
@@ -19,26 +19,26 @@ module ActiveScaffold
         ActiveScaffold::Bridges.run_all
 
         # converts Foo::BarController to 'bar' and FooBarsController to 'foo_bar' and AddressController to 'address'
-        model_id = self.to_s.split('::').last.sub(/Controller$/, '').pluralize.singularize.underscore unless model_id
+        model_id = to_s.split('::').last.sub(/Controller$/, '').pluralize.singularize.underscore unless model_id
 
         # run the configuration
         @active_scaffold_config = ActiveScaffold::Config::Core.new(model_id)
         @active_scaffold_config_block = block
-        self.links_for_associations
-        
-        self.active_scaffold_superclasses_blocks.each {|superblock| self.active_scaffold_config.configure &superblock}
-        self.active_scaffold_config.sti_children = nil # reset sti_children if set in parent block
-        self.active_scaffold_config.configure &block if block_given?
-        self.active_scaffold_config._configure_sti unless self.active_scaffold_config.sti_children.nil?
-        self.active_scaffold_config._load_action_columns
+        links_for_associations
+
+        active_scaffold_superclasses_blocks.each { |superblock| active_scaffold_config.configure(&superblock) }
+        active_scaffold_config.sti_children = nil # reset sti_children if set in parent block
+        active_scaffold_config.configure(&block) if block_given?
+        active_scaffold_config._configure_sti unless active_scaffold_config.sti_children.nil?
+        active_scaffold_config._load_action_columns
 
         # defines the attribute read methods on the model, so record.send() doesn't find protected/private methods instead
-        klass = self.active_scaffold_config.model
+        klass = active_scaffold_config.model
         # Rails 4.0.4 has removed attribute_methods_generated,
         # and made define_attribute_methods threadsave to call multiple times.
         # Check for that here.
-        if ((Rails::VERSION::MAJOR == 4) && !klass.respond_to?(:attribute_methods_generated)) ||
-            !klass.attribute_methods_generated?
+        if (Rails::VERSION::MAJOR == 4 && !klass.respond_to?(:attribute_methods_generated)) ||
+           !klass.attribute_methods_generated?
           klass.define_attribute_methods
         end
         # include the rest of the code into the controller: the action core and the included actions
@@ -50,21 +50,19 @@ module ActiveScaffold
             include ActiveScaffold::Actions::Core
           end
           active_scaffold_config.actions.each do |mod|
-            name = mod.to_s.camelize
-            include "ActiveScaffold::Actions::#{name}".constantize
+            include "ActiveScaffold::Actions::#{mod.to_s.camelize}".constantize
+            mod_conf = active_scaffold_config.send(mod)
+            next unless mod_conf.respond_to?(:link) && (link = mod_conf.link)
 
             # sneak the action links from the actions into the main set
-            mod_conf = active_scaffold_config.send(mod)
-            if mod_conf.respond_to?(:link) && (link = mod_conf.link)
-              if link.is_a? Array
-                link.each {|current| active_scaffold_config.action_links.add_to_group(current, active_scaffold_config.send(mod).action_group)}
-              elsif link.is_a? ActiveScaffold::DataStructures::ActionLink
-                active_scaffold_config.action_links.add_to_group(link, active_scaffold_config.send(mod).action_group)
-              end
+            if link.is_a? Array
+              link.each { |current| active_scaffold_config.action_links.add_to_group(current, active_scaffold_config.send(mod).action_group) }
+            elsif link.is_a? ActiveScaffold::DataStructures::ActionLink
+              active_scaffold_config.action_links.add_to_group(link, active_scaffold_config.send(mod).action_group)
             end
           end
         end
-        self._add_sti_create_links if self.active_scaffold_config.add_sti_create_links?
+        _add_sti_create_links if active_scaffold_config.add_sti_create_links?
       end
 
       module Prefixes
@@ -76,64 +74,59 @@ module ActiveScaffold
       # To be called after include action modules
       def _add_sti_create_links
         new_action_link = active_scaffold_config.action_links.collection['new']
-        unless new_action_link.nil? || active_scaffold_config.sti_children.empty?
-          active_scaffold_config.action_links.collection.delete('new')
-          active_scaffold_config.sti_children.each do |child|
-            new_sti_link = Marshal.load(Marshal.dump(new_action_link)) # deep clone
-            new_sti_link.label = as_(:create_model, :model => child.to_s.camelize.constantize.model_name.human)
-            new_sti_link.parameters = {:parent_sti => controller_path}
-            new_sti_link.controller = Proc.new { active_scaffold_controller_for(child.to_s.camelize.constantize).controller_path }
-            active_scaffold_config.action_links.collection.create.add(new_sti_link)
-          end
+        return if new_action_link.nil? || active_scaffold_config.sti_children.empty?
+        active_scaffold_config.action_links.collection.delete('new')
+        active_scaffold_config.sti_children.each do |child|
+          new_sti_link = Marshal.load(Marshal.dump(new_action_link)) # deep clone
+          new_sti_link.label = as_(:create_model, :model => child.to_s.camelize.constantize.model_name.human)
+          new_sti_link.parameters = {:parent_sti => controller_path}
+          new_sti_link.controller = proc { active_scaffold_controller_for(child.to_s.camelize.constantize).controller_path }
+          active_scaffold_config.action_links.collection.create.add(new_sti_link)
         end
       end
 
       # Create the automatic column links. Note that this has to happen when configuration is *done*, because otherwise the Nested module could be disabled. Actually, it could still be disabled later, couldn't it?
       def links_for_associations
-        return unless active_scaffold_config.actions.include? :list and active_scaffold_config.actions.include? :nested
+        return unless active_scaffold_config.actions.include?(:list) && active_scaffold_config.actions.include?(:nested)
         active_scaffold_config.columns.each do |column|
-          next unless column.link.nil? and column.autolink?
-          #lazy load of action_link, cause it was really slowing down app in dev mode
-          #and might lead to trouble cause of cyclic constantization of controllers
-          #and might be unnecessary cause it is done before columns are configured
-          column.set_link(Proc.new {|col| link_for_association(col)})
+          next unless column.link.nil? && column.autolink?
+          # lazy load of action_link, cause it was really slowing down app in dev mode
+          # and might lead to trouble cause of cyclic constantization of controllers
+          # and might be unnecessary cause it is done before columns are configured
+          column.set_link(proc { |col| link_for_association(col) })
         end
       end
-      
+
       def active_scaffold_controller_for_column(column, options = {})
-        begin
-          if column.polymorphic_association?
-            :polymorph
-          elsif options.include?(:controller)
-            "#{options[:controller].to_s.camelize}Controller".constantize
-          else
-            active_scaffold_controller_for(column.association.klass)
-          end
-        rescue ActiveScaffold::ControllerNotFound
-          nil        
+        if column.polymorphic_association?
+          :polymorph
+        elsif options.include?(:controller)
+          "#{options[:controller].to_s.camelize}Controller".constantize
+        else
+          active_scaffold_controller_for(column.association.klass)
         end
+      rescue ActiveScaffold::ControllerNotFound
+        nil
       end
-      
+
       def link_for_association(column, options = {})
-        controller = active_scaffold_controller_for_column(column, options)
-        
-        unless controller.nil?
-          options.reverse_merge! :position => :after, :type => :member, :controller => (controller == :polymorph ? controller : "/#{controller.controller_path}"), :column => column
-          options[:parameters] ||= {}
-          options[:parameters].reverse_merge! :association => column.association.name
-          if column.plural_association?
-            ActiveScaffold::DataStructures::ActionLink.new('index', options.merge(:refresh_on_close => true))
-          else
-            actions = controller.active_scaffold_config.actions unless controller == :polymorph
-            actions ||= [:create, :update, :show] 
-            column.actions_for_association_links.delete :new unless actions.include? :create
-            column.actions_for_association_links.delete :edit unless actions.include? :update
-            column.actions_for_association_links.delete :show unless actions.include? :show
-            ActiveScaffold::DataStructures::ActionLink.new(nil, options.merge(:html_options => {:class => column.name}))
-          end 
+        return if (controller = active_scaffold_controller_for_column(column, options)).nil?
+        options.reverse_merge! :position => :after, :type => :member, :column => column,
+                               :controller => (controller == :polymorph ? controller : "/#{controller.controller_path}")
+        options[:parameters] ||= {}
+        options[:parameters].reverse_merge! :association => column.association.name
+        if column.plural_association?
+          ActiveScaffold::DataStructures::ActionLink.new('index', options.merge(:refresh_on_close => true))
+        else
+          actions = controller.active_scaffold_config.actions unless controller == :polymorph
+          actions ||= [:create, :update, :show]
+          column.actions_for_association_links.delete :new unless actions.include? :create
+          column.actions_for_association_links.delete :edit unless actions.include? :update
+          column.actions_for_association_links.delete :show unless actions.include? :show
+          ActiveScaffold::DataStructures::ActionLink.new(nil, options.merge(:html_options => {:class => column.name}))
         end
       end
-      
+
       def link_for_association_as_scope(scope, options = {})
         options.reverse_merge! :label => scope, :position => :after, :type => :member, :controller => controller_path
         options[:parameters] ||= {}
@@ -145,7 +138,7 @@ module ActiveScaffold
         as_path = File.join(ActiveScaffold::Config::Core.plugin_directory, 'app', 'views')
         index = view_paths.find_index { |p| p.to_s == as_path }
         if index
-          self.view_paths = view_paths[0..index-1] + Array(path) + view_paths[index..-1]
+          self.view_paths = view_paths[0..index - 1] + Array(path) + view_paths[index..-1]
         else
           append_view_path path
         end
@@ -153,19 +146,17 @@ module ActiveScaffold
 
       def active_scaffold_config
         if @active_scaffold_config.nil?
-          self.superclass.active_scaffold_config if self.superclass.respond_to? :active_scaffold_config
+          superclass.active_scaffold_config if superclass.respond_to? :active_scaffold_config
         else
           @active_scaffold_config
         end
       end
 
-      def active_scaffold_config_block
-        @active_scaffold_config_block
-      end
+      attr_reader :active_scaffold_config_block
 
       def active_scaffold_superclasses_blocks
         blocks = []
-        klass = self.superclass
+        klass = superclass
         while klass.respond_to? :active_scaffold_superclasses_blocks
           blocks << klass.active_scaffold_config_block
           klass = klass.superclass
@@ -174,23 +165,20 @@ module ActiveScaffold
       end
 
       def active_scaffold_config_for(klass)
-        begin
-          controller = active_scaffold_controller_for(klass)
-        rescue ActiveScaffold::ControllerNotFound
-          config = ActiveScaffold::Config::Core.new(klass)
-          config._load_action_columns
-          config
-        else
-          controller.active_scaffold_config
-        end
+        controller = active_scaffold_controller_for(klass)
+      rescue ActiveScaffold::ControllerNotFound
+        config = ActiveScaffold::Config::Core.new(klass)
+        config._load_action_columns
+        config
+      else
+        controller.active_scaffold_config
       end
 
       def active_scaffold_controller_for(klass)
         return self if uses_active_scaffold? && klass == active_scaffold_config.model
-        ActiveScaffold::Core.active_scaffold_controller_for(klass, self.to_s.deconstantize + '::')
+        ActiveScaffold::Core.active_scaffold_controller_for(klass, to_s.deconstantize + '::')
       end
 
-
       def uses_active_scaffold?
         !active_scaffold_config.nil?
       end
@@ -220,7 +208,7 @@ module ActiveScaffold
           return controller
         end
       end
-      raise ActiveScaffold::ControllerNotFound, "Could not find " + error_message.join(" or "), caller
+      raise ActiveScaffold::ControllerNotFound, 'Could not find ' + error_message.join(' or '), caller
     end
 
     def self.column_type_cast(value, column)