meta_search 1.1.0 → 1.1.1

data/README.rdoc

@@ -4,7 +4,7 @@ MetaSearch is extensible searching for your form_for enjoyment. It “wraps” o
 
 == NOTE
 
-The successor to MetaSearch is {Ransack}[http://github.com/ernie/ransack]). It's got features
+The successor to MetaSearch is {Ransack}[http://github.com/ernie/ransack]. It's got features
 that MetaSearch doesn't, along with some API changes. I haven't had the time to dedicate to
 making it bulletproof yet, so I'm releasing a 1.1.x branch of MetaSearch to help with migrations
 to Rails 3.1.

data/Rakefile

@@ -17,6 +17,7 @@ begin
     gem.add_development_dependency "shoulda"
     gem.add_dependency "activerecord", "~> 3.1.0"
     gem.add_dependency "activesupport", "~> 3.1.0"
+    gem.add_dependency "polyamorous", "~> 0.5.0"
     gem.add_dependency "actionpack", "~> 3.1.0"
     gem.post_install_message = <<END
 

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.1.1

data/lib/meta_search.rb

@@ -47,13 +47,11 @@ require 'active_record'
 require 'active_support'
 require 'action_view'
 require 'action_controller'
-require 'meta_search/join_dependency'
 require 'meta_search/searches/active_record'
 require 'meta_search/helpers'
 
 I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'meta_search', 'locale', '*.yml')]
 
-ActiveRecord::Associations::JoinDependency.send(:include, MetaSearch::JoinDependency)
 ActiveRecord::Base.send(:include, MetaSearch::Searches::ActiveRecord)
 ActionView::Helpers::FormBuilder.send(:include, MetaSearch::Helpers::FormBuilder)
 ActionController::Base.helper(MetaSearch::Helpers::UrlHelper)

data/lib/meta_search/builder.rb

@@ -1,3 +1,4 @@
+require 'polyamorous'
 require 'meta_search/model_compatibility'
 require 'meta_search/exceptions'
 require 'meta_search/where'
@@ -254,7 +255,7 @@ module MetaSearch
         (!klass || assoc.reflection.klass == klass)
       end
       unless found_association
-        @join_dependency.send(:build_polymorphic, name.to_sym, parent, @join_type, klass)
+        @join_dependency.send(:build, Polyamorous::Join.new(name, @join_type, klass), parent)
         found_association = @join_dependency.join_associations.last
         # Leverage the stashed association functionality in AR
         @relation = @relation.joins(found_association)

data/meta_search.gemspec

@@ -4,18 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{meta_search}
-  s.version = "1.1.0"
+  s.name = "meta_search"
+  s.version = "1.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Ernie Miller}]
-  s.date = %q{2011-08-31}
-  s.description = %q{
-      Allows simple search forms to be created against an AR3 model
-      and its associations, has useful view helpers for sort links
-      and multiparameter fields as well.
-    }
-  s.email = %q{ernie@metautonomo.us}
+  s.authors = ["Ernie Miller"]
+  s.date = "2011-09-03"
+  s.description = "\n      Allows simple search forms to be created against an AR3 model\n      and its associations, has useful view helpers for sort links\n      and multiparameter fields as well.\n    "
+  s.email = "ernie@metautonomo.us"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -35,7 +31,6 @@ Gem::Specification.new do |s|
     "lib/meta_search/helpers/form_builder.rb",
     "lib/meta_search/helpers/form_helper.rb",
     "lib/meta_search/helpers/url_helper.rb",
-    "lib/meta_search/join_dependency.rb",
     "lib/meta_search/locale/en.yml",
     "lib/meta_search/method.rb",
     "lib/meta_search/model_compatibility.rb",
@@ -61,18 +56,11 @@ Gem::Specification.new do |s|
     "test/test_search.rb",
     "test/test_view_helpers.rb"
   ]
-  s.homepage = %q{http://metautonomo.us/projects/metasearch/}
-  s.post_install_message = %q{
-*** Thanks for installing MetaSearch! ***
-Be sure to check out http://metautonomo.us/projects/metasearch/ for a
-walkthrough of MetaSearch's features, and click the donate button if
-you're feeling especially appreciative. It'd help me justify this
-"open source" stuff to my lovely wife. :)
-
-}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{Object-based searching (and more) for simply creating search forms.}
+  s.homepage = "http://metautonomo.us/projects/metasearch/"
+  s.post_install_message = "\n*** Thanks for installing MetaSearch! ***\nBe sure to check out http://metautonomo.us/projects/metasearch/ for a\nwalkthrough of MetaSearch's features, and click the donate button if\nyou're feeling especially appreciative. It'd help me justify this\n\"open source\" stuff to my lovely wife. :)\n\n"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Object-based searching (and more) for simply creating search forms."
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -81,17 +69,20 @@ you're feeling especially appreciative. It'd help me justify this
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_runtime_dependency(%q<activerecord>, ["~> 3.1.0"])
       s.add_runtime_dependency(%q<activesupport>, ["~> 3.1.0"])
+      s.add_runtime_dependency(%q<polyamorous>, ["~> 0.5.0"])
       s.add_runtime_dependency(%q<actionpack>, ["~> 3.1.0"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<activerecord>, ["~> 3.1.0"])
       s.add_dependency(%q<activesupport>, ["~> 3.1.0"])
+      s.add_dependency(%q<polyamorous>, ["~> 0.5.0"])
       s.add_dependency(%q<actionpack>, ["~> 3.1.0"])
     end
   else
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<activerecord>, ["~> 3.1.0"])
     s.add_dependency(%q<activesupport>, ["~> 3.1.0"])
+    s.add_dependency(%q<polyamorous>, ["~> 0.5.0"])
     s.add_dependency(%q<actionpack>, ["~> 3.1.0"])
   end
 end

data/test/test_search.rb

@@ -91,7 +91,7 @@ class TestSearch < Test::Unit::TestCase
 
     context "with outer join specified" do
       setup do
-        @s = Developer.search({:name_equals=>"Forgetful Notetaker"}, :join_type=>:outer)
+        @s = Developer.search({:name_equals => "Forgetful Notetaker"}, :join_type => :outer)
       end
 
       should "find a null entry when searching notes" do
@@ -105,7 +105,7 @@ class TestSearch < Test::Unit::TestCase
 
     context "with inner join specified" do
       setup do
-        @s = Developer.search({:name_equals=>"Forgetful Notetaker"}, :join_type=>:inner)
+        @s = Developer.search({:name_equals=>"Forgetful Notetaker"}, :join_type => :inner)
       end
 
       should "find no null entry when searching notes" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meta_search
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-31 00:00:00.000000000Z
+date: 2011-09-03 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70351581512540 !ruby/object:Gem::Requirement
+  requirement: &70309382367880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70351581512540
+  version_requirements: *70309382367880
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70351581512040 !ruby/object:Gem::Requirement
+  requirement: &70309382364060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70351581512040
+  version_requirements: *70309382364060
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70351581511400 !ruby/object:Gem::Requirement
+  requirement: &70309382359180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,21 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70351581511400
+  version_requirements: *70309382359180
+- !ruby/object:Gem::Dependency
+  name: polyamorous
+  requirement: &70309382354200 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70309382354200
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70351581510860 !ruby/object:Gem::Requirement
+  requirement: &70309382347400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +65,7 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70351581510860
+  version_requirements: *70309382347400
 description: ! "\n      Allows simple search forms to be created against an AR3 model\n
   \     and its associations, has useful view helpers for sort links\n      and multiparameter
   fields as well.\n    "
@@ -79,7 +90,6 @@ files:
 - lib/meta_search/helpers/form_builder.rb
 - lib/meta_search/helpers/form_helper.rb
 - lib/meta_search/helpers/url_helper.rb
-- lib/meta_search/join_dependency.rb
 - lib/meta_search/locale/en.yml
 - lib/meta_search/method.rb
 - lib/meta_search/model_compatibility.rb
@@ -137,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Object-based searching (and more) for simply creating search forms.

data/lib/meta_search/join_dependency.rb

@@ -1,94 +0,0 @@
-module MetaSearch
-
-  module JoinDependency
-
-    class JoinAssociation < ::ActiveRecord::Associations::JoinDependency::JoinAssociation
-
-      def initialize(reflection, join_dependency, parent = nil, polymorphic_class = nil)
-        if polymorphic_class && ::ActiveRecord::Base > polymorphic_class
-          swapping_reflection_klass(reflection, polymorphic_class) do |reflection|
-            super(reflection, join_dependency, parent)
-          end
-        else
-          super(reflection, join_dependency, parent)
-        end
-      end
-
-      def swapping_reflection_klass(reflection, klass)
-        reflection = reflection.clone
-        original_polymorphic = reflection.options.delete(:polymorphic)
-        reflection.instance_variable_set(:@klass, klass)
-        yield reflection
-      ensure
-        reflection.options[:polymorphic] = original_polymorphic
-      end
-
-      def ==(other)
-        super && active_record == other.active_record
-      end
-
-      def build_constraint(reflection, table, key, foreign_table, foreign_key)
-        if reflection.options[:polymorphic]
-          super.and(
-            foreign_table[reflection.foreign_type].eq(reflection.klass.name)
-          )
-        else
-          super
-        end
-      end
-
-    end
-
-    # Yes, I'm using alias_method_chain here. No, I don't feel too
-    # bad about it. JoinDependency, or, to call it by its full proper
-    # name, ::ActiveRecord::Associations::JoinDependency, is one of the
-    # most "for internal use only" chunks of ActiveRecord.
-    def self.included(base)
-      base.class_eval do
-        alias_method_chain :graft, :meta_search
-      end
-    end
-
-    def graft_with_meta_search(*associations)
-      associations.each do |association|
-        join_associations.detect {|a| association == a} ||
-          build_polymorphic(association.reflection.name, association.find_parent_in(self) || join_base, association.join_type, association.reflection.klass)
-      end
-      self
-    end
-
-    # Should only be called by MetaSearch, and only with a single association name
-    def build_polymorphic(association, parent = nil, join_type = Arel::OuterJoin, klass = nil)
-      parent ||= join_parts.last
-      reflection = parent.reflections[association] or
-        raise ::ActiveRecord::ConfigurationError, "Association named '#{ association }' was not found; perhaps you misspelled it?"
-      unless join_association = find_join_association_respecting_polymorphism(reflection, parent, klass)
-        @reflections << reflection
-        join_association = build_join_association_respecting_polymorphism(reflection, parent, klass)
-        join_association.join_type = join_type
-        @join_parts << join_association
-        cache_joined_association(join_association)
-      end
-
-      join_association
-    end
-
-    def find_join_association_respecting_polymorphism(reflection, parent, klass)
-      if association = find_join_association(reflection, parent)
-        unless reflection.options[:polymorphic]
-          association
-        else
-          association if association.active_record == klass
-        end
-      end
-    end
-
-    def build_join_association_respecting_polymorphism(reflection, parent, klass = nil)
-      if reflection.options[:polymorphic] && klass
-        JoinAssociation.new(reflection, self, parent, klass)
-      else
-        JoinAssociation.new(reflection, self, parent)
-      end
-    end
-  end
-end