searchlogic 2.4.19 → 2.4.21

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 2
-:build: 
 :minor: 4
-:patch: 19
+:patch: 21
+:build: 

data/lib/searchlogic/named_scopes/alias_scope.rb

@@ -47,7 +47,7 @@ module Searchlogic
       alias_method :scope_procedure, :alias_scope
       
       def alias_scopes # :nodoc:
-        @alias_scopes ||= {}
+        read_inheritable_attribute(:alias_scopes) || write_inheritable_attribute(:alias_scopes, {})
       end
       
       def alias_scope?(name) # :nodoc:

data/lib/searchlogic/named_scopes/conditions.rb

@@ -17,7 +17,7 @@ module Searchlogic
         :greater_than => [:gt, :after],
         :greater_than_or_equal_to => [:gte],
       }
-      
+
       WILDCARD_CONDITIONS = {
         :like => [:contains, :includes],
         :not_like => [:does_not_include],
@@ -26,7 +26,7 @@ module Searchlogic
         :ends_with => [:ew],
         :not_end_with => [:does_not_end_with]
       }
-      
+
       BOOLEAN_CONDITIONS = {
         :null => [:nil],
         :not_null => [:not_nil],
@@ -34,41 +34,41 @@ module Searchlogic
         :blank => [],
         :not_blank => [:present]
       }
-      
+
       CONDITIONS = {}
-      
+
       # Add any / all variations to every comparison and wildcard condition
       COMPARISON_CONDITIONS.merge(WILDCARD_CONDITIONS).each do |condition, aliases|
         CONDITIONS[condition] = aliases
         CONDITIONS["#{condition}_any".to_sym] = aliases.collect { |a| "#{a}_any".to_sym }
         CONDITIONS["#{condition}_all".to_sym] = aliases.collect { |a| "#{a}_all".to_sym }
       end
-      
+
       CONDITIONS[:equals_any] = CONDITIONS[:equals_any] + [:in]
       CONDITIONS[:does_not_equal_all] = CONDITIONS[:does_not_equal_all] + [:not_in]
-      
+
       BOOLEAN_CONDITIONS.each { |condition, aliases| CONDITIONS[condition] = aliases }
-      
+
       PRIMARY_CONDITIONS = CONDITIONS.keys
       ALIAS_CONDITIONS = CONDITIONS.values.flatten
-      
+
       # Is the name of the method a valid condition that can be dynamically created?
       def condition?(name)
         local_condition?(name)
       end
-      
+
       private
         def local_condition?(name)
           return false if name.blank?
           scope_names = scopes.keys.reject { |k| k == :scoped }
           scope_names.include?(name.to_sym) || !condition_details(name).nil? || boolean_condition?(name)
         end
-        
+
         def boolean_condition?(name)
           column = columns_hash[name.to_s] || columns_hash[name.to_s.gsub(/^not_/, "")]
           column && column.type == :boolean
         end
-        
+
         def method_missing(name, *args, &block)
           if details = condition_details(name)
             create_condition(details[:column], details[:condition], args)
@@ -81,8 +81,8 @@ module Searchlogic
             super
           end
         end
-        
-        
+
+
         def condition_details(method_name)
           column_name_matcher = column_names.join("|")
           conditions_matcher = (PRIMARY_CONDITIONS + ALIAS_CONDITIONS).join("|")
@@ -91,7 +91,7 @@ module Searchlogic
             {:column => $1, :condition => $2}
           end
         end
-        
+
         def create_condition(column, condition, args)
           if PRIMARY_CONDITIONS.include?(condition.to_sym)
             create_primary_condition(column, condition)
@@ -99,12 +99,12 @@ module Searchlogic
             create_alias_condition(column, condition, args)
           end
         end
-        
+
         def create_primary_condition(column, condition)
           column_type = columns_hash[column.to_s].type
           skip_conversion = skip_time_zone_conversion_for_attributes.include?(columns_hash[column.to_s].name.to_sym)
           match_keyword = ::ActiveRecord::Base.connection.adapter_name == "PostgreSQL" ? "ILIKE" : "LIKE"
-          
+
           scope_options = case condition.to_s
           when /^equals/
             scope_options(condition, column_type, lambda { |a| attribute_condition("#{table_name}.#{column}", a) }, :skip_conversion => skip_conversion)
@@ -141,10 +141,10 @@ module Searchlogic
           when "not_blank"
             {:conditions => "#{table_name}.#{column} != '' AND #{table_name}.#{column} IS NOT NULL"}
           end
-          
+
           named_scope("#{column}_#{condition}".to_sym, scope_options)
         end
-        
+
         # This method helps cut down on defining scope options for conditions that allow *_any or *_all conditions.
         # Kepp in mind that the lambdas get cached in a method, so you want to keep the contents of the lambdas as
         # fast as possible, which is why I didn't do the case statement inside of the lambda.
@@ -152,15 +152,18 @@ module Searchlogic
           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]) }
+              unless values.empty?
+                values.flatten!
+                values.collect! { |value| value_with_modifier(value, options[:value_modifier]) }
 
-              join = $1 == "any" ? " OR " : " AND "
+                join = $1 == "any" ? " OR " : " AND "
 
-              scope_sql = values.collect { |value| sql.is_a?(Proc) ? sql.call(value) : sql }.join(join)
+                scope_sql = values.collect { |value| sql.is_a?(Proc) ? sql.call(value) : sql }.join(join)
 
-              {:conditions => [scope_sql, *expand_range_bind_variables(values)]}
+                {:conditions => [scope_sql, *expand_range_bind_variables(values)]}
+              else
+                {}
+              end
             }
           else
             searchlogic_lambda(column_type, :skip_conversion => options[:skip_conversion]) { |*values|
@@ -172,7 +175,7 @@ module Searchlogic
             }
           end
         end
-        
+
         def value_with_modifier(value, modifier)
           case modifier
           when :like
@@ -185,7 +188,7 @@ module Searchlogic
             value
           end
         end
-        
+
         def create_alias_condition(column, condition, args)
           primary_condition = primary_condition(condition)
           alias_name = "#{column}_#{condition}"
@@ -193,7 +196,7 @@ module Searchlogic
           send(primary_name, *args) # go back to method_missing and make sure we create the method
           (class << self; self; end).class_eval { alias_method alias_name, primary_name }
         end
-        
+
         # Returns the primary condition for the given alias. Ex:
         #
         #   primary_condition(:gt) => :greater_than

data/lib/searchlogic/named_scopes/or_conditions.rb

@@ -11,7 +11,7 @@ module Searchlogic
       end
       
       def named_scope_options(name) # :nodoc:
-        super || super(or_conditions(name).join("_or_"))
+        super || super(or_conditions(name).try(:join, "_or_"))
       end
       
       private

data/lib/searchlogic/rails_helpers.rb

@@ -44,6 +44,9 @@ module Searchlogic
       url_options = {
         options[:params_scope] => search.conditions.merge( { :order => new_scope } )
       }.deep_merge(options[:params] || {})
+
+      options[:as] = raw(options[:as]) if defined?(RailsXss)
+
       link_to options[:as], url_for(url_options), html_options
     end
 
@@ -60,8 +63,8 @@ module Searchlogic
       end
       super
     end
-    
-    # Automatically adds an "order" hidden field in your form to preserve how the data 
+
+    # Automatically adds an "order" hidden field in your form to preserve how the data
     # is being ordered.
     def fields_for(*args, &block)
       if search_obj = args.find { |arg| arg.is_a?(Searchlogic::Search) }

data/lib/searchlogic/search.rb

@@ -60,6 +60,10 @@ module Searchlogic
       mass_conditions.clone.merge(@conditions)
     end
     
+    def compact_conditions
+      conditions.select { |k,v| !v.blank? }
+    end
+    
     # Accepts a hash of conditions.
     def conditions=(values)
       values.each do |condition, value|

data/searchlogic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "2.4.19"
+  s.version = "2.4.21"
 
   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-16}
+  s.date = %q{2010-07-25}
   s.description = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = [
@@ -56,7 +56,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.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
   s.test_files = [
     "spec/searchlogic/active_record/association_proxy_spec.rb",
@@ -77,7 +77,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 2.0.0"])
     else
       s.add_dependency(%q<activerecord>, [">= 2.0.0"])

data/spec/searchlogic/named_scopes/alias_scope_spec.rb

@@ -16,4 +16,8 @@ describe Searchlogic::NamedScopes::AliasScope do
     search.username_has = "bjohnson"
     search.username_has.should == "bjohnson"
   end
-end
+  
+  it "should inherit alias scopes from superclasses" do
+    Class.new(User).alias_scope?("username_has").should be_true
+  end
+end

data/spec/searchlogic/named_scopes/conditions_spec.rb

@@ -115,7 +115,7 @@ describe Searchlogic::NamedScopes::Conditions do
     it "should do nothing if no arguments are passed" do
       User.username_equals_any.proxy_options.should == {}
     end
-    
+  
     it "should treat an array and multiple arguments the same" do
       %w(bjohnson thunt dgainor).each { |username| User.create(:username => username) }
       User.username_like_any("bjohnson", "thunt").should == User.username_like_any(["bjohnson", "thunt"])

data/spec/searchlogic/search_spec.rb

@@ -102,6 +102,14 @@ describe Searchlogic::Search do
     end
   end
   
+  context "#compact_conditions" do
+    it "should remove conditions with blank values" do
+      search = User.search
+      search.conditions = {"id_equals" => "", "name_equals" => "Ben"}
+      search.compact_conditions.should == {:name_equals => "Ben"}
+    end
+  end
+  
   context "condition accessors" do
     it "should allow setting exact columns individually" do
       search = User.search

data/spec/spec_helper.rb

@@ -82,20 +82,20 @@ require 'searchlogic'
 
 Spec::Runner.configure do |config|
   config.before(:each) do
-    class Audit < ActiveRecord::Base
+    class ::Audit < ActiveRecord::Base
       belongs_to :auditable, :polymorphic => true
     end
     
-    class Company < ActiveRecord::Base
+    class ::Company < ActiveRecord::Base
       has_many :orders, :through => :users
       has_many :users, :dependent => :destroy
     end
     
-    class UserGroup < ActiveRecord::Base
+    class ::UserGroup < ActiveRecord::Base
       has_and_belongs_to_many :users
     end
     
-    class User < ActiveRecord::Base
+    class ::User < ActiveRecord::Base
       belongs_to :company, :counter_cache => true
       has_many :orders, :dependent => :destroy
       has_many :orders_big, :class_name => 'Order', :conditions => 'total > 100'
@@ -104,23 +104,23 @@ Spec::Runner.configure do |config|
       self.skip_time_zone_conversion_for_attributes = [:whatever_at]
     end
     
-    class Order < ActiveRecord::Base
+    class ::Order < ActiveRecord::Base
       belongs_to :user
       has_many :line_items, :dependent => :destroy
     end
     
-    class Fee < ActiveRecord::Base
+    class ::Fee < ActiveRecord::Base
       belongs_to :owner, :polymorphic => true
     end
     
-    class LineItem < ActiveRecord::Base
+    class ::LineItem < ActiveRecord::Base
       belongs_to :order
     end
     
-    Company.destroy_all
-    User.destroy_all
-    Order.destroy_all
-    LineItem.destroy_all
+    ::Company.destroy_all
+    ::User.destroy_all
+    ::Order.destroy_all
+    ::LineItem.destroy_all
   end
   
   config.after(:each) do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: searchlogic
 version: !ruby/object:Gem::Version 
+  hash: 53
   prerelease: false
   segments: 
   - 2
   - 4
-  - 19
-  version: 2.4.19
+  - 21
+  version: 2.4.21
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 -04:00
+date: 2010-07-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 0
@@ -85,23 +88,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: searchlogic
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Searchlogic makes using ActiveRecord named scopes easier and less repetitive.