active_scaffold 3.0.4 → 3.0.5

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -117,14 +117,14 @@ module ActiveScaffold
 
         active_scaffold_checkbox_list(column, select_options, associated_options.collect {|a| a[1]}, options)
       end
-      
+
       def active_scaffold_checkbox_list(column, select_options, associated_ids, options)
         html = "<ul class=\"checkbox-list\" id=\"#{options[:id]}\">"
-        
+
         select_options.each_with_index do |option, i|
           label, id = option
           this_id = "#{options[:id]}_#{i}_id"
-          html << content_tag(:li) do 
+          html << content_tag(:li) do
             check_box_tag("#{options[:name]}[]", id, associated_ids.include?(id), :id => this_id) <<
             content_tag(:label, h(label), :for => this_id)
           end
@@ -184,7 +184,7 @@ module ActiveScaffold
         if [:has_one, :has_many].include?(column.association.macro)
           params.merge!({column.association.primary_key_name => ''})
         end
- 
+
         record_select_options = {:controller => remote_controller, :id => options[:id]}
         record_select_options.merge!(active_scaffold_input_text_options)
         record_select_options.merge!(column.options)
@@ -208,7 +208,7 @@ module ActiveScaffold
       def active_scaffold_input_textarea(column, options)
         text_area(:record, column.name, options.merge(:cols => column.options[:cols], :rows => column.options[:rows], :size => column.options[:size]))
       end
-      
+
       def active_scaffold_input_virtual(column, options)
         options = active_scaffold_input_text_options(options)
         text_field :record, column.name, options.merge(column.options)

data/lib/active_scaffold/helpers/id_helpers.rb

@@ -90,7 +90,7 @@ module ActiveScaffold
         options[:action] ||= params[:action]
         clean_id "#{controller_id}-#{options[:action]}-#{options[:id]}-loading-indicator"
       end
-      
+
       def sub_section_id(options = {})
         options[:id] ||= params[:id]
         options[:id] ||= params[:parent_id]
@@ -102,7 +102,7 @@ module ActiveScaffold
         options[:id] ||= params[:parent_id]
         clean_id "#{controller_id}-#{options[:id]}-#{options[:association]}-subform"
       end
-      
+
       def sub_form_list_id(options = {})
         options[:id] ||= params[:id]
         options[:id] ||= params[:parent_id]

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -59,7 +59,7 @@ module ActiveScaffold
         associated = options.delete :value
         associated = [associated].compact unless associated.is_a? Array
         associated.collect!(&:to_i)
-        
+
         if column.association
           select_options = options_for_association(column.association, false)
         else
@@ -86,7 +86,7 @@ module ActiveScaffold
         if html_options[:multiple]
           html_options[:name] += '[]'
         else
-          options[:include_blank] ||= as_(:_select_) 
+          options[:include_blank] ||= as_(:_select_)
         end
         select(:record, method, select_options, options, html_options)
       end
@@ -107,7 +107,7 @@ module ActiveScaffold
       end
       # we can't use checkbox ui because it's not possible to decide whether search for this field or not
       alias_method :active_scaffold_search_checkbox, :active_scaffold_search_boolean
-      
+
       def active_scaffold_search_null(column, options)
         select_options = []
         select_options << [as_(:_select_), nil]
@@ -148,9 +148,9 @@ module ActiveScaffold
         value = field_search_record_select_value(column)
         active_scaffold_record_select(column, options, value, column.options[:multiple])
       end
-      
+
       def field_search_record_select_value(column)
-        begin 
+        begin
           value = field_search_params[column.name]
           unless value.blank?
             if column.options[:multiple]
@@ -168,13 +168,13 @@ module ActiveScaffold
       def field_search_datetime_value(value)
         DateTime.new(value[:year].to_i, value[:month].to_i, value[:day].to_i, value[:hour].to_i, value[:minute].to_i, value[:second].to_i) unless value.nil? || value[:year].blank?
       end
-      
+
       def active_scaffold_search_datetime(column, options)
         opt_value, from_value, to_value = field_search_params_range_values(column)
         options = column.options.merge(options)
         helper = "select_#{'date' unless options[:discard_date]}#{'time' unless options[:discard_time]}"
-        
-        send(helper, field_search_datetime_value(from_value), {:include_blank => true, :prefix => "#{options[:name]}[from]"}.merge(options)) << 
+
+        send(helper, field_search_datetime_value(from_value), {:include_blank => true, :prefix => "#{options[:name]}[from]"}.merge(options)) <<
         ' - '.html_safe << send(helper, field_search_datetime_value(to_value), {:include_blank => true, :prefix => "#{options[:name]}[to]"}.merge(options))
       end
 
@@ -207,9 +207,9 @@ module ActiveScaffold
       def override_search(form_ui)
         "active_scaffold_search_#{form_ui}"
       end
-      
+
       def visibles_and_hiddens(search_config)
-        visibles = [] 
+        visibles = []
         hiddens = []
         search_config.columns.each do |column|
           next unless column.search_sql
@@ -221,7 +221,7 @@ module ActiveScaffold
         end
         return visibles, hiddens
       end
-      
+
       def searched_by?(column)
         value = field_search_params[column.name]
         case value

data/lib/active_scaffold/helpers/view_helpers.rb

@@ -64,7 +64,7 @@ module ActiveScaffold
       def form_remote_upload_tag(url_for_options = {}, options = {})
         options[:target] = action_iframe_id(url_for_options)
         options[:multipart] ||= true
-        options[:class] = "#{options[:class]} as_remote_upload".strip 
+        options[:class] = "#{options[:class]} as_remote_upload".strip
         output=""
         output << form_tag(url_for_options, options)
         (output << "<iframe id='#{action_iframe_id(url_for_options)}' name='#{action_iframe_id(url_for_options)}' style='display:none'></iframe>").html_safe
@@ -78,13 +78,13 @@ module ActiveScaffold
           ActiveScaffold::Config::Core.asset_path(name, frontend)
         end
       end
-      
+
       # Provides stylesheets to include with +stylesheet_link_tag+
       def active_scaffold_stylesheets(frontend = :default)
         [ActiveScaffold::Config::Core.asset_path("stylesheet.css", frontend)]
       end
 
-      # Provides stylesheets for IE to include with +stylesheet_link_tag+ 
+      # Provides stylesheets for IE to include with +stylesheet_link_tag+
       def active_scaffold_ie_stylesheets(frontend = :default)
         [ActiveScaffold::Config::Core.asset_path("stylesheet-ie.css", frontend)]
       end
@@ -113,7 +113,7 @@ module ActiveScaffold
       # You may also flag whether the other element is visible by default or not, and the initial text will adjust accordingly.
       def link_to_visibility_toggle(id, options = {})
         options[:default_visible] = true if options[:default_visible].nil?
-        options[:hide_label] = as_(:hide) 
+        options[:hide_label] = as_(:hide)
         options[:show_label] = as_(:show)
         javascript_tag("ActiveScaffold.create_visibility_toggle('#{id}', #{options.to_json});")
       end
@@ -127,7 +127,7 @@ module ActiveScaffold
         html_options = action_link_html_options(link, url_options, record, html_options)
         action_link_html(link, url_options, html_options)
       end
-      
+
       def action_link_url_options(link, url_options, record, options = {})
         url_options = url_options.clone
         url_options[:action] = link.action
@@ -138,12 +138,12 @@ module ActiveScaffold
         url_options[:_method] = link.method if link.inline? && link.method != :get
         url_options
       end
-      
+
       def action_link_html_options(link, url_options, record, html_options)
         link_id = get_action_link_id(url_options, record, link.column)
         html_options.reverse_merge! link.html_options.merge(:class => link.action)
 
-        # Needs to be in html_options to as the adding _method to the url is no longer supported by Rails        
+        # Needs to be in html_options to as the adding _method to the url is no longer supported by Rails
         html_options[:method] = link.method if !link.inline? && link.method != :get
 
         html_options['data-confirm'] = link.confirm(record.try(:to_label)) if link.confirm?
@@ -172,10 +172,10 @@ module ActiveScaffold
         action_id = "#{id_from_controller(url_options[:controller]) + '-' if url_options[:parent_controller]}#{url_options[:action].to_s}"
         action_link_id(action_id, id)
       end
-      
+
       def action_link_html(link, url, html_options)
         # issue 260, use url_options[:link] if it exists. This prevents DB data from being localized.
-        label = url.delete(:link) if url.is_a?(Hash) 
+        label = url.delete(:link) if url.is_a?(Hash)
         label ||= link.label
         if link.image.nil?
           html = link_to(label, url, html_options)
@@ -183,11 +183,11 @@ module ActiveScaffold
           html = link_to(image_tag(link.image[:name] , :size => link.image[:size], :alt => label), url, html_options)
         end
         # if url is nil we would like to generate an anchor without href attribute
-        url.nil? ? html.sub(/href=".*?"/, '') : html 
+        url.nil? ? html.sub(/href=".*?"/, '') : html
       end
-      
+
       def url_options_for_nested_link(column, record, link, url_options, options = {})
-        if column && column.association 
+        if column && column.association
           url_options[:assoc_id] = url_options.delete(:id)
           url_options[:id] = record.send(column.association.name).id if column.singular_association? && record.send(column.association.name).present?
           link.eid = "#{controller_id.from(3)}_#{record.id}_#{column.association.name}" unless options.has_key?(:reuse_eid)
@@ -208,13 +208,13 @@ module ActiveScaffold
         else
           classes << column.css_class
         end unless column.css_class.nil?
-         
+
         classes << 'empty' if column_empty? column_value
         classes << 'sorted' if active_scaffold_config.list.user.sorting.sorts_on?(column)
         classes << 'numeric' if column.column and [:decimal, :float, :integer].include?(column.column.type)
         classes.join(' ').rstrip
       end
-      
+
       def column_heading_class(column, sorting)
         classes = []
         classes << "#{column.name}-column_heading"
@@ -255,7 +255,7 @@ module ActiveScaffold
         value = false unless record.class.authorized_for?(:crud_type => :create)
         value
       end
-      
+
       def error_messages_for(*params)
         options = params.extract_options!.symbolize_keys
 

data/lib/active_scaffold/marked_model.rb

@@ -1,16 +1,16 @@
 module ActiveScaffold
   module MarkedModel
     # This is a module aimed at making the make session_stored marked_records available to ActiveRecord models
-    
+
     def self.included(base)
       base.extend ClassMethods
       base.scope :marked, lambda {{:conditions => {:id => base.marked_records.to_a}}}
     end
-    
+
     def marked
       marked_records.include?(self.id)
     end
-    
+
     def marked=(value)
       value = [true, 'true', 1, '1', 'T', 't'].include?(value.class == String ? value.downcase : value)
       if value == true
@@ -19,17 +19,17 @@ module ActiveScaffold
         marked_records.delete(self.id)
       end
     end
-  
+
     module ClassMethods
       # The proc to call that retrieves the marked_records from the ApplicationController.
       attr_accessor :marked_records_proc
-  
+
       # Class-level access to the marked_records
       def marked_records
         (marked_records_proc.call || Set.new) if marked_records_proc
       end
     end
-  
+
     # Instance-level access to the marked_records
     def marked_records
       self.class.marked_records

data/lib/extensions/action_view_rendering.rb

@@ -58,10 +58,10 @@ module ActionView::Rendering #:nodoc:
       session["as:#{eid}"] = {:constraints => constraints, :conditions => conditions, :list => {:label => args.first[:label]}}
       options[:params] ||= {}
       options[:params].merge! :eid => eid, :embedded => true
-      
+
       id = "as_#{eid}-content"
       url_options = {:controller => remote_controller.to_s, :action => 'index'}.merge(options[:params])
-      
+
       if respond_to? :render_component
         render_component url_options
       else
@@ -75,7 +75,7 @@ module ActionView::Rendering #:nodoc:
           end
         end
       end
-      
+
     else
       options = args.first
       if options.is_a?(Hash)
@@ -87,7 +87,7 @@ module ActionView::Rendering #:nodoc:
     end
   end
   alias_method_chain :render, :active_scaffold
-  
+
 
   def partial_pieces(partial_path)
     if partial_path.include?('/')
@@ -96,7 +96,7 @@ module ActionView::Rendering #:nodoc:
       return controller.class.controller_path, partial_path
     end
   end
-  
+
   # This is the template finder logic, keep it updated with however we find stuff in rails
   # currently this very similar to the logic in ActionBase::Base.render for options file
   # TODO: Work with rails core team to find a better way to check for this.

data/lib/extensions/active_record_offset.rb

@@ -1,12 +1,12 @@
 # Bugfix: Team.offset(1).limit(1) throws an error
 ActiveRecord::Base.instance_eval do
-  def offset(*args, &block) 
+  def offset(*args, &block)
     scoped.__send__(:offset, *args, &block)
-  rescue NoMethodError       
-    if scoped.nil?           
+  rescue NoMethodError
+    if scoped.nil?
       'depends on :allow_nil'
-    else                     
-      raise                  
-    end                      
-  end       
+    else
+      raise
+    end
+  end
 end

data/lib/extensions/localize.rb

@@ -4,7 +4,7 @@ class Object
       text = I18n.translate "#{key}", {:scope => [:active_scaffold], :default => key.is_a?(String) ? key : key.to_s.titleize}.merge(options)
       # text = nil if text.include?('translation missing:')
     end
-    text ||= key 
+    text ||= key
     text
   end
 end

data/lib/extensions/name_option_for_datetime.rb

@@ -4,7 +4,7 @@ module ActionView
       private
       def datetime_selector_with_name(options, html_options)
         options.merge!(:prefix => options[:name].gsub(/\[[^\[]*\]$/,'')) if options[:name]
-        datetime_selector_without_name(options, html_options)        
+        datetime_selector_without_name(options, html_options)
       end
       alias_method_chain :datetime_selector, :name
     end

data/lib/extensions/paginator_extensions.rb

@@ -7,12 +7,12 @@ class Paginator
     number_of_pages_without_infinite unless infinite?
   end
   alias_method_chain :number_of_pages, :infinite
-  
+
   # Is this an "infinite" paginator
   def infinite?
     @count.nil?
   end
-  
+
   class Page
     # Checks to see if there's a page after this one
     def next_with_infinite?

data/lib/extensions/reverse_associations.rb

@@ -2,7 +2,7 @@ module ActiveRecord
   module Reflection
     class AssociationReflection #:nodoc:
       def reverse_for?(klass)
-        reverse_matches_for(klass).empty? ? false : true
+        ! reverse_matches_for(klass).empty?
       end
 
       attr_writer :reverse

data/lib/extensions/routing_mapper.rb

@@ -19,9 +19,9 @@ module ActionDispatch
           end
           as_association_routes if options[:association]
         end
-        
+
         def as_association_routes
-          collection do 
+          collection do
             ActionDispatch::Routing::ACTIVE_SCAFFOLD_ASSOCIATION_ROUTING[:collection].each {|name, type| send(type, name)}
           end
           member do

data/lib/extensions/usa_state.rb

@@ -2,16 +2,20 @@ module ActionView
   module Helpers
     module FormOptionsHelper
 
-      # Return a full select and option tags for the given object and method, using usa_state_options_for_select to generate the list of option <tags>.
+      # Return a full select and option tags for the given object and
+      # method, using usa_state_options_for_select to generate the
+      # list of option <tags>.
       def usa_state_select(object, method, priority_states = nil, options = {}, html_options = {})
         InstanceTag.new(object, method, self, options.delete(:object)).to_usa_state_select_tag(priority_states, options, html_options)
       end
-    
 
-      # Returns a string of option tags for the states in the United States. Supply a state name as +selected to
-      # have it marked as the selected option tag. Included also is the option to set a couple of +priority_states+ 
-      # in case you want to highligh a local area
-      # NOTE: Only the option tags are returned from this method, wrap it in a <select>
+
+      # Returns a string of option tags for the states in the United
+      # States. Supply a state name as +selected to have it marked as
+      # the selected option tag. Included also is the option to set a
+      # couple of +priority_states+ in case you want to highligh a
+      # local area.  NOTE: Only the option tags are returned from this
+      # method, wrap it in a <select>
       def usa_state_options_for_select(selected = nil, priority_states = nil)
         state_options = ""
         if priority_states
@@ -28,13 +32,13 @@ module ActionView
         return state_options
       end
 
-    	USASTATES = [["Alabama", "AL"], ["Alaska", "AK"], ["Arizona", "AZ"], ["Arkansas", "AR"], ["California", "CA"], ["Colorado", "CO"], ["Connecticut", "CT"], ["Delaware", "DE"], ["District of Columbia", "DC"], ["Florida", "FL"], ["Georgia", "GA"], ["Hawaii", "HI"], ["Idaho", "ID"], ["Illinois", "IL"], ["Indiana", "IN"], ["Iowa", "IA"], ["Kansas", "KS"], ["Kentucky", "KY"], ["Louisiana", "LA"], ["Maine", "ME"], ["Maryland", "MD"], ["Massachusetts", "MA"], ["Michigan", "MI"], ["Minnesota", "MN"], ["Mississippi", "MS"], ["Missouri", "MO"], ["Montana", "MT"], ["Nebraska", "NE"], ["Nevada", "NV"], ["New Hampshire", "NH"], ["New Jersey", "NJ"], ["New Mexico", "NM"], ["New York", "NY"], ["North Carolina", "NC"], ["North Dakota", "ND"], ["Ohio", "OH"], ["Oklahoma", "OK"], ["Oregon", "OR"], ["Pennsylvania", "PA"], ["Rhode Island", "RI"], ["South Carolina", "SC"], ["South Dakota", "SD"], ["Tennessee", "TN"], ["Texas", "TX"], ["Utah", "UT"], ["Vermont", "VT"], ["Virginia", "VA"], ["Washington", "WA"], ["Wisconsin", "WI"], ["West Virginia", "WV"], ["Wyoming", "WY"]] unless const_defined?("USASTATES")
- 
+        USASTATES = [["Alabama", "AL"], ["Alaska", "AK"], ["Arizona", "AZ"], ["Arkansas", "AR"], ["California", "CA"], ["Colorado", "CO"], ["Connecticut", "CT"], ["Delaware", "DE"], ["District of Columbia", "DC"], ["Florida", "FL"], ["Georgia", "GA"], ["Hawaii", "HI"], ["Idaho", "ID"], ["Illinois", "IL"], ["Indiana", "IN"], ["Iowa", "IA"], ["Kansas", "KS"], ["Kentucky", "KY"], ["Louisiana", "LA"], ["Maine", "ME"], ["Maryland", "MD"], ["Massachusetts", "MA"], ["Michigan", "MI"], ["Minnesota", "MN"], ["Mississippi", "MS"], ["Missouri", "MO"], ["Montana", "MT"], ["Nebraska", "NE"], ["Nevada", "NV"], ["New Hampshire", "NH"], ["New Jersey", "NJ"], ["New Mexico", "NM"], ["New York", "NY"], ["North Carolina", "NC"], ["North Dakota", "ND"], ["Ohio", "OH"], ["Oklahoma", "OK"], ["Oregon", "OR"], ["Pennsylvania", "PA"], ["Rhode Island", "RI"], ["South Carolina", "SC"], ["South Dakota", "SD"], ["Tennessee", "TN"], ["Texas", "TX"], ["Utah", "UT"], ["Vermont", "VT"], ["Virginia", "VA"], ["Washington", "WA"], ["Wisconsin", "WI"], ["West Virginia", "WV"], ["Wyoming", "WY"]] unless const_defined?("USASTATES")
+
     end
-  
+
     class InstanceTag #:nodoc:
       include FormOptionsHelper
- 
+
       def to_usa_state_select_tag(priority_states, options, html_options)
         html_options = html_options.stringify_keys
         add_default_name_and_id(html_options)
@@ -43,4 +47,4 @@ module ActionView
       end
     end
   end
-end
+end