searchlogic 2.3.9 → 2.3.10

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:minor: 3
-:patch: 9
 :major: 2
+:minor: 3
 :build: 
+:patch: 10

data/lib/searchlogic/named_scopes/conditions.rb

@@ -89,13 +89,11 @@ module Searchlogic
           end
         end
         
-        def condition_details(name, *args)
-          if args.size > 0 and !args.first.nil?
-            assoc = reflect_on_association(args.first.to_sym)
-            klass = assoc.klass
-            name.to_s =~ /^(#{klass.column_names.join("|")})_(#{(PRIMARY_CONDITIONS + ALIAS_CONDITIONS).join("|")})$/
-            {:column => $1, :condition => $2}
-          elsif name.to_s =~ /^(#{column_names.join("|")})_(#{(PRIMARY_CONDITIONS + ALIAS_CONDITIONS).join("|")})$/
+        def condition_details(method_name)
+          column_name_matcher = column_names.join("|")
+          conditions_matcher = (PRIMARY_CONDITIONS + ALIAS_CONDITIONS).join("|")
+
+          if method_name.to_s =~ /^(#{column_name_matcher})_(#{conditions_matcher})$/
             {:column => $1, :condition => $2}
           end
         end

data/lib/searchlogic/named_scopes/or_conditions.rb

@@ -10,6 +10,10 @@ module Searchlogic
         super || or_condition?(name)
       end
       
+      def named_scope_options(name) # :nodoc:
+        super || super(or_conditions(name).join("_or_"))
+      end
+      
       private
         def or_condition?(name)
           !or_conditions(name).nil?
@@ -106,7 +110,7 @@ module Searchlogic
                 path << details[:association]
                 part = details[:condition]
                 given_assoc = details[:association]
-              elsif details = klass.send(:condition_details, part, nil)
+              elsif details = klass.send(:condition_details, part)
                 return { :path => path, :column => details[:column], :condition => details[:condition] }
               end
             end
@@ -114,7 +118,11 @@ module Searchlogic
         end
         
         def create_or_condition(scopes, args)
-          named_scope scopes.join("_or_"), lambda { |*args|
+          scopes_options = scopes.collect { |scope, *args| send(scope, *args).proxy_options }
+          # We're using first scope to determine column's type
+          scope = named_scope_options(scopes.first)
+          column_type = scope.respond_to?(:searchlogic_arg_type) ? scope.searchlogic_arg_type : :string
+          named_scope scopes.join("_or_"), searchlogic_lambda(column_type) { |*args|
             merge_scopes_with_or(scopes.collect { |scope| [scope, *args] })
           }
         end

data/lib/searchlogic/rails_helpers.rb

@@ -66,7 +66,7 @@ module Searchlogic
     def fields_for(*args, &block)
       if search_obj = args.find { |arg| arg.is_a?(Searchlogic::Search) }
         args.unshift(:search) if args.first == search_obj
-        concat(content_tag("div", hidden_field_tag("#{args.first}[order]", search_obj.order)) + "\n")
+        concat(content_tag("div", hidden_field_tag("#{args.first}[order]", search_obj.order)))
         super
       else
         super

data/lib/searchlogic/search.rb

@@ -84,7 +84,11 @@ module Searchlogic
         
         if setter?(name)
           if scope?(scope_name)
-            conditions[condition_name] = type_cast(args.first, cast_type(scope_name))
+            if args.size == 1
+              conditions[condition_name] = type_cast(args.first, cast_type(scope_name))
+            else
+              conditions[condition_name] = args
+            end
           else
             raise UnknownConditionError.new(condition_name)
           end
@@ -109,11 +113,7 @@ module Searchlogic
                 scope
               end
             else
-              if value.is_a?(Array)
-                scope.send(scope_name, *value)
-              else
-                scope.send(scope_name, value)
-              end
+              scope.send(scope_name, *value)
             end
           end
           scope.send(name, *args, &block)

data/searchlogic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.3.9"
+  s.version = "2.3.10"
 
   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-11-27}
+  s.date = %q{2010-01-14}
   s.description = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [

data/spec/named_scopes/or_conditions_spec.rb

@@ -56,4 +56,11 @@ describe "Or conditions" do
     User.find_or_create_by_name_and_username("Fred", "fredb").should be_a_kind_of User
   end
   
+  it "should work with User.search(conditions) method" do
+    User.search(:username_or_name_like => 'ben').proxy_options.should == {:conditions => "(users.username LIKE '%ben%') OR (users.name LIKE '%ben%')"}
+  end
+
+  it "should convert types properly when used with User.search(conditions) method" do
+    User.search(:id_or_age_lte => '10').proxy_options.should == {:conditions => "(users.id <= 10) OR (users.age <= 10)"}
+  end
 end

data/spec/search_spec.rb

@@ -365,5 +365,13 @@ describe "Search" do
       search1.empty?.should == false
       search2.empty?.should == true
     end
+
+		it "should delegate to named scopes with arity > 1" do
+		  User.named_scope :paged, lambda {|start, limit| { :limit => limit, :offset => start }}
+			User.create(:username => "bjohnson")
+			search = User.search(:username => "bjohnson")
+			search.paged(0, 1).count.should == 1
+			search.paged(0, 0).count.should == 0
+	  end
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 require 'spec'
 require 'rubygems'
 require 'ruby-debug'
-require 'activerecord'
+require 'active_record'
 
 ENV['TZ'] = 'UTC'
 Time.zone = 'Eastern Time (US & Canada)'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchlogic
 version: !ruby/object:Gem::Version 
-  version: 2.3.9
+  version: 2.3.10
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-27 00:00:00 -05:00
+date: 2010-01-14 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency