searchlogic 2.5.15 → 2.5.16

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGE2MTk1ZjAzYWQ0ODVkNjg1M2Y3MzYzZmEwMjcxN2E2ZGMwMTNjMg==
+    NTZhMTNmZDNiMDlkZjcyZjI5MmI2ZjE1OWY3M2IxMmI5NTI0MzQ1OA==
   data.tar.gz: !binary |-
-    M2ExYTk4MjkxNzhlZjk4ZWM4NGE3MDhkMmI1NDViODBhY2VhOWZlNA==
+    ZDIzMjY3N2RiNmJiZWU5MmIzOTQwODFlNWYxMDRhOWQ5YTk5NjZmYw==
 SHA512:
   metadata.gz: !binary |-
-    ODJmNDkzYTAyZTZkZTc1NGE3MTAxMDMzZGFlZTM0MmI1MTQ0ODdiMzI1YzI5
-    MDJmMTgwZDM3OTAwODg3NmMxOGRkZjVmNTgxOTI2OWUxOGJjMTZjNDQ0MjNk
-    ZmRkZjI2YjZlYTE2NjdiZGEwYTY5MmMzODQ1NzNkYTY2OGU5MzY=
+    Zjg0NWI3OWFiOGY3NTY1YzJhYWM0ZjRmNGZlY2IwYjI3MGI0ZGMyNTVjZDI0
+    YTIyN2NlNjE2MjRlYjg3YTYyYmY3NzdkZDNjNGMxMzJiYjIwMDRmNGQ4Njc1
+    NTM1YWQ3NWRjYzMxMmFjNmIwNTJhNTI1MTkwY2I1NjBlZTc1MmE=
   data.tar.gz: !binary |-
-    NGRkZTJmYWRjMTlhYzgyNTdlYzQ5NjU5YmZiNjM4ZGJiMTIxMDRjZGNjMGE5
-    ZmFlYjRjNWQ4MDAxYzQ2YTEzZmFiMjEyYTNmYzJiOGM1NzZkNGI5NzE3NTJm
-    YTBhZDQwMjJkMTQ0Njc1NTJiZjMyZWMxMDNjYTFjZjdlMWRmZTQ=
+    ODcyMTk3YTNmODY0NTRjN2Q1MmY4YmUxMzVhOTBmMmZmYjFjYTQ0YzAwOTA0
+    NWFjNGMzNTg5ZTVkYjQyNmI3ZmJlN2I3MTY4MTY0YWRkMmM3YWQ0NjViY2Qy
+    MTU2OTkzZTU2MTU2ZjNjZmVhNDhkNTcyYjRjNmE3YWNjN2UyOTM=

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    searchlogic (2.5.12)
+    searchlogic (2.5.15)
       activerecord (~> 2.3.12)
       activesupport (~> 2.3.12)
 
@@ -16,7 +16,7 @@ GEM
       rake
     coderay (1.1.0)
     method_source (0.8.2)
-    pry (0.9.12.3)
+    pry (0.9.12.4)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
@@ -24,6 +24,7 @@ GEM
     rspec (1.3.2)
     slop (3.4.7)
     sqlite3 (1.3.8)
+    timecop (0.5.9.2)
 
 PLATFORMS
   ruby
@@ -34,3 +35,4 @@ DEPENDENCIES
   rspec (~> 1.3.1)
   searchlogic!
   sqlite3
+  timecop (~> 0.5.9.1)

data/lib/searchlogic/named_scopes/association_conditions.rb

@@ -12,7 +12,7 @@ module Searchlogic
         end
 
         # We need to try and create other conditions first so that we give priority to conflicting names.
-        # Such as having a column names the exact same name as an association condition.
+        # Such as having a column name with the exact same name as an association condition.
         def create_condition(name)
           if result = super
             result
@@ -62,7 +62,7 @@ module Searchlogic
           raise ArgumentError.new("The #{klass} class does not respond to the #{association_condition} scope") if !klass.respond_to?(association_condition)
           arity = klass.named_scope_arity(association_condition)
 
-          if !arity || arity == 0
+          if !arity
             # The underlying condition doesn't require any parameters, so let's just create a simple
             # named scope that is based on a hash.
             options = {}

data/lib/searchlogic/version.rb

@@ -1,3 +1,3 @@
 module Searchlogic
-  VERSION = "2.5.15"
+  VERSION = "2.5.16"
 end

data/searchlogic.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'activerecord', '~> 2.3.12'
   s.add_dependency 'activesupport', '~> 2.3.12'
   s.add_development_dependency 'rspec', '~> 1.3.1'
+  s.add_development_dependency 'timecop', '~> 0.5.9.1'
   s.add_development_dependency 'sqlite3'
   s.add_development_dependency 'appraisal', '0.4.1'
   s.add_development_dependency 'pry'

data/spec/searchlogic/named_scopes/association_conditions_spec.rb

@@ -209,7 +209,7 @@ describe Searchlogic::NamedScopes::AssociationConditions do
     user.orders.count.should == 1
     user.orders.shipped_on_not_null.shipped_on_greater_than(2.days.ago).count.should == 1
   end
-  
+
   it "should allow chained dynamic scopes without losing association scope conditions" do
     user = User.create
     order1 = Order.create :user => user, :shipped_on => Time.now, :total => 2
@@ -218,6 +218,26 @@ describe Searchlogic::NamedScopes::AssociationConditions do
     user.orders.id_equals(order1.id).total_equals(2).count.should == 1
   end
 
+  it "shouldn't cache the lambda of a named_scope for a chained association" do
+    user = User.create
+    Order.create :user => user, :shipped_on => Time.current
+
+    # create the named_scope and use it through a chained association
+    Order.named_scope :shipped, lambda { {:conditions => ["shipped_on <= ?", Time.current]} }
+    User.orders_shipped
+
+    # simulate a day passing after the chained scope is first used
+    Timecop.travel(Date.tomorrow)
+
+    # make a new object that is active on our simulated day
+    Order.create :user => user, :shipped_on => Time.current
+
+    # we have 2 orders and both were shipped on or before the current time,
+    # so both should be included in the scope
+    user.orders.count.should == 2
+    User.orders_shipped.count.should == 2
+  end
+
   it "should allow Marshal.dump on objects that only have polymorphic associations where a polymorphic association is loaded" do
     audit = Audit.create
     audit.auditable = User.create

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 Bundler.setup
 require 'searchlogic'
 require "pry"
+require "timecop"
 
 ENV['TZ'] = 'UTC'
 Time.zone = 'Eastern Time (US & Canada)'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: searchlogic
 version: !ruby/object:Gem::Version
-  version: 2.5.15
+  version: 2.5.16
 platform: ruby
 authors:
 - Ben Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -52,6 +52,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.1
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.9.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.9.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +160,6 @@ files:
 - lib/searchlogic/search/unknown_condition_error.rb
 - lib/searchlogic/version.rb
 - rails/init.rb
-- searchlogic-2.5.13.gem
 - searchlogic.gemspec
 - spec/searchlogic/active_record/association_proxy_spec.rb
 - spec/searchlogic/active_record/consistency_spec.rb