active_scaffold 3.0.12 → 3.0.21

data/lib/active_scaffold/extensions/active_record_offset.rb

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

data/lib/{extensions → active_scaffold/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 → active_scaffold/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 → active_scaffold/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 → active_scaffold/extensions}/reverse_associations.rb

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

data/lib/{extensions → active_scaffold/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/active_scaffold/extensions/usa_state.rb

@@ -0,0 +1,46 @@
+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>.
+      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>
+      def usa_state_options_for_select(selected = nil, priority_states = nil)
+        state_options = ""
+        if priority_states
+          state_options += options_for_select(priority_states, selected)
+          state_options += "<option>-------------</option>\n"
+        end
+
+        if priority_states && priority_states.include?(selected)
+          state_options += options_for_select(USASTATES - priority_states, selected)
+        else
+          state_options += options_for_select(USASTATES, selected)
+        end
+
+        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")
+ 
+    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)
+        value = value(object) if method(:value).arity > 0
+        content_tag("select", add_options(usa_state_options_for_select(value, priority_states), options, value), html_options)
+      end
+    end
+  end
+end

data/lib/active_scaffold/finder.rb

@@ -1,5 +1,9 @@
 module ActiveScaffold
   module Finder
+    def self.like_operator
+      @@like_operator ||= ::ActiveRecord::Base.connection.adapter_name == "PostgreSQL" ? "ILIKE" : "LIKE"
+    end
+
     module ClassMethods
       # Takes a collection of search terms (the tokens) and creates SQL that
       # searches all specified ActiveScaffold columns. A row will match if each
@@ -13,13 +17,13 @@ module ActiveScaffold
 
         where_clauses = []
         columns.each do |column|
-          where_clauses << ((column.column.nil? || column.column.text?) ? "LOWER(#{column.search_sql}) LIKE ?" : "#{column.search_sql} = ?")
+          where_clauses << ((column.column.nil? || column.column.text?) ? "#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?" : "#{column.search_sql} = ?")
         end
         phrase = "(#{where_clauses.join(' OR ')})"
 
         sql = ([phrase] * tokens.length).join(' AND ')
         tokens = tokens.collect do |value|
-          columns.collect {|column| (column.column.nil? || column.column.text?) ? like_pattern.sub('?', value.downcase) : column.column.type_cast(value)}
+          columns.collect {|column| (column.column.nil? || column.column.text?) ? like_pattern.sub('?', value) : column.column.type_cast(value)}
         end.flatten
 
         [sql, *tokens]
@@ -52,7 +56,7 @@ module ActiveScaffold
                 ["#{column.search_sql} in (?)", Array(value)]
                 else
                   if column.column.nil? || column.column.text?
-                    ["LOWER(#{column.search_sql}) LIKE ?", like_pattern.sub('?', value.downcase)]
+                    ["#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?", like_pattern.sub('?', value)]
                   else
                     ["#{column.search_sql} = ?", column.column.type_cast(value)]
                   end
@@ -62,7 +66,7 @@ module ActiveScaffold
             end
           end
         rescue Exception => e
-          logger.error Time.now.to_s + "#{e.inspect} -- on the ActiveScaffold column :#{column.name}, search_ui = #{search_ui} in #{@controller.class}"
+          logger.error Time.now.to_s + "#{e.inspect} -- on the ActiveScaffold column :#{column.name}, search_ui = #{search_ui} in #{self.name}"
           raise e
         end
       end
@@ -82,10 +86,12 @@ module ActiveScaffold
       def condition_for_range(column, value, like_pattern = nil)
         if !value.is_a?(Hash)
           if column.column.nil? || column.column.text?
-            ["LOWER(#{column.search_sql}) LIKE ?", like_pattern.sub('?', value.downcase)]
+            ["#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?", like_pattern.sub('?', value)]
           else
             ["#{column.search_sql} = ?", column.column.type_cast(value)]
           end
+        elsif ActiveScaffold::Finder::NullComparators.include?(value[:opt])
+          condition_for_null_type(column, value[:opt], like_pattern)
         elsif value[:from].blank?
           nil
         elsif ActiveScaffold::Finder::StringComparators.values.include?(value[:opt])
@@ -98,7 +104,7 @@ module ActiveScaffold
           nil
         end
       end
-
+      
       def condition_value_for_datetime(value, conversion = :to_time)
         if value.is_a? Hash
           Time.zone.local(*[:year, :month, :day, :hour, :minute, :second].collect {|part| value[field][part].to_i}) rescue nil
@@ -132,7 +138,7 @@ module ActiveScaffold
           value
         end
       end
-
+            
       def condition_for_datetime(column, value, like_pattern = nil)
         conversion = column.column.type == :date ? :to_date : :to_time
         from_value = condition_value_for_datetime(value[:from], conversion)
@@ -156,7 +162,7 @@ module ActiveScaffold
           ["#{column.search_sql} = ?", value]
         end
       end
-
+      
       def condition_for_null_type(column, value, like_pattern = nil)
         case value.to_sym
         when :null
@@ -196,8 +202,8 @@ module ActiveScaffold
       :null,
       :not_null
     ]
-
-
+    
+    
 
     def self.included(klass)
       klass.extend ClassMethods
@@ -219,7 +225,7 @@ module ActiveScaffold
     def active_scaffold_habtm_joins
       @active_scaffold_habtm_joins ||= []
     end
-
+    
     def all_conditions
       merge_conditions(
         active_scaffold_conditions,                   # from the search modules
@@ -229,7 +235,7 @@ module ActiveScaffold
         active_scaffold_session_storage[:conditions] # embedding conditions (weaker constraints)
       )
     end
-
+    
     # returns a single record (the given id) but only if it's allowed for the specified action.
     # accomplishes this by checking model.#{action}_authorized?
     # TODO: this should reside on the model, not the controller
@@ -255,19 +261,19 @@ module ActiveScaffold
       options[:count_includes] ||= full_includes unless search_conditions.nil?
 
       klass = beginning_of_chain
-
+      
       # create a general-use options array that's compatible with Rails finders
       finder_options = { :order => options[:sorting].try(:clause),
                          :where => search_conditions,
                          :joins => joins_for_finder,
                          :includes => options[:count_includes]}
-
+                         
       finder_options.merge! custom_finder_options
 
       # NOTE: we must use :include in the count query, because some conditions may reference other tables
       count_query = append_to_query(klass, finder_options.reject{|k, v| [:select, :order].include?(k)})
       count = count_query.count unless options[:pagination] == :infinite
-
+  
       # Converts count to an integer if ActiveRecord returned an OrderedHash
       # that happens when finder_options contains a :group key
       count = count.length if count.is_a? ActiveSupport::OrderedHash
@@ -288,12 +294,17 @@ module ActiveScaffold
       end
       pager.page(options[:page])
     end
-
+    
     def append_to_query(query, options)
       options.assert_valid_keys :where, :select, :group, :order, :limit, :offset, :joins, :includes, :lock, :readonly, :from
       options.reject{|k, v| v.blank?}.inject(query) do |query, (k, v)|
-        query = query.except(:order) if k.to_sym == :order
-        query.send((k.to_sym), v)
+        # default ordering of model has a higher priority than current queries ordering
+        # fix this by removing existing ordering from arel
+        if k.to_sym == :order
+          query = query.where('1=1') unless query.is_a?(ActiveRecord::Relation)
+          query = query.except(:order)
+        end
+        query.send((k.to_sym), v) 
       end
     end
 
@@ -307,7 +318,7 @@ module ActiveScaffold
           []
       end + active_scaffold_habtm_joins
     end
-
+    
     def merge_conditions(*conditions)
       segments = []
       conditions.each do |condition|

data/lib/active_scaffold/helpers/controller_helpers.rb

@@ -4,9 +4,9 @@ module ActiveScaffold
       def self.included(controller)
         controller.class_eval { helper_method :params_for, :main_path_to_return, :render_parent?, :render_parent_options, :render_parent_action, :nested_singular_association?}
       end
-
+      
       include ActiveScaffold::Helpers::IdHelpers
-
+      
       def params_for(options = {})
         # :adapter and :position are one-use rendering arguments. they should not propagate.
         # :sort, :sort_direction, and :page are arguments that stored in the session. they need not propagate.
@@ -22,9 +22,7 @@ module ActiveScaffold
         @params_for.merge(options)
       end
 
-      # Parameters to generate url to the main page (override if the
-      # ActiveScaffold is used as a component on another controllers
-      # page)
+      # Parameters to generate url to the main page (override if the ActiveScaffold is used as a component on another controllers page)
       def main_path_to_return
         if params[:return_to]
           params[:return_to]

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -31,6 +31,7 @@ module ActiveScaffold
                 raise "Unknown form_ui `#{column.form_ui}' for column `#{column.name}'"
               end
             elsif column.virtual?
+              options[:value] = format_number_value(@record.send(column.name), column.options) if column.number?
               active_scaffold_input_virtual(column, options)
 
             else # regular model attribute column
@@ -47,7 +48,7 @@ module ActiveScaffold
                   options[:size] ||= ActionView::Helpers::InstanceTag::DEFAULT_FIELD_OPTIONS["size"]
                 end
                 options[:include_blank] = true if column.column.null and [:date, :datetime, :time].include?(column.column.type)
-                options[:value] = format_number_value(@record.send(column.name), column.options) if column.column.number?
+                options[:value] = format_number_value(@record.send(column.name), column.options) if column.number?
                 text_field(:record, column.name, options.merge(column.options))
               end
             end
@@ -79,13 +80,14 @@ module ActiveScaffold
       def update_columns_options(column, scope, options)
         if column.update_columns
           form_action = params[:action] == 'edit' ? :update : :create
-          url_params = {:action => 'render_field', :id => params[:id], :column => column.name, :update_columns => column.update_columns}
+          url_params = {:action => 'render_field', :id => params[:id], :column => column.name}
           url_params[:eid] = params[:eid] if params[:eid]
           url_params[:controller] = controller.class.active_scaffold_controller_for(@record.class).controller_path if scope
-          url_params[:scope] = params[:scope] if scope
+          url_params[:scope] = scope if scope
 
           options[:class] = "#{options[:class]} update_form".strip
           options['data-update_url'] = url_for(url_params)
+          options['data-update_send_form'] = true if column.send_form_on_update_column
         end
         options
       end
@@ -107,6 +109,7 @@ module ActiveScaffold
 
         html_options.update(column.options[:html_options] || {})
         options.update(column.options)
+        html_options[:name] = "#{html_options[:name]}[]" if (html_options[:multiple] == true && !html_options[:name].to_s.ends_with?("[]"))
         select(:record, method, select_options.uniq, options, html_options)
       end
 
@@ -117,14 +120,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
@@ -135,7 +138,7 @@ module ActiveScaffold
       end
 
       def active_scaffold_translated_option(column, text, value = nil)
-        value ||= text
+        value = text if value.nil?
         [(text.is_a?(Symbol) ? column.active_record_class.human_attribute_name(text) : text), value]
       end
 
@@ -167,39 +170,6 @@ module ActiveScaffold
         end.html_safe
       end
 
-      # requires RecordSelect plugin to be installed and configured.
-      # ... maybe this should be provided in a bridge?
-      def active_scaffold_input_record_select(column, options)
-        if column.singular_association?
-          active_scaffold_record_select(column, options, @record.send(column.name), false)
-        elsif column.plural_association?
-          active_scaffold_record_select(column, options, @record.send(column.name), true)
-        end
-      end
-
-      def active_scaffold_record_select(column, options, value, multiple)
-        unless column.association
-          raise ArgumentError, "record_select can only work against associations (and #{column.name} is not).  A common mistake is to specify the foreign key field (like :user_id), instead of the association (:user)."
-        end
-        remote_controller = active_scaffold_controller_for(column.association.klass).controller_path
-
-        # if the opposite association is a :belongs_to (in that case association in this class must be has_one or has_many)
-        # then only show records that have not been associated yet
-        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)
-
-        if multiple
-          record_multi_select_field(options[:name], value || [], record_select_options)
-        else
-          record_select_field(options[:name], value || column.association.klass.new, record_select_options)
-        end
-      end
-
       def active_scaffold_input_checkbox(column, options)
         check_box(:record, column.name, options)
       end
@@ -212,7 +182,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)
@@ -258,13 +228,17 @@ module ActiveScaffold
         "#{column.name}_form_column"
       end
 
-      def override_form_field?(column)
-        respond_to?(override_form_field(column))
+      def override_form_field(column)
+        method_with_class = override_form_field_name(column, true)
+        return method_with_class if respond_to?(method_with_class)
+        method = override_form_field_name(column)
+        method if respond_to?(method)
       end
+      alias_method :override_form_field?, :override_form_field
 
       # the naming convention for overriding form fields with helpers
-      def override_form_field(column)
-        "#{column.name}_form_column"
+      def override_form_field_name(column, class_prefix = false)
+        "#{clean_class_name(column.active_record_class.name) + '_' if class_prefix}#{clean_column_name(column.name)}_form_column"
       end
 
       def override_input?(form_ui)