active_scaffold 3.4.17 → 3.4.18

data/lib/active_scaffold/data_structures/action_columns.rb

@@ -12,9 +12,11 @@ module ActiveScaffold::DataStructures
     def label
       as_(@label) if @label
     end
+
     def name
       @label.to_s.underscore
     end
+
     def css_class
       @label.to_s.underscore
     end
@@ -23,7 +25,7 @@ module ActiveScaffold::DataStructures
     def ==(other) #:nodoc:
       # another ActionColumns
       if other.class == self.class
-        self.label == other.label
+        label == other.label
       else
         @label.to_s == other.to_s
       end
@@ -31,28 +33,28 @@ module ActiveScaffold::DataStructures
 
     # Whether this column set is collapsed by default in contexts where collapsing is supported
     attr_accessor :collapsed
-    
+
     # nests a subgroup in the column set
     def add_subgroup(label, &proc)
       columns = ActiveScaffold::DataStructures::ActionColumns.new
       columns.label = label
-      columns.action = self.action
-      columns.configure &proc
-      self.exclude columns.collect_columns
-      self.add columns
+      columns.action = action
+      columns.configure(&proc)
+      exclude columns.collect_columns
+      add columns
     end
 
     def include?(item)
       @set.each do |c|
-        return true if !c.is_a? Symbol and c.include? item
+        return true if !c.is_a?(Symbol) && c.include?(item)
         return true if c == item.to_sym
       end
-      return false
+      false
     end
 
     def names
       if @columns
-        self.collect_visible(:flatten => true) { |c| c.name }
+        collect_visible(:flatten => true) { |c| c.name }
       else
         names_without_auth_check
       end
@@ -87,35 +89,34 @@ module ActiveScaffold::DataStructures
         end
       end
     end
-    
+
     def collect_visible(options = {}, &proc)
       columns = []
       options[:for] ||= @columns.active_record_class
       self.unauthorized_columns = []
       @set.each do |item|
-        unless item.is_a? ActiveScaffold::DataStructures::ActionColumns || @columns.nil?
+        unless item.is_a?(ActiveScaffold::DataStructures::ActionColumns) || @columns.nil?
           item = (@columns[item] || ActiveScaffold::DataStructures::Column.new(item.to_sym, @columns.active_record_class))
           next if self.skip_column?(item, options)
         end
-        if item.is_a? ActiveScaffold::DataStructures::ActionColumns and options.has_key?(:flatten) and options[:flatten]
+        if item.is_a?(ActiveScaffold::DataStructures::ActionColumns) && options.key?(:flatten) && options[:flatten]
           columns += item.collect_visible(options, &proc)
         else
           columns << (block_given? ? yield(item) : item)
         end
       end
       columns
-    end      
-    
+    end
+
     def skip_column?(column, options)
-      result = false
       # skip if this matches a constrained column
-      result = true if constraint_columns.include?(column.name.to_sym)
+      return true if constraint_columns.include?(column.name.to_sym)
       # skip this field if it's not authorized
-      unless options[:for].authorized_for?(:action => options[:action], :crud_type => options[:crud_type] || self.action.try(:crud_type) || :read, :column => column.name)
-        self.unauthorized_columns << column.name.to_sym
-        result = true
+      unless options[:for].authorized_for?(:action => options[:action], :crud_type => options[:crud_type] || action.try(:crud_type) || :read, :column => column.name)
+        unauthorized_columns << column.name.to_sym
+        return true
       end
-      return result
+      false
     end
 
     # registers a set of column objects (recursively, for all nested ActionColumns)
@@ -139,25 +140,25 @@ module ActiveScaffold::DataStructures
       Thread.current[:constraint_columns] ||= {}
       Thread.current[:constraint_columns][constraint_columns_key] = columns
     end
-      
+
     def constraint_columns
       constraints = Thread.current[:constraint_columns]
       (constraints[constraint_columns_key] if constraints) || []
     end
-    
+
     attr_writer :unauthorized_columns
     def unauthorized_columns
       @unauthorized_columns ||= []
     end
-    
+
     def length
-      ((@set - self.constraint_columns) - self.unauthorized_columns).length
+      ((@set - constraint_columns) - unauthorized_columns).length
     end
 
     protected
 
     def collect_columns
-      @set.collect {|col| col.is_a?(ActiveScaffold::DataStructures::ActionColumns) ? col.collect_columns : col}
+      @set.collect { |col| col.is_a?(ActiveScaffold::DataStructures::ActionColumns) ? col.collect_columns : col }
     end
 
     # called during clone or dup. makes the clone/dup deeper.

data/lib/active_scaffold/data_structures/action_link.rb

@@ -21,14 +21,14 @@ module ActiveScaffold::DataStructures
       # apply quick properties
       options.each_pair do |k, v|
         setter = "#{k}="
-        self.send(setter, v) if self.respond_to? setter
+        send(setter, v) if self.respond_to? setter
       end
       self.toggle = self.action.try(:to_sym) == :index && (parameters.present? || dynamic_parameters) unless options.include? :toggle
     end
 
     def initialize_copy(action_link)
-      self.parameters = self.parameters.clone if action_link.instance_variable_get(:@parameters)
-      self.html_options = self.html_options.clone if action_link.instance_variable_get(:@html_options)
+      self.parameters = parameters.clone if action_link.instance_variable_get(:@parameters)
+      self.html_options = html_options.clone if action_link.instance_variable_get(:@html_options)
     end
 
     # the weight for this link in the action links collection, it will be used to sort the collection
@@ -36,7 +36,7 @@ module ActiveScaffold::DataStructures
 
     # the action-path for this link. what page to request? this is required!
     attr_accessor :action
-    
+
     # the controller for this action link. if nil, the current controller should be assumed.
     attr_writer :controller
 
@@ -71,7 +71,7 @@ module ActiveScaffold::DataStructures
     def label
       @label.is_a?(Symbol) ? as_(@label) : @label
     end
-    
+
     # image to use {:name => 'arrow.png', :size => '16x16'}
     attr_accessor :image
 
@@ -80,21 +80,24 @@ module ActiveScaffold::DataStructures
       @dhtml_confirm = nil if value
       @confirm = value
     end
+
     def confirm(label = '')
       @confirm.is_a?(String) ? @confirm : as_(@confirm, :label => label)
     end
+
     def confirm?
-      !!@confirm
+      @confirm.present?
     end
-    
+
     # if the action uses a DHTML based (i.e. 2-phase) confirmation
     attr_accessor :dhtml_confirm
     def dhtml_confirm=(value)
       @confirm = nil if value
       @dhtml_confirm = value
     end
+
     def dhtml_confirm?
-      !!@dhtml_confirm
+      @dhtml_confirm.present?
     end
 
     # what method to call on the controller to see if this action_link should be visible
@@ -102,20 +105,20 @@ module ActiveScaffold::DataStructures
     # note that this is only the UI part of the security. to prevent URL hax0rz, you also need security on requests (e.g. don't execute update method unless authorized).
     attr_writer :security_method
     def security_method
-      @security_method || "#{self.action}_authorized?"
+      @security_method || "#{action}_authorized?"
     end
 
     def security_method_set?
-      !!@security_method
+      @security_method.present?
     end
 
     # enable it to refresh the parent row when the view is closed
     attr_accessor :refresh_on_close
-    
+
     # what method to call on the controller to see if this action_link should be visible
     # if method return true, link won't be displayed
     attr_accessor :ignore_method
-    
+
     # the crud type of the (eventual?) action. different than :method, because this crud action may not be imminent.
     # this is used to determine record-level authorization (e.g. record.authorized_for?(:crud_type => link.crud_type).
     # options are :create, :read, :update, and :delete
@@ -127,38 +130,37 @@ module ActiveScaffold::DataStructures
       @inline = (val == true)
       self.popup = self.page = false if @inline
     end
-    def inline?; @inline end
+
+    def inline?
+      @inline
+    end
 
     # a "popup" link displays in a separate (browser?) window. this will eventually take arguments.
     # exclusive with inline? and page?
     def popup=(val)
       @popup = (val == true)
-      if @popup
-        self.inline = self.page = false
+      return unless @popup
+      self.inline = self.page = false
 
-        # the :method parameter doesn't mix with the :popup parameter
-        # when/if we start using DHTML popups, we can bring :method back
-        self.method = nil
-      end
+      # the :method parameter doesn't mix with the :popup parameter
+      # when/if we start using DHTML popups, we can bring :method back
+      self.method = nil
+    end
+
+    def popup?
+      @popup
     end
-    def popup?; @popup end
 
     # a "page" link displays by reloading the current page
     # exclusive with inline? and popup?
     def page=(val)
       @page = (val == true)
-      if @page
-        self.inline = self.popup = false
-
-        # when :method is defined, ActionView adds an onclick to use a form ...
-        # so it's best to just empty out :method whenever possible.
-        # we only ever need to know @method = :get for things that default to POST.
-        # the only things that default to POST are forms and ajax calls.
-        # when @page = true, we don't use ajax.
-        self.method = nil if method == :get
-      end
+      self.inline = self.popup = false if @page
+    end
+
+    def page?
+      @page
     end
-    def page?; @page end
 
     # where the result of this action should insert in the display.
     # for :type => :collection, supported values are:
@@ -173,10 +175,10 @@ module ActiveScaffold::DataStructures
     #   false (no attempt at positioning)
     attr_writer :position
     def position
-      return @position unless @position.nil? or @position == true
-      return :replace if self.type == :member
-      return :top if self.type == :collection
-      raise "what should the default position be for #{self.type}?"
+      return @position unless @position.nil? || @position == true
+      return :replace if type == :member
+      return :top if type == :collection
+      raise "what should the default position be for #{type}?"
     end
 
     # what type of link this is. currently supported values are :collection and :member.
@@ -187,25 +189,23 @@ module ActiveScaffold::DataStructures
     def html_options
       @html_options ||= {}
     end
-    
+
     # nested action_links are referencing a column
     attr_accessor :column
-    
-    # don't close the panel when another action link is open 
+
+    # don't close the panel when another action link is open
     attr_writer :keep_open
     def keep_open?
       @keep_open
     end
-    
+
     # indicates that this a nested_link
     def nested_link?
       @column || (parameters && parameters[:named_scope])
     end
-    
+
     def name_to_cache
-      @name_to_cache ||= "#{controller || 'self'}_#{type}_#{action}#{'_' if parameters.present?}#{parameters.map{|k,v| "#{k}=#{v.is_a?(Array) ? v.join(',') : v}"}.join('_')}"
+      @name_to_cache ||= "#{controller || 'self'}_#{type}_#{action}#{'_' if parameters.present?}#{parameters.map { |k, v| "#{k}=#{v.is_a?(Array) ? v.join(',') : v}" }.join('_')}"
     end
-    
-    
   end
 end

data/lib/active_scaffold/data_structures/action_links.rb

@@ -11,22 +11,24 @@ module ActiveScaffold::DataStructures
 
     # adds an ActionLink, creating one from the arguments if need be
     def add(action, options = {})
-      link = if action.is_a?(ActiveScaffold::DataStructures::ActionLink) || action.is_a?(ActiveScaffold::DataStructures::ActionLinks)
-        action
-      else
-        options[:type] ||= default_type if default_type
-        ActiveScaffold::DataStructures::ActionLink.new(action, options)
-      end
+      link =
+        if action.is_a?(ActiveScaffold::DataStructures::ActionLink) || action.is_a?(ActiveScaffold::DataStructures::ActionLinks)
+          action
+        else
+          options[:type] ||= default_type if default_type
+          ActiveScaffold::DataStructures::ActionLink.new(action, options)
+        end
       # NOTE: this duplicate check should be done by defining the comparison operator for an Action data structure
       existing = find_duplicate(link)
-      unless existing
+
+      if existing
+        existing
+      else
         # That s for backwards compatibility if we are in root of action_links
         # we have to move actionlink into members or collection subgroup
         group = (name == :root ? subgroup(link.type, link.type) : self)
         group.add_to_set(link)
         link
-      else
-        existing
       end
     end
     alias_method :<<, :add
@@ -38,9 +40,9 @@ module ActiveScaffold::DataStructures
     # adds a link to a specific group
     # groups are represented as a string separated by a dot
     # eg member.crud
-    def add_to_group(link, group = nil)
+    def add_to_group(link, group_name = nil)
       add_to = root
-      add_to = group.split('.').inject(root){|group, group_name| group.send(group_name)} if group
+      add_to = group_name.split('.').inject(root) { |group, name| group.send(name) } if group_name
       add_to << link unless link.nil?
     end
 
@@ -65,14 +67,14 @@ module ActiveScaffold::DataStructures
           collected = item.find_duplicate(link)
           links << collected unless collected.nil?
         else
-          links << item if item.action == link.action and item.static_controller? && item.controller == link.controller and item.parameters == link.parameters
+          links << item if item.action == link.action && item.static_controller? && item.controller == link.controller && item.parameters == link.parameters
         end
       end
       links.first
     end
 
     def delete(val)
-      self.each({:include_set => true}) do |link, set|
+      each(:include_set => true) do |link, set|
         if link.action.to_s == val.to_s
           set.delete link
           break
@@ -107,10 +109,10 @@ module ActiveScaffold::DataStructures
         end
       end
     end
-    
+
     def collect_by_type(type = nil)
       links = []
-      subgroup(type).each(type) {|link| links << link}
+      subgroup(type).each(type) { |link| links << link }
       links
     end
 

data/lib/active_scaffold/data_structures/actions.rb

@@ -3,11 +3,11 @@ class ActiveScaffold::DataStructures::Actions
 
   def initialize(*args)
     @set = []
-    self.add *args
+    add *args
   end
 
   def exclude(*args)
-    args.collect! { |a| a.to_sym } # symbolize the args
+    args.collect!(&:to_sym) # symbolize the args
     @set.reject! { |m| args.include? m } # reject all actions specified
   end
 
@@ -17,11 +17,11 @@ class ActiveScaffold::DataStructures::Actions
   alias_method :<<, :add
 
   def each
-    @set.each {|item| yield item}
+    @set.each { |item| yield item }
   end
 
   def include?(val)
-    val.is_a?(Symbol) ? super : @set.any?{|item| item.to_s == val.to_s}
+    val.is_a?(Symbol) ? super : @set.any? { |item| item.to_s == val.to_s }
   end
 
   # swaps one element in the list with the other.
@@ -42,4 +42,4 @@ class ActiveScaffold::DataStructures::Actions
   def initialize_copy(from)
     @set = from.instance_variable_get('@set').clone
   end
-end
+end

data/lib/active_scaffold/data_structures/bridge.rb

@@ -1,14 +1,17 @@
 module ActiveScaffold::DataStructures
   class Bridge
     def self.install
-      raise(RunTimeError, "install not defined for bridge #{name}")
+      raise RunTimeError, "install not defined for bridge #{name}"
     end
-      
+
+    def self.prepare
+    end
+
     # by convention and default, use the bridge name as the required constant for installation
     def self.install?
       Object.const_defined? name.demodulize
     end
-      
+
     def self.run
       install if install?
     end