searchgasm 0.9.1 → 0.9.2

data/CHANGELOG

@@ -1,3 +1,5 @@
-v0.9.1 Added aliases for datetime, date, time, and timestamp attrs. You could call created_at_after, mow you can also call created_after.
+v0.9.2. Enhanced protection
+
+v0.9.1. Added aliases for datetime, date, time, and timestamp attrs. You could call created_at_after, mow you can also call created_after.
 
 v0.9.0. First release

data/Manifest

@@ -2,7 +2,6 @@ CHANGELOG
 init.rb
 lib/searchgasm/active_record/associations.rb
 lib/searchgasm/active_record/base.rb
-lib/searchgasm/active_record/protection.rb
 lib/searchgasm/helpers.rb
 lib/searchgasm/search/base.rb
 lib/searchgasm/search/condition.rb

data/README.mdown

@@ -2,12 +2,34 @@
 
 Searchgasm is orgasmic. Maybe not orgasmic, but you will get aroused. So go grab a towel and let's dive in.
 
-Searchgasm originated to satisfy a VERY simple need: so that I could use my form builder when making search forms. Sounds simple right? The goal was to use an object, that represents a search, just like an ActiveRecord object in form\_for and fields\_for.
+Searchgasm was a super secret tool of mine until I decided to share with the world. It has saved me tons of time, allowed me to write less code, made searching painless, and kept my controllers DRY.
+
+It originated to satisfy a VERY simple need: so that I could use my form builder when making search forms. Sounds simple right? The goal was to use an object, that represents a search, just like an ActiveRecord object in form\_for and fields\_for.
 
 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 "santiizes" down into the options passed into ActiveRecord::Base.find(). It basically 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. This doesn't step on the toes or dig into he internals of ActiveRecord. It uses what ActiveRecord provides publicly. Letting ActiveRecord do all of the hard work and keeping this plugin solid and less brittle.
 
 Here's where you get aroused...
 
+## Why I love Searchgasm!
+
+    # app/controllers/users_controller.rb
+    def index
+        @search = User.new_search(:conditions => params[:conditions])
+        @users, @users_count = @search.all, @search.count
+    end
+
+Now your view:
+
+    # app/views/users/index.html.erb
+    <%= form_for :conditions, @search.conditions, :url => users_path do |f| %>
+        <%= f.text_field :first_name_contains %>
+        <%= f.calendar_date_select :created_after %> # nice rails plugin for replacing date_select
+        <% f.fields_for :orders, f.object.orders do |orders_f| %>
+            <%= f.select :total_gt, (1..100) %>
+        <% end %>
+        <%= f.submit %>
+    <% end %>
+
 ## Install and use
 
     sudo gem install searchgasm
@@ -30,7 +52,7 @@ Now go into your console and try out any of these example with your own models.
 
 **For all examples, let's assume the following relationships: User => Orders => Line Items**
 
-## Super Simple Example
+## Simple Searching Example
 
     User.all(
         :conditions => {
@@ -44,7 +66,7 @@ Now go into your console and try out any of these example with your own models.
 ## Detailed Example w/ object based searching
 
     # Instantiate
-    search = User.new_search(
+    @search = User.new_search(
         :conditions => {
             :first_name_contains => "Ben", 
             :age_gt => 18,
@@ -57,21 +79,23 @@ Now go into your console and try out any of these example with your own models.
     )
     
     # Set conditions on relationships
-    search.conditions.email_ends_with = "binarylogic.com"
-    search.conditions.oders.line_items.created_after = Time.now
+    @search.conditions.email_ends_with = "binarylogic.com"
+    @search.conditions.oders.line_items.created_after = Time.now
     
     # Set options
-    search.per_page = 50 # overrides the 20 set above
+    @search.per_page = 50 # overrides the 20 set above
     
     # Set ANY of the ActiveRecord options
-    search.group = "last_name"
-    search.readonly = true
+    @search.group = "last_name"
+    @search.readonly = true
     # ... see ActiveRecord documentation
     
     # Return results just like ActiveRecord
-    search.all
-    search.search # alias for all
-    search.first
+    @search.all
+    @search.search # alias for all
+    @search.first
+
+Take the @search object and pass it right into form\_for or fields\_for (see above).
 
 ## Calculations
 
@@ -131,6 +155,8 @@ Again, if you want to be hardcore:
     conditions.first_name_contains = "Ben"
     conditions.search
 
+Now pass the conditions object right into form\_for or fields\_for (see above for example).
+
 ## Scoped searching
 
     @current_user.orders.find(:all, :conditions => {:total_lte => 500})
@@ -170,27 +196,24 @@ Not only can you use searchgasm when searching, but you can use it when setting
         named_scope :sexy, :conditions => {:first_name => "Ben", email_ends_with => "binarylogic.com"}, :per_page => 20
     end
 
-## Always use protection (searching with params)
-
-If there is one thing we in sex ed. it's to always use protection. As I mentioned above the purpose of this plugin was to create a search object and use it in form\_for or fields\_for. What about receiving the params in the controller and protecting against SQL injection?
+## Always use protection...against SQL injections
 
-    accounts = Account.find_with_protection(params[:search])
-    accounts = Account.all_with_protection(params[:search])
-    account = Account.first_with_protection(params[:search])
+If there is one thing we all know, it's to always use protection. That's why searchgasm protects you by default. The new\_search and new\_conditions methods are protected by default. This means that various checks are done to ensure it is not possible to perform any type of SQL injection. But this also limits how you can search, meaning you can't write raw SQL. If you want to be daring and search without protection prepare to accept the consequences. All that you have to do is add ! to the end of the methods: new\_search! and new\_conditions!. That was an awkward paragraph. Let's move on.
 
-For the lazy programmer:
+### Protected from SQL injections
 
-    accounts = Account.findwp(params[:search])
-    accounts = Account.allwp(params[:search])
-    account = Account.firstwp(params[:search])
+    search = Account.new_search(params[:search])
+    conditions = Account.new_conditions(params[:conditions])
 
-This performs various checks to ensure SQL injection is impossible. I'm sure you know this, but I have to say it: *DO NOT* pass params into the "find", "all", or "first" methods, otherwise you are opening yourself up to SQL injections.
+### *NOT* protected from SQL injections
 
-    # DO NOT DO THIS!
+    accounts = Account.find(params[:search])
     accounts = Account.all(params[:search])
-    
-    # OR THIS!
-    accounts = Account.all(:conditions => params[:conditions])
+    account = Account.first(params[:search])
+    search = Account.new_search!(params[:search])
+    conditions = Account.new_conditions!(params[:conditions])
+
+Lesson learned: use new\_search and new\_conditions when passing in params as *ANY* of the options.
 
 ## Available Conditions
 
@@ -223,16 +246,6 @@ Some of these conditions come with aliases, so you have your choice how to call
 
 You will notice above there is "contains" and "keywords". The difference is that "keywords" is an enhanced search. It acts like a real keyword search. It finds those keywords, in any order, and blacklists meaningless words such as "and", "the", etc. "contains" finds the EXACT string in the column you are searching, spaces and all.
 
-## Creating your search form
-
-After all of that, here's why I love this plugin:
-
-    <% form_for :search, User.new_conditions, :url => users_path do |f| %>
-        <%= f.text_field :first_name_contains %>
-        <%= f.calendar_date_select :created_after %>
-        <%= f.select :age_gt, (1..100) %>
-    <% end %>
-
 ## Credits
 
 Author: [Ben Johnson](http://github.com/binarylogic) of [Binary Logic](http://www.binarylogic.com)

data/Rakefile

@@ -11,7 +11,7 @@ Echoe.new 'searchgasm' do |p|
   p.summary = "Orgasmic ActiveRecord searching"
   p.description = "Makes ActiveRecord searching easier, robust, and powerful. Automatic conditions, pagination support, object based searching, and more."
   p.url = "http://github.com/binarylogic/searchgasm"
-  p.dependencies = %w(activerecord)
+  p.dependencies = %w(activerecord activesupport)
   p.include_rakefile = true
 end
 

data/lib/searchgasm/active_record/associations.rb

@@ -3,12 +3,6 @@ module BinaryLogic
     module ActiveRecord
       module Associations
         module AssociationCollection
-          def self.included(klass)
-            klass.class_eval do
-              include Protection
-            end
-          end
-          
           def find_with_searchgasm(*args)
             options = args.extract_options!
             args << sanitize_options_with_searchgasm(options)
@@ -16,11 +10,27 @@ module BinaryLogic
           end
           
           def build_conditions(options = {}, &block)
-            @reflection.klass.build_conditions(options.merge(:scope => scope(:find)[:conditions]), &block)
+            conditions = @reflection.klass.build_conditions(options, &block)
+            conditions.scope = scope(:find)[:conditions]
+            conditions
+          end
+          
+          def build_conditions!(options = {}, &block)
+            conditions = @reflection.klass.build_conditions!(options, &block)
+            conditions.scope = scope(:find)[:conditions]
+            conditions
           end
         
           def build_search(options = {}, &block)
-            @reflection.klass.build_search(options.merge(:scope => scope(:find)[:conditions]), &block)
+            conditions = @reflection.klass.build_search(options, &block)
+            conditions.scope = scope(:find)[:conditions]
+            conditions
+          end
+          
+          def build_search!(options = {}, &block)
+            conditions = @reflection.klass.build_search!(options, &block)
+            conditions.scope = scope(:find)[:conditions]
+            conditions
           end
         end
       

data/lib/searchgasm/active_record/base.rb

@@ -2,49 +2,62 @@ module BinaryLogic
   module Searchgasm
     module ActiveRecord
       module Base
-        def self.included(klass)
-          klass.class_eval do
-            alias_method :new_conditions, :build_conditions
-            alias_method :new_search, :build_search
-            include Protection
-          end
-        end
-        
         def calculate_with_searchgasm(*args)
           options = args.extract_options!
           options = sanitize_options_with_searchgasm(options)
           args << options
           calculate_without_searchgasm(*args)
         end
-        
+      
         def find_with_searchgasm(*args)
           options = args.extract_options!
           options = sanitize_options_with_searchgasm(options)
           args << options
           find_without_searchgasm(*args)
         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
+          return sanitize_options_with_searchgasm(scope) if key.nil? && method == :find && !scope.blank?
           scope
         end
-        
-        def build_conditions(options = {})
-          BinaryLogic::Searchgasm::Search::Conditions(self, options)
+      
+        def build_conditions(values = {}, &block)
+          conditions = searchgasm_conditions({})
+          conditions.protect = true
+          conditions.value = values
+          yield conditions if block_given?
+          conditions
         end
-        
-        def build_search(options = {})
-          searcher = searchgasm_searcher(options)
-          yield searcher if block_given?
-          searcher
+      
+        def build_conditions!(values = {}, &block)
+          conditions = searchgasm_conditions(values)
+          yield conditions if block_given?
+          conditions
         end
-        
+      
+        def build_search(options = {}, &block)
+          options[:protect] = true
+          search = searchgasm_searcher(options)
+          yield search if block_given?
+          search
+        end
+      
+        def build_search!(options = {}, &block)
+          search = searchgasm_searcher(options)
+          yield search if block_given?
+          search
+        end
+      
         private
           def sanitize_options_with_searchgasm(options)
             searchgasm_searcher(options).sanitize
           end
-          
+        
+          def searchgasm_conditions(options)
+            BinaryLogic::Searchgasm::Search::Conditions.new(self, options)
+          end
+        
           def searchgasm_searcher(options)
             BinaryLogic::Searchgasm::Search::Base.new(self, options)
           end
@@ -61,6 +74,10 @@ module ::ActiveRecord
       alias_method_chain :calculate, :searchgasm
       alias_method_chain :find, :searchgasm
       alias_method_chain :scope, :searchgasm
+      alias_method :new_conditions, :build_conditions
+      alias_method :new_conditions!, :build_conditions!
+      alias_method :new_search, :build_search
+      alias_method :new_search!, :build_search!
       
       def valid_find_options
          VALID_FIND_OPTIONS

data/lib/searchgasm/search/base.rb

@@ -1,14 +1,16 @@
 module BinaryLogic
   module Searchgasm
-    module Search
+    module Search      
       class Base
         include Utilities
         
         SPECIAL_FIND_OPTIONS = [:order_by, :order_as, :page, :per_page]
         VALID_FIND_OPTIONS = ::ActiveRecord::Base.valid_find_options + SPECIAL_FIND_OPTIONS
+        SAFE_OPTIONS = SPECIAL_FIND_OPTIONS + [:conditions, :limit, :offset]
+        VULNERABLE_OPTIONS = VALID_FIND_OPTIONS - SAFE_OPTIONS
         
         attr_accessor :klass
-        attr_reader :conditions
+        attr_reader :conditions, :protect
         attr_writer :options
         
         def initialize(klass, options = {})
@@ -18,10 +20,12 @@ module BinaryLogic
         end
         
         (::ActiveRecord::Base.valid_find_options - [:conditions]).each do |option|
-          class_eval <<-SRC
+          src = <<-SRC
             def #{option}(sanitize = false); options[:#{option}]; end
             def #{option}=(value); self.options[:#{option}] = value; end
           SRC
+          
+          class_eval src
         end
         
         alias_method :per_page, :limit
@@ -61,6 +65,11 @@ module BinaryLogic
           includes.blank? ? nil : (includes.size == 1 ? includes.first : includes)
         end
         
+        def inspect
+          options_as_nice_string = ::ActiveRecord::Base.valid_find_options.collect { |name| "#{name}: #{send(name)}" }.join(", ")
+          "#<#{klass} #{options_as_nice_string}>"
+        end
+        
         def limit=(value)
           return options[:limit] = nil if value.nil? || value == 0
           
@@ -75,9 +84,12 @@ module BinaryLogic
           @options ||= {}
         end
         
-        def options=(options)
-          return unless options.is_a?(Hash)
-          options.each { |option, value| send("#{option}=", value) }
+        def options=(values)
+          return unless values.is_a?(Hash)
+          self.protect = values.delete(:protect) if values.has_key?(:protect) # make sure we do this first
+          values.symbolize_keys.assert_valid_keys(VALID_FIND_OPTIONS)
+          frisk!(values) if protect?
+          values.each { |option, value| send("#{option}=", value) }
         end
         
         def order_as
@@ -114,6 +126,15 @@ module BinaryLogic
           value
         end
         
+        def protect=(value)
+          conditions.protect = value
+          @protect = value
+        end
+        
+        def protect?
+          protect == true
+        end
+        
         def reset!
           conditions.reset!
           self.options = {}
@@ -136,6 +157,31 @@ module BinaryLogic
         def scope=(value)
           conditions.scope = value
         end
+        
+        private
+          def order_by_safe?(order_by)
+            return true if order_by.blank?
+            
+            column_names = klass.column_names
+            
+            [order_by].flatten.each do |column|
+              case column
+              when Hash
+                return false unless order_by_safe?(column.to_a)
+              when Array
+                return false unless order_by_safe?(column)
+              else
+                return false unless column_names.include?(column)
+              end
+            end
+            
+            true
+          end
+          
+          def frisk!(options)
+            options.symbolize_keys.assert_valid_keys(SAFE_OPTIONS)
+            raise(ArgumentError, ":order_by can only contain colum names in the string, hash, or array format") unless order_by_safe?(options[:order_by])
+          end
       end
     end
   end

data/lib/searchgasm/search/conditions.rb

@@ -4,7 +4,7 @@ module BinaryLogic
       class Conditions
         include Utilities
         
-        attr_accessor :klass, :relationship_name, :scope
+        attr_accessor :klass, :protect, :relationship_name, :scope
         
         class << self
           def condition_types_for_column_type(type)
@@ -55,17 +55,27 @@ module BinaryLogic
           end
         end
         
-        def initialize(klass, values = {})
+        def initialize(klass, init_values = {})
           self.klass = klass
           klass.columns.each { |column| add_conditions_for_column!(column) }
           klass.reflect_on_all_associations.each { |association| add_association!(association)  }
-          self.value = values
+          self.value = init_values
+        end
+        
+        def assert_valid_values(values)
+          keys = condition_names.collect { |condition_name| condition_name.to_sym }
+          keys += klass.reflect_on_all_associations.collect { |association| association.name }
+          values.symbolize_keys.assert_valid_keys(keys)
         end
         
         def associations
           objects.select { |object| object.is_a?(self.class) }
         end
         
+        def condition_names
+          @condition_names ||= []
+        end
+        
         def includes
           i = []
           associations.each do |association|
@@ -79,6 +89,10 @@ module BinaryLogic
           @objects ||= []
         end
         
+        def protect?
+          protect == true
+        end
+        
         def reset!
           dupped_objects = objects.dup
           dupped_objects.each do |object|
@@ -97,15 +111,17 @@ module BinaryLogic
           merge_conditions(sanitized_objects, scope)
         end
         
-        def value=(conditions)
+        def value=(values)
           reset!
           self.scope = nil
           
-          case conditions
+          case values
           when Hash
-            conditions.each { |condition, value| send("#{condition}=", value) }
+            assert_valid_values(values)
+            values.each { |condition, value| send("#{condition}=", value) }
           else
-            self.scope = conditions
+            raise(ArgumentError, "You can not set a scope or pass SQL while the search is being protected") if protect?
+            self.scope = values
           end
         end
         
@@ -143,7 +159,8 @@ module BinaryLogic
           
           def add_condition!(condition_type, column)
             name = Condition.generate_name(column, condition_type)
-
+            self.condition_names << name
+            
             # Define accessor methods
             self.class.class_eval <<-SRC
               def #{name}_object
@@ -161,6 +178,7 @@ module BinaryLogic
             
             # Define aliases
             self.class.aliases_for_condition(column, condition_type).each do |alias_name|
+              self.condition_names << alias_name
               self.class.class_eval do
                 alias_method alias_name, name
                 alias_method "#{alias_name}=", "#{name}="

data/lib/searchgasm/version.rb

@@ -68,7 +68,7 @@ module BinaryLogic
 
       MAJOR = 0
       MINOR = 9
-      TINY  = 1
+      TINY  = 2
 
       # The current version as a Version instance
       CURRENT = new(MAJOR, MINOR, TINY)

data/lib/searchgasm.rb

@@ -1,5 +1,4 @@
 require "active_record"
-require "searchgasm/active_record/protection"
 require "searchgasm/active_record/base"
 require "searchgasm/active_record/associations"
 require "searchgasm/version"

data/searchgasm.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Searchgasm-0.9.1
+# Gem::Specification for Searchgasm-0.9.2
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
 autorequire: 
 bindir: bin
 
-date: 2008-09-01 00:00:00 -04:00
+date: 2008-09-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +25,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
   type: :development
@@ -45,7 +55,6 @@ extra_rdoc_files:
 - CHANGELOG
 - lib/searchgasm/active_record/associations.rb
 - lib/searchgasm/active_record/base.rb
-- lib/searchgasm/active_record/protection.rb
 - lib/searchgasm/helpers.rb
 - lib/searchgasm/search/base.rb
 - lib/searchgasm/search/condition.rb
@@ -59,7 +68,6 @@ files:
 - init.rb
 - lib/searchgasm/active_record/associations.rb
 - lib/searchgasm/active_record/base.rb
-- lib/searchgasm/active_record/protection.rb
 - lib/searchgasm/helpers.rb
 - lib/searchgasm/search/base.rb
 - lib/searchgasm/search/condition.rb

data/test/test_active_record_base.rb

@@ -12,6 +12,19 @@ class TestActiveRecordBase < Test::Unit::TestCase
     teardown_db
   end
   
+  def test_standard_searches
+    assert_nothing_raised { Account.all }
+    assert_nothing_raised { Account.first }
+    assert_nothing_raised { Account.find(:all) }
+    assert_nothing_raised { Account.find(:first) }
+    assert_nothing_raised { Account.find(:all, nil) }
+    assert_nothing_raised { Account.find(:all, {}) }
+    assert_nothing_raised { Account.count({}) }
+    assert_nothing_raised { Account.count(nil) }
+    assert_nothing_raised { Account.sum("id") }
+    assert_nothing_raised { Account.sum("id", {}) }
+  end
+  
   def test_valid_find_options
     assert_equal [ :conditions, :include, :joins, :limit, :offset, :order, :select, :readonly, :group, :from, :lock ], ActiveRecord::Base.valid_find_options
   end
@@ -23,6 +36,9 @@ class TestActiveRecordBase < Test::Unit::TestCase
     assert_equal "awesome", search.conditions.name_keywords
     assert_equal 2, search.page
     assert_equal 15, search.per_page
+    
+    search = Account.new_search(:conditions => {:name_keywords => "awesome"}, :page => 2, :per_page => 15)
+    assert_equal Account, search.klass
   end
   
   def test_searching
@@ -43,6 +59,6 @@ class TestActiveRecordBase < Test::Unit::TestCase
   end
   
   def test_scoping
-    assert_equal({}, Account.send(:scope, :find))
+    assert_equal nil, Account.send(:scope, :find)
   end
 end

data/test/test_searchgasm_base.rb

@@ -113,4 +113,20 @@ class TestSearchgasmBase < Test::Unit::TestCase
     assert_equal search.first, Account.find(1)
     assert_equal search.find(:first), Account.find(1)
   end
+  
+  def test_protection
+    assert_raise(ArgumentError) { Account.build_search(:conditions => "(DELETE FROM users)", :page => 2, :per_page => 15) }
+    BinaryLogic::Searchgasm::Search::Base::VULNERABLE_OPTIONS.each { |option| assert_raise(ArgumentError) { Account.build_search(option => "(DELETE FROM users)") } }
+    
+    assert_nothing_raised { Account.build_search!(:conditions => "(DELETE FROM users)", :page => 2, :per_page => 15) }
+    BinaryLogic::Searchgasm::Search::Base::VULNERABLE_OPTIONS.each { |option| assert_nothing_raised { Account.build_search!(option => "(DELETE FROM users)") } }
+    
+    account = Account.first
+    
+    assert_raise(ArgumentError) { account.users.build_search(:conditions => "(DELETE FROM users)", :page => 2, :per_page => 15) }
+    BinaryLogic::Searchgasm::Search::Base::VULNERABLE_OPTIONS.each { |option| assert_raise(ArgumentError) { account.users.build_search(option => "(DELETE FROM users)") } }
+    
+    assert_nothing_raised { account.users.build_search!(:conditions => "(DELETE FROM users)", :page => 2, :per_page => 15) }
+    BinaryLogic::Searchgasm::Search::Base::VULNERABLE_OPTIONS.each { |option| assert_nothing_raised { account.users.build_search!(option => "(DELETE FROM users)") } }
+  end
 end

data/test/test_searchgasm_conditions.rb

@@ -118,6 +118,16 @@ class TestSearchgasmConditions < Test::Unit::TestCase
     assert_equal conditions.scope, "id in (1,2,3,4)"
   end
   
+  def test_protection
+    assert_raise(ArgumentError) { Account.new_conditions("(DELETE FROM users)") }
+    assert_nothing_raised { Account.build_conditions!("(DELETE FROM users)") }
+    
+    account = Account.first
+    
+    assert_raise(ArgumentError) { account.users.build_conditions("(DELETE FROM users)") }
+    assert_nothing_raised { account.users.build_conditions!("(DELETE FROM users)") }
+  end
+  
   private
     def column_value(column)
       case column.type

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-01 00:00:00 -04:00
+date: 2008-09-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
   type: :development
@@ -42,7 +52,6 @@ extra_rdoc_files:
 - CHANGELOG
 - lib/searchgasm/active_record/associations.rb
 - lib/searchgasm/active_record/base.rb
-- lib/searchgasm/active_record/protection.rb
 - lib/searchgasm/helpers.rb
 - lib/searchgasm/search/base.rb
 - lib/searchgasm/search/condition.rb
@@ -56,7 +65,6 @@ files:
 - init.rb
 - lib/searchgasm/active_record/associations.rb
 - lib/searchgasm/active_record/base.rb
-- lib/searchgasm/active_record/protection.rb
 - lib/searchgasm/helpers.rb
 - lib/searchgasm/search/base.rb
 - lib/searchgasm/search/condition.rb

data/lib/searchgasm/active_record/protection.rb

@@ -1,37 +0,0 @@
-module BinaryLogic
-  module Searchgasm
-    module ActiveRecord
-      module Protection
-        def self.included(klass)
-          klass.class_eval do
-            alias_method :new_search, :build_search
-            alias_method :findwp, :find_with_protection
-            alias_method :allwp, :all_with_protection
-            alias_method :firstwp, :first_with_protection
-          end
-        end
-        
-        def find_with_protection(*args)
-          options = args.extract_options!
-          options.merge!(:protect => true)
-          args << options
-          find(*args)
-        end
-
-        def all_with_protection(*args)
-          options = args.extract_options!
-          options.merge!(:protect => true)
-          args << options
-          all(*args)
-        end
-  
-        def first_with_protection(*args)
-          options = args.extract_options!
-          options.merge!(:protect => true)
-          args << options
-          first(*args)
-        end
-      end
-    end
-  end
-end