searchlogic 2.4.14 → 2.4.15

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 2
 :build: 
 :minor: 4
-:patch: 14
+:patch: 15

data/lib/searchlogic.rb

@@ -1,5 +1,6 @@
 require "searchlogic/core_ext/proc"
 require "searchlogic/core_ext/object"
+require "searchlogic/active_record/association_proxy"
 require "searchlogic/active_record/consistency"
 require "searchlogic/active_record/named_scope_tools"
 require "searchlogic/named_scopes/conditions"
@@ -14,6 +15,12 @@ Proc.send(:include, Searchlogic::CoreExt::Proc)
 Object.send(:include, Searchlogic::CoreExt::Object)
 
 module ActiveRecord # :nodoc: all
+  module Associations
+    class AssociationProxy
+      include Searchlogic::ActiveRecord::AssociationProxy
+    end
+  end
+
   class Base
     class << self; include Searchlogic::ActiveRecord::Consistency; end
   end

data/lib/searchlogic/active_record/association_proxy.rb

@@ -0,0 +1,19 @@
+module Searchlogic
+  module ActiveRecord
+    module AssociationProxy
+      def self.included(klass)
+        klass.class_eval do
+          alias_method_chain :send, :searchlogic
+        end
+      end
+      
+      def send_with_searchlogic(method, *args)
+        if !proxy_respond_to?(method) && proxy_reflection.klass.condition?(method)
+          proxy_reflection.klass.send(method, *args)
+        else
+          send_without_searchlogic(method, *args)
+        end
+      end
+    end
+  end
+end

data/lib/searchlogic/named_scopes/conditions.rb

@@ -20,7 +20,7 @@ module Searchlogic
       
       WILDCARD_CONDITIONS = {
         :like => [:contains, :includes],
-        :not_like => [],
+        :not_like => [:does_not_include],
         :begins_with => [:bw],
         :not_begin_with => [:does_not_begin_with],
         :ends_with => [:ew],
@@ -50,7 +50,7 @@ module Searchlogic
       end
       
       CONDITIONS[:equals_any] = CONDITIONS[:equals_any] + [:in]
-      CONDITIONS[:does_not_equal_any] = CONDITIONS[:equals_any] + [:not_in]
+      CONDITIONS[:does_not_equal_any] = CONDITIONS[:does_not_equal_any] + [:not_in]
       
       BOOLEAN_CONDITIONS.each { |condition, aliases| CONDITIONS[condition] = aliases }
       
@@ -89,6 +89,7 @@ module Searchlogic
           end
         end
         
+        
         def condition_details(method_name)
           column_name_matcher = column_names.join("|")
           conditions_matcher = (PRIMARY_CONDITIONS + ALIAS_CONDITIONS).join("|")
@@ -157,27 +158,35 @@ module Searchlogic
         def scope_options(condition, column_type, sql, options = {})
           case condition.to_s
           when /_(any|all)$/
-            searchlogic_lambda(column_type, :skip_conversion => options[:skip_conversion]) { |*values|
-              return {} if values.empty?
-              values.flatten!
-              values.collect! { |value| value_with_modifier(value, options[:value_modifier]) }
-              
-              join = $1 == "any" ? " OR " : " AND "
-              scope_sql = values.collect { |value| sql.is_a?(Proc) ? sql.call(value) : sql }.join(join)
-              
-              {:conditions => [scope_sql, *expand_range_bind_variables(values)]}
-            }
+            any_or_all_scope_options(column_type, sql, options)
           else
-            searchlogic_lambda(column_type, :skip_conversion => options[:skip_conversion]) { |*values|
-              values.collect! { |value| value_with_modifier(value, options[:value_modifier]) }
-              
-              scope_sql = sql.is_a?(Proc) ? sql.call(*values) : sql
-              
-              {:conditions => [scope_sql, *expand_range_bind_variables(values)]}
-            }
+            general_scope_options(column_type, sql, options)
           end
         end
         
+        def any_or_all_scope_options(column_type, sql, options)
+          searchlogic_lambda(column_type, :skip_conversion => options[:skip_conversion]) { |*values|
+            return {} if values.empty?
+            values.flatten!
+            values.collect! { |value| value_with_modifier(value, options[:value_modifier]) }
+            
+            join = $1 == "any" ? " OR " : " AND "
+            scope_sql = values.collect { |value| sql.is_a?(Proc) ? sql.call(value) : sql }.join(join)
+            
+            {:conditions => [scope_sql, *expand_range_bind_variables(values)]}
+          }
+        end
+        
+        def general_scope_options(column_type, sql, options)
+          searchlogic_lambda(column_type, :skip_conversion => options[:skip_conversion]) { |*values|
+            values.collect! { |value| value_with_modifier(value, options[:value_modifier]) }
+            
+            scope_sql = sql.is_a?(Proc) ? sql.call(*values) : sql
+            
+            {:conditions => [scope_sql, *expand_range_bind_variables(values)]}
+          }
+        end
+        
         def value_with_modifier(value, modifier)
           case modifier
           when :like

data/lib/searchlogic/search.rb

@@ -62,6 +62,21 @@ module Searchlogic
     
     # Accepts a hash of conditions.
     def conditions=(values)
+      values.each do |condition, value|
+        # if a condition name ends with "(1i)", assume it's date / datetime
+        if condition =~ /(.*)\(1i\)$/
+          date_scope_name = $1
+          date_parts = (1..6).to_a.map do |idx|
+            values.delete("#{ date_scope_name }(#{ idx }i)")
+          end.reject{|s| s.blank? }.map{|s| s.to_i }
+
+          # did we get enough info to build a time?
+          if date_parts.length >= 3
+            values[date_scope_name] = Time.zone.local(*date_parts)
+          end
+        end
+      end
+
       values.each do |condition, value|
         mass_conditions[condition.to_sym] = value
         value.delete_if { |v| ignore_value?(v) } if value.is_a?(Array)

data/searchlogic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.4.14"
+  s.version = "2.4.15"
 
   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{2010-04-04}
+  s.date = %q{2010-04-15}
   s.description = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
      "VERSION.yml",
      "init.rb",
      "lib/searchlogic.rb",
+     "lib/searchlogic/active_record/association_proxy.rb",
      "lib/searchlogic/active_record/consistency.rb",
      "lib/searchlogic/active_record/named_scope_tools.rb",
      "lib/searchlogic/core_ext/object.rb",
@@ -38,16 +39,17 @@ Gem::Specification.new do |s|
      "lib/searchlogic/search.rb",
      "rails/init.rb",
      "searchlogic.gemspec",
-     "spec/active_record/consistency_spec.rb",
-     "spec/core_ext/object_spec.rb",
-     "spec/core_ext/proc_spec.rb",
-     "spec/named_scopes/alias_scope_spec.rb",
-     "spec/named_scopes/association_conditions_spec.rb",
-     "spec/named_scopes/association_ordering_spec.rb",
-     "spec/named_scopes/conditions_spec.rb",
-     "spec/named_scopes/or_conditions_spec.rb",
-     "spec/named_scopes/ordering_spec.rb",
-     "spec/search_spec.rb",
+     "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/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"
   ]
   s.homepage = %q{http://github.com/binarylogic/searchlogic}
@@ -57,16 +59,17 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
   s.test_files = [
-    "spec/active_record/consistency_spec.rb",
-     "spec/core_ext/object_spec.rb",
-     "spec/core_ext/proc_spec.rb",
-     "spec/named_scopes/alias_scope_spec.rb",
-     "spec/named_scopes/association_conditions_spec.rb",
-     "spec/named_scopes/association_ordering_spec.rb",
-     "spec/named_scopes/conditions_spec.rb",
-     "spec/named_scopes/or_conditions_spec.rb",
-     "spec/named_scopes/ordering_spec.rb",
-     "spec/search_spec.rb",
+    "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/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"
   ]
 

data/spec/searchlogic/active_record/association_proxy_spec.rb

@@ -0,0 +1,23 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+
+describe "Searchlogic::ActiveRecord::AssociationProxy" do
+  it "should call location conditions" do
+    company = Company.create
+    user = company.users.create(:username => "bjohnson")
+    company.users.send(:username_like, "bjohnson").should == [user]
+  end
+  
+  it "should call ordering conditions" do
+    company = Company.create
+    user = company.users.create(:username => "bjohnson")
+    company.users.send(:ascend_by_username).should == [user]
+  end
+  
+  it "should call 'or' conditions" do
+    company = Company.create
+    user = company.users.create(:username => "bjohnson")
+    company.users.send(:username_or_some_type_id_like, "bjohnson").should == [user]
+  end
+    
+end
+

data/spec/{active_record → searchlogic/active_record}/consistency_spec.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
-describe "Consistency" do
+describe Searchlogic::ActiveRecord::Consistency do
   it "should merge joins with consistent conditions" do
     user_group = UserGroup.create
     user_group.users.user_groups_name_like("name").user_groups_id_gt(10).scope(:find)[:joins].should == [

data/spec/{core_ext → searchlogic/core_ext}/object_spec.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
-describe "Object" do
+describe Searchlogic::CoreExt::Object do
   it "should accept and pass the argument to the searchlogic_options" do
     proc = searchlogic_lambda(:integer, :test => :value) {}
     proc.searchlogic_options[:type].should == :integer

data/spec/{core_ext → searchlogic/core_ext}/proc_spec.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
-describe "Proc" do
+describe Searchlogic::CoreExt::Proc do
   it "should have a searchlogic_options accessor" do
     p = Proc.new {}
     p.searchlogic_options[:type] = :integer

data/spec/{named_scopes → searchlogic/named_scopes}/alias_scope_spec.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
-describe "AliasScope" do
+describe Searchlogic::NamedScopes::AliasScope do
   before(:each) do
     User.alias_scope :username_has, lambda { |value| User.username_like(value) }
   end

data/spec/{named_scopes → searchlogic/named_scopes}/association_conditions_spec.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
-describe "Association Conditions" do
+describe Searchlogic::NamedScopes::AssociationConditions do
   it "should create a named scope" do
     Company.users_username_like("bjohnson").proxy_options.should == User.username_like("bjohnson").proxy_options.merge(:joins => :users)
   end

data/spec/{named_scopes → searchlogic/named_scopes}/association_ordering_spec.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
-describe "Association Ordering" do
+describe Searchlogic::NamedScopes::Ordering do
   it "should allow ascending" do
     Company.ascend_by_users_username.proxy_options.should == User.ascend_by_username.proxy_options.merge(:joins => :users)
   end

data/spec/{named_scopes → searchlogic/named_scopes}/conditions_spec.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
-describe "Conditions" do
+describe Searchlogic::NamedScopes::Conditions do
   it "should be dynamically created and then cached" do
     User.should_not respond_to(:age_less_than)
     User.age_less_than(5)

data/spec/{named_scopes → searchlogic/named_scopes}/or_conditions_spec.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
-describe "Or conditions" do
+describe Searchlogic::NamedScopes::OrConditions do
   it "should define a scope by the exact same name as requested by the code" do
     User.name_or_username_like('Test')
     User.respond_to?(:name_or_username_like).should be_true

data/spec/{named_scopes → searchlogic/named_scopes}/ordering_spec.rb

@@ -1,6 +1,6 @@
-require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
-describe "Ordering" do
+describe Searchlogic::NamedScopes::Ordering do
   it "should be dynamically created and then cached" do
     User.should_not respond_to(:ascend_by_username)
     User.ascend_by_username

data/spec/{search_spec.rb → searchlogic/search_spec.rb}

@@ -1,24 +1,26 @@
-require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
-describe "Search" do
-  context "implementation" do
-    it "should create a search proxy" do
-      User.search(:username => "joe").should be_kind_of(Searchlogic::Search)
-    end
+describe Searchlogic::Search do
+  describe "Implementation" do
+    context "#searchlogic" 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 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
-      search = company.users.search
-      search.current_scope.should == company.users.scope(:find)
+      it "should pass on the current scope to the proxy" do
+        company = Company.create
+        user = company.users.create
+        search = company.users.search
+        search.current_scope.should == company.users.scope(:find)
+      end
     end
   end
   
-  context "initialization" do
+  context "#initialize" do
     it "should require a class" do
       lambda { Searchlogic::Search.new }.should raise_error(ArgumentError)
     end
@@ -29,35 +31,30 @@ describe "Search" do
     end
   end
   
-  it "should clone properly" do
-    company = Company.create
-    user1 = company.users.create(:age => 5)
-    user2 = company.users.create(:age => 25)
-    search1 = company.users.search(:age_gt => 10)
-    search2 = search1.clone
-    search2.age_gt = 1
-    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)
-    search1 = User.search(:age_gt => 10)
-    search2 = search1.clone
-    search2.age_gt = 1
-    search2.all.should == User.all
-    search1.all.should == [user2]
-  end
+  context "#clone" do
+    it "should clone properly" do
+      company = Company.create
+      user1 = company.users.create(:age => 5)
+      user2 = company.users.create(:age => 25)
+      search1 = company.users.search(:age_gt => 10)
+      search2 = search1.clone
+      search2.age_gt = 1
+      search2.all.should == User.all
+      search1.all.should == [user2]
+    end
   
-  it "should delete the condition" do
-    search = User.search(:username_like => "bjohnson")
-    search.delete("username_like")
-    search.username_like.should be_nil
-    search.conditions["username_like"].should be_nil
+    it "should clone properly without scope" do
+      user1 = User.create(:age => 5)
+      user2 = User.create(:age => 25)
+      search1 = User.search(:age_gt => 10)
+      search2 = search1.clone
+      search2.age_gt = 1
+      search2.all.should == User.all
+      search1.all.should == [user2]
+    end
   end
   
-  context "conditions" do
+  context "#conditions" do
     it "should set the conditions and be accessible individually" do
       search = User.search
       search.conditions = {:username => "bjohnson"}
@@ -320,10 +317,81 @@ describe "Search" do
         search.users_orders_total_gt = "10"
         search.users_orders_total_gt.should == 10
       end
+
+      it "should support Rails' date_select and datetime_select out of the box" do
+        search = Company.search('created_at_after(1i)' => 2000, 'created_at_after(2i)' => 1, 'created_at_after(3i)' => 1)
+        search.created_at_after.should_not be_nil
+        search.created_at_after.should == Time.zone.local(2000, 1, 1)
+      end
     end
   end
   
-  context "taking action" do
+  context "#delete" do
+    it "should delete the condition" do
+      search = User.search(:username_like => "bjohnson")
+      search.delete("username_like")
+      search.username_like.should be_nil
+      search.conditions["username_like"].should be_nil
+    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)
+          {:conditions => ["id IN (?)", args]}
+        })
+        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)
+          {:conditions => ["id IN (?)", args]}
+        })
+        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" => ""}
+        s.proxy_options.should == {}
+      end
+    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
@@ -342,60 +410,6 @@ describe "Search" do
       User.four_year_olds.search.all.should == User.find_all_by_age(4)
     end
     
-    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)
-        {:conditions => ["id IN (?)", args]}
-      })
-      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)
-        {:conditions => ["id IN (?)", args]}
-      })
-      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" => ""}
-      s.proxy_options.should == {}
-    end
-  end
-  
-  context "method delegation" do
     it "should respond to count" do
       User.create(:username => "bjohnson")
       search1 = User.search(:username => "bjohnson")

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 4
-  - 14
-  version: 2.4.14
+  - 15
+  version: 2.4.15
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-04 00:00:00 -04:00
+date: 2010-04-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -48,6 +48,7 @@ files:
 - VERSION.yml
 - init.rb
 - lib/searchlogic.rb
+- lib/searchlogic/active_record/association_proxy.rb
 - lib/searchlogic/active_record/consistency.rb
 - lib/searchlogic/active_record/named_scope_tools.rb
 - lib/searchlogic/core_ext/object.rb
@@ -62,16 +63,17 @@ files:
 - lib/searchlogic/search.rb
 - rails/init.rb
 - searchlogic.gemspec
-- spec/active_record/consistency_spec.rb
-- spec/core_ext/object_spec.rb
-- spec/core_ext/proc_spec.rb
-- spec/named_scopes/alias_scope_spec.rb
-- spec/named_scopes/association_conditions_spec.rb
-- spec/named_scopes/association_ordering_spec.rb
-- spec/named_scopes/conditions_spec.rb
-- spec/named_scopes/or_conditions_spec.rb
-- spec/named_scopes/ordering_spec.rb
-- spec/search_spec.rb
+- 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/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
 has_rdoc: true
 homepage: http://github.com/binarylogic/searchlogic
@@ -104,14 +106,15 @@ signing_key:
 specification_version: 3
 summary: Searchlogic makes using ActiveRecord named scopes easier and less repetitive.
 test_files: 
-- spec/active_record/consistency_spec.rb
-- spec/core_ext/object_spec.rb
-- spec/core_ext/proc_spec.rb
-- spec/named_scopes/alias_scope_spec.rb
-- spec/named_scopes/association_conditions_spec.rb
-- spec/named_scopes/association_ordering_spec.rb
-- spec/named_scopes/conditions_spec.rb
-- spec/named_scopes/or_conditions_spec.rb
-- spec/named_scopes/ordering_spec.rb
-- spec/search_spec.rb
+- 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/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