searchlogic 2.5.6 → 2.5.7

data/Gemfile

@@ -1,6 +1,6 @@
 source :rubygems
 
-gem 'activerecord', '~> 2.3.11'
+gem 'activerecord', '~> 2.3.12'
 
 group :test do
   gem 'jeweler'

data/Gemfile.lock

@@ -1,21 +1,21 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activerecord (2.3.11)
-      activesupport (= 2.3.11)
-    activesupport (2.3.11)
+    activerecord (2.3.12)
+      activesupport (= 2.3.12)
+    activesupport (2.3.12)
     archive-tar-minitar (0.5.2)
-    columnize (0.3.2)
+    columnize (0.3.4)
     git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    linecache19 (0.5.11)
+    linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-    rake (0.8.7)
+    rake (0.9.2)
     rspec (1.3.1)
-    ruby-debug-base19 (0.11.24)
+    ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby_core_source (>= 0.1.4)
@@ -23,15 +23,15 @@ GEM
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
       ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.4)
+    ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    sqlite3 (1.3.3)
+    sqlite3 (1.3.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 2.3.11)
+  activerecord (~> 2.3.12)
   jeweler
   rspec (= 1.3.1)
   ruby-debug19

data/VERSION.yml

@@ -1,5 +1,5 @@
---- 
+---
 :major: 2
 :minor: 5
-:patch: 6
-:build: 
+:patch: 7
+:build: !!null 

data/lib/searchlogic/search/method_missing.rb

@@ -101,11 +101,7 @@ module Searchlogic
 
             if Time.zone && casted_value.is_a?(Time)
               if value.is_a?(String)
-                if options[:skip_conversion]
-                  casted_value.utc
-                else
-                  (casted_value + (Time.zone.utc_offset * -1)).in_time_zone
-                end
+                (casted_value + (Time.zone.utc_offset * -1)).in_time_zone
               else
                 if options[:skip_conversion]
                   casted_value.utc

data/searchlogic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.5.6"
+  s.version = "2.5.7"
 
   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{2011-05-17}
+  s.date = %q{2011-08-14}
   s.description = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [
@@ -65,36 +65,22 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/binarylogic/searchlogic}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
-  s.test_files = [
-    "spec/searchlogic/active_record/association_proxy_spec.rb",
-    "spec/searchlogic/active_record/consistency_spec.rb",
-    "spec/searchlogic/core_ext/object_spec.rb",
-    "spec/searchlogic/core_ext/proc_spec.rb",
-    "spec/searchlogic/named_scopes/alias_scope_spec.rb",
-    "spec/searchlogic/named_scopes/association_conditions_spec.rb",
-    "spec/searchlogic/named_scopes/association_ordering_spec.rb",
-    "spec/searchlogic/named_scopes/column_conditions_spec.rb",
-    "spec/searchlogic/named_scopes/or_conditions_spec.rb",
-    "spec/searchlogic/named_scopes/ordering_spec.rb",
-    "spec/searchlogic/search_spec.rb",
-    "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, ["~> 2.3.11"])
-      s.add_runtime_dependency(%q<activerecord>, ["~> 2.3.11"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 2.3.12"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 2.3.12"])
     else
-      s.add_dependency(%q<activerecord>, ["~> 2.3.11"])
-      s.add_dependency(%q<activerecord>, ["~> 2.3.11"])
+      s.add_dependency(%q<activerecord>, ["~> 2.3.12"])
+      s.add_dependency(%q<activerecord>, ["~> 2.3.12"])
     end
   else
-    s.add_dependency(%q<activerecord>, ["~> 2.3.11"])
-    s.add_dependency(%q<activerecord>, ["~> 2.3.11"])
+    s.add_dependency(%q<activerecord>, ["~> 2.3.12"])
+    s.add_dependency(%q<activerecord>, ["~> 2.3.12"])
   end
 end
 

data/spec/searchlogic/search_spec.rb

@@ -6,11 +6,11 @@ describe Searchlogic::Search do
       it "should create a search proxy" do
         User.search(:username => "joe").should be_kind_of(Searchlogic::Search)
       end
-    
+
       it "should create a search proxy using the same class" do
         User.search.klass.should == User
       end
-    
+
       it "should pass on the current scope to the proxy" do
         company = Company.create
         user = company.users.create
@@ -19,18 +19,18 @@ describe Searchlogic::Search do
       end
     end
   end
-  
+
   context "#initialize" do
     it "should require a class" do
       lambda { Searchlogic::Search.new }.should raise_error(ArgumentError)
     end
-  
+
     it "should set the conditions" do
       search = User.search(:username => "bjohnson")
       search.conditions.should == {:username => "bjohnson"}
     end
   end
-  
+
   context "#clone" do
     it "should clone properly" do
       company = Company.create
@@ -42,7 +42,7 @@ describe Searchlogic::Search do
       search2.all.should == User.all
       search1.all.should == [user2]
     end
-  
+
     it "should clone properly without scope" do
       user1 = User.create(:age => 5)
       user2 = User.create(:age => 25)
@@ -53,20 +53,20 @@ describe Searchlogic::Search do
       search1.all.should == [user2]
     end
   end
-  
+
   context "#conditions" do
     it "should set the conditions and be accessible individually" do
       search = User.search
       search.conditions = {:username => "bjohnson"}
       search.username.should == "bjohnson"
     end
-    
+
     it "should set the conditions and allow string keys" do
       search = User.search
       search.conditions = {"username" => "bjohnson"}
       search.username.should == "bjohnson"
     end
-    
+
     it "should use custom scopes before normalizing" do
       User.create(:username => "bjohnson")
       User.named_scope :username, lambda { |value| {:conditions => {:username => value.reverse}} }
@@ -75,7 +75,7 @@ describe Searchlogic::Search do
       search1.count.should == 0
       search2.count.should == 1
     end
-    
+
     # We ignore them upon execution. But we still want to accept the condition so that returning the conditions
     # preserves the values.
     it "should ignore blank values but still return on conditions" do
@@ -84,24 +84,24 @@ describe Searchlogic::Search do
       search.username.should be_nil
       search.conditions.should == {:username => ""}
     end
-    
+
     it "should not ignore blank values and should not cast them" do
       search = User.search
       search.conditions = {"id_equals" => ""}
       search.id_equals.should be_nil
       search.conditions.should == {:id_equals => ""}
     end
-    
+
     it "should ignore blank values in arrays" do
       search = User.search
       search.conditions = {"username_equals_any" => [""]}
       search.username_equals_any.should be_nil
-      
+
       search.conditions = {"id_equals_any" => ["", "1"]}
       search.id_equals_any.should == [1]
     end
   end
-  
+
   context "#compact_conditions" do
     it "should remove conditions with blank values" do
       search = User.search
@@ -109,20 +109,20 @@ describe Searchlogic::Search do
       search.compact_conditions.should == {:name_equals => "Ben"}
     end
   end
-  
+
   context "condition accessors" do
     it "should allow setting exact columns individually" do
       search = User.search
       search.username = "bjohnson"
       search.username.should == "bjohnson"
     end
-    
+
     it "should allow setting local column conditions individually" do
       search = User.search
       search.username_gt = "bjohnson"
       search.username_gt.should == "bjohnson"
     end
-    
+
     it "should allow chaining conditions" do
       user = User.create(:username => "bjohnson", :age => 20)
       User.create(:username => "bjohnson", :age => 5)
@@ -130,27 +130,27 @@ describe Searchlogic::Search do
       search.username_equals("bjohnson").age_gt(10)
       search.all.should == [user]
     end
-    
+
     it "should allow setting association conditions" do
       search = User.search
       search.orders_total_gt = 10
       search.orders_total_gt.should == 10
     end
-    
+
     it "should allow setting pre-existing association conditions" do
       User.named_scope :uname, lambda { |value| {:conditions => ["users.username = ?", value]} }
       search = Company.search
       search.users_uname = "bjohnson"
       search.users_uname.should == "bjohnson"
     end
-    
+
     it "should allow setting pre-existing association alias conditions" do
       User.alias_scope :username_has, lambda { |value| User.username_like(value) }
       search = Company.search
       search.users_username_has = "bjohnson"
       search.users_username_has.should == "bjohnson"
     end
-    
+
     it "should allow using custom conditions" do
       User.named_scope(:four_year_olds, { :conditions => { :age => 4 } })
       search = User.search
@@ -158,7 +158,7 @@ describe Searchlogic::Search do
       search.four_year_olds.should == true
       search.proxy_options.should == User.four_year_olds.proxy_options
     end
-    
+
     it "should not merge conflicting conditions into one value" do
       # This class should JUST be a proxy. It should not do anything more than that.
       # A user would be allowed to call both named scopes if they wanted.
@@ -168,158 +168,165 @@ describe Searchlogic::Search do
       search.username_greater_than.should == "bjohnson1"
       search.username_gt.should == "bjohnson2"
     end
-    
+
     it "should allow setting custom conditions individually with an arity of 0" do
       User.named_scope(:four_year_olds, :conditions => {:age => 4})
       search = User.search
       search.four_year_olds = true
       search.four_year_olds.should == true
     end
-    
+
     it "should allow setting custom conditions individually with an arity of 1" do
       User.named_scope(:username_should_be, lambda { |u| {:conditions => {:username => u}} })
       search = User.search
       search.username_should_be = "bjohnson"
       search.username_should_be.should == "bjohnson"
     end
-    
+
     it "should not allow setting conditions that are not scopes" do
       search = User.search
       lambda { search.unknown = true }.should raise_error(Searchlogic::Search::UnknownConditionError)
     end
-    
+
     it "should not allow setting conditions on sensitive methods" do
       search = User.search
       lambda { search.destroy = true }.should raise_error(Searchlogic::Search::UnknownConditionError)
     end
-    
+
     it "should not use the ruby implementation of the id method" do
       search = User.search
       search.id.should be_nil
     end
-    
+
     context "type casting" do
       it "should be a Boolean given true" do
         search = User.search
         search.id_nil = true
         search.id_nil.should == true
       end
-      
+
       it "should be a Boolean given 'true'" do
         search = User.search
         search.id_nil = "true"
         search.id_nil.should == true
       end
-      
+
       it "should be a Boolean given '1'" do
         search = User.search
         search.id_nil = "1"
         search.id_nil.should == true
       end
-      
+
       it "should be a Boolean given false" do
         search = User.search
         search.id_nil = false
         search.id_nil.should == false
       end
-      
+
       it "should be a Boolean given 'false'" do
         search = User.search
         search.id_nil = "false"
         search.id_nil.should == false
       end
-      
+
       it "should be a Boolean given '0'" do
         search = User.search
         search.id_nil = "0"
         search.id_nil.should == false
       end
-      
+
       it "should be an Integer given ''" do
         search = User.search
         search.id_gt = ''
         search.id_gt.should == 0
       end
-      
+
       it "should be an Integer given 1" do
         search = User.search
         search.id_gt = 1
         search.id_gt.should == 1
       end
-      
+
       it "should be an Integer given '1'" do
         search = User.search
         search.id_gt = "1"
         search.id_gt.should == 1
       end
-      
+
       it "should be a Float given 1.0" do
         search = Order.search
         search.total_gt = 1.0
         search.total_gt.should == 1.0
       end
-      
+
       it "should be a Float given '1'" do
         search = Order.search
         search.total_gt = "1"
         search.total_gt.should == 1.0
       end
-      
+
       it "should be a Float given '1.5'" do
         search = Order.search
         search.total_gt = "1.5"
         search.total_gt.should == 1.5
       end
-      
+
       it "should be a Range given 1..3" do
         search = Order.search
         search.total_eq = (1..3)
         search.total_eq.should == (1..3)
       end
-      
+
       it "should be a Date given 'Jan 1, 2009'" do
         search = Order.search
         search.shipped_on_after = "Jan 1, 2009"
         search.shipped_on_after.should == Date.parse("Jan 1, 2009")
       end
-      
+
       it "should be a Time given 'Jan 1, 2009'" do
         search = Order.search
         search.created_at_after = "Jan 1, 2009"
         search.created_at_after.should == Time.zone.parse("Jan 1, 2009")
       end
-      
+
       it "should be a Time given 'Jan 1, 2009 9:33AM'" do
         search = Order.search
         search.created_at_after = "Jan 1, 2009 9:33AM"
         search.created_at_after.should == Time.zone.parse("Jan 1, 2009 9:33AM")
       end
-      
-      it "should skip time zone conversion for attributes skipped" do
+
+      it "should still convert for strings, even if the conversion is skipped for the attribute" do
         search = User.search
         search.whatever_at_after = "Jan 1, 2009 9:33AM"
-        search.whatever_at_after.should == Time.parse("Jan 1, 2009 9:33AM").utc
+        search.whatever_at_after.should == Time.zone.parse("Jan 1, 2009 9:33AM")
       end
-      
+
       it "should convert the time to the current zone" do
         search = Order.search
         now = Time.now
         search.created_at_after = now
         search.created_at_after.should == now.in_time_zone
       end
-      
+
+      it "should skip time zone conversion for attributes skipped" do
+        search = User.search
+        now = Time.now
+        search.whatever_at_after = now
+        search.whatever_at_after.should == now.utc
+      end
+
       it "should be an Array and cast it's values given ['1', '2', '3']" do
         search = Order.search
         search.id_equals_any = ["1", "2", "3"]
         search.id_equals_any.should == [1, 2, 3]
       end
-      
+
       it "should type cast association conditions" do
         search = User.search
         search.orders_total_gt = "10"
         search.orders_total_gt.should == 10
       end
-      
+
       it "should type cast deep association conditions" do
         search = Company.search
         search.users_orders_total_gt = "10"
@@ -333,7 +340,7 @@ describe Searchlogic::Search do
       end
     end
   end
-  
+
   context "#delete" do
     it "should delete the condition" do
       search = User.search(:username_like => "bjohnson")
@@ -342,55 +349,55 @@ describe Searchlogic::Search do
       search.conditions["username_like"].should be_nil
     end
   end
-  
+
   context "#ordering_by" do
     it "should return nil if we aren't ordering" do
       search = User.search
       search.ordering_by.should be_nil
     end
-    
+
     it "should return the column name for ascending" do
       search = User.search(:order => "ascend_by_first_name")
       search.ordering_by.should == "first_name"
     end
-    
+
     it "should return the column name for descending" do
       search = User.search(:order => "descend_by_first_name")
       search.ordering_by.should == "first_name"
     end
-    
+
     it "should handle symbols" do
       search = User.search(:order => :descend_by_first_name)
       search.ordering_by.should == "first_name"
     end
   end
-  
+
   context "#method_missing" do
     context "setting" do
       it "should call named scopes for conditions" do
         User.search(:age_less_than => 5).proxy_options.should == User.age_less_than(5).proxy_options
       end
-    
+
       it "should alias exact column names to use equals" do
         User.search(:username => "joe").proxy_options.should == User.username_equals("joe").proxy_options
       end
-    
+
       it "should recognize conditions with a value of true where the named scope has an arity of 0" do
         User.search(:username_nil => true).proxy_options.should == User.username_nil.proxy_options
       end
-    
+
       it "should ignore conditions with a value of false where the named scope has an arity of 0" do
         User.search(:username_nil => false).proxy_options.should == {}
       end
-    
+
       it "should not ignore conditions with a value of false where the named scope does not have an arity of 0" do
         User.search(:username_is => false).proxy_options.should == User.username_is(false).proxy_options
       end
-    
+
       it "should recognize the order condition" do
         User.search(:order => "ascend_by_username").proxy_options.should == User.ascend_by_username.proxy_options
       end
-    
+
       it "should pass array values as multiple arguments with arity -1" do
         User.named_scope(:multiple_args, lambda { |*args|
           raise "This should not be an array, it should be 1" if args.first.is_a?(Array)
@@ -398,7 +405,7 @@ describe Searchlogic::Search do
         })
         User.search(:multiple_args => [1,2]).proxy_options.should == User.multiple_args(1,2).proxy_options
       end
-    
+
       it "should pass array as a single value with arity >= 0" do
         User.named_scope(:multiple_args, lambda { |args|
           raise "This should be an array" if !args.is_a?(Array)
@@ -406,13 +413,13 @@ describe Searchlogic::Search do
         })
         User.search(:multiple_args => [1,2]).proxy_options.should == User.multiple_args([1,2]).proxy_options
       end
-    
+
       it "should not split out dates or times (big fix)" do
         s = User.search
         s.created_at_after = Time.now
         lambda { s.count }.should_not raise_error
       end
-    
+
       it "should not include blank values" do
         s = User.search
         s.conditions = {"id_equals" => ""}
@@ -420,43 +427,43 @@ describe Searchlogic::Search do
       end
     end
   end
-  
+
   context "#respond_to?" do
     it "should respond to created_at_lte" do
       s = User.search
       s.respond_to?(:created_at_lte).should == true
     end
-    
+
     it "should respond to created_at" do
       s = User.search
       s.respond_to?(:created_at).should == true
     end
-    
+
     it "should not respond to created_at_or_whatever" do
       s = User.search
       s.respond_to?(:created_at_or_whatever)
     end
   end
-  
+
   context "delegation" do
     it "should return all when not given any conditions" do
       3.times { User.create }
       User.search.all.length.should == 3
     end
-    
+
     it "should implement the current scope based on an association" do
       User.create
       company = Company.create
       user = company.users.create
       company.users.search.all.should == [user]
     end
-    
+
     it "should implement the current scope based on a named scope" do
       User.named_scope(:four_year_olds, :conditions => {:age => 4})
       (3..5).each { |age| User.create(:age => age) }
       User.four_year_olds.search.all.should == User.find_all_by_age(4)
     end
-    
+
     it "should respond to count" do
       User.create(:username => "bjohnson")
       search1 = User.search(:username => "bjohnson")
@@ -464,7 +471,7 @@ describe Searchlogic::Search do
       search1.count.should == 1
       search2.count.should == 0
     end
-    
+
     it "should respond to empty?" do
       User.create(:username => "bjohnson")
       search1 = User.search(:username => "bjohnson")
@@ -481,9 +488,10 @@ describe Searchlogic::Search do
       search.paged(0, 0).count.should == 0
     end
   end
-  
+
   context "yaml" do
     it "should load yaml" do
+      pending
       time = Time.now
       search = User.search(:name_like => "Ben", :created_at_after => time)
       search.current_scope = {:conditions => "1=1"}

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 require 'spec'
 require 'rubygems'
 require 'ruby-debug'
-gem "activerecord", "2.3.11"
 require "active_record"
 
 ENV['TZ'] = 'UTC'

metadata

@@ -1,50 +1,47 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: searchlogic
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 2.5.7
   prerelease: 
-  version: 2.5.6
 platform: ruby
-authors: 
+authors:
 - Ben Johnson of Binary Logic
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-17 00:00:00 -04:00
+date: 2011-08-14 00:00:00.000000000 -04:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70173063739320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.3.11
+      - !ruby/object:Gem::Version
+        version: 2.3.12
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70173063739320
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70173063738640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.3.11
+      - !ruby/object:Gem::Version
+        version: 2.3.12
   type: :runtime
   prerelease: false
-  version_requirements: *id002
+  version_requirements: *70173063738640
 description: Searchlogic makes using ActiveRecord named scopes easier and less repetitive.
 email: bjohnson@binarylogic.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -93,44 +90,29 @@ files:
 has_rdoc: true
 homepage: http://github.com/binarylogic/searchlogic
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -2263377899941046855
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -218814993959786403
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Searchlogic makes using ActiveRecord named scopes easier and less repetitive.
-test_files: 
-- spec/searchlogic/active_record/association_proxy_spec.rb
-- spec/searchlogic/active_record/consistency_spec.rb
-- spec/searchlogic/core_ext/object_spec.rb
-- spec/searchlogic/core_ext/proc_spec.rb
-- spec/searchlogic/named_scopes/alias_scope_spec.rb
-- spec/searchlogic/named_scopes/association_conditions_spec.rb
-- spec/searchlogic/named_scopes/association_ordering_spec.rb
-- spec/searchlogic/named_scopes/column_conditions_spec.rb
-- spec/searchlogic/named_scopes/or_conditions_spec.rb
-- spec/searchlogic/named_scopes/ordering_spec.rb
-- spec/searchlogic/search_spec.rb
-- spec/spec_helper.rb
+test_files: []