searchlogic 2.1.8 → 2.1.9

data/CHANGELOG.rdoc

@@ -1,4 +1,9 @@
-== 2.1.8
+== 2.1.9 released 2009-07-28
+
+* Fixed bug when cloning with no scope
+* Allow the call of foreign pre-existing named scopes instead of those generated by searchlogic. Allows you to call named scopes on associations that you define yourself.
+
+== 2.1.8 released 2009-07-15
 
 * Added support for not_like, not_begin_with, not_end_with, and not_null
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
+:patch: 9
 :major: 2
 :minor: 1
-:patch: 8

data/lib/searchlogic/named_scopes/association_conditions.rb

@@ -49,14 +49,21 @@ module Searchlogic
         end
         
         def association_condition_details(name)
-          associations = reflect_on_all_associations.collect { |assoc| assoc.name }
-          if !local_condition?(name) && name.to_s =~ /^(#{associations.join("|")})_(\w+)_(#{Conditions::PRIMARY_CONDITIONS.join("|")})$/
+          regexes = [/^(#{reflect_on_all_associations.collect(&:name).join("|")})_(\w+)_(#{Conditions::PRIMARY_CONDITIONS.join("|")})$/]
+          reflect_on_all_associations.each do |assoc|
+            regexes << /^(#{assoc.name})_(#{assoc.klass.scopes.keys.join("|")})$/
+          end
+          
+          
+          if !local_condition?(name) && regexes.any? { |regex| name.to_s =~ regex }
             {:association => $1, :column => $2, :condition => $3}
           end
         end
         
         def create_association_condition(association_name, column, condition, args)
-          named_scope("#{association_name}_#{column}_#{condition}", association_condition_options(association_name, "#{column}_#{condition}", args))
+          name_parts = [column, condition].compact
+          condition_name = name_parts.join("_")
+          named_scope("#{association_name}_#{condition_name}", association_condition_options(association_name, condition_name, args))
         end
         
         def association_alias_condition_details(name)
@@ -103,8 +110,11 @@ module Searchlogic
                 end
               end
             end
+            
+            arg_type = (scope_options.respond_to?(:searchlogic_arg_type) && scope_options.searchlogic_arg_type) || :string
+            
             eval <<-"end_eval"
-              searchlogic_lambda(:#{scope_options.searchlogic_arg_type}) { |#{proc_args.join(",")}|
+              searchlogic_lambda(:#{arg_type}) { |#{proc_args.join(",")}|
                 options = association.klass.named_scope_options(association_condition).call(#{proc_args.join(",")})
                 options[:joins] = options[:joins].blank? ? association.name : {association.name => options[:joins]}
                 options

data/lib/searchlogic/named_scopes/conditions.rb

@@ -140,6 +140,8 @@ module Searchlogic
         
         def create_primary_condition(column, condition)
           column_type = columns_hash[column.to_s].type
+          match_keyword = 
+            ActiveRecord::Base.connection.adapter_name == "PostgreSQL" ? "ILIKE" : "LIKE"
           scope_options = case condition.to_s
           when /^equals/
             scope_options(condition, column_type, "#{table_name}.#{column} = ?")
@@ -154,17 +156,17 @@ module Searchlogic
           when /^greater_than/
             scope_options(condition, column_type, "#{table_name}.#{column} > ?")
           when /^like/
-            scope_options(condition, column_type, "#{table_name}.#{column} LIKE ?", :like)
+            scope_options(condition, column_type, "#{table_name}.#{column} #{match_keyword} ?", :like)
           when /^not_like/
-            scope_options(condition, column_type, "#{table_name}.#{column} NOT LIKE ?", :like)
+            scope_options(condition, column_type, "#{table_name}.#{column} NOT #{match_keyword} ?", :like)
           when /^begins_with/
-            scope_options(condition, column_type, "#{table_name}.#{column} LIKE ?", :begins_with)
+            scope_options(condition, column_type, "#{table_name}.#{column} #{match_keyword} ?", :begins_with)
           when /^not_begin_with/
-            scope_options(condition, column_type, "#{table_name}.#{column} NOT LIKE ?", :begins_with)
+            scope_options(condition, column_type, "#{table_name}.#{column} NOT #{match_keyword} ?", :begins_with)
           when /^ends_with/
-            scope_options(condition, column_type, "#{table_name}.#{column} LIKE ?", :ends_with)
+            scope_options(condition, column_type, "#{table_name}.#{column} #{match_keyword} ?", :ends_with)
           when /^not_end_with/
-            scope_options(condition, column_type, "#{table_name}.#{column} NOT LIKE ?", :ends_with)
+            scope_options(condition, column_type, "#{table_name}.#{column} NOT #{match_keyword} ?", :ends_with)
           when "null"
             {:conditions => "#{table_name}.#{column} IS NULL"}
           when "not_null"

data/lib/searchlogic/rails_helpers.rb

@@ -17,6 +17,7 @@ module Searchlogic
     # * <tt>:as</tt> - the text used in the link, defaults to whatever is passed to :by
     # * <tt>:ascend_scope</tt> - what scope to call for ascending the data, defaults to "ascend_by_:by"
     # * <tt>:descend_scope</tt> - what scope to call for descending the data, defaults to "descend_by_:by"
+    # * <tt>:params</tt> - hash with additional params which will be added to generated url
     # * <tt>:params_scope</tt> - the name of the params key to scope the order condition by, defaults to :search
     def order(search, options = {}, html_options = {})
       options[:params_scope] ||= :search
@@ -37,7 +38,10 @@ module Searchlogic
         end
         html_options[:class] = css_classes.join(" ")
       end
-      link_to options[:as], url_for(options[:params_scope] => search.conditions.merge( { :order => new_scope } ) ), html_options
+      url_options = {
+        options[:params_scope] => search.conditions.merge( { :order => new_scope } )
+      }.deep_merge(options[:params] || {})
+      link_to options[:as], url_for(url_options), html_options
     end
 
     # Automatically makes the form method :get if a Searchlogic::Search and sets
@@ -66,4 +70,4 @@ module Searchlogic
       end
     end
   end
-end
+end

data/lib/searchlogic/search.rb

@@ -51,7 +51,7 @@ module Searchlogic
     end
     
     def clone
-      self.class.new(klass, current_scope.clone, conditions.clone)
+      self.class.new(klass, current_scope && current_scope.clone, conditions.clone)
     end
     
     # Returns a hash of the current conditions set.
@@ -148,4 +148,4 @@ module Searchlogic
         end
       end
   end
-end
+end

data/searchlogic.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.1.8"
+  s.version = "2.1.9"
 
   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-07-16}
+  s.date = %q{2009-07-28}
   s.description = %q{Searchlogic provides common named scopes and object based searching for ActiveRecord.}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{searchlogic}
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Searchlogic provides common named scopes and object based searching for ActiveRecord.}
   s.test_files = [
     "spec/core_ext/object_spec.rb",

data/spec/named_scopes/association_conditions_spec.rb

@@ -9,11 +9,15 @@ describe "Association Conditions" do
     Company.users_orders_total_greater_than(10).proxy_options.should == Order.total_greater_than(10).proxy_options.merge(:joins => {:users => :orders})
   end
   
-  it "should not allowed named scopes on non existent association columns" do
+  it "should allow the use of foreign pre-existing named scopes" do
+    Company.users_uname("bjohnson").proxy_options.should == User.uname("bjohnson").proxy_options.merge(:joins => :users)
+  end
+  
+  it "should not allow named scopes on non existent association columns" do
     lambda { User.users_whatever_like("bjohnson") }.should raise_error(NoMethodError)
   end
   
-  it "should not allowed named scopes on non existent deep association columns" do
+  it "should not allow named scopes on non existent deep association columns" do
     lambda { User.users_orders_whatever_like("bjohnson") }.should raise_error(NoMethodError)
   end
   

data/spec/named_scopes/association_ordering_spec.rb

@@ -16,4 +16,8 @@ describe "Association Ordering" do
   it "should allow deep descending" do
     Company.descend_by_users_orders_total.proxy_options.should == Order.descend_by_total.proxy_options.merge(:joins => {:users => :orders})
   end
+  
+  it "should ascend with a belongs to" do
+    User.ascend_by_company_name.proxy_options.should == Company.ascend_by_name.proxy_options.merge(:joins => :company)
+  end
 end

data/spec/search_spec.rb

@@ -40,6 +40,16 @@ describe "Search" do
     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
+  
   it "should delete the condition" do
     search = User.search(:username_like => "bjohnson")
     search.delete("username_like")
@@ -292,4 +302,4 @@ describe "Search" do
       User.search(:order => "ascend_by_username").proxy_options.should == User.ascend_by_username.proxy_options
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -14,6 +14,7 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table :companies do |t|
     t.datetime :created_at
     t.datetime :updated_at
+    t.string :name
     t.integer :users_count, :default => 0
   end
   
@@ -56,6 +57,7 @@ Spec::Runner.configure do |config|
     class User < ActiveRecord::Base
       belongs_to :company, :counter_cache => true
       has_many :orders, :dependent => :destroy
+      named_scope :uname, lambda { |value| {:conditions => ["users.username = ?", value]} }
       alias_scope :username_has, lambda { |value| username_like(value) }
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchlogic
 version: !ruby/object:Gem::Version 
-  version: 2.1.8
+  version: 2.1.9
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-16 00:00:00 -04:00
+date: 2009-07-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: searchlogic
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Searchlogic provides common named scopes and object based searching for ActiveRecord.