searchgasm 1.0.2 → 1.0.3

data/CHANGELOG.rdoc

@@ -1,7 +1,17 @@
+== 1.0.3 released 2008-09-18
+
+* Updated inspect to show the current options for your search. Plays nicer in the console.
+* Made sure protection state is persistent among relationship conditions.
+* Fixed bug with backwards compatibility of rails. concat requires a proc in older version.
+* Defaulted remote control types to use GET requests instead of POST.
+* Completely reengineered integration with ActiveRecord. Searchgasm is properly using scopes letting you do use serachgasm where scope are implemented. @current_users.orders.new_search, etc. If your search is scoped and you want a search object, that search object will represent a new search in the context of those scopes, meaning the scopes get merged into Searchgasm as options.
+* Dropped support for Searchgasm functionality when defining relationships: has_many :order, :conditions => {:total_gt => 100}, will not work anymore. It's a chicken and the egg thing. Searchgasm needs AR constants, some models get loaded before others, therefore the Order model may not have been loaded yet, causing an unknown constant error.
+* Clean up redundant code and moved it into the Searchgasm::Shared namespace.
+
 == 1.0.2 released 2008-09-12
 
 * Moved cached searchers out of the global namespace and into the Searchgasm::Cache namespce.
-* Various changes to improve performance. Added in benchmark reports in readme as well as a benchmarks directory.
+* Various changes to improve performance through profiling / benchmarking. http://pastie.org/271936
 * Config.per_page works with new_search & new_search! only. Where as before it was only working if the search was protected.
 
 == 1.0.1 released 2008-09-11
@@ -50,7 +60,7 @@
 == 0.9.4 released 2008-09-03
 
 * Cleaned up search methods
-* Removed reset!method for both searching and searching by conditions
+* Removed reset! method for both searching and searching by conditions
 
 == 0.9.3 released 2008-09-02
 

data/Manifest

@@ -1,6 +1,3 @@
-benchmarks/benchmark.rb
-benchmarks/benchmark_helper.rb
-benchmarks/profile.rb
 CHANGELOG.rdoc
 examples/README.rdoc
 init.rb
@@ -42,7 +39,11 @@ lib/searchgasm/search/conditions.rb
 lib/searchgasm/search/ordering.rb
 lib/searchgasm/search/pagination.rb
 lib/searchgasm/search/protection.rb
-lib/searchgasm/utilities.rb
+lib/searchgasm/search/scoping.rb
+lib/searchgasm/search.rb
+lib/searchgasm/shared/searching.rb
+lib/searchgasm/shared/utilities.rb
+lib/searchgasm/shared/virtual_classes.rb
 lib/searchgasm/version.rb
 lib/searchgasm.rb
 Manifest

data/README.rdoc

@@ -219,14 +219,23 @@ For tree data structures you get a few nifty methods. Let's assume Users is a tr
   User.all(:conditions => {:inclusive_descendant_of => User.roots.first.id})
   
 
-== Available anywhere (relationships & scopes)
+== Scope support
 
-Not only can you use searchgasm when searching, but you can use it when setting up relationships or scopes. Anywhere you specify conditions in ActiveRecord.
+Not only can you use searchgasm when searching, but you can use it when using scopes.
 
   class User < ActiveRecord::Base
-    has_many :expensive_pending_orders, :conditions => {:total_greater_than => 1_000_000, :state => :pending}, :per_page => 20
     named_scope :sexy, :conditions => {:first_name => "Ben", email_ends_with => "binarylogic.com"}, :per_page => 20
   end
+  
+or
+
+  class User < ActiveRecord::Base
+    def self.find_sexy
+      with_scope(:find => {:conditions => {:first_name => "Ben", email_ends_with => "binarylogic.com"}, :per_page => 20}) do
+        all
+      end
+    end
+  end
 
 == Always use protection...against SQL injections
 
@@ -328,22 +337,11 @@ Pretty nifty, huh? You can create any condition ultimately creating any SQL you
 
 == Under the hood
 
-I'm a big fan of understanding what I'm using, so here's a quick explanation: The design behind this plugin is pretty simple. The search object "sanitizes" down into the options passed into ActiveRecord::Base.find(). It serves as a transparent filter between you and ActiveRecord::Base.find(). This filter provides "enhancements" that get translated into options that ActiveRecord::Base.find() can understand. It doesn't dig into the ActiveRecord internals, it only uses what is publicly available. It jumps in and helps out <em>only</em> when needed, otherwise it sits back and lets ActiveRecord do all of the work. Between that and the extensive tests, this is a solid and fast plugin.
-
-== Performance / Benchmarking
-
-I ran searchgasm through some performance tests using ruby-prof. After working on it for a little while I improved performance quite a bit. Notice the "2nd instantiation" report. This is implementing caching and skips all dynamic method creation / meta programming. It resulted in code over 50 times faster.
+I'm a big fan of understanding what I'm using, so here's a quick explanation: The design behind this plugin is pretty simple and I had 1 main rule when developing this:
 
-	                          user     system      total        real
-	1st instantiation:    0.000000   0.000000   0.000000 (  0.005466)
-	2nd instantiation:    0.000000   0.000000   0.000000 (  0.000108)
-	Local ordering:       0.000000   0.000000   0.000000 (  0.000265)
-	Advanced ordering:    0.000000   0.000000   0.000000 (  0.000413)
-	Local conditions:     0.000000   0.000000   0.000000 (  0.000241)
-	Advanced conditions:  0.000000   0.000000   0.000000 (  0.000602)
-	Its complicated:      0.000000   0.000000   0.000000 (  0.001017)
+ActiveRecord should never know about Searchgasm
 
-I also included the benchmarking file in benchmarks/benchmark.rb to see for yourself.
+What that rule means is that any options you pass when searching get "sanitized" down into options ActiveRecord can understand. Searchgasm serves as a transparent filter between you and ActiveRecord. It doesn't dig into the ActiveRecord internals, it only uses what is publicly available. It jumps in and helps out <em>only</em> when needed, otherwise it sits back and stays completely out of the way. Between that and the extensive tests, this is a solid and fast plugin.
 
 == Reporting problems / bugs
 

data/Rakefile

@@ -8,8 +8,7 @@ Echoe.new 'searchgasm' do |p|
   p.author = "Ben Johnson of Binary Logic"
   p.email  = 'bjohnson@binarylogic.com'
   p.project = 'searchgasm'
-  p.summary = "Orgasmic ActiveRecord searching"
-  p.description = "Makes ActiveRecord searching easier, robust, and powerful. Automatic conditions, pagination support, object based searching, and more."
+  p.summary = "Object based ActiveRecord searching, ordering, pagination, and more!"
   p.url = "http://github.com/binarylogic/searchgasm"
   p.dependencies = %w(activerecord activesupport)
   p.include_rakefile = true

data/lib/searchgasm/active_record/associations.rb

@@ -5,68 +5,56 @@ module Searchgasm
     # These methods hook into ActiveRecords association methods and add in searchgasm functionality.
     module Associations
       module AssociationCollection
-        # This is an alias method chain. It hook into ActiveRecord's "find" method for associations and checks to see if Searchgasm should get involved.
+        # This needs to be implemented because AR doesn't leverage scopes with this method like it probably should
         def find_with_searchgasm(*args)
           options = args.extract_options!
           args << sanitize_options_with_searchgasm(options)
           find_without_searchgasm(*args)
         end
-        
+      
         # See build_conditions under Searchgasm::ActiveRecord::Base. This is the same thing but for associations.
         def build_conditions(options = {}, &block)
-          conditions = @reflection.klass.build_conditions(options, &block)
-          conditions.scope = scope(:find)[:conditions]
-          conditions
+          @reflection.klass.send(:with_scope, :find => construct_scope[:find]) { @reflection.klass.build_conditions(options, &block) }
         end
-        
+      
         # See build_conditions! under Searchgasm::ActiveRecord::Base. This is the same thing but for associations.
         def build_conditions!(options = {}, &block)
-          conditions = @reflection.klass.build_conditions!(options, &block)
-          conditions.scope = scope(:find)[:conditions]
-          conditions
+          @reflection.klass.send(:with_scope, :find => construct_scope[:find]) { @reflection.klass.build_conditions!(options, &block) }
         end
-        
+      
         # See build_search under Searchgasm::ActiveRecord::Base. This is the same thing but for associations.
         def build_search(options = {}, &block)
-          conditions = @reflection.klass.build_search(options, &block)
-          conditions.scope = scope(:find)[:conditions]
-          conditions
+          @reflection.klass.send(:with_scope, :find => construct_scope[:find]) { @reflection.klass.build_search(options, &block) }
         end
-        
+      
         # See build_conditions! under Searchgasm::ActiveRecord::Base. This is the same thing but for associations.
         def build_search!(options = {}, &block)
-          conditions = @reflection.klass.build_search!(options, &block)
-          conditions.scope = scope(:find)[:conditions]
-          conditions
+          @reflection.klass.send(:with_scope, :find => construct_scope[:find]) { @reflection.klass.build_search!(options, &block) }
         end
       end
-    
-      module HasManyAssociation
-        # This is an alias method chain. It hook into ActiveRecord's "calculate" method for has many associations and checks to see if Searchgasm should get involved.
+      
+      module Shared
         def count_with_searchgasm(*args)
-          column_name, options = @reflection.klass.send(:construct_count_options_from_args, *args)
-          count_without_searchgasm(column_name, sanitize_options_with_searchgasm(options))
+          options = args.extract_options!
+          args << sanitize_options_with_searchgasm(options)
+          count_without_searchgasm(*args)
         end
       end
     end
   end
 end
 
-ActiveRecord::Associations::AssociationCollection.send(:include, Searchgasm::ActiveRecord::Associations::AssociationCollection)
-
 module ActiveRecord
   module Associations
     class AssociationCollection
+      include Searchgasm::ActiveRecord::Associations::AssociationCollection
+      
       alias_method_chain :find, :searchgasm
     end
-  end
-end
-
-ActiveRecord::Associations::HasManyAssociation.send(:include, Searchgasm::ActiveRecord::Associations::HasManyAssociation)
-
-module ActiveRecord
-  module Associations
+    
     class HasManyAssociation
+      include Searchgasm::ActiveRecord::Associations::Shared
+      
       alias_method_chain :count, :searchgasm
     end
   end

data/lib/searchgasm/active_record/base.rb

@@ -18,21 +18,29 @@ module Searchgasm
         args << options
         find_without_searchgasm(*args)
       end
-    
+      
       # This is an alias method chain. It hooks into ActiveRecord's scopes and checks to see if Searchgasm should get involved. Allowing you to use all of Searchgasms conditions and tools
       # in scopes as well.
       #
       # === Examples
       #
+      # Named scopes:
+      #
       #   named_scope :top_expensive, :conditions => {:total_gt => 1_000_000}, :per_page => 10
+      #   named_scope :top_expensive_ordered, :conditions => {:total_gt => 1_000_000}, :per_page => 10, :order_by => {:user => :first_name}
+      #
+      # Good ole' regular scopes:
       #
       #   with_scope(:find => {:conditions => {:total_gt => 1_000_000}, :per_page => 10}) do
       #     find(:all)
       #   end
-      def scope_with_searchgasm(method, key = nil)
-        scope = scope_without_searchgasm(method, key)
-        return sanitize_options_with_searchgasm(scope) if key.nil? && method == :find && !scope.blank?
-        scope
+      #
+      #   with_scope(:find => {:conditions => {:total_gt => 1_000_000}, :per_page => 10}) do
+      #     build_search
+      #   end
+      def with_scope_with_searchgasm(method_scoping = {}, action = :merge, &block)
+        method_scoping[:find] = sanitize_options_with_searchgasm(method_scoping[:find]) if method_scoping[:find]
+        with_scope_without_searchgasm(method_scoping, action, &block)
       end
       
       # This is a special method that Searchgasm adds in. It returns a new conditions object on the model. So you can search by conditions *only*.
@@ -118,17 +126,40 @@ module Searchgasm
       private
         def sanitize_options_with_searchgasm(options = {})
           return options unless Searchgasm::Search::Base.needed?(self, options)
-          search = searchgasm_searcher(options)
+          search = Searchgasm::Search::Base.create_virtual_class(self).new(options) # call explicitly to avoid merging the scopes into the searcher
           search.acting_as_filter = true
           search.sanitize
         end
       
         def searchgasm_conditions(options = {})
-          Searchgasm::Conditions::Base.create_virtual_class(self).new(options)
+          conditions = Searchgasm::Conditions::Base.create_virtual_class(self).new(options)
+          conditions.conditions = (scope(:find) || {})[:conditions]
+          conditions
         end
       
         def searchgasm_searcher(options = {})
-          Searchgasm::Search::Base.create_virtual_class(self).new(options)
+          search = Searchgasm::Search::Base.create_virtual_class(self).new(options)
+          options_from_scope_for_searchgasm(options).each { |option, value| search.send("#{option}=", value) }
+          search
+        end
+        
+        def options_from_scope_for_searchgasm(options)
+          # The goal here is to mimic how scope work. Merge what scopes would and don't what they wouldn't.
+          scope = scope(:find) || {}
+          scope_options = {}
+          [:group, :include, :select, :readonly].each { |option| scope_options[option] = scope[option] if !options.has_key?(option) && scope.has_key?(option) }
+          
+          if scope[:joins] || options[:joins]
+            scope_options[:joins] = []
+            scope_options[:joins] += scope[:joins].is_a?(Array) ? scope[:joins] : [scope[:joins]] unless scope[:joins].blank?
+            scope_options[:joins] += options[:joins].is_a?(Array) ? options[:joins] : [options[:joins]] unless options[:joins].blank?
+          end
+          
+          scope_options[:limit] = scope[:limit] if !options.has_key?(:per_page) && !options.has_key?(:limit) && scope.has_key?(:per_page)
+          scope_options[:offset] = scope[:offset] if !options.has_key?(:page) && !options.has_key?(:offset) && scope.has_key?(:offset)
+          scope_options[:order] = scope[:order] if !options.has_key?(:order_by) && !options.has_key?(:order) && scope.has_key?(:order)
+          scope_options[:conditions] = scope[:conditions] if scope.has_key?(:conditions)
+          scope_options
         end
     end
   end
@@ -141,7 +172,7 @@ module ActiveRecord #:nodoc: all
     class << self
       alias_method_chain :calculate, :searchgasm
       alias_method_chain :find, :searchgasm
-      alias_method_chain :scope, :searchgasm
+      alias_method_chain :with_scope, :searchgasm
       alias_method :new_conditions, :build_conditions
       alias_method :new_conditions!, :build_conditions!
       alias_method :new_search, :build_search

data/lib/searchgasm/condition/base.rb

@@ -5,7 +5,7 @@ module Searchgasm
     # The base class for creating a condition. Your custom conditions should extend this class.
     # See Searchgasm::Conditions::Base.register_condition on how to write your own condition.
     class Base
-      include Utilities
+      include Shared::Utilities
       
       attr_accessor :column, :klass
       attr_reader :value

data/lib/searchgasm/condition/inclusive_descendant_of.rb

@@ -1,8 +1,6 @@
 module Searchgasm
   module Condition
     class InclusiveDescendantOf < Tree
-      include Searchgasm::Utilities
-      
       def to_conditions(value)
         condition = DescendantOf.new(klass, column)
         condition.value = value

data/lib/searchgasm/condition/sibling_of.rb

@@ -1,8 +1,6 @@
 module Searchgasm
   module Condition
     class SiblingOf < Tree
-      include Searchgasm::Utilities
-      
       def to_conditions(value)
         parent_association = klass.reflect_on_association(:parent)
         foreign_key_name = (parent_association && parent_association.options[:foreign_key]) || "parent_id"

data/lib/searchgasm/conditions/base.rb

@@ -5,9 +5,11 @@ module Searchgasm
     # Represents a collection of conditions and performs various tasks on that collection. For information on each condition see Searchgasm::Condition.
     # Each condition has its own file and class and the source for each condition is pretty self explanatory.
     class Base
-      include Utilities
+      include Searchgasm::Shared::Utilities
+      include Searchgasm::Shared::Searching
+      include Searchgasm::Shared::VirtualClasses
       
-      attr_accessor :relationship_name, :scope
+      attr_accessor :relationship_name, :sql
       
       class << self
         attr_accessor :added_klass_conditions, :added_column_conditions, :added_associations
@@ -64,37 +66,14 @@ module Searchgasm
         
         def needed?(model_class, conditions) # :nodoc:
           if conditions.is_a?(Hash)
+            column_names = model_class.column_names
             conditions.stringify_keys.keys.each do |condition|
-              return true unless model_class.column_names.include?(condition)
+              return true unless column_names.include?(condition)
             end
           end
           
           false
         end
-        
-        # Creates virtual classes for the class passed to it. This is a neccesity for keeping dynamically created method
-        # names specific to models. It provides caching and helps a lot with performance.
-        def create_virtual_class(model_class)
-          class_search_name = "::Searchgasm::Cache::#{model_class.name}Conditions"
-          
-          begin
-            eval(class_search_name)
-          rescue NameError
-            eval <<-end_eval
-              class #{class_search_name} < ::Searchgasm::Conditions::Base
-                def self.klass
-                  #{model_class.name}
-                end
-                
-                def klass
-                  #{model_class.name}
-                end
-              end
-              
-              #{class_search_name}
-            end_eval
-          end
-        end
       end
       
       def initialize(init_conditions = {})
@@ -125,22 +104,29 @@ module Searchgasm
         i.blank? ? nil : (i.size == 1 ? i.first : i)
       end
       
+      def inspect
+        conditions_hash = conditions
+        conditions_hash[:sql] = sql if sql
+        conditions_hash[:protected] = true if protected?
+        conditions_hash.inspect
+      end
+      
       # Sanitizes the conditions down into conditions that ActiveRecord::Base.find can understand.
-      def sanitize
+      def sanitize(for_method = nil)
         conditions = merge_conditions(*objects.collect { |object| object.sanitize })
-        return scope if conditions.blank?
-        merge_conditions(conditions, scope)
+        return sql if conditions.blank?
+        merged_conditions = merge_conditions(conditions, sql)
+        for_method.blank? ? merged_conditions : {:conditions => merged_conditions}
       end
       
-      # Allows you to set the conditions via a hash. If you do not pass a hash it will set scope instead, so that you can continue to add conditions and ultimately
-      # merge it all together at the end.
+      # Allows you to set the conditions via a hash.
       def conditions=(conditions)
         case conditions
         when Hash
           assert_valid_conditions(conditions)
           remove_conditions_from_protected_assignement(conditions).each { |condition, value| send("#{condition}=", value) }
         else
-          self.scope = conditions
+          self.sql = conditions
         end
       end
       
@@ -171,8 +157,9 @@ module Searchgasm
             self.class.class_eval <<-"end_eval", __FILE__, __LINE__
               def #{association.name}
                 if @#{association.name}.nil?
-                  @#{association.name} = #{association.class_name}.new_conditions
+                  @#{association.name} = Searchgasm::Conditions::Base.create_virtual_class(#{association.class_name}).new
                   @#{association.name}.relationship_name = "#{association.name}"
+                  @#{association.name}.protect = protect
                   objects << @#{association.name}
                 end
                 @#{association.name}

data/lib/searchgasm/conditions/protection.rb

@@ -6,7 +6,7 @@ module Searchgasm
     module Protection
       def self.included(klass)
         klass.class_eval do
-          attr_accessor :protect
+          attr_reader :protect
           alias_method_chain :conditions=, :protection
         end
       end
@@ -15,16 +15,22 @@ module Searchgasm
         unless conditions.is_a?(Hash)
           if protect?
             return if conditions.blank?
-            raise(ArgumentError, "You can not set a scope or pass SQL while the search is being protected")
+            raise(ArgumentError, "You can not pass SQL as conditions while the search is being protected, you can only pass a hash")
           end
         end
         
         self.conditions_without_protection = conditions
       end
       
+      def protect=(value)
+        associations.each { |association| association.protect = value }
+        @protect = value
+      end
+      
       def protect?
         protect == true
       end
+      alias_method :protected?, :protect?
     end
   end
 end

data/lib/searchgasm/helpers/control_types/links.rb

@@ -1,6 +1,9 @@
 module Searchgasm
   module Helpers
     module ControlTypes
+      # = Links Control Types
+      #
+      # These helpers create a group of links to help navigate through search data.
       module Links
         # Creates a group of links that order the data by a column or columns. All that this does is loop through the :choices option and call order_by_link and then glue it all together.
         #
@@ -11,7 +14,7 @@ module Searchgasm
         #
         # === Options
         #
-        # Please look at order_by_link. All options there are applicable here and are passed onto each option.
+        # Please look at order_by_link. All options there are applicable here and are passed onto each option. Here are the options specific to this method:
         #
         # * <tt>:choices</tt> -- default: the models column names, the choices to loop through when calling order_by_link
         def order_by_links(options = {})
@@ -32,7 +35,7 @@ module Searchgasm
         #
         # === Options
         #
-        # Please look at order_as_link. All options there are applicable here and are passed onto each option.
+        # Please look at order_as_link. All options there are applicable here and are passed onto each option. Here are the options specific to this method:
         #
         # * <tt>:choices</tt> -- default: ["asc", "desc"], the choices to loop through when calling order_as_link
         def order_as_links(options = {})
@@ -53,7 +56,7 @@ module Searchgasm
         #
         # === Options
         #
-        # Please look at per_page_link. All options there are applicable here and are passed onto each option.
+        # Please look at per_page_link. All options there are applicable here and are passed onto each option. Here are the options specific to this method:
         #
         # * <tt>:choices</tt> -- default: [10, 25, 50, 100, 150, 200, nil], the choices to loop through when calling per_page_link.
         def per_page_links(options = {})
@@ -88,11 +91,11 @@ module Searchgasm
         #
         # === Options
         #
-        # Please look at per_page_link. All options there are applicable here and are passed onto each option.
+        # Please look at per_page_link. All options there are applicable here and are passed onto each option. Here are the options specific to this method:
         #
         # * <tt>:spread</tt> -- default: 3, set to nil to show all page, this represents how many choices available on each side of the current page
-        # * <tt>:prev</tt> -- default: < Prev, set to nil to omit. This is an extra link on the left side of the page links that will go to the previous page
-        # * <tt>:next</tt> -- default: Next >, set to nil to omit. This is an extra link on the right side of the page links that will go to the next page
+        # * <tt>:prev</tt> -- default: "< Prev", set to nil to omit. This is an extra link on the left side of the page links that will go to the previous page
+        # * <tt>:next</tt> -- default: "Next >", set to nil to omit. This is an extra link on the right side of the page links that will go to the next page
         # * <tt>:first</tt> -- default: nil, set to nil to omit. This is an extra link on thefar left side of the page links that will go to the first page
         # * <tt>:last</tt> -- default: nil, set to nil to omit. This is an extra link on the far right side of the page links that will go to the last page
         def page_links(options = {})

data/lib/searchgasm/helpers/control_types/remote_link.rb

@@ -76,6 +76,7 @@ module Searchgasm
         private
           def add_remote_defaults!(options)
             options[:remote] ||= {}
+            options[:remote][:method] ||= :get
             options[:is_remote] = true
           end
       end

data/lib/searchgasm/helpers/control_types/remote_links.rb

@@ -1,6 +1,9 @@
 module Searchgasm
   module Helpers
     module ControlTypes
+      # = Remote Links Control Types
+      #
+      # These helpers use rails built in remote_function as links. They are the same thing as the Links control type, but just use rails built in remote helpers.
       module RemoteLinks
         # Same as order_by_links, but uses link_to_remote instead of remote.
         #

data/lib/searchgasm/helpers/control_types/remote_select.rb

@@ -1,6 +1,9 @@
 module Searchgasm
   module Helpers
     module ControlTypes
+      # = Remote Select Control Types
+      #
+      # These helpers use rails built in remote_function as links. They are the same thing as the Select control type, but just use rails built in remote helpers.
       module RemoteSelect
         # Please see order_by_links. All options are the same and applicable here. The only difference is that instead of a group of links, this gets returned as a select form element that will perform the same function when the value is changed.
         def remote_order_by_select(options = {})

data/lib/searchgasm/helpers/control_types/select.rb

@@ -1,6 +1,9 @@
 module Searchgasm
   module Helpers
     module ControlTypes
+      # = Select Control Types
+      #
+      # These create <select> tags to help navigate through search data. This is here as an alternative to the Links control types.
       module Select
         # Please see order_by_links. All options are the same and applicable here. The only difference is that instead of a group of links, this gets returned as a select form element that will perform the same function when the value is changed.
         def order_by_select(options = {})

data/lib/searchgasm/helpers/form.rb

@@ -116,13 +116,20 @@ module Searchgasm
             args
           end
         
-          def insert_searchgasm_fields(args, search_object, search_options)
+          def insert_searchgasm_fields(args, search_object, search_options, &block)
             return unless search_object.is_a?(Search::Base)
             name = args.first
             options = args.extract_options!
             options
             search_options[:hidden_fields].each do |field|
-              concat(hidden_field(name, field, :object => search_object, :id => "#{name}_#{field}_hidden", :value => (field == :order_by ? searchgasm_order_by_value(search_object.order_by) : search_object.send(field))))
+              html = hidden_field(name, field, :object => search_object, :id => "#{name}_#{field}_hidden", :value => (field == :order_by ? searchgasm_order_by_value(search_object.order_by) : search_object.send(field)))
+              
+              # For edge rails and older version compatibility, passing a binding to concat was deprecated
+              begin
+                concat(html)
+              rescue ArgumentError
+                concat(html, block.binding)
+              end
             end
             args << options
           end
@@ -136,7 +143,7 @@ module Searchgasm
           if search_object
             searchgasm_options = extract_searchgasm_options!(args)
             new_args = searchgasm_args(args, search_object, searchgasm_options, :fields_for)
-            insert_searchgasm_fields(new_args, search_object, searchgasm_options)
+            insert_searchgasm_fields(new_args, search_object, searchgasm_options, &block)
             fields_for_without_searchgasm(*new_args, &block)
           else
             fields_for_without_searchgasm(*args, &block)
@@ -172,7 +179,7 @@ module Searchgasm
           if search_object
             searchgasm_options = extract_searchgasm_options!(args)
             new_args = searchgasm_args(args, search_object, searchgasm_options, :fields_for)
-            insert_searchgasm_fields(new_args, search_object, searchgasm_options)
+            insert_searchgasm_fields(new_args, search_object, searchgasm_options, &block)
             fields_for_without_searchgasm(*new_args, &block)
           else
             fields_for_without_searchgasm(*args, &block)