meta_search 0.9.9.1 → 0.9.10

data/CHANGELOG

@@ -2,6 +2,7 @@ Changes since 0.9.9 (2010-11-15):
   * Fix bug introduced by new polymorphic belongs_to association code in
     honoring :url param to form_for
   * Support localization of predicate text in labels
+  * Fix bug when accessing localizations for named search methods
 
 Changes since 0.9.8 (2010-10-20):
   * ARel 2.x and Rails 3.0.2 compatability

data/VERSION

@@ -1 +1 @@
-0.9.9.1
+0.9.10

data/lib/meta_search/builder.rb

@@ -22,7 +22,7 @@ module MetaSearch
     include ModelCompatibility
     include Utility
 
-    attr_reader :base, :search_key, :search_attributes, :join_dependency, :errors
+    attr_reader :base, :relation, :search_key, :search_attributes, :join_dependency, :errors
     delegate *RELATION_METHODS + [:to => :relation]
 
     # Initialize a new Builder. Requires a base model to wrap, and supports a couple of options
@@ -36,11 +36,6 @@ module MetaSearch
       @errors = ActiveModel::Errors.new(self)
     end
 
-    def relation
-      enforce_join_depth_limit!
-      @relation
-    end
-
     def get_column(column, base = @base)
       base.columns_hash[column.to_s] unless base_excludes_attribute(base, column)
     end
@@ -132,12 +127,6 @@ module MetaSearch
       end
     end
 
-    def enforce_join_depth_limit!
-      raise JoinDepthError, "Maximum join depth of #{MAX_JOIN_DEPTH} exceeded." if @join_dependency.join_associations.detect {|ja|
-        gauge_depth_of_join_association(ja) > MAX_JOIN_DEPTH
-      }
-    end
-
     def gauge_depth_of_join_association(ja)
       1 + (ja.respond_to?(:parent) ? gauge_depth_of_join_association(ja.parent) : 0)
     end
@@ -236,22 +225,24 @@ module MetaSearch
       end
     end
 
-    def column_type(name, base = @base)
+    def column_type(name, base = @base, depth = 1)
       type = nil
       if column = get_column(name, base)
         type = column.type
       elsif (segments = name.split(/_/)).size > 1
-        type = type_from_association_segments(segments, base)
+        type = type_from_association_segments(segments, base, depth)
       end
       type
     end
 
-    def type_from_association_segments(segments, base)
+    def type_from_association_segments(segments, base, depth)
       remainder = []
       found_assoc = nil
       type = nil
       while remainder.unshift(segments.pop) && segments.size > 0 && !found_assoc do
         if found_assoc = get_association(segments.join('_'), base)
+          depth += 1
+          raise JoinDepthError, "Maximum join depth of #{MAX_JOIN_DEPTH} exceeded." if depth > MAX_JOIN_DEPTH
           if found_assoc.options[:polymorphic]
             unless delimiter = remainder.index('type')
               raise PolymorphicAssociationMissingTypeError, "Polymorphic association specified without a type"
@@ -259,9 +250,9 @@ module MetaSearch
             polymorphic_class, attribute_name = remainder[0...delimiter].join('_'),
                                                 remainder[delimiter + 1...remainder.size].join('_')
             polymorphic_class = polymorphic_class.classify.constantize
-            type = column_type(attribute_name, polymorphic_class)
+            type = column_type(attribute_name, polymorphic_class, depth)
           else
-            type = column_type(remainder.join('_'), found_assoc.klass)
+            type = column_type(remainder.join('_'), found_assoc.klass, depth)
           end
         end
       end

data/lib/meta_search/model_compatibility.rb

@@ -64,7 +64,7 @@ module MetaSearch
       defaults << options.delete(:default) if options[:default]
       defaults << attribute.to_s.humanize
 
-      options.reverse_merge! :count => 1, :default => defaults, :attribute => klass.human_attribute_name(predicate_attribute)
+      options.reverse_merge! :count => 1, :default => defaults, :attribute => klass.human_attribute_name(predicate_attribute || attribute)
       I18n.translate(defaults.shift, options)
     end
   end

data/meta_search.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{meta_search}
-  s.version = "0.9.9.1"
+  s.version = "0.9.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ernie Miller"]
-  s.date = %q{2010-11-16}
+  s.date = %q{2010-11-18}
   s.description = %q{
       Allows simple search forms to be created against an AR3 model
       and its associations, has useful view helpers for sort links

data/test/locales/flanders.yml

@@ -7,5 +7,7 @@ flanders:
     predicates:
       contains: "%{attribute} contains-diddly"
     attributes:
+      company:
+        reverse_name: "Company reverse name-diddly"
       developer:
         name_contains: "Developer name-diddly contains-aroonie"

data/test/test_search.rb

@@ -80,6 +80,12 @@ class TestSearch < Test::Unit::TestCase
         end
       end
 
+      should "raise an error when MAX_JOIN_DEPTH is exceeded" do
+        assert_raise MetaSearch::JoinDepthError do
+          @s.developers_company_developers_company_developers_name_equals = "Ernie Miller"
+        end
+      end
+
       context "sorted by name in ascending order" do
         setup do
           @s.meta_sort = 'name.asc'
@@ -211,18 +217,6 @@ class TestSearch < Test::Unit::TestCase
         end
       end
 
-      context "with a join more than five tables deep (including source table)" do
-        setup do
-          @s.developers_company_developers_company_developers_name_equals = "Ernie Miller"
-        end
-
-        should "raise an error when the relation is accessed" do
-          assert_raise MetaSearch::JoinDepthError do
-            @s.all
-          end
-        end
-      end
-
       context "where backwards name is hcetinI" do
         setup do
           @s.backwards_name = 'hcetinI'

data/test/test_view_helpers.rb

@@ -60,6 +60,7 @@ class TestViewHelpers < ActionView::TestCase
 
       should "localize according to their bases" do
         assert_match /Company name-diddly contains-diddly/, @f1.label(:name_contains)
+        assert_match /Company reverse name-diddly/, @f1.label(:reverse_name)
         assert_match /Developer name-diddly contains-aroonie/, @f2.label(:name_like)
       end
     end

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 9
-  - 1
-  version: 0.9.9.1
+  - 10
+  version: 0.9.10
 platform: ruby
 authors: 
 - Ernie Miller
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 -05:00
+date: 2010-11-18 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency