active_scaffold 3.4.17 → 3.4.18

data/lib/active_scaffold/data_structures/column.rb

@@ -10,10 +10,10 @@ module ActiveScaffold::DataStructures
     # Whether to enable inplace editing for this column. Currently works for text columns, in the List.
     attr_reader :inplace_edit
     def inplace_edit=(value)
-      self.clear_link if value
+      clear_link if value
       @inplace_edit = value
     end
-    
+
     attr_accessor :inplace_edit_update
 
     # Whether this column set is collapsed by default in contexts where collapsing is supported
@@ -21,10 +21,10 @@ module ActiveScaffold::DataStructures
 
     # Whether to enable add_existing for this column
     attr_accessor :allow_add_existing
-    
+
     # What columns load from main table
     attr_accessor :select_columns
-    
+
     # Any extra parameters this particular column uses.  This is for create/update purposes.
     def params
       # lazy initialize
@@ -63,9 +63,9 @@ module ActiveScaffold::DataStructures
     def required?
       @required
     end
-    
+
     attr_reader :update_columns
-    
+
     # update dependent columns after value change in form
     #  update_columns = :name
     #  update_columns = [:name, :age]
@@ -92,7 +92,7 @@ module ActiveScaffold::DataStructures
     end
 
     def sort
-      self.initialize_sort if @sort === true
+      initialize_sort if @sort == true
       @sort
     end
 
@@ -112,9 +112,7 @@ module ActiveScaffold::DataStructures
       self.list_method = nil if @list_ui.nil? && value != @form_ui
       @form_ui = value
     end
-    def form_ui
-      @form_ui
-    end
+    attr_reader :form_ui
 
     def list_ui=(value)
       self.list_method = nil if value != @list_ui
@@ -141,13 +139,13 @@ module ActiveScaffold::DataStructures
       @link
     end
 
-     # associate an action_link with this column
+    # associate an action_link with this column
     def set_link(action, options = {})
       if action.is_a?(ActiveScaffold::DataStructures::ActionLink) || (action.is_a? Proc)
         @link = action
       else
-        options[:label] ||= self.label
-        options[:position] ||= :after unless options.has_key?(:position)
+        options[:label] ||= label
+        options[:position] ||= :after unless options.key?(:position)
         options[:type] ||= :member
         @link = ActiveScaffold::DataStructures::ActionLink.new(action, options)
       end
@@ -169,14 +167,14 @@ module ActiveScaffold::DataStructures
 
     # get whether to run a calculation on this column
     def calculation?
-      !(@calculate == false or @calculate.nil?)
+      !(@calculate == false || @calculate.nil?)
     end
 
     # a collection of associations to pre-load when finding the records on a page
     attr_reader :includes
     def includes=(value)
       @includes = case value
-        when Array then value 
+        when Array then value
         else value ? [value] : value # not convert nil to [nil]
       end
     end
@@ -188,7 +186,7 @@ module ActiveScaffold::DataStructures
 
     def search_joins=(value)
       @search_joins = case value
-        when Array then value 
+        when Array then value
         else [value] # automatically convert to an array
       end
     end
@@ -201,18 +199,21 @@ module ActiveScaffold::DataStructures
     #   search = "CONCAT(a, b)" define your own sql for searching. this should be the "left-side" of a WHERE condition. the operator and value will be supplied by ActiveScaffold.
     #   search = [:a, :b]       searches in both fields
     def search_sql=(value)
-      @search_sql = if value
-        (value == true || value.is_a?(Proc)) ? value : Array(value)
-      else
-        value
-      end
+      @search_sql =
+        if value
+          (value == true || value.is_a?(Proc)) ? value : Array(value)
+        else
+          value
+        end
     end
+
     def search_sql
-      self.initialize_search_sql if @search_sql === true
+      initialize_search_sql if @search_sql == true
       @search_sql
     end
+
     def searchable?
-      !!search_sql
+      search_sql.present?
     end
 
     # to modify the default order of columns
@@ -236,17 +237,16 @@ module ActiveScaffold::DataStructures
     @@show_blank_record = true
     attr_writer :show_blank_record
     def show_blank_record?(associated)
-      if @show_blank_record
-        return false unless self.association.klass.authorized_for?(:crud_type => :create) and not self.association.options[:readonly]
-        self.plural_association? or (self.singular_association? and associated.blank?)
-      end
+      return false unless @show_blank_record
+      return false unless association.klass.authorized_for?(:crud_type => :create) && !association.options[:readonly]
+      self.plural_association? || (self.singular_association? && associated.blank?)
     end
 
     # methods for automatic links in singular association columns
     cattr_accessor :actions_for_association_links
     @@actions_for_association_links = [:new, :edit, :show]
     attr_accessor :actions_for_association_links
-    
+
     cattr_accessor :association_form_ui
     @@association_form_ui = nil
 
@@ -260,24 +260,27 @@ module ActiveScaffold::DataStructures
     # the association from the ActiveRecord class
     attr_reader :association
     def singular_association?
-      self.association and !self.association.collection?
+      association && !association.collection?
     end
+
     def plural_association?
-      self.association and self.association.collection?
+      association && association.collection?
     end
+
     def through_association?
-      self.association and self.association.options[:through]
+      association && association.options[:through]
     end
+
     def polymorphic_association?
-      self.association and self.association.options[:polymorphic]
+      association && association.options[:polymorphic]
     end
+
     def readonly_association?
-      if self.association
-        if self.association.options.has_key? :readonly
-          self.association.options[:readonly]
-        else
-          self.through_association?
-        end
+      return false unless association
+      if association.options.key? :readonly
+        association.options[:readonly]
+      else
+        self.through_association?
       end
     end
 
@@ -285,7 +288,7 @@ module ActiveScaffold::DataStructures
     def virtual?
       column.nil? && association.nil?
     end
-    
+
     attr_writer :number
     def number?
       @number
@@ -298,11 +301,11 @@ module ActiveScaffold::DataStructures
     # this is so that array.delete and array.include?, etc., will work by column name
     def ==(other) #:nodoc:
       # another column
-      if other.respond_to? :name and other.class == self.class
-        self.name == other.name.to_sym
+      if other.respond_to?(:name) && other.class == self.class
+        name == other.name.to_sym
       # a string or symbol
       elsif other.respond_to? :to_sym
-        self.name == other.to_sym rescue false # catch "interning empty string"
+        name == other.to_sym rescue false # catch "interning empty string"
       # unknown
       else
         self.eql? other
@@ -323,25 +326,8 @@ module ActiveScaffold::DataStructures
       @show_blank_record = self.class.show_blank_record
       @send_form_on_update_column = self.class.send_form_on_update_column
       @actions_for_association_links = self.class.actions_for_association_links.clone if @association
-      @select_columns = if @association.nil? && @column
-        [field]
-      elsif polymorphic_association?
-        [field, quoted_field(@active_record_class.connection.quote_column_name(@association.foreign_type))]
-      elsif @association
-        if self.association.belongs_to?
-          [field]
-        else
-          columns = []
-          if active_record_class.columns_hash[count_column = "#{@association.name}_count"]
-            columns << quoted_field(@active_record_class.connection.quote_column_name(count_column))
-          end
-          if @association.through_reflection.try(:belongs_to?)
-            columns << quoted_field(@active_record_class.connection.quote_column_name(@association.through_reflection.foreign_key))
-          end
-          columns
-        end
-      end
-      
+      @select_columns = default_select_columns
+
       @text = @column.nil? || [:string, :text].include?(@column.type)
       if @column
         @form_ui = case @column.type
@@ -356,23 +342,21 @@ module ActiveScaffold::DataStructures
       end
       @allow_add_existing = true
       @form_ui = self.class.association_form_ui if @association && self.class.association_form_ui
-      
+
+      if association && !polymorphic_association?
+        self.includes = [association.name]
+        self.search_joins = includes.clone
+      end
+
       # default all the configurable variables
       self.css_class = ''
       self.required = active_record_class.validators_on(self.name).any? do |val|
-        !val.options[:if] && !val.options[:unless] && (ActiveModel::Validations::PresenceValidator === val ||
-          (ActiveModel::Validations::InclusionValidator === val && !val.options[:allow_nil] && !val.options[:allow_blank] && !(@form_ui == :checkbox && [[true, false], [false, true]].include?(val.send(:delimiter))))
-        )
+        validator_force_required?(val)
       end
       self.sort = true
       self.search_sql = true
-      
-      @weight = estimate_weight
 
-      if association && !polymorphic_association?
-        self.includes = [association.name]
-        self.search_joins = self.includes.clone
-      end
+      @weight = estimate_weight
     end
 
     # just the field (not table.field)
@@ -381,16 +365,16 @@ module ActiveScaffold::DataStructures
       @field_name ||= column ? @active_record_class.connection.quote_column_name(column.name) : association.foreign_key
     end
 
-    def <=>(other_column)
-      order_weight = self.weight <=> other_column.weight
-      order_weight != 0 ? order_weight : self.name.to_s <=> other_column.name.to_s
+    def <=>(other)
+      order_weight = weight <=> other.weight
+      order_weight != 0 ? order_weight : name.to_s <=> other.name.to_s
     end
 
     def number_to_native(value)
       return value if value.blank? || !value.is_a?(String)
       native = '.' # native ruby separator
       format = {:separator => '', :delimiter => ''}.merge! I18n.t('number.format', :default => {})
-      specific = case self.options[:format]
+      specific = case options[:format]
       when :currency
         I18n.t('number.currency.format', :default => nil)
       when :size
@@ -399,10 +383,10 @@ module ActiveScaffold::DataStructures
         I18n.t('number.percentage.format', :default => nil)
       end
       format.merge! specific unless specific.nil?
-      unless format[:separator].blank? || !value.include?(format[:separator]) && value.include?(native) && (format[:delimiter] != native || value !~ /\.\d{3}$/)
-        value.gsub(/[^0-9\-#{format[:separator]}]/, '').gsub(format[:separator], native)
-      else
+      if format[:separator].blank? || !value.include?(format[:separator]) && value.include?(native) && (format[:delimiter] != native || value !~ /\.\d{3}$/)
         value
+      else
+        value.gsub(/[^0-9\-#{format[:separator]}]/, '').gsub(format[:separator], native)
       end
     end
 
@@ -419,6 +403,42 @@ module ActiveScaffold::DataStructures
 
     protected
 
+    def validator_force_required?(val)
+      return false if val.options[:if] || val.options[:unless]
+      case val
+      when ActiveModel::Validations::PresenceValidator
+        true
+      when ActiveModel::Validations::InclusionValidator
+        !val.options[:allow_nil] && !val.options[:allow_blank] &&
+          !inclusion_validator_for_checkbox?(val)
+      end
+    end
+
+    def inclusion_validator_for_checkbox?(val)
+      @form_ui == :checkbox && [[true, false], [false, true]].include?(val.options[:with] || val.options[:within])
+    end
+
+    def default_select_columns
+      if association.nil? && column
+        [field]
+      elsif polymorphic_association?
+        [field, quoted_field(@active_record_class.connection.quote_column_name(association.foreign_type))]
+      elsif association
+        if association.belongs_to?
+          [field]
+        else
+          columns = []
+          if active_record_class.columns_hash[count_column = "#{association.name}_count"]
+            columns << quoted_field(@active_record_class.connection.quote_column_name(count_column))
+          end
+          if association.through_reflection.try(:belongs_to?)
+            columns << quoted_field(@active_record_class.connection.quote_column_name(association.through_reflection.foreign_key))
+          end
+          columns
+        end
+      end
+    end
+
     def quoted_field(name)
       [@active_record_class.quoted_table_name, name].join('.')
     end
@@ -429,34 +449,35 @@ module ActiveScaffold::DataStructures
         self.sort = false
       else
         if column && !@tableless
-          self.sort = {:sql => self.field}
+          self.sort = {:sql => field}
         else
           self.sort = false
         end
       end
     end
-    
+
     def initialize_search_sql
-      self.search_sql = unless self.virtual?
-        if association.nil?
-          self.field.to_s unless @tableless
-        elsif !self.polymorphic_association?
-          [association.klass.quoted_table_name, association.klass.quoted_primary_key].join('.') unless association.klass < ActiveScaffold::Tableless
+      self.search_sql =
+        unless self.virtual?
+          if association.nil?
+            field.to_s unless @tableless
+          elsif !self.polymorphic_association?
+            [association.klass.quoted_table_name, association.klass.quoted_primary_key].join('.') unless association.klass < ActiveScaffold::Tableless
+          end
         end
-      end
     end
 
     # the table name from the ActiveRecord class
     attr_reader :table
-    
+
     def estimate_weight
       if singular_association?
         400
       elsif plural_association?
         500
-      elsif [:created_at, :updated_at].include?(self.name) 
+      elsif [:created_at, :updated_at].include?(name)
         600
-      elsif [:name, :label, :title].include?(self.name)
+      elsif [:name, :label, :title].include?(name)
         100
       elsif required?
         200

data/lib/active_scaffold/data_structures/columns.rb

@@ -24,14 +24,14 @@ module ActiveScaffold::DataStructures
       @_inheritable = []
       @set = []
 
-      self.add *args
+      add *args
     end
 
     # the way to add columns to the set. this is primarily useful for virtual columns.
     # note that this also makes columns inheritable
     def add(*args)
       args.flatten! # allow [] as a param
-      args = args.collect{ |a| a.to_sym }
+      args = args.collect(&:to_sym)
 
       # make the columns inheritable
       @_inheritable.concat(args)
@@ -59,7 +59,7 @@ module ActiveScaffold::DataStructures
     alias_method :[], :find_by_name
 
     def each
-      @set.each {|i| yield i }
+      @set.each { |i| yield i }
     end
 
     def _inheritable

data/lib/active_scaffold/data_structures/error_message.rb

@@ -6,19 +6,17 @@ module ActiveScaffold::DataStructures
     end
 
     def public_attributes
-      { :error => @error }
+      {:error => @error}
     end
 
     def to_xml
-      public_attributes.to_xml(:root => "errors")
+      public_attributes.to_xml(:root => 'errors')
     end
 
-    def to_yaml
-      public_attributes.to_yaml
-    end
+    delegate :to_yaml, :to => :public_attributes
 
     def to_s
       @error
     end
   end
-end
+end

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -1,37 +1,34 @@
 module ActiveScaffold::DataStructures
   class NestedInfo
     def self.get(model, params)
-      nested_info = {}
-      begin
-        unless params[:association].nil?
-          ActiveScaffold::DataStructures::NestedInfoAssociation.new(model, params)
-        else
-          ActiveScaffold::DataStructures::NestedInfoScope.new(model, params)
-        end
-      rescue ActiveScaffold::ControllerNotFound
-        nil
+      if params[:association].nil?
+        ActiveScaffold::DataStructures::NestedInfoScope.new(model, params)
+      else
+        ActiveScaffold::DataStructures::NestedInfoAssociation.new(model, params)
       end
+    rescue ActiveScaffold::ControllerNotFound
+      nil
     end
-    
+
     attr_accessor :association, :child_association, :parent_model, :parent_scaffold, :parent_id, :param_name, :constrained_fields, :scope
-        
+
     def initialize(model, params)
       @parent_scaffold = "#{params[:parent_scaffold].to_s.camelize}Controller".constantize
       @parent_model = @parent_scaffold.active_scaffold_config.model
     end
-    
+
     def to_params
       {:parent_scaffold => parent_scaffold.controller_path}
     end
-    
+
     def new_instance?
       result = @new_instance.nil?
       @new_instance = false
       result
     end
-    
+
     def habtm?
-      false 
+      false
     end
 
     def has_many?
@@ -61,7 +58,7 @@ module ActiveScaffold::DataStructures
     def through_association?
       false
     end
-    
+
     def readonly?
       false
     end
@@ -70,7 +67,7 @@ module ActiveScaffold::DataStructures
       false
     end
   end
-  
+
   class NestedInfoAssociation < NestedInfo
     def initialize(model, params)
       super
@@ -79,88 +76,86 @@ module ActiveScaffold::DataStructures
       @parent_id = params[@param_name]
       iterate_model_associations(model)
     end
-    
-    def name
-      self.association.name
-    end
-    
+
+    delegate :name, :to => :association
+
     def has_many?
-      association.macro == :has_many 
+      association.macro == :has_many
     end
-    
+
     def habtm?
-      association.macro == :has_and_belongs_to_many 
-    end
-    
-    def belongs_to?
-      association.belongs_to?
+      association.macro == :has_and_belongs_to_many
     end
 
+    delegate :belongs_to?, :to => :association
+
     def has_one?
       association.macro == :has_one
     end
-    
+
     # A through association with has_one or has_many as source association
-    # create cannot be called in such through association, unless create columns include through reflection of reverse association
+    # create cannot be called in nested through associations, and not-nested through associations
+    # unless create columns include through reflection of reverse association
     # e.g. customer -> networks -> firewall, reverse is firewall -> network -> customer,
     # firewall can be created if create columns include network
     def readonly_through_association?(columns)
-      through_association? && association.source_reflection.macro != :belongs_to && (
+      return false unless through_association?
+      return true if association.through_reflection.options[:through]
+      association.source_reflection.macro != :belongs_to && (
         !child_association || !columns.include?(child_association.through_reflection.name)
       )
     end
-    
+
     def through_association?
       association.options[:through]
     end
-    
+
     def readonly?
       association.options[:readonly]
     end
 
     def sorted?
-      association.options.has_key? :order
+      association.options.key? :order
     end
 
     def default_sorting
-      if association.options[:order] # TODO remove when rails 3 compatibility is removed
+      if association.options[:order] # TODO: remove when rails 3 compatibility is removed
         association.options[:order]
       elsif association.respond_to?(:scope) # rails 4
         association.klass.class_eval(&association.scope).values[:order] if association.scope.is_a? Proc
       end
     end
-    
+
     def to_params
       super.merge(:association => @association.name, :assoc_id => parent_id)
     end
-    
+
     protected
-    
+
     def iterate_model_associations(model)
       @constrained_fields = []
       constrained_fields << association.foreign_key.to_sym unless association.belongs_to?
-      if reverse = association.reverse(model)
-        @child_association = model.reflect_on_association(reverse)
-        constrained_fields << @child_association.name unless @child_association == association
-      end
+      return if (reverse = association.reverse(model)).nil?
+      @child_association = model.reflect_on_association(reverse)
+      constrained_fields << @child_association.name unless @child_association == association
     end
   end
-  
+
   class NestedInfoScope < NestedInfo
     def initialize(model, params)
       super
       @scope = params[:named_scope].to_sym
       @param_name = parent_model.name.foreign_key.to_sym
       @parent_id = params[@param_name]
-      @constrained_fields = [] 
+      @constrained_fields = []
     end
-    
+
     def to_params
       super.merge(:named_scope => @scope)
     end
-    
+
     def name
-      self.scope
+      scope
     end
   end
 end