searchgasm 1.4.0 → 1.4.1

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 1.4.1 released 2008-10-08
+
+* Extracted english text into configuration to support alternate languages. I18n support.
+* Improved method detection in add_joins to use respond_to? with the private method option set to true
+
 == 1.4.0 released 2008-10-08
 
 * Fixed bug when duping or cloning to copy over instance vars instead of method values

data/lib/searchgasm/active_record/base.rb

@@ -175,8 +175,7 @@ module ActiveRecord #:nodoc: all
         #
         # Where as before, the only way to get the above query to work would be to include line_items also, which is not neccessarily what you want.
         def add_joins!(sql, options_or_joins, scope = :auto) # :nodoc:
-          code_type = array_of_strings?([""]) && :array_of_strings rescue nil
-          code_type ||= merge_joins("", "") && :merge_joins rescue nil
+          code_type = (respond_to?(:array_of_strings?, true) && :array_of_strings) || (respond_to?(:merge_joins, true) && :merge_joins)
 
           case code_type
           when :array_of_strings, :merge_joins

data/lib/searchgasm/config.rb

@@ -154,6 +154,55 @@ module Searchgasm
         @per_page_choices = value
       end
       
+      def per_page_show_all_text # :nodoc:
+        @per_page_show_all_text ||= "Show all"
+      end
+      
+      # The default value for the :text option for per_page_links and per_page_select when the page is nil, meaning show all.
+      #
+      # * <tt>Default:</tt> "Show all"
+      # * <tt>Accepts:</tt> String
+      def per_page_show_all_text=(value)
+        @per_page_show_all_text = value
+      end
+      
+      def per_page_text # :nodoc:
+        @per_page_text ||= "%s per page"
+      end
+      
+      # The default value for the :text option for per_page_links and per_page_select when the page is NOT nil. Only one substitution is
+      # passed, which is the per_page value.
+      #
+      # * <tt>Default:</tt> "%s per page"
+      # * <tt>Accepts:</tt> String with substitutions, using rubys % method for strings
+      def per_page_text=(value)
+        @per_page_text = value
+      end
+      
+      def priority_order_by_link_activate_text # :nodoc:
+        @priority_order_by_link_activate_text ||= "Show %s first"
+      end
+      
+      # The default value for the :activate_text option for priority_order_by_link
+      #
+      # * <tt>Default:</tt> "Show %s first"
+      # * <tt>Accepts:</tt> String with substitutions, using rubys % method for strings
+      def priority_order_by_link_activate_text=(value)
+        @priority_order_by_link_activate_text = value
+      end
+      
+      def priority_order_by_link_deactivate_text # :nodoc:
+        @priority_order_by_link_deactivate_text ||= "Don't show %s first"
+      end
+      
+      # The default value for the :deactivate_text option for priority_order_by_link
+      #
+      # * <tt>Default:</tt> "Dont' show %s first"
+      # * <tt>Accepts:</tt> String with substitutions, using rubys % method for strings
+      def priority_order_by_link_deactivate_text=(value)
+        @priority_order_by_link_deactivate_text = value
+      end
+      
       def remove_duplicates # :nodoc:
         return @remove_duplicates if @set_remove_duplicates
         @remove_duplicates ||= true

data/lib/searchgasm/helpers/control_types/link.rb

@@ -181,7 +181,8 @@ module Searchgasm
         # As you can see above, passing nil means "show all" and the text will automatically revert to "show all"
         #
         # === Options
-        # * <tt>:text</tt> -- default: column_name.to_s.humanize, text for the link
+        # * <tt>:text</tt> -- default: "%s per page", text for the link, only if per_page is not blank
+        # * <tt>:show_all_text</tt> -- default: "Show all", text for the link, only if per_page is blank
         # * <tt>:html</tt> -- html arrtributes for the <a> tag.
         #
         # === Advanced Options
@@ -259,8 +260,8 @@ module Searchgasm
           def add_priority_order_by_link_defaults!(priority_order_by, priority_order_as, options = {})
             add_searchgasm_control_defaults!(:priority_order_by, options)
             options[:column_name] ||= determine_order_by_text(priority_order_by).downcase 
-            options[:activate_text] ||= "Show #{options[:column_name]} first"
-            options[:deactivate_text] ||= "Don't show #{options[:column_name]} first"
+            options[:activate_text] ||= Config.priority_order_by_link_activate_text % options[:column_name]
+            options[:deactivate_text] ||= Config.priority_order_by_link_deactivate_text % options[:column_name]
             active = deep_stringify(options[:search_obj].priority_order_by) == deep_stringify(priority_order_by) && options[:search_obj].priority_order_as == priority_order_as
             options[:text] ||= active ? options[:deactivate_text] : options[:activate_text]
             if active
@@ -274,7 +275,8 @@ module Searchgasm
           
           def add_per_page_link_defaults!(per_page, options = {})
             add_searchgasm_control_defaults!(:per_page, options)
-            options[:text] ||= per_page.blank? ? "Show all" : "#{per_page} per page"
+            options[:show_all_text] ||= Config.per_page_show_all_text
+            options[:text] ||= per_page.blank? ? options[:show_all_text] : Config.per_page.text % per_page
             options[:url] = searchgasm_params(options.merge(:search_params => {:per_page => per_page}))
             options
           end

data/lib/searchgasm/helpers/control_types/select.rb

@@ -44,7 +44,9 @@ module Searchgasm
           
           def add_per_page_select_defaults!(options)
             add_per_page_links_defaults!(options)
-            options[:choices] = options[:choices].collect { |choice| choice.nil? ? ["Show all", choice] : ["#{choice} per page", choice]}
+            options[:show_all_text] ||= Config.per_page_show_all_text
+            options[:text] ||= Config.per_page_text
+            options[:choices] = options[:choices].collect { |choice| choice.nil? ? [options[:show_all_text], choice] : [options[:text] % choice, choice]}
             add_searchgasm_select_defaults!(:per_page, options)
             options
           end

data/lib/searchgasm/search/base.rb

@@ -83,24 +83,9 @@ module Searchgasm #:nodoc:
       # Merges all joins together, including the scopes joins for
       def joins
         all_joins = (safe_to_array(conditions.auto_joins) + safe_to_array(order_by_auto_joins) + safe_to_array(priority_order_by_auto_joins) + safe_to_array(@joins)).uniq
-        # For partial backwards compatibility, delete if the scope contains conflicts, AR 2.2 does this for you
-        scope_joins = safe_to_array(scope && scope[:joins])
-        all_joins.delete_if { |j| scope_joins.include?(j) } unless scope_joins.blank?
         all_joins.size <= 1 ? all_joins.first : all_joins
       end
-=begin
-      def joins
-        auto_joins = joins_to_sql_array((safe_to_array(conditions.auto_joins) + safe_to_array(order_by_auto_joins) + safe_to_array(priority_order_by_auto_joins)).uniq)
-        scope_joins = joins_to_sql_array(scope && scope[:joins])
-        include_joins = joins_to_sql_array(include)
-        
-        #raise auto_joins.inspect if conditions.respond_to?(:dogs) && conditions.dogs.id == 1
-        
-        auto_joins.delete_if { |auto_join| scope_joins.include?(auto_join) || include_joins.include?(auto_join) }
-        
-        #raise auto_joins.inspect if auto_joins.size > 1
-      end
-=end
+      
       def limit=(value)
         @set_limit = true
         @limit = value.blank? || value == 0 ? nil : value.to_i
@@ -134,20 +119,16 @@ module Searchgasm #:nodoc:
         find_options
       end
       
+      def select
+        @select ||= "DISTINCT #{klass.connection.quote_table_name(klass.table_name)}.*" if !joins.blank? && Config.remove_duplicates?
+        @select
+      end
+      
       def scope
         @scope ||= {}
       end
       
       private
-        def joins_to_sql_array(joins)
-          unless array_of_strings?(safe_to_array(joins))
-            join_dependency = ::ActiveRecord::Associations::ClassMethods::JoinDependency.new(klass, joins, nil)
-            join_dependency.join_associations.collect { |assoc| assoc.association_join }
-          else
-            joins.is_a?(Array) ? joins : safe_to_array(joins)
-          end
-        end
-        
         def safe_to_array(o)
           case o
           when NilClass

data/lib/searchgasm/search/searching.rb

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

data/lib/searchgasm/version.rb

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

data/searchgasm.gemspec

@@ -1,11 +1,11 @@
 
-# Gem::Specification for Searchgasm-1.4.0
+# Gem::Specification for Searchgasm-1.4.1
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic

data/test/test_active_record_base.rb

@@ -45,6 +45,7 @@ class TestActiveRecordBase < Test::Unit::TestCase
     assert_equal Account.find(1, 3), Account.all(:conditions => {:name_contains => "Binary"})
     assert_equal [Account.find(1)], Account.all(:conditions => {:name_contains => "Binary", :users => {:first_name_starts_with => "Ben"}})
     assert_equal [], Account.all(:conditions => {:name_contains => "Binary", :users => {:first_name_starts_with => "Ben", :last_name => "Mills"}})
+    assert_equal Account.find(1, 2), Account.all(:conditions => {:users => {:id_gt => 0}}, :include => :users)
     
     read_only_accounts = Account.all(:conditions => {:name_contains => "Binary"}, :readonly => true)
     assert read_only_accounts.first.readonly?

data/test/test_search_base.rb

@@ -98,23 +98,23 @@ class TestSearchBase < Test::Unit::TestCase
     search.lock = true
     assert_equal search.lock, true
   end
-=begin
-  def test_auto_joins
+
+  def test_joins
     search = Account.new_search
-    assert_equal nil, search.auto_joins
+    assert_equal nil, search.joins
     search.conditions.name_contains = "Binary"
-    assert_equal nil, search.auto_joins
+    assert_equal nil, search.joins
     search.conditions.users.first_name_contains = "Ben"
-    assert_equal(:users, search.auto_joins)
+    assert_equal(:users, search.joins)
     search.conditions.users.orders.id_gt = 2
-    assert_equal({:users => :orders}, search.auto_joins)
+    assert_equal({:users => :orders}, search.joins)
     search.conditions.users.reset_orders!
-    assert_equal(:users, search.auto_joins)
+    assert_equal(:users, search.joins)
     search.conditions.users.orders.id_gt = 2
     search.conditions.reset_users!
-    assert_equal nil, search.auto_joins
+    assert_equal nil, search.joins
   end
-=end
+
   def test_limit
     search = Account.new_search
     search.limit = 10
@@ -141,7 +141,7 @@ class TestSearchBase < Test::Unit::TestCase
     search.conditions.users.id_greater_than = 2
     search.page = 3
     search.readonly = true
-    assert_equal({:joins => :users, :offset => 4, :readonly => true, :conditions => ["(\"accounts\".\"name\" LIKE ?) AND (\"users\".\"id\" > ?)", "%Binary%", 2], :limit => 2 }, search.sanitize)
+    assert_equal({:joins => :users, :offset => 4, :select => "DISTINCT \"accounts\".*", :readonly => true, :conditions => ["(\"accounts\".\"name\" LIKE ?) AND (\"users\".\"id\" > ?)", "%Binary%", 2], :limit => 2 }, search.sanitize)
   end
 
   def test_scope

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic