searchgasm 0.9.5 → 0.9.6

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.9.6. Fix bug when instantiating with nil options
+
 v0.9.5. Enhanced searching with conditions only. Updated read me to include example on adding your own conditions.
 
 v0.9.4. Cleaned up search methods, removed reset! method for base and conditions.

data/README.mdown

@@ -273,6 +273,9 @@ I want to use it, so let's add it:
         end
       end
       
+      # You can return an array or a string. NOT a hash, because all of these conditions
+      # need to eventually get merged together. The array or string can be anything you would put in
+      # the :conditions option for ActiveRecord::Base.find()
       def to_conditions(value)
         ["#{quoted_table_name}.#{quoted_column_name} SOUNDS LIKE ?", value]
       end

data/lib/searchgasm/active_record/base.rb

@@ -23,7 +23,7 @@ module BinaryLogic
         end
       
         def build_conditions(values = {}, &block)
-          conditions = searchgasm_conditions({})
+          conditions = searchgasm_conditions
           conditions.protect = true
           conditions.value = values
           yield conditions if block_given?
@@ -37,8 +37,9 @@ module BinaryLogic
         end
       
         def build_search(options = {}, &block)
-          options[:protect] = true
-          search = searchgasm_searcher(options)
+          search = searchgasm_searcher
+          search.protect = true
+          search.options = options
           yield search if block_given?
           search
         end
@@ -50,15 +51,16 @@ module BinaryLogic
         end
       
         private
-          def sanitize_options_with_searchgasm(options)
+          def sanitize_options_with_searchgasm(options = {})
+            return options unless BinaryLogic::Searchgasm::Search::Base.needed?(self, options)
             searchgasm_searcher(options).sanitize
           end
         
-          def searchgasm_conditions(options)
+          def searchgasm_conditions(options = {})
             BinaryLogic::Searchgasm::Search::Conditions.new(self, options)
           end
         
-          def searchgasm_searcher(options)
+          def searchgasm_searcher(options = {})
             BinaryLogic::Searchgasm::Search::Base.new(self, options)
           end
       end

data/lib/searchgasm/search/base.rb

@@ -13,6 +13,14 @@ module BinaryLogic
         attr_reader :conditions, :protect
         attr_writer :options
         
+        def self.needed?(klass, options)
+          SPECIAL_FIND_OPTIONS.each do |option|
+            return true if options.symbolize_keys.keys.include?(option)
+          end
+          
+          Conditions.needed?(klass, options[:conditions])
+        end
+        
         def initialize(klass, options = {})
           self.klass = klass
           self.conditions = Conditions.new(klass)

data/lib/searchgasm/search/condition_types/keywords_condition.rb

@@ -21,13 +21,13 @@ module BinaryLogic
             subs = []
             
             search_parts = value.gsub(/,/, " ").split(/ /).collect { |word| word.downcase.gsub(/[^[:alnum:]]/, ''); }.uniq.select { |word| !BLACKLISTED_WORDS.include?(word.downcase) && !word.blank? }
+            return if search_parts.blank?
+            
             search_parts.each do |search_part|
               strs << "#{quoted_table_name}.#{quoted_column_name} LIKE ?"
               subs << "%#{search_part}%"
             end
             
-            return if strs.blank?
-            
             [strs.join(" AND "), *subs]
           end
         end

data/lib/searchgasm/search/conditions.rb

@@ -15,6 +15,16 @@ module BinaryLogic
           def conditions
             @@conditions ||= []
           end
+          
+          def needed?(klass, conditions)
+            if conditions.is_a?(Hash)
+              conditions.stringify_keys.keys.each do |condition|
+                return true unless klass.column_names.include?(condition)
+              end
+            end
+            
+            false
+          end
         end
         
         def initialize(klass, init_values = {})

data/lib/searchgasm/version.rb

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

data/searchgasm.gemspec

@@ -1,11 +1,11 @@
 
-# Gem::Specification for Searchgasm-0.9.5
+# Gem::Specification for Searchgasm-0.9.6
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic

data/test/test_active_record_base.rb

@@ -16,6 +16,9 @@ class TestActiveRecordBase < Test::Unit::TestCase
     assert_nothing_raised { Account.all }
     assert_nothing_raised { Account.first }
     assert_nothing_raised { Account.find(:all) }
+    assert_nothing_raised { Account.find(:all, :conditions => {:name => "Ben"}) }
+    assert_nothing_raised { Account.find(:all, :conditions => ["name = ?", "Ben"]) }
+    assert_nothing_raised { Account.find(:all, :conditions => "name = 'Ben'") }
     assert_nothing_raised { Account.find(:first) }
     assert_nothing_raised { Account.find(:all, nil) }
     assert_nothing_raised { Account.find(:all, {}) }
@@ -30,6 +33,9 @@ class TestActiveRecordBase < Test::Unit::TestCase
   end
   
   def test_build_search
+    search = Account.new_search
+    assert_kind_of BinaryLogic::Searchgasm::Search::Base, search
+    
     search = Account.build_search(:conditions => {:name_keywords => "awesome"}, :page => 2, :per_page => 15)
     assert_kind_of BinaryLogic::Searchgasm::Search::Base, search
     assert_equal Account, search.klass
@@ -41,6 +47,19 @@ class TestActiveRecordBase < Test::Unit::TestCase
     assert_equal Account, search.klass
   end
   
+  def test_build_conditions
+    search = Account.new_conditions
+    assert_kind_of BinaryLogic::Searchgasm::Search::Conditions, search
+    
+    search = Account.build_conditions(:name_keywords => "awesome")
+    assert_kind_of BinaryLogic::Searchgasm::Search::Conditions, search
+    assert_equal Account, search.klass
+    assert_equal "awesome", search.name_keywords
+
+    search = Account.new_conditions(:name_keywords => "awesome")
+    assert_equal Account, search.klass
+  end
+  
   def test_searching
     assert_equal Account.find(1, 3), Account.all(:conditions => {:name_contains => "Binary"})
     assert_equal [Account.find(1)], Account.all(:conditions => {:name_contains => "Binary", :users => {:first_name_starts_with => "Ben"}})

data/test/test_searchgasm_base.rb

@@ -12,7 +12,16 @@ class TestSearchgasmBase < Test::Unit::TestCase
     teardown_db
   end
   
+  def test_needed
+    assert BinaryLogic::Searchgasm::Search::Base.needed?(Account, :page => 2, :conditions => {:name => "Ben"})
+    assert !BinaryLogic::Searchgasm::Search::Base.needed?(Account, :conditions => {:name => "Ben"})
+    assert BinaryLogic::Searchgasm::Search::Base.needed?(Account, :limit => 2, :conditions => {:name_contains => "Ben"})
+    assert !BinaryLogic::Searchgasm::Search::Base.needed?(Account, :limit => 2)
+    assert BinaryLogic::Searchgasm::Search::Base.needed?(Account, :per_page => 2)
+  end
+  
   def test_initialize
+    assert_nothing_raised { BinaryLogic::Searchgasm::Search::Base.new(Account) }
     search = BinaryLogic::Searchgasm::Search::Base.new(Account, :conditions => {:name_like => "binary"}, :page => 2, :limit => 10, :readonly => true)
     assert_equal Account, search.klass
     assert_equal "binary", search.conditions.name_like

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic