searchlogic 1.5.3 → 1.5.4

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+== 1.5.4 released 2008-11-16
+
+* Removed subclass requirement for adding conditions in Conditions::Base
+* Removed DISTINCT in the select clause, instead called uniq! on the results. PostgreSQL complains about DISTINCT and AR uses uniq! when using :includes, so this is the best option.
+* Converted the return for SQLite's strftime to integer from string. This way day of month, day of year, etc works as expected.
+
 == 1.5.3 released 2008-10-30
 
 * Removed ilike conditions and let the like condition determine if it should use like or ilike depending on the connection adapter.

data/Manifest

@@ -1,5 +1,4 @@
 CHANGELOG.rdoc
-examples/README.rdoc
 init.rb
 lib/searchlogic/active_record/associations.rb
 lib/searchlogic/active_record/base.rb
@@ -98,26 +97,46 @@ Manifest
 MIT-LICENSE
 Rakefile
 README.rdoc
+test/active_record_tests/associations_test.rb
+test/active_record_tests/base_test.rb
+test/condition_tests/base_test.rb
+test/condition_tests/begins_with_test.rb
+test/condition_tests/blank_test.rb
+test/condition_tests/child_of_test.rb
+test/condition_tests/descendant_of_test.rb
+test/condition_tests/ends_with_test.rb
+test/condition_tests/equals_test.rb
+test/condition_tests/greater_than_or_equal_to_test.rb
+test/condition_tests/greater_than_test.rb
+test/condition_tests/inclusive_descendant_of_test.rb
+test/condition_tests/keyswords_test.rb
+test/condition_tests/less_than_or_equal_to_test.rb
+test/condition_tests/less_than_test.rb
+test/condition_tests/like_test.rb
+test/condition_tests/nil_test.rb
+test/condition_tests/not_begin_with_test.rb
+test/condition_tests/not_blank_test.rb
+test/condition_tests/not_end_with_test.rb
+test/condition_tests/not_equal_test.rb
+test/condition_tests/not_have_keywords_test.rb
+test/condition_tests/not_like_test.rb
+test/condition_tests/not_nil_test.rb
+test/condition_tests/sibling_of_test.rb
+test/conditions_tests/base_test.rb
+test/conditions_tests/protection_test.rb
+test/config_test.rb
 test/fixtures/accounts.yml
-test/fixtures/cats.yml
-test/fixtures/dogs.yml
+test/fixtures/animals.yml
 test/fixtures/orders.yml
 test/fixtures/user_groups.yml
 test/fixtures/users.yml
-test/test_active_record_associations.rb
-test/test_active_record_base.rb
-test/test_condition_base.rb
-test/test_condition_types.rb
-test/test_conditions_base.rb
-test/test_conditions_protection.rb
-test/test_config.rb
+test/libs/acts_as_tree.rb
+test/libs/rexml_fix.rb
+test/modifier_tests/day_of_month_test.rb
+test/search_tests/base_test.rb
+test/search_tests/conditions_test.rb
+test/search_tests/ordering_test.rb
+test/search_tests/pagination_test.rb
+test/search_tests/protection_test.rb
 test/test_helper.rb
-test/test_search_base.rb
-test/test_search_conditions.rb
-test/test_search_ordering.rb
-test/test_search_pagination.rb
-test/test_search_protection.rb
-test_libs/acts_as_tree.rb
-test_libs/ordered_hash.rb
-test_libs/rexml_fix.rb
 TODO.rdoc

data/README.rdoc

@@ -1,8 +1,6 @@
 = Searchlogic
 
-Searchlogic is orgasmic. Maybe not orgasmic, but you will get aroused. So go grab a towel and let's dive in.
-
-<b>Searchlogic's inspiration comes right from ActiveRecord. ActiveRecord lets you create objects that represent a record in the database, so why can't you create objects that represent searching the database? Now you can! It's searching, ordering, and pagination all in one.</b>
+Searchlogic is object based ActiveRecord searching, ordering, and pagination all in one.
 
 == Helpful links
 
@@ -58,7 +56,7 @@ same as above, but object based
 
 In both examples, instead of using the "all" method you could use any search method: first, find(:all), find(:first), count, sum, average, etc, just like ActiveRecord.
 
-== The beauty of searchlogic, integration into rails
+== The beauty of Searchlogic, integration into rails
 
 Using Searchlogic in rails is the best part, because rails has all kinds of nifty methods to make dealing with ActiveRecord objects quick and easy, especially with forms. So let's take advantage of them! That's the idea behind this plugin. Searchlogic is searching, ordering, and pagination all rolled into one simple plugin. Take all of that pagination and searching cruft out of your models and controllers, and let Searchlogic handle it. Check it out:
 
@@ -79,7 +77,7 @@ Now your view:
         = orders.select :total_gt, (1..100)
     = f.submit "Search"
   
-  - if @users_count > 0
+  - unless @users_count.zero?
     %table
       %tr
         %th= order_by_link :account => :name
@@ -93,10 +91,8 @@ Now your view:
           %td= user.last_name
           %td= user.email
   
-    Per page:
-    = per_page_select
-    Page:
-    = page_select
+    == Per page: #{per_page_select}
+    == Page: #{page_select}
   - else
     No users were found.
 
@@ -186,10 +182,11 @@ Any of the options used in the above example can be used in these, but for the s
 
 As you saw above, the nice thing about Searchlogic is it's integration with forms. I designed the "any" option so that forms can set this as well, just like a condition.
 
-  search = User.new_search(:conditions => {:age_gt => 18})
-  search.conditions.first_name_contains = "Ben"
-  search.conditions.any = true # can set this to "true" or "1" or "yes"
-  search.all # will join all conditions with "or" instead of "and"
+  @search = User.new_search(:conditions => {:age_gt => 18}) do |search|
+    search.conditions.first_name_contains = "Ben"
+    search.conditions.any = true # can set this to "true" or "1" or "yes"
+    search.all # will join all conditions with "or" instead of "and"
+  end
   # ... all operations above are available
 
 == Scoped searching
@@ -197,8 +194,7 @@ As you saw above, the nice thing about Searchlogic is it's integration with form
   @current_user.orders.find(:all, :conditions => {:total_lte => 500})
   @current_user.orders.count(:conditions => {:total_lte => 500})
   @current_user.orders.sum('total', :conditions => {:total_lte => 500})
-  
-  search = @current_user.orders.build_search(:conditions => {:total_lte => 500})
+  @current_user.orders.build_search(:conditions => {:total_lte => 500})
 
 == Scope support
 
@@ -218,9 +214,9 @@ or
     end
   end
 
-== Always use protection...against SQL injections
+== Protection against SQL injections
 
-If there is one thing we all know, it's to always use protection against SQL injections. That's why searchlogic protects you by default. The new\_search methods protect mass assignments by default (instantiation and search.options = {}). This means that various checks are done to ensure it is not possible to perform any type of SQL injection during mass assignments. But this also limits how you can search, meaning you can't write raw SQL. If you want to be daring and search without protection, all that you have to do is add ! to the end of the method: new\_search!.
+SQL injections are not fun, so let's make sure they don't happen. That's why searchlogic protects you by default. The new\_search methods protect mass assignments by default (instantiation and search.options = {}). This means that various checks are done to ensure it is not possible to perform any type of SQL injection during mass assignments. But this also limits how you can search, meaning you can't write raw SQL. If you want to be daring and search without protection, all that you have to do is add ! to the end of the method: new\_search!.
 
 === Protected from SQL injections
 

data/TODO.rdoc

@@ -1,6 +1,4 @@
 = To Do
 
 1. Perform "more efficient" checks: year_of_created_at = 2008 and month_of_created_at = 8. Should result in a "BETWEEN" statement utilizing the column indexes. Thanks Georg for letting me know about this.
-2. Solve conflicts between scope joins and joins in the search (for old versions of AR). Also solve conflicts between joins and includes.
-3. Add configuration to change the "english" words
-4. Re-add the distinct option
+2. Solve conflicts between scope joins and joins in the search (for old versions of AR). Also solve conflicts between joins and includes.

data/lib/searchlogic.rb

@@ -44,13 +44,13 @@ require "searchlogic/conditions/base"
 # Condition
 require "searchlogic/condition/base"
 require "searchlogic/condition/tree"
-SEARCHGASM_CONDITIONS = [:begins_with, :blank, :child_of, :descendant_of, :ends_with, :equals, :greater_than, :greater_than_or_equal_to, :inclusive_descendant_of, :like, :nil, :not_begin_with, :not_blank, :not_end_with, :not_equal, :not_have_keywords, :not_nil, :keywords, :less_than, :less_than_or_equal_to, :sibling_of]
-SEARCHGASM_CONDITIONS.each { |condition| require "searchlogic/condition/#{condition}" }
+SEARCHLOGIC_CONDITIONS = [:begins_with, :blank, :child_of, :descendant_of, :ends_with, :equals, :greater_than, :greater_than_or_equal_to, :inclusive_descendant_of, :like, :nil, :not_begin_with, :not_blank, :not_end_with, :not_equal, :not_have_keywords, :not_nil, :keywords, :less_than, :less_than_or_equal_to, :sibling_of]
+SEARCHLOGIC_CONDITIONS.each { |condition| require "searchlogic/condition/#{condition}" }
 
 # Modifiers
 require "searchlogic/modifiers/base"
-SEARCHGASM_MODIFIERS = [:absolute, :acos, :asin, :atan, :ceil, :char_length, :cos, :cot, :day_of_month, :day_of_week, :day_of_year, :degrees, :exp, :floor, :hex, :hour, :log, :log10, :log2, :lower, :ltrim, :md5, :microseconds, :milliseconds, :minute, :month, :octal, :radians, :round, :rtrim, :second, :sign, :sin, :square_root, :tan, :trim, :upper, :week, :year]
-SEARCHGASM_MODIFIERS.each { |modifier| require "searchlogic/modifiers/#{modifier}" }
+SEARCHLOGIC_MODIFIERS = [:absolute, :acos, :asin, :atan, :ceil, :char_length, :cos, :cot, :day_of_month, :day_of_week, :day_of_year, :degrees, :exp, :floor, :hex, :hour, :log, :log10, :log2, :lower, :ltrim, :md5, :microseconds, :milliseconds, :minute, :month, :octal, :radians, :round, :rtrim, :second, :sign, :sin, :square_root, :tan, :trim, :upper, :week, :year]
+SEARCHLOGIC_MODIFIERS.each { |modifier| require "searchlogic/modifiers/#{modifier}" }
 
 # Helpers
 require "searchlogic/helpers/utilities"
@@ -79,8 +79,8 @@ module Searchlogic
       include Protection
     end
     
-    SEARCHGASM_CONDITIONS.each { |condition| Base.register_condition("Searchlogic::Condition::#{condition.to_s.camelize}".constantize) }
-    SEARCHGASM_MODIFIERS.each { |modifier| Base.register_modifier("Searchlogic::Modifiers::#{modifier.to_s.camelize}".constantize) }
+    SEARCHLOGIC_CONDITIONS.each { |condition| Base.register_condition("Searchlogic::Condition::#{condition.to_s.camelize}".constantize) }
+    SEARCHLOGIC_MODIFIERS.each { |modifier| Base.register_modifier("Searchlogic::Modifiers::#{modifier.to_s.camelize}".constantize) }
   end
   
   # The namespace I put all cached search classes.

data/lib/searchlogic/active_record/connection_adapters/sqlite_adapter.rb

@@ -12,39 +12,39 @@ module Searchlogic
         end
         
         def second_sql(column_name)
-          "strftime('%S', #{column_name})"
+          "(strftime('%S', #{column_name}) * 1)"
         end
         
         def minute_sql(column_name)
-          "strftime('%M', #{column_name})"
+          "(strftime('%M', #{column_name}) * 1)"
         end
         
         def hour_sql(column_name)
-          "strftime('%H', #{column_name})"
+          "(strftime('%H', #{column_name}) * 1)"
         end
         
         def day_of_week_sql(column_name)
-          "strftime('%w', #{column_name})"
+          "(strftime('%w', #{column_name}) * 1)"
         end
         
         def day_of_month_sql(column_name)
-          "strftime('%d', #{column_name})"
+          "(strftime('%d', #{column_name}) * 1)"
         end
         
         def day_of_year_sql(column_name)
-          "strftime('%j', #{column_name})"
+          "(strftime('%j', #{column_name}) * 1)"
         end
         
         def week_sql(column_name)
-          "strftime('%W', #{column_name})"
+          "(strftime('%W', #{column_name}) * 1)"
         end
         
         def month_sql(column_name)
-          "strftime('%m', #{column_name})"
+          "(strftime('%m', #{column_name}) * 1)"
         end
         
         def year_sql(column_name)
-          "strftime('%Y', #{column_name})"
+          "(strftime('%Y', #{column_name}) * 1)"
         end
         
         # String functions

data/lib/searchlogic/conditions/base.rb

@@ -44,8 +44,8 @@ module Searchlogic
         #   class SoundsLike < Searchlogic::Condition::Base
         #     # The name of the conditions. By default its the name of the class, if you want alternate or alias conditions just add them on.
         #     # If you don't want to add aliases you don't even need to define this method
-        #     def self.name_for_column(column)
-        #       super
+        #     def self.condition_names_for_column(column)
+        #       super + ["similar_to", "sounds"]
         #     end
         #
         #     # You can return an array or a string. NOT a hash, because all of these conditions
@@ -57,7 +57,7 @@ module Searchlogic
         #     end
         #   end
         #
-        #   Searchlogic::Seearch::Conditions.register_condition(SoundsLike)
+        #   Searchlogic::Conditions::Base.register_condition(SoundsLike)
         def register_condition(condition_class)
           raise(ArgumentError, "You can only register conditions that extend Searchlogic::Condition::Base") unless condition_class.ancestors.include?(Searchlogic::Condition::Base)
           conditions << condition_class unless conditions.include?(condition_class)
@@ -170,7 +170,21 @@ module Searchlogic
       
       # Convenience method for determining if we should join the conditions with "AND" or "OR".
       def any?
-        @any == true || @any == "true" || @any == "1" || @any == "yes"
+        ["true", "1", "yes"].include? @any.to_s
+      end
+      
+      # Sets the conditions to be searched by "or"
+      def any!
+        any = true
+      end
+      
+      def all # :nodoc:
+        not any?
+      end
+      
+      # Sets the conditions to be searched by "and"
+      def all!
+        any = false
       end
       
       # A list of joins to use when searching, includes relationships
@@ -344,7 +358,7 @@ module Searchlogic
           method_name_parts << modifier_name_parts.join("_of_") + "_of" unless modifier_name_parts.blank?
           method_name_parts << column_name
           method_name_parts << condition_name unless condition_name.blank?
-          method_name_parts.join("_")
+          method_name_parts.join("_").underscore
         end
         
         def method_missing(name, *args, &block)
@@ -395,7 +409,7 @@ module Searchlogic
         
         def add_condition!(condition, name, options = {})
           self.class.condition_names << name
-          options[:column] = options[:column].name if options[:column].class < ::ActiveRecord::ConnectionAdapters::Column
+          options[:column] = options[:column].name
           
           self.class.class_eval <<-"end_eval", __FILE__, __LINE__
             def #{name}_object

data/lib/searchlogic/search/base.rb

@@ -119,11 +119,6 @@ module Searchlogic #:nodoc:
         find_options
       end
       
-      def select
-        @select ||= "DISTINCT #{klass.connection.quote_table_name(klass.table_name)}.*" if !joins.blank? && Config.search.remove_duplicates?
-        @select
-      end
-      
       def scope
         @scope ||= {}
       end

data/lib/searchlogic/search/searching.rb

@@ -21,7 +21,9 @@ module Searchlogic
                 args[0] = klass.primary_key if [nil, :all].include?(args[0])
               end
               args << options
-              klass.#{method}(*args)
+              results = klass.#{method}(*args)
+              results.uniq! if #{SEARCH_METHODS.include?(method)} && results.is_a?(Array) && !joins.blank? && Config.search.remove_duplicates?
+              results
             end
           end
         end_eval

data/lib/searchlogic/version.rb

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

data/searchlogic.gemspec

@@ -1,14 +1,14 @@
 Gem::Specification.new do |s|
   s.name = %q{searchlogic}
-  s.version = "1.5.3"
+  s.version = "1.5.4"
 
   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-11-03}
+  s.date = %q{2008-11-16}
   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/base.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/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/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/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/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"]
-  s.files = ["CHANGELOG.rdoc", "examples/README.rdoc", "init.rb", "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/base.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/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/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/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/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", "Manifest", "MIT-LICENSE", "Rakefile", "README.rdoc", "test/fixtures/accounts.yml", "test/fixtures/cats.yml", "test/fixtures/dogs.yml", "test/fixtures/orders.yml", "test/fixtures/user_groups.yml", "test/fixtures/users.yml", "test/test_active_record_associations.rb", "test/test_active_record_base.rb", "test/test_condition_base.rb", "test/test_condition_types.rb", "test/test_conditions_base.rb", "test/test_conditions_protection.rb", "test/test_config.rb", "test/test_helper.rb", "test/test_search_base.rb", "test/test_search_conditions.rb", "test/test_search_ordering.rb", "test/test_search_pagination.rb", "test/test_search_protection.rb", "test_libs/acts_as_tree.rb", "test_libs/ordered_hash.rb", "test_libs/rexml_fix.rb", "TODO.rdoc", "searchlogic.gemspec"]
+  s.files = ["CHANGELOG.rdoc", "init.rb", "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/base.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/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/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/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/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", "Manifest", "MIT-LICENSE", "Rakefile", "README.rdoc", "test/active_record_tests/associations_test.rb", "test/active_record_tests/base_test.rb", "test/condition_tests/base_test.rb", "test/condition_tests/begins_with_test.rb", "test/condition_tests/blank_test.rb", "test/condition_tests/child_of_test.rb", "test/condition_tests/descendant_of_test.rb", "test/condition_tests/ends_with_test.rb", "test/condition_tests/equals_test.rb", "test/condition_tests/greater_than_or_equal_to_test.rb", "test/condition_tests/greater_than_test.rb", "test/condition_tests/inclusive_descendant_of_test.rb", "test/condition_tests/keyswords_test.rb", "test/condition_tests/less_than_or_equal_to_test.rb", "test/condition_tests/less_than_test.rb", "test/condition_tests/like_test.rb", "test/condition_tests/nil_test.rb", "test/condition_tests/not_begin_with_test.rb", "test/condition_tests/not_blank_test.rb", "test/condition_tests/not_end_with_test.rb", "test/condition_tests/not_equal_test.rb", "test/condition_tests/not_have_keywords_test.rb", "test/condition_tests/not_like_test.rb", "test/condition_tests/not_nil_test.rb", "test/condition_tests/sibling_of_test.rb", "test/conditions_tests/base_test.rb", "test/conditions_tests/protection_test.rb", "test/config_test.rb", "test/fixtures/accounts.yml", "test/fixtures/animals.yml", "test/fixtures/orders.yml", "test/fixtures/user_groups.yml", "test/fixtures/users.yml", "test/libs/acts_as_tree.rb", "test/libs/rexml_fix.rb", "test/modifier_tests/day_of_month_test.rb", "test/search_tests/base_test.rb", "test/search_tests/conditions_test.rb", "test/search_tests/ordering_test.rb", "test/search_tests/pagination_test.rb", "test/search_tests/protection_test.rb", "test/test_helper.rb", "TODO.rdoc", "searchlogic.gemspec"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/binarylogic/searchlogic}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Searchlogic", "--main", "README.rdoc"]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{searchlogic}
   s.rubygems_version = %q{1.2.0}
   s.summary = %q{Object based ActiveRecord searching, ordering, pagination, and more!}
-  s.test_files = ["test/test_active_record_associations.rb", "test/test_active_record_base.rb", "test/test_condition_base.rb", "test/test_condition_types.rb", "test/test_conditions_base.rb", "test/test_conditions_protection.rb", "test/test_config.rb", "test/test_helper.rb", "test/test_search_base.rb", "test/test_search_conditions.rb", "test/test_search_ordering.rb", "test/test_search_pagination.rb", "test/test_search_protection.rb"]
+  s.test_files = ["test/active_record_tests/associations_test.rb", "test/active_record_tests/base_test.rb", "test/condition_tests/base_test.rb", "test/condition_tests/begins_with_test.rb", "test/condition_tests/blank_test.rb", "test/condition_tests/child_of_test.rb", "test/condition_tests/descendant_of_test.rb", "test/condition_tests/ends_with_test.rb", "test/condition_tests/equals_test.rb", "test/condition_tests/greater_than_or_equal_to_test.rb", "test/condition_tests/greater_than_test.rb", "test/condition_tests/inclusive_descendant_of_test.rb", "test/condition_tests/keyswords_test.rb", "test/condition_tests/less_than_or_equal_to_test.rb", "test/condition_tests/less_than_test.rb", "test/condition_tests/like_test.rb", "test/condition_tests/nil_test.rb", "test/condition_tests/not_begin_with_test.rb", "test/condition_tests/not_blank_test.rb", "test/condition_tests/not_end_with_test.rb", "test/condition_tests/not_equal_test.rb", "test/condition_tests/not_have_keywords_test.rb", "test/condition_tests/not_like_test.rb", "test/condition_tests/not_nil_test.rb", "test/condition_tests/sibling_of_test.rb", "test/conditions_tests/base_test.rb", "test/conditions_tests/protection_test.rb", "test/config_test.rb", "test/modifier_tests/day_of_month_test.rb", "test/search_tests/base_test.rb", "test/search_tests/conditions_test.rb", "test/search_tests/ordering_test.rb", "test/search_tests/pagination_test.rb", "test/search_tests/protection_test.rb", "test/test_helper.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/test/active_record_tests/associations_test.rb

@@ -0,0 +1,95 @@
+require File.dirname(__FILE__) + '/../test_helper.rb'
+
+module ActiveRecordTests
+  class AssociationsTest < ActiveSupport::TestCase
+    def test_has_many
+      binary_logic = accounts(:binary_logic)
+      ben = users(:ben)
+      jennifer = users(:jennifer)
+      
+      search = binary_logic.users.new_search
+      assert_kind_of Searchlogic::Search::Base, search
+      assert_equal User, search.klass
+      assert_equal({:conditions => "\"users\".account_id = #{binary_logic.id}"}, search.scope)
+      
+      assert_equal [jennifer, ben], search.all
+      assert_equal jennifer, search.first
+      assert_equal ((ben.id + jennifer.id) / 2.0), search.average("id")
+      assert_equal 2, search.count
+    
+      search.conditions.first_name_contains = "Ben"
+    
+      assert_equal [ben], search.all
+      assert_equal ben, search.first
+      assert_equal ben.id, search.average("id")
+      assert_equal 1, search.count
+    
+      assert_equal 2, binary_logic.users.count
+      assert_equal 1, binary_logic.users.all(:conditions => {:first_name_contains => "Ben"}).size
+      assert_equal 0, binary_logic.users.all(:conditions => {:first_name_contains => "No one"}).size
+      assert_equal ben.id, binary_logic.users.sum("id", :conditions => {:first_name_contains => "Ben"})
+      assert_equal 0, binary_logic.users.sum("id", :conditions => {:first_name_contains => "No one"})
+      assert_equal ben.id, binary_logic.users.average("id", :conditions => {:first_name_contains => "Ben"})
+    end
+  
+    def test_has_many_through
+      binary_logic = accounts(:binary_logic)
+      
+      search = binary_logic.orders.new_search
+      assert_kind_of Searchlogic::Search::Base, search
+      assert_equal Order, search.klass
+      assert_equal({:joins => "INNER JOIN users ON orders.user_id = users.id   ", :conditions => "(\"users\".account_id = #{binary_logic.id})"}, search.scope)
+      
+      bens_order = orders(:bens_order)
+      assert_equal [bens_order], search.all
+      assert_equal bens_order, search.first
+      assert_equal bens_order.id, search.average("id")
+      assert_equal 1, search.count
+    
+      search.conditions.total_gt = 100
+    
+      assert_equal [bens_order], search.all
+      assert_equal bens_order, search.first
+      assert_equal bens_order.id, search.average("id")
+      assert_equal 1, search.count
+    
+      assert_equal 1, binary_logic.orders.count
+      assert_equal 1, binary_logic.orders.all(:conditions => {:total_gt => 100}).size
+      assert_equal 0, binary_logic.orders.all(:conditions => {:total_gt => 1000}).size
+      assert_equal bens_order.id, binary_logic.orders.sum("id", :conditions => {:total_gt => 100})
+      assert_equal 0, binary_logic.orders.sum("id", :conditions => {:total_gt => 1000})
+      assert_equal bens_order.id, binary_logic.orders.average("id", :conditions => {:total_gt => 100})
+    end
+  
+    def test_habtm
+      neco = user_groups(:neco)
+      ben = users(:ben)
+      drew = users(:drew)
+      
+      search = neco.users.new_search
+      assert_kind_of Searchlogic::Search::Base, search
+      assert_equal User, search.klass
+      assert_equal({:conditions => "\"user_groups_users\".user_group_id = #{neco.id} ", :joins => "INNER JOIN \"user_groups_users\" ON \"users\".id = \"user_groups_users\".user_id"}, search.scope)
+      
+      assert_equal [ben, drew], search.all
+      
+      assert_equal ben, search.first
+      assert_equal ((ben.id + drew.id) / 2.0).to_s, search.average("id").to_s
+      assert_equal 2, search.count
+    
+      search.conditions.first_name_contains = "Ben"
+
+      assert_equal [ben], search.all
+      assert_equal ben, search.first
+      assert_equal ben.id, search.average("id")
+      assert_equal 1, search.count
+    
+      assert_equal 2, neco.users.count
+      assert_equal 1, neco.users.all(:conditions => {:first_name_contains => "Ben"}).size
+      assert_equal 0, neco.users.all(:conditions => {:first_name_contains => "No one"}).size
+      assert_equal ben.id, neco.users.sum("id", :conditions => {:first_name_contains => "Ben"})
+      assert_equal 0, neco.users.sum("id", :conditions => {:first_name_contains => "No one"})
+      assert_equal ben.id, neco.users.average("id", :conditions => {:first_name_contains => "Ben"})
+    end
+  end
+end