active_scaffold 3.2.8 → 3.2.9

data/CHANGELOG

@@ -1,4 +1,8 @@
-= 3.2.8 (not released)
+= 3.2.9 (not released)
+- remove duplicated conditions with constraints
+- fix constraints for polymorphic associations
+
+= 3.2.8
 - add deprecation for update_column, update_columns should be used instead
 - fix constraints with hide_nested_column disabled in list and embedded scaffolds which are nested too
 - fix setting a hash as includes, cannot be concat in finder

data/lib/active_scaffold/actions/core.rb

@@ -27,7 +27,6 @@ module ActiveScaffold::Actions
     end
 
     def render_field_for_inplace_editing
-      register_constraints_with_action_columns(active_scaffold_config.update.hide_nested_column ? [] : [:update]) if nested?
       @record = find_if_allowed(params[:id], :update)
       render :inline => "<%= active_scaffold_input_for(active_scaffold_config.columns[params[:update_column].to_sym]) %>"
     end
@@ -151,25 +150,22 @@ module ActiveScaffold::Actions
         
     # Builds search conditions by search params for column names. This allows urls like "contacts/list?company_id=5".
     def conditions_from_params
-      conditions = nil
+      conditions = {}
       params.reject {|key, value| [:controller, :action, :id, :page, :sort, :sort_direction].include?(key.to_sym)}.each do |key, value|
-        next unless active_scaffold_config.model.column_names.include?(key)
-        if value.is_a?(Array)
-          conditions = merge_conditions(conditions, ["#{active_scaffold_config.model.table_name}.#{key.to_s} in (?)", value])
-        else
-          conditions = merge_conditions(conditions, ["#{active_scaffold_config.model.table_name}.#{key.to_s} = ?", value])
-        end
+        next unless active_scaffold_config.model.columns_hash[key.to_s]
+        next if active_scaffold_constraints[key.to_sym]
+        conditions[key] = value
       end
       conditions
     end
 
     def new_model
       model = beginning_of_chain
-      if model.columns_hash[model.inheritance_column]
-        build_options = {model.inheritance_column.to_sym => active_scaffold_config.model_id} if nested? && nested.association && nested.association.collection?
-        params = self.params # in new action inheritance_column must be in params
-        params = params[:record] || {} unless params[model.inheritance_column] # in create action must be inside record key
-        model = params.delete(model.inheritance_column).camelize.constantize if params[model.inheritance_column]
+      if model.columns_hash[column = model.inheritance_column]
+        build_options = {column.to_sym => active_scaffold_config.model_id} if nested? && nested.association && nested.association.collection?
+        model_name = params.delete(column) # in new action inheritance_column must be in params
+        model_name ||= params[:record].delete(column) unless params[:record].blank? # in create action must be inside record key
+        model = model_name.camelize.constantize if model_name
       end
       model.respond_to?(:build) ? model.build(build_options || {}) : model.new
     end

data/lib/active_scaffold/actions/create.rb

@@ -78,10 +78,7 @@ module ActiveScaffold::Actions
     def do_new
       @record = new_model
       apply_constraints_to_record(@record)
-      if nested?
-        create_association_with_parent(@record)
-        register_constraints_with_action_columns
-      end
+      create_association_with_parent(@record) if nested?
       @record
     end
 
@@ -93,10 +90,7 @@ module ActiveScaffold::Actions
         active_scaffold_config.model.transaction do
           @record = update_record_from_params(new_model, active_scaffold_config.create.columns, hash)
           apply_constraints_to_record(@record, :allow_autosave => true)
-          if nested?
-            create_association_with_parent(@record) 
-            register_constraints_with_action_columns
-          end
+          create_association_with_parent(@record) if nested?
           create_save
         end
       rescue ActiveRecord::ActiveRecordError => ex

data/lib/active_scaffold/actions/field_search.rb

@@ -43,23 +43,19 @@ module ActiveScaffold::Actions
 
     def do_search
       unless search_params.blank?
+        filtered_columns = []
         text_search = active_scaffold_config.field_search.text_search
-        search_conditions = []
-        human_condition_columns = [] if active_scaffold_config.field_search.human_conditions
         columns = active_scaffold_config.field_search.columns
         search_params.each do |key, value|
           next unless columns.include? key
           search_condition = self.class.condition_for_column(active_scaffold_config.columns[key], value, text_search)
           unless search_condition.blank?
-            search_conditions << search_condition
-            human_condition_columns << active_scaffold_config.columns[key] unless human_condition_columns.nil?
+            self.active_scaffold_conditions << search_condition
+            filtered_columns << active_scaffold_config.columns[key]
           end
         end
-        self.active_scaffold_conditions = merge_conditions(self.active_scaffold_conditions, *search_conditions)
-        if search_conditions.blank?
-          @filtered = false
-        else
-          @filtered = human_condition_columns.nil? ? true : human_condition_columns
+        unless filtered_columns.blank?
+          @filtered = active_scaffold_config.field_search.human_conditions ? filtered_columns : true
         end
 
         includes_for_search_columns = columns.collect{ |column| column.includes}.flatten.uniq.compact

data/lib/active_scaffold/actions/nested.rb

@@ -26,11 +26,7 @@ module ActiveScaffold::Actions
     def set_nested
       if params[:parent_scaffold] && (params[:association] || params[:named_scope])
         @nested = ActiveScaffold::DataStructures::NestedInfo.get(active_scaffold_config.model, params)
-        unless @nested.nil?
-          active_scaffold_constraints.merge! @nested.constraints  
-          active_scaffold_constraints[:id] = params[:id] if @nested.belongs_to?
-          register_constraints_with_action_columns
-        end
+        register_constraints_with_action_columns(@nested.constrained_fields) unless @nested.nil?
       end
     end
     
@@ -86,7 +82,7 @@ module ActiveScaffold::Actions
       elsif nested? && nested.scope
         nested.parent_scope.send(nested.scope)
       else
-        active_scaffold_config.model
+        super
       end
     end
 

data/lib/active_scaffold/actions/search.rb

@@ -26,8 +26,8 @@ module ActiveScaffold::Actions
         text_search = active_scaffold_config.search.text_search
         query = query.split(active_scaffold_config.search.split_terms) if active_scaffold_config.search.split_terms
         search_conditions = self.class.create_conditions_for_columns(query, columns, text_search)
-        self.active_scaffold_conditions = merge_conditions(self.active_scaffold_conditions, search_conditions)
         @filtered = !search_conditions.blank?
+        self.active_scaffold_conditions.concat search_conditions if @filtered
 
         includes_for_search_columns = columns.collect{ |column| column.includes}.flatten.uniq.compact
         self.active_scaffold_includes.concat includes_for_search_columns

data/lib/active_scaffold/actions/update.rb

@@ -65,7 +65,6 @@ module ActiveScaffold::Actions
     # A simple method to find and prepare a record for editing
     # May be overridden to customize the record (set default values, etc.)
     def do_edit
-      register_constraints_with_action_columns(active_scaffold_config.update.hide_nested_column ? [] : [:update]) if nested?
       @record = find_if_allowed(params[:id], :update)
     end
 

data/lib/active_scaffold/active_record_permissions.rb

@@ -41,6 +41,7 @@ module ActiveRecordPermissions
     module Model
       def self.included(base)
         base.extend ClassMethods
+        base.send :include, ActiveRecordPermissions::Permissions
       end
 
       module ClassMethods

data/lib/active_scaffold/config/base.rb

@@ -5,6 +5,7 @@ module ActiveScaffold::Config
 
     def initialize(core_config)
       @core = core_config
+      @action_group = self.class.action_group.clone if self.class.action_group
     end
 
     def self.inherited(subclass)
@@ -62,9 +63,12 @@ module ActiveScaffold::Config
     private
     
     def columns=(val)
-      @columns = ActiveScaffold::DataStructures::ActionColumns.new(*val)
-      @columns.action = self
-      @columns.set_columns(@core.columns) if @columns.respond_to?(:set_columns)
+      @columns.set_values(*val) if @column
+      @columns ||= ActiveScaffold::DataStructures::ActionColumns.new(*val).tap do |columns|
+        columns.action = self
+        columns.set_columns(@core.columns) if @columns.respond_to?(:set_columns)
+        columns
+      end
       @columns
     end
   end

data/lib/active_scaffold/config/create.rb

@@ -4,9 +4,7 @@ module ActiveScaffold::Config
     def initialize(core_config)
       super
       @label = :create_model
-      self.persistent = self.class.persistent
       self.action_after_create = self.class.action_after_create
-      self.refresh_list = self.class.refresh_list
     end
 
     # global level configuration
@@ -20,25 +18,15 @@ module ActiveScaffold::Config
     end
     @@link = ActiveScaffold::DataStructures::ActionLink.new('new', :label => :create_new, :type => :collection, :security_method => :create_authorized?, :ignore_method => :create_ignore?)
 
-    # whether the form stays open after a create or not
-    cattr_accessor :persistent
-    @@persistent = false
-
     # whether update form is opened after a create or not
     cattr_accessor :action_after_create
     @@action_after_create = nil
 
-    # whether we should refresh list after create or not
-    cattr_accessor :refresh_list
-    @@refresh_list = false
-
-    # whether the form stays open after a create or not
-    attr_accessor :persistent
+    # instance-level configuration
+    # ----------------------------
 
     # whether the form stays open after a create or not
     attr_accessor :action_after_create
 
-    # whether we should refresh list after create or not
-    attr_accessor :refresh_list
   end
 end

data/lib/active_scaffold/config/delete.rb

@@ -6,8 +6,7 @@ module ActiveScaffold::Config
       super
       # start with the ActionLink defined globally
       @link = self.class.link.clone
-      @action_group = self.class.action_group.clone if self.class.action_group
-      self.refresh_list = self.class.refresh_list
+      @refresh_list = self.class.refresh_list
     end
 
     # global level configuration

data/lib/active_scaffold/config/field_search.rb

@@ -5,10 +5,10 @@ module ActiveScaffold::Config
     def initialize(core_config)
       super
       @text_search = self.class.text_search
+      @human_conditions = self.class.human_conditions
 
       # start with the ActionLink defined globally
       @link = self.class.link.clone
-      @action_group = self.class.action_group.clone if self.class.action_group
     end
 
 
@@ -27,6 +27,11 @@ module ActiveScaffold::Config
     cattr_accessor :text_search
     @@text_search = :full
 
+    # human conditions
+    # instead of just filtered you may show the user a humanized search condition statment
+    cattr_accessor :human_conditions
+    @@human_conditions = false
+    
     # instance-level configuration
     # ----------------------------
 
@@ -54,8 +59,8 @@ module ActiveScaffold::Config
     attr_accessor :link
     
     # rarely searched columns may be placed in a hidden subgroup
-     def optional_columns=(optionals)
-      @optional_columns= Array(optionals)
+    def optional_columns=(optionals)
+      @optional_columns = Array(optionals)
     end
     
     def optional_columns

data/lib/active_scaffold/config/form.rb

@@ -4,8 +4,9 @@ module ActiveScaffold::Config
       super
       # start with the ActionLink defined globally
       @link = self.class.link.clone unless self.class.link.nil?
-      @action_group = self.class.action_group.clone if self.class.action_group
       @show_unauthorized_columns = self.class.show_unauthorized_columns
+      @refresh_list = self.class.refresh_list
+      @persistent = self.class.persistent
 
       # no global setting here because multipart should only be set for specific forms
       @multipart = false
@@ -16,6 +17,14 @@ module ActiveScaffold::Config
     # show value of unauthorized columns instead of skip them
     class_attribute :show_unauthorized_columns
 
+    # whether the form stays open after an update or not
+    cattr_accessor :persistent
+    @@persistent = false
+
+    # whether we should refresh list after update or not
+    cattr_accessor :refresh_list
+    @@refresh_list = false
+
     # instance-level configuration
     # ----------------------------
 
@@ -28,6 +37,12 @@ module ActiveScaffold::Config
     # the label for this Form action. used for the header.
     attr_writer :label
 
+    # whether the form stays open after a create or not
+    attr_accessor :persistent
+
+    # whether we should refresh list after create or not
+    attr_accessor :refresh_list
+
     # provides access to the list of columns specifically meant for the Form to use
     def columns
       unless @columns # lazy evaluation

data/lib/active_scaffold/config/list.rb

@@ -18,10 +18,12 @@ module ActiveScaffold::Config
       @empty_field_text = self.class.empty_field_text
       @association_join_text = self.class.association_join_text
       @pagination = self.class.pagination
-      @show_search_reset = true
+      @show_search_reset = self.class.show_search_reset
       @reset_link = self.class.reset_link.clone
       @mark_records = self.class.mark_records
       @wrap_tag = self.class.wrap_tag
+      @always_show_search = self.class.always_show_search
+      @always_show_create = self.class.always_show_create
     end
 
     # global level configuration
@@ -62,9 +64,14 @@ module ActiveScaffold::Config
 
     # Add a checkbox in front of each record to mark them and use them with a batch action later
     cattr_accessor :mark_records
+    @@mark_records = false
+
+    # show a link to reset the search next to filtered message
+    cattr_accessor :show_search_reset
+    @@show_search_reset = true
 
     # the ActionLink to reset search
-    cattr_accessor :reset_link
+    cattr_reader :reset_link
     @@reset_link = ActiveScaffold::DataStructures::ActionLink.new('index', :label => :click_to_reset, :type => :collection, :position => false)
 
     # wrap normal cells (not inplace editable columns or with link) with a tag
@@ -72,6 +79,14 @@ module ActiveScaffold::Config
     cattr_accessor :wrap_tag
     @@wrap_tag = nil
 
+    # 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
+
     # instance-level configuration
     # ----------------------------
 

data/lib/active_scaffold/config/nested.rb

@@ -5,8 +5,7 @@ module ActiveScaffold::Config
     def initialize(core_config)
       super
       @label = :add_existing_model
-      self.shallow_delete = self.class.shallow_delete
-      @action_group = self.class.action_group.clone if self.class.action_group
+      @shallow_delete = self.class.shallow_delete
     end
 
     # global level configuration

data/lib/active_scaffold/config/search.rb

@@ -10,7 +10,6 @@ module ActiveScaffold::Config
 
       # start with the ActionLink defined globally
       @link = self.class.link.clone
-      @action_group = self.class.action_group.clone if self.class.action_group
     end
 
 
@@ -35,6 +34,9 @@ module ActiveScaffold::Config
       @@live
     end
 
+    cattr_accessor :split_terms
+    @@split_terms = " "
+
     # instance-level configuration
     # ----------------------------
 
@@ -57,8 +59,6 @@ module ActiveScaffold::Config
     # Default is :full
     attr_accessor :text_search
 
-    @@split_terms = " "
-    cattr_accessor :split_terms
     attr_accessor :split_terms
 
     # the ActionLink for this action

data/lib/active_scaffold/config/show.rb

@@ -6,7 +6,6 @@ module ActiveScaffold::Config
       super
       # start with the ActionLink defined globally
       @link = self.class.link.clone
-      @action_group = self.class.action_group.clone if self.class.action_group
     end
 
     # global level configuration

data/lib/active_scaffold/config/update.rb

@@ -4,7 +4,6 @@ module ActiveScaffold::Config
     def initialize(core_config)
       super
       self.nested_links = self.class.nested_links
-      self.refresh_list = self.class.refresh_list
     end
 
     # global level configuration
@@ -18,14 +17,6 @@ module ActiveScaffold::Config
     end
     @@link = ActiveScaffold::DataStructures::ActionLink.new('edit', :label => :edit, :type => :member, :security_method => :update_authorized?)
 
-    # whether the form stays open after an update or not
-    cattr_accessor :persistent
-    @@persistent = false
-
-    # whether we should refresh list after update or not
-    cattr_accessor :refresh_list
-    @@refresh_list = false
-
     # instance-level configuration
     # ----------------------------
 
@@ -33,16 +24,10 @@ module ActiveScaffold::Config
     cattr_accessor :nested_links
     @@nested_links = false
     
-    # whether the form stays open after an update or not
-    attr_accessor :persistent
-
     attr_writer :hide_nested_column
     def hide_nested_column
       @hide_nested_column.nil? ? true : @hide_nested_column
     end
-
-    # whether we should refresh list after update or not
-    attr_accessor :refresh_list
  
   end
 end

data/lib/active_scaffold/constraints.rb

@@ -12,9 +12,13 @@ module ActiveScaffold
     # This lets the ActionColumns object skip constrained columns.
     #
     # 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(exclude_actions = [])
-      constrained_fields = active_scaffold_constraints.reject{|k, v| v.is_a? Hash}.keys.collect{|k| k.to_sym}
+    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)
+      exclude_actions = []
       exclude_actions << :list unless active_scaffold_config.list.hide_nested_column
+      exclude_actions << :update unless active_scaffold_config.update.hide_nested_column
+
       if self.class.uses_active_scaffold?
         # we actually want to do this whether constrained_fields exist or not, so that we can reset the array when they don't
         active_scaffold_config.actions.each do |action_name|
@@ -34,10 +38,11 @@ module ActiveScaffold
     # All of this work is primarily to support nested scaffolds in a manner generally useful for other
     # embedded scaffolds.
     def conditions_from_constraints
-      conditions = nil
+      hash_conditions = {}
+      conditions = [hash_conditions]
       active_scaffold_constraints.each do |k, v|
         column = active_scaffold_config.columns[k]
-        constraint_condition = if column
+        if column
           # Assume this is a multi-level association constraint.
           # example:
           #   data model: Park -> Den -> Bear
@@ -47,8 +52,8 @@ module ActiveScaffold
             field = far_association.klass.primary_key
             table = far_association.table_name
 
-            active_scaffold_includes.concat([{k => v.keys.first}]) # e.g. {:den => :park}
-            constraint_condition_for("#{table}.#{field}", v.values.first)
+            active_scaffold_includes.concat([{k => far_association.name}]) # e.g. {:den => :park}
+            hash_conditions.merge!("#{table}.#{field}" => v.values.first)
 
           # association column constraint
           elsif column.association
@@ -57,23 +62,20 @@ module ActiveScaffold
             else
               active_scaffold_includes.concat column.includes
             end
-            condition_from_association_constraint(column.association, v)
+            hash_conditions.merge!(condition_from_association_constraint(column.association, v))
 
           # regular column constraints
-          elsif column.searchable?
+          elsif column.searchable? && params[column.name] != v
             active_scaffold_includes.concat column.includes
-            constraint_condition_for(column.search_sql, v)
+            conditions << ["#{column.search_sql} = ?", v]
           end
         # unknown-to-activescaffold-but-real-database-column constraint
-        elsif active_scaffold_config.model.column_names.include? k.to_s
-          constraint_condition_for(k.to_s, v)
+        elsif active_scaffold_config.model.columns_hash[k.to_s] && params[column.name] != v
+          hash_conditions.merge!(k => v)
         else
           raise ActiveScaffold::MalformedConstraint, constraint_error(active_scaffold_config.model, k), caller
         end
-
-        conditions = merge_conditions(conditions, constraint_condition)
       end
-
       conditions
     end
 
@@ -108,22 +110,19 @@ module ActiveScaffold
         value = association.klass.find(value).send(association.options[:primary_key])
       end
 
-      condition = constraint_condition_for("#{table}.#{field}", value)
+      condition = {"#{table}.#{field}" => value}
       if association.options[:polymorphic]
-        begin
-          parent_scaffold = "#{session_info[:parent_scaffold].to_s.camelize}Controller".constantize
-          condition = merge_conditions(
-            condition,
-            constraint_condition_for("#{table}.#{association.name}_type", parent_scaffold.active_scaffold_config.model_id.to_s)
-          )
-        rescue ActiveScaffold::ControllerNotFound
-          nil
-        end
+        raise ActiveScaffold::MalformedConstraint, polymorphic_constraint_error(association), caller unless params[:parent_model]
+        condition["#{table}.#{association.name}_type"] = params[:parent_model].constantize.model.to_s
       end
 
       condition
     end
 
+    def polymorphic_constraint_error(association)
+      "Malformed constraint. You have added a constraint for #{association.name} polymorphic association but parent_model is not set."
+    end
+
     def constraint_error(klass, column_name)
       "Malformed constraint `#{klass}##{column_name}'. If it's a legitimate column, and you are using a nested scaffold, please specify or double-check the reverse association name."
     end
@@ -145,6 +144,7 @@ module ActiveScaffold
           if column.plural_association?
             record.send("#{k}").send(:<<, column.association.klass.find(v))
           elsif column.association.options[:polymorphic]
+            raise ActiveScaffold::MalformedConstraint, polymorphic_constraint_error(column.association), caller unless params[:parent_model]
             record.send("#{k}=", params[:parent_model].constantize.find(v))
           else # regular singular association
             record.send("#{k}=", column.association.klass.find(v))
@@ -164,11 +164,5 @@ module ActiveScaffold
         end
       end
     end
-
-    private
-
-    def constraint_condition_for(sql, value)
-      value.nil? ? "#{sql} IS NULL" : ["#{sql} = ?", value]
-    end
   end
 end

data/lib/active_scaffold/data_structures/column.rb

@@ -317,7 +317,7 @@ module ActiveScaffold::DataStructures
     # just the field (not table.field)
     def field_name
       return nil if virtual?
-      column ? @active_record_class.connection.quote_column_name(column.name) : association.foreign_key
+      @field_name ||= column ? @active_record_class.connection.quote_column_name(column.name) : association.foreign_key
     end
 
     def <=>(other_column)
@@ -356,7 +356,7 @@ module ActiveScaffold::DataStructures
           self.sort = {:method => "#{self.name}.to_s"}
         elsif self.plural_association?
           self.sort = {:method => "#{self.name}.join(',')"}
-        else
+        elsif @active_record_class.connection
           self.sort = {:sql => self.field}
         end
       end
@@ -365,11 +365,9 @@ module ActiveScaffold::DataStructures
     def initialize_search_sql
       self.search_sql = unless self.virtual?
         if association.nil?
-          self.field.to_s
+          self.field.to_s unless @active_record_class.connection.nil?
         elsif !self.polymorphic_association?
-          [association.klass.table_name, association.klass.primary_key].collect! do |str|
-            association.klass.connection.quote_column_name str
-          end.join('.')
+          [association.klass.quoted_table_name, association.klass.quoted_primary_key].join('.') unless association.klass.connection.nil?
         end
       end
     end
@@ -379,7 +377,7 @@ module ActiveScaffold::DataStructures
 
     # the table.field name for this column, if applicable
     def field
-      @field ||= [@active_record_class.connection.quote_table_name(@table), field_name].join('.')
+      @field ||= [@active_record_class.quoted_table_name, field_name].join('.')
     end
     
     def estimate_weight

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -19,7 +19,7 @@ module ActiveScaffold::DataStructures
       end
     end
     
-    attr_accessor :association, :child_association, :parent_model, :parent_scaffold, :parent_id, :constrained_fields, :constraints, :scope
+    attr_accessor :association, :child_association, :parent_model, :parent_scaffold, :parent_id, :constrained_fields, :scope
         
     def initialize(model, nested_info)
       @parent_model = nested_info[:parent_model]
@@ -108,16 +108,16 @@ module ActiveScaffold::DataStructures
     protected
     
     def iterate_model_associations(model)
-      @constraints = {}
-      @constraints[association.foreign_key.to_sym] = parent_id unless association.belongs_to?
+      @constrained_fields = Set.new
+      constrained_fields << association.foreign_key.to_sym unless association.belongs_to?
       model.reflect_on_all_associations.each do |current|
         if !current.belongs_to? && association.foreign_key == current.association_foreign_key
-          constraints[current.name.to_sym] = parent_id
+          constrained_fields << current.name.to_sym
           @child_association = current if current.klass == @parent_model
         end
         if association.foreign_key == current.foreign_key
           # show columns for has_many and has_one child associationes
-          constraints[current.name.to_sym] = parent_id if current.belongs_to?
+          constrained_fields << current.name.to_sym if current.belongs_to?
           if association.options[:as] and current.options[:polymorphic]
             @child_association = current if association.options[:as].to_sym == current.name
           else
@@ -125,7 +125,7 @@ module ActiveScaffold::DataStructures
           end
         end
       end
-      @constrained_fields = @constraints.keys
+      @constrained_fields = @constrained_fields.to_a
     end
   end
   

data/lib/active_scaffold/data_structures/set.rb

@@ -4,6 +4,10 @@ module ActiveScaffold::DataStructures
     include ActiveScaffold::Configurable
 
     def initialize(*args)
+      set_values(*args)
+    end
+
+    def set_values(*args)
       @set = []
       self.add *args
     end

data/lib/active_scaffold/finder.rb

@@ -19,14 +19,13 @@ module ActiveScaffold
         columns.each do |column|
           where_clauses << ((column.column.nil? || column.column.text?) ? "#{column.search_sql} #{ActiveScaffold::Finder.like_operator} ?" : "#{column.search_sql} = ?")
         end
-        phrase = "(#{where_clauses.join(' OR ')})"
+        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) : column.column.type_cast(value)}
-        end.flatten
-
-        [sql, *tokens]
+        tokens.collect do |value|
+          columns.inject([phrase]) do |condition, column|
+            condition.push((column.column.nil? || column.column.text?) ? like_pattern.sub('?', value) : column.column.type_cast(value))
+          end
+        end
       end
 
       # Generates an SQL condition for the given ActiveScaffold column based on
@@ -247,13 +246,13 @@ module ActiveScaffold
     end
     
     def all_conditions
-      merge_conditions(
+      [
         active_scaffold_conditions,                   # from the search modules
         conditions_for_collection,                    # from the dev
         conditions_from_params,                       # from the parameters (e.g. /users/list?first_name=Fred)
         conditions_from_constraints,                  # from any constraints (embedded scaffolds)
         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.
@@ -264,8 +263,6 @@ module ActiveScaffold
       raise ActiveScaffold::RecordNotAllowed, "#{klass} with id = #{id}" unless record.authorized_for?(:crud_type => crud_type.to_sym)
       return record
     end
-
-    # returns a hash with options to find records
     # valid options may include:
     # * :sorting - a Sorting DataStructure (basically an array of hashes of field => direction, e.g. [{:field1 => 'asc'}, {:field2 => 'desc'}]). please note that multi-column sorting has some limitations: if any column in a multi-field sort uses method-based sorting, it will be ignored. method sorting only works for single-column sorting.
     # * :per_page
@@ -276,10 +273,10 @@ module ActiveScaffold
 
       # create a general-use options array that's compatible with Rails finders
       finder_options = { :reorder => options[:sorting].try(:clause),
-                         :where => search_conditions,
+                         :conditions => search_conditions,
                          :joins => joins_for_finder,
                          :includes => full_includes}
-                         
+    
       finder_options.merge! custom_finder_options
       finder_options
     end
@@ -330,7 +327,8 @@ module ActiveScaffold
     end
     
     def append_to_query(query, options)
-      options.assert_valid_keys :where, :select, :group, :reorder, :limit, :offset, :joins, :includes, :lock, :readonly, :from
+      options.assert_valid_keys :where, :select, :group, :reorder, :limit, :offset, :joins, :includes, :lock, :readonly, :from, :conditions
+      query = apply_conditions(query, *options.delete(:conditions)) if options[:conditions]
       options.reject{|k, v| v.blank?}.inject(query) do |query, (k, v)|
         query.send((k.to_sym), v) 
       end
@@ -347,15 +345,14 @@ module ActiveScaffold
       end + active_scaffold_habtm_joins
     end
     
-    def merge_conditions(*conditions)
-      segments = []
-      conditions.each do |condition|
-        unless condition.blank?
-          sql = active_scaffold_config.model.send(:sanitize_sql, condition)
-          segments << sql unless sql.blank?
+    def apply_conditions(query, *conditions)
+      conditions.reject(&:blank?).inject(query) do |query, condition|
+        if condition.is_a?(Array) && !condition.first.is_a?(String) # multiple conditions
+          apply_conditions(query, *condition)
+        else
+          query.where(condition)
         end
       end
-      "(#{segments.join(') AND (')})" unless segments.empty?
     end
 
     # TODO: this should reside on the column, not the controller

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 2
-    PATCH = 8
+    PATCH = 9
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/lib/active_scaffold_env.rb

@@ -8,4 +8,3 @@ ActionView::Base.send(:include, ActiveScaffold::Helpers::ViewHelpers)
 
 ActionController::Base.class_eval {include ActiveRecordPermissions::ModelUserAccess::Controller}
 ActiveRecord::Base.class_eval     {include ActiveRecordPermissions::ModelUserAccess::Model}
-ActiveRecord::Base.class_eval     {include ActiveRecordPermissions::Permissions}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 3
   - 2
-  - 8
-  version: 3.2.8
+  - 9
+  version: 3.2.9
 platform: ruby
 authors: 
 - Many, see README
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-17 00:00:00 Z
+date: 2012-05-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development