searchlogic 1.5.9 → 1.5.10

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+== 1.5.10 released 2008-12-10
+
+* Create class level conditions upon instantiation to avoid conflicts.
+
 == 1.5.9 released 2008-12-3
 
 * Added metaclass object extension for older version of ActiveSupport.

data/lib/searchlogic/condition/inclusive_descendant_of.rb

@@ -1,6 +1,6 @@
 module Searchlogic
   module Condition
-    class InclusiveDescendantOf < Tree      
+    class InclusiveDescendantOf < Tree
       def to_conditions(value)
         condition = DescendantOf.new(klass, options)
         condition.value = value

data/lib/searchlogic/condition/tree.rb

@@ -8,7 +8,7 @@ module Searchlogic
           []
         end
         
-        def condition_names_for_model(model)
+        def condition_names_for_model
           [condition_type_name]
         end
       end

data/lib/searchlogic/conditions/magic_methods.rb

@@ -7,7 +7,7 @@ module Searchlogic
       def self.included(klass)
         klass.metaclass.class_eval do
           include ClassMethods
-          attr_accessor :added_column_equals_conditions, :added_associations
+          attr_accessor :added_class_level_conditions, :added_column_equals_conditions, :added_associations
         end
         
         klass.class_eval do
@@ -45,6 +45,7 @@ module Searchlogic
         def initialize_with_magic_methods(*args)
           add_associations!
           add_column_equals_conditions!
+          add_class_level_conditions!
           initialize_without_magic_methods(*args)
         end
         
@@ -83,6 +84,21 @@ module Searchlogic
             klass.column_names.each { |name| setup_condition(name) }
             self.class.added_column_equals_conditions = true
           end
+          
+          def add_class_level_conditions!
+            return true if self.class.added_class_level_conditions
+            class_level_conditions = self.class.conditions.select { |condition_class| !condition_class.condition_names_for_model.blank? }
+            class_level_conditions.each do |condition_class|
+              condition_class.condition_names_for_model.each_with_index do |condition_name, index|
+                if index == 0
+                  add_condition!(condition_class, condition_name)
+                else
+                  add_condition_alias!(condition_name, condition_class.condition_names_for_model.first)
+                end
+              end
+            end
+            self.class.added_class_level_conditions = true
+          end
         
           def sanitize_method_name(name)
             name.gsub("=", "").gsub(/^(and|or)_/, "")
@@ -209,7 +225,7 @@ module Searchlogic
           end
         
           def add_condition!(condition, name, options = {})
-            options[:column] = options[:column].name
+            options[:column] = options[:column].name if options[:column]
           
             self.class.class_eval <<-"end_eval", __FILE__, __LINE__
               def #{name}_object

data/lib/searchlogic/version.rb

@@ -67,7 +67,7 @@ module Searchlogic
 
     MAJOR = 1
     MINOR = 5
-    TINY  = 9
+    TINY  = 10
 
     # The current version as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/searchlogic.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "1.5.9"
+  s.version = "1.5.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Johnson of Binary Logic"]
-  s.date = %q{2008-12-05}
+  s.date = %q{2008-12-07}
   s.description = %q{Object based ActiveRecord searching, ordering, pagination, and more!}
   s.email = %q{bjohnson@binarylogic.com}
   s.extra_rdoc_files = ["CHANGELOG.rdoc", "lib/searchlogic/active_record/associations.rb", "lib/searchlogic/active_record/base.rb", "lib/searchlogic/active_record/connection_adapters/mysql_adapter.rb", "lib/searchlogic/active_record/connection_adapters/postgresql_adapter.rb", "lib/searchlogic/active_record/connection_adapters/sqlite_adapter.rb", "lib/searchlogic/condition/base.rb", "lib/searchlogic/condition/begins_with.rb", "lib/searchlogic/condition/blank.rb", "lib/searchlogic/condition/child_of.rb", "lib/searchlogic/condition/descendant_of.rb", "lib/searchlogic/condition/ends_with.rb", "lib/searchlogic/condition/equals.rb", "lib/searchlogic/condition/greater_than.rb", "lib/searchlogic/condition/greater_than_or_equal_to.rb", "lib/searchlogic/condition/inclusive_descendant_of.rb", "lib/searchlogic/condition/keywords.rb", "lib/searchlogic/condition/less_than.rb", "lib/searchlogic/condition/less_than_or_equal_to.rb", "lib/searchlogic/condition/like.rb", "lib/searchlogic/condition/nil.rb", "lib/searchlogic/condition/not_begin_with.rb", "lib/searchlogic/condition/not_blank.rb", "lib/searchlogic/condition/not_end_with.rb", "lib/searchlogic/condition/not_equal.rb", "lib/searchlogic/condition/not_have_keywords.rb", "lib/searchlogic/condition/not_like.rb", "lib/searchlogic/condition/not_nil.rb", "lib/searchlogic/condition/sibling_of.rb", "lib/searchlogic/condition/tree.rb", "lib/searchlogic/conditions/any_or_all.rb", "lib/searchlogic/conditions/base.rb", "lib/searchlogic/conditions/groups.rb", "lib/searchlogic/conditions/magic_methods.rb", "lib/searchlogic/conditions/multiparameter_attributes.rb", "lib/searchlogic/conditions/protection.rb", "lib/searchlogic/config/helpers.rb", "lib/searchlogic/config/search.rb", "lib/searchlogic/config.rb", "lib/searchlogic/core_ext/hash.rb", "lib/searchlogic/core_ext/object.rb", "lib/searchlogic/helpers/control_types/link.rb", "lib/searchlogic/helpers/control_types/links.rb", "lib/searchlogic/helpers/control_types/remote_link.rb", "lib/searchlogic/helpers/control_types/remote_links.rb", "lib/searchlogic/helpers/control_types/remote_select.rb", "lib/searchlogic/helpers/control_types/select.rb", "lib/searchlogic/helpers/form.rb", "lib/searchlogic/helpers/utilities.rb", "lib/searchlogic/modifiers/absolute.rb", "lib/searchlogic/modifiers/acos.rb", "lib/searchlogic/modifiers/asin.rb", "lib/searchlogic/modifiers/atan.rb", "lib/searchlogic/modifiers/avg.rb", "lib/searchlogic/modifiers/base.rb", "lib/searchlogic/modifiers/ceil.rb", "lib/searchlogic/modifiers/char_length.rb", "lib/searchlogic/modifiers/cos.rb", "lib/searchlogic/modifiers/cot.rb", "lib/searchlogic/modifiers/count.rb", "lib/searchlogic/modifiers/day_of_month.rb", "lib/searchlogic/modifiers/day_of_week.rb", "lib/searchlogic/modifiers/day_of_year.rb", "lib/searchlogic/modifiers/degrees.rb", "lib/searchlogic/modifiers/exp.rb", "lib/searchlogic/modifiers/floor.rb", "lib/searchlogic/modifiers/hex.rb", "lib/searchlogic/modifiers/hour.rb", "lib/searchlogic/modifiers/log.rb", "lib/searchlogic/modifiers/log10.rb", "lib/searchlogic/modifiers/log2.rb", "lib/searchlogic/modifiers/lower.rb", "lib/searchlogic/modifiers/ltrim.rb", "lib/searchlogic/modifiers/md5.rb", "lib/searchlogic/modifiers/microseconds.rb", "lib/searchlogic/modifiers/milliseconds.rb", "lib/searchlogic/modifiers/minute.rb", "lib/searchlogic/modifiers/month.rb", "lib/searchlogic/modifiers/octal.rb", "lib/searchlogic/modifiers/radians.rb", "lib/searchlogic/modifiers/round.rb", "lib/searchlogic/modifiers/rtrim.rb", "lib/searchlogic/modifiers/second.rb", "lib/searchlogic/modifiers/sign.rb", "lib/searchlogic/modifiers/sin.rb", "lib/searchlogic/modifiers/square_root.rb", "lib/searchlogic/modifiers/sum.rb", "lib/searchlogic/modifiers/tan.rb", "lib/searchlogic/modifiers/trim.rb", "lib/searchlogic/modifiers/upper.rb", "lib/searchlogic/modifiers/week.rb", "lib/searchlogic/modifiers/year.rb", "lib/searchlogic/search/base.rb", "lib/searchlogic/search/conditions.rb", "lib/searchlogic/search/ordering.rb", "lib/searchlogic/search/pagination.rb", "lib/searchlogic/search/protection.rb", "lib/searchlogic/search/searching.rb", "lib/searchlogic/shared/utilities.rb", "lib/searchlogic/shared/virtual_classes.rb", "lib/searchlogic/version.rb", "lib/searchlogic.rb", "README.rdoc", "TODO.rdoc"]

data/test/conditions_tests/magic_methods_test.rb

@@ -2,6 +2,17 @@ require File.dirname(__FILE__) + '/../test_helper.rb'
 
 module ConditionsTests
   class MagicMethodsTest < ActiveSupport::TestCase
+    def test_class_level_conditions
+      ben = users(:ben)
+      drew = users(:drew)
+      jennifer = users(:jennifer)
+      tren = users(:tren)
+      
+      conditions = Searchlogic::Cache::UserConditions.new
+      conditions.descendant_of = ben
+      assert_equal ["\"users\".\"id\" = ? OR \"users\".\"id\" = ? OR \"users\".\"id\" = ?", drew.id, tren.id, jennifer.id], conditions.sanitize
+    end
+    
     def test_virtual_columns
       search = Account.new_search
       conditions = search.conditions
@@ -15,10 +26,10 @@ module ConditionsTests
       assert_equal ["(strftime('%H', \"accounts\".\"created_at\") * 1) > ? AND (strftime('%w', \"accounts\".\"created_at\") * 1) <= ? AND (strftime('%m', \"accounts\".\"created_at\") * 1) IS NULL AND (strftime('%m', (strftime('%H', (strftime('%M', \"accounts\".\"created_at\") * 1)) * 1)) * 1) IS NULL", 2, 5], conditions.sanitize
       assert_nothing_raised { search.all }
     end
-  end
-  
-  def test_method_conflicts
-    conditions = Searchlogic::Cache::AccountConditions.new
-    assert_nil conditions.id
+    
+    def test_method_conflicts
+      conditions = Searchlogic::Cache::AccountConditions.new
+      assert_nil conditions.id
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchlogic
 version: !ruby/object:Gem::Version 
-  version: 1.5.9
+  version: 1.5.10
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-05 00:00:00 -05:00
+date: 2008-12-07 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency