searchlogic 2.3.0 → 2.3.1

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 2.3.1 released 2009-08-24
+
+* Added blank and not_blank conditions.
+* Made User.whatever_like_any("val1", "val2") consistent with User.whatever_like_any(["val1", "val2"])
+
 == 2.3.0 released 2009-08-22
 
 * Thanks to laserlemon for support of ranges and arrays in the equals condition.

data/README.rdoc

@@ -1,6 +1,6 @@
 = Searchlogic
 
-Searchlogic provides tools that make using ActiveRecord named scopes easier and less repetitive. It helps keep your code DRY, clean, and simple.
+Searchlogic makes using ActiveRecord named scopes easier and less repetitive. It helps keep your code DRY, clean, and simple.
 
 == Helpful links
 
@@ -71,17 +71,19 @@ For a complete list of conditions please see the constants in Searchlogic::Named
 
 Typing out 'greater_than_or_equal_to' is not fun. Instead Searchlogic provides various aliases for the conditions. For a complete list please see Searchlogic::NamedScopes::Conditions. But they are pretty straightforward:
 
-  User.username_is(10)
-  User.username_eq(10)
-  User.id_lt(10)
-  User.id_lte(10)
+  User.username_is(10)  # equals
+  User.username_eq(10)  # equals
+  User.id_lt(10)        # less than
+  User.id_lte(10)       # less than or equal to
+  User.id_gt(10)        # greater than
+  User.id_gte(10)       # greater than or equal to
   # etc...
 
 == Search using scopes in associated classes
 
 This is my favorite part of Searchlogic. You can dynamically call scopes on associated classes and Searchlogic will take care of creating the necessary joins for you. This is REALY nice for keeping your code DRY. The best way to explain this is to show you:
 
-Let's take some basic scopes that Searchlogic provides:
+Let's take some basic scopes that Searchlogic provides for every model:
 
   # We have the following relationships
   User.has_many :orders

data/Rakefile

@@ -5,8 +5,8 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = "searchlogic"
-    gem.summary = "Searchlogic provides tools that make using ActiveRecord named scopes easier and less repetitive."
-    gem.description = "Searchlogic provides tools that make using ActiveRecord named scopes easier and less repetitive."
+    gem.summary = "Searchlogic makes using ActiveRecord named scopes easier and less repetitive."
+    gem.description = "Searchlogic makes using ActiveRecord named scopes easier and less repetitive."
     gem.email = "bjohnson@binarylogic.com"
     gem.homepage = "http://github.com/binarylogic/searchlogic"
     gem.authors = ["Ben Johnson of Binary Logic"]

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 3
-:patch: 0
+:patch: 1
 :major: 2

data/lib/searchlogic/named_scopes/conditions.rb

@@ -30,7 +30,9 @@ module Searchlogic
       BOOLEAN_CONDITIONS = {
         :null => [:nil],
         :not_null => [:not_nil],
-        :empty => []
+        :empty => [],
+        :blank => [],
+        :not_blank => [:present]
       }
       
       CONDITIONS = {}
@@ -117,6 +119,10 @@ module Searchlogic
             {:conditions => "#{table_name}.#{column} IS NOT NULL"}
           when "empty"
             {:conditions => "#{table_name}.#{column} = ''"}
+          when "blank"
+            {:conditions => "#{table_name}.#{column} = '' OR #{table_name}.#{column} IS NULL"}
+          when "not_blank"
+            {:conditions => "#{table_name}.#{column} != '' OR #{table_name}.#{column} IS NOT NULL"}
           end
           
           named_scope("#{column}_#{condition}".to_sym, scope_options)
@@ -130,7 +136,7 @@ module Searchlogic
           when /_(any|all)$/
             searchlogic_lambda(column_type) { |*values|
               return {} if values.empty?
-              
+              values.flatten!
               values.collect! { |value| value_with_modifier(value, value_modifier) }
               
               join = $1 == "any" ? " OR " : " AND "

data/searchlogic.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.3.0"
+  s.version = "2.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Johnson of Binary Logic"]
-  s.date = %q{2009-08-22}
-  s.description = %q{Searchlogic provides tools that make using ActiveRecord named scopes easier and less repetitive.}
+  s.date = %q{2009-08-24}
+  s.description = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{searchlogic}
   s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Searchlogic provides tools that make using ActiveRecord named scopes easier and less repetitive.}
+  s.summary = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
   s.test_files = [
     "spec/core_ext/object_spec.rb",
      "spec/core_ext/proc_spec.rb",

data/spec/named_scopes/conditions_spec.rb

@@ -93,6 +93,16 @@ describe "Conditions" do
       ["bjohnson", ""].each { |username| User.create(:username => username) }
       User.username_empty.all.should == User.find_all_by_username("")
     end
+    
+    it "should have blank" do
+      ["bjohnson", "", nil].each { |username| User.create(:username => username) }
+      User.username_blank.all.should == User.all(:conditions => "username IS NULL OR username = ''")
+    end
+    
+    it "should have not blank" do
+      ["bjohnson", "", nil].each { |username| User.create(:username => username) }
+      User.username_not_blank.all.should == User.all(:conditions => "username IS NOT NULL OR username != ''")      
+    end
   end
   
   context "any and all conditions" do
@@ -100,6 +110,11 @@ describe "Conditions" do
       User.username_equals_any.proxy_options.should == {}
     end
     
+    it "should treat an array and multiple arguments the same" do
+      %w(bjohnson thunt dgainor).each { |username| User.create(:username => username) }
+      User.username_like_any("bjohnson", "thunt").should == User.username_like_any(["bjohnson", "thunt"])
+    end
+    
     it "should have equals any" do
       %w(bjohnson thunt dgainor).each { |username| User.create(:username => username) }
       User.username_equals_any("bjohnson", "thunt").all == User.find_all_by_username(["bjohnson", "thunt"])

data/spec/named_scopes/or_conditions_spec.rb

@@ -17,6 +17,18 @@ describe "Or conditions" do
     lambda { User.usernme_begins_with_or_name_like("ben") }.should raise_error(Searchlogic::NamedScopes::OrConditions::UnknownConditionError)
   end
   
+  it "should work well with _or_equal_to" do
+    User.id_less_than_or_equal_to_or_age_gt(10).proxy_options.should == {:conditions => "(users.age > 10) OR (users.id <= 10)"}
+  end
+  
+  it "should work well with _or_equal_to_any" do
+    User.id_less_than_or_equal_to_all_or_age_gt(10).proxy_options.should == {:conditions => "(users.age > 10) OR (users.id <= 10)"}
+  end
+  
+  it "should work well with _or_equal_to_all" do
+    User.id_less_than_or_equal_to_any_or_age_gt(10).proxy_options.should == {:conditions => "(users.age > 10) OR (users.id <= 10)"}
+  end
+  
   it "should play nice with other scopes" do
     User.username_begins_with("ben").id_gt(10).age_not_nil.username_or_name_ends_with("ben").scope(:find).should ==
       {:conditions => "((users.name LIKE '%ben') OR (users.username LIKE '%ben')) AND ((users.age IS NOT NULL) AND ((users.id > 10) AND (users.username LIKE 'ben%')))"}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchlogic
 version: !ruby/object:Gem::Version 
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-22 00:00:00 -04:00
+date: 2009-08-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.0
     version: 
-description: Searchlogic provides tools that make using ActiveRecord named scopes easier and less repetitive.
+description: Searchlogic makes using ActiveRecord named scopes easier and less repetitive.
 email: bjohnson@binarylogic.com
 executables: []
 
@@ -91,7 +91,7 @@ rubyforge_project: searchlogic
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Searchlogic provides tools that make using ActiveRecord named scopes easier and less repetitive.
+summary: Searchlogic makes using ActiveRecord named scopes easier and less repetitive.
 test_files: 
 - spec/core_ext/object_spec.rb
 - spec/core_ext/proc_spec.rb