meta_search 1.0.4 → 1.0.5

data/CHANGELOG

@@ -1,3 +1,8 @@
+Changes since 1.0.4 (2011-04-08):
+  * Add :join_type option to Builder to allow for using InnerJoin if desired
+    (Stephen Pike)
+  * Fix a memory leak in development mode (Bonias)
+
 Changes since 1.0.3 (2011-03-14):
   * Be sure not to override form_for options if super returns a non-true value,
     fixes a compatibility issue when using client_side_validation

data/README.rdoc

@@ -1,5 +1,8 @@
 = MetaSearch
 
+(If you're using edge Rails and you'd like to take an early peek at the successor to
+MetaSearch, please have a look at {Ransack}[http://github.com/ernie/ransack])
+
 MetaSearch is extensible searching for your form_for enjoyment. It “wraps” one of your ActiveRecord models, providing methods that allow you to build up search conditions against that model, and has a few extra form helpers to simplify sorting and supplying multiple parameters to your condition methods as well.
 
 == Getting Started

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/meta_search/builder.rb

@@ -33,6 +33,8 @@ module MetaSearch
       @base = @relation.klass
       @search_key = (opts.delete(:search_key) || 'search').to_s
       @options = opts  # Let's just hang on to other options for use in authorization blocks
+      @join_type = opts[:join_type] ||  Arel::Nodes::OuterJoin
+      @join_type = get_join_type(@join_type)
       @join_dependency = build_join_dependency
       @search_attributes = {}
       @errors = ActiveModel::Errors.new(self)
@@ -257,7 +259,7 @@ module MetaSearch
         assoc.parent == parent
       end
       unless found_association
-        @join_dependency.send(:build_with_metasearch, association, parent, Arel::Nodes::OuterJoin, klass)
+        @join_dependency.send(:build_with_metasearch, association, parent, @join_type, klass)
         found_association = @join_dependency.join_associations.last
         @relation = @relation.joins(found_association)
       end
@@ -299,5 +301,15 @@ module MetaSearch
       arel.joins(arel)
     end
 
+    def get_join_type(opt_join)
+      # Allow "inner"/:inner and "upper"/:upper
+      if opt_join.to_s.upcase == 'INNER'
+        opt_join = Arel::Nodes::InnerJoin
+      elsif opt_join.to_s.upcase == 'OUTER'
+        opt_join = Arel::Nodes::OuterJoin
+      end
+      # Default to trusting what the user gave us
+      opt_join
+    end
   end
-end
+end

data/lib/meta_search/searches/active_record.rb

@@ -181,22 +181,23 @@ module MetaSearch
     end
 
     def self.for(klass)
-      DISPATCH[klass]
+      DISPATCH[klass.name]
     end
 
     private
 
-    DISPATCH = Hash.new do |hash, klass|
-      class_name = klass.name.gsub('::', '_')
-      hash[klass] = module_eval <<-RUBY_EVAL
+    DISPATCH = Hash.new do |hash, klass_name|
+      class_name = klass_name.gsub('::', '_')
+      hash[klass_name] = module_eval <<-RUBY_EVAL
         class #{class_name} < MetaSearch::Builder
           def self.klass
-            ::#{klass}
+            ::#{klass_name}
           end
         end
 
         #{class_name}
       RUBY_EVAL
     end
+
   end
 end

data/meta_search.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{meta_search}
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ernie Miller"]
-  s.date = %q{2011-04-08}
+  s.authors = [%q{Ernie Miller}]
+  s.date = %q{2011-05-05}
   s.description = %q{
       Allows simple search forms to be created against an AR3 model
       and its associations, has useful view helpers for sort links
@@ -70,20 +70,9 @@ you're feeling especially appreciative. It'd help me justify this
 "open source" stuff to my lovely wife. :)
 
 }
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.0}
   s.summary = %q{Object-based searching (and more) for simply creating search forms.}
-  s.test_files = [
-    "test/fixtures/company.rb",
-    "test/fixtures/data_type.rb",
-    "test/fixtures/developer.rb",
-    "test/fixtures/note.rb",
-    "test/fixtures/project.rb",
-    "test/fixtures/schema.rb",
-    "test/helper.rb",
-    "test/test_search.rb",
-    "test/test_view_helpers.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/fixtures/developers.yml

@@ -52,4 +52,11 @@ another:
   company_id: 3
   name      : Another Guy
   salary    : 80000
-  slacker   : false
+  slacker   : false
+
+forgetful:
+  id        : 9
+  company_id: 3
+  name      : Forgetful Notetaker
+  salary    : 40000
+  slacker   : false

data/test/test_search.rb

@@ -74,6 +74,52 @@ class TestSearch < Test::Unit::TestCase
     end
   end
 
+  context "A Developer search" do
+    setup do
+      @s = Developer.search({:name_equals=>"Forgetful Notetaker"})
+    end
+
+    context "without any opts" do
+      should "find a null entry when searching notes" do
+        assert_equal 1, @s.notes_note_is_null(true).all.size
+      end
+
+      should "find no non-null entry when searching notes" do
+        assert_equal 0, @s.notes_note_is_not_null(true).all.size
+      end
+    end
+
+    context "with outer join specified" do
+      setup do
+        @s = Developer.search({:name_equals=>"Forgetful Notetaker"}, :join_type=>:outer)
+      end
+
+      should "find a null entry when searching notes" do
+        assert_equal 1, @s.notes_note_is_null(true).all.size
+      end
+
+      should "find no non-null entry when searching notes" do
+        assert_equal 0, @s.notes_note_is_not_null(true).all.size
+      end
+    end
+
+    context "with inner join specified" do
+      setup do
+        @s = Developer.search({:name_equals=>"Forgetful Notetaker"}, :join_type=>:inner)
+      end
+
+      should "find no null entry when searching notes" do
+        assert_equal 0, @s.notes_note_is_null(true).all.size
+      end
+
+      should "find no non-null entry when searching notes" do
+        assert_equal 0, @s.notes_note_is_not_null(true).all.size
+      end
+    end
+
+
+  end
+
   [{:name => 'Company', :object => Company},
    {:name => 'Company as a Relation', :object => Company.scoped}].each do |object|
     context_a_search_against object[:name], object[:object] do
@@ -477,8 +523,8 @@ class TestSearch < Test::Unit::TestCase
           @s.name_ne = 'Ernie Miller'
         end
 
-        should "return seven results" do
-          assert_equal 7, @s.all.size
+        should "return eight results" do
+          assert_equal 8, @s.all.size
         end
 
         should "not return a developer named Ernie Miller" do

metadata

@@ -2,7 +2,7 @@
 name: meta_search
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - Ernie Miller
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 Z
+date: 2011-05-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
@@ -144,17 +144,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.0
 signing_key: 
 specification_version: 3
 summary: Object-based searching (and more) for simply creating search forms.
-test_files: 
-- test/fixtures/company.rb
-- test/fixtures/data_type.rb
-- test/fixtures/developer.rb
-- test/fixtures/note.rb
-- test/fixtures/project.rb
-- test/fixtures/schema.rb
-- test/helper.rb
-- test/test_search.rb
-- test/test_view_helpers.rb
+test_files: []
+