meta_search 0.5.4 → 0.9.1

data/.gitmodules

@@ -3,4 +3,4 @@
 	url = git://github.com/rails/rails.git
 [submodule "vendor/arel"]
 	path = vendor/arel
-	url = git://github.com/ernie/arel.git
+	url = git://github.com/rails/arel.git

data/CHANGELOG

@@ -1,6 +1,7 @@
 Changes since 0.5.3 (2010-07-26):
- *Add is_true/is_false for boolean columns
- * Add is_present and is_blank for non-boolean columns
+ * Add is_true/is_false for boolean columns
+ * Add is_present and is_blank for string/numeric columns
+ * Add is_null and is_not_null for all columns
  * Fix behavior of equals when used with boolean columns.
 
 Changes since 0.5.2 (2010-07-22):

data/Gemfile

@@ -1,6 +1,8 @@
 source :rubygems
-gem "arel", ">= 0.4.0"
-gem "rails", ">= 3.0.0.beta4"
+gem "arel", "~> 1.0.0.rc1"
+gem "activerecord", "~> 3.0.0.rc2"
+gem "activesupport", "~> 3.0.0.rc2"
+gem "actionpack", "~> 3.0.0.rc2"
 group :test do
   gem "rake"
   gem "shoulda"

data/README.rdoc

@@ -231,9 +231,14 @@ Excluded attributes on a model will be honored across associations, so if an Art
 Then your call to <tt>Article.search</tt> will allow <tt>:comments_body_contains</tt>
 but not <tt>:comments_user_id_equals</tt> to be passed.
 
-== Reporting issues
+== Contributions
 
-Please report any issues using {Lighthouse}[http://metautonomous.lighthouseapp.com/projects/53012-metasearch/]. Thanks in advance for helping me improve MetaSearch!
+There are several ways you can help MetaSearch continue to improve.
+
+* Use MetaSearch in your real-world projects and {submit bug reports or feature suggestions}[http://metautonomous.lighthouseapp.com/projects/53012-metasearch/].
+* Better yet, if you’re so inclined, fix the issue yourself and submit a patch! Or you can {fork the project on GitHub}[http://github.com/ernie/meta_search] and send me a pull request (please include tests!)
+* If you like MetaSearch, spread the word. More users == more eyes on code == more bugs getting found == more bugs getting fixed (hopefully!)
+* Lastly, if MetaSearch has saved you hours of development time on your latest Rails gig, and you’re feeling magnanimous, please consider {making a donation}[http://pledgie.com/campaigns/9647] to the project. I have spent hours of my personal time coding and supporting MetaSearch, and your donation would go a great way toward justifying that time spent to my loving wife. :)
 
 == Copyright
 

data/Rakefile

@@ -15,10 +15,10 @@ begin
     gem.homepage = "http://metautonomo.us/projects/metasearch/"
     gem.authors = ["Ernie Miller"]
     gem.add_development_dependency "shoulda"
-    gem.add_dependency "activerecord", ">= 3.0.0.beta4"
-    gem.add_dependency "activesupport", ">= 3.0.0.beta4"
-    gem.add_dependency "actionpack", ">= 3.0.0.beta4"
-    gem.add_dependency "arel", ">= 0.4.0"
+    gem.add_dependency "activerecord", "~> 3.0.0.rc2"
+    gem.add_dependency "activesupport", "~> 3.0.0.rc2"
+    gem.add_dependency "actionpack", "~> 3.0.0.rc2"
+    gem.add_dependency "arel", "~> 1.0.0.rc1"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.9.1

data/lib/meta_search/builder.rb

@@ -28,7 +28,7 @@ module MetaSearch
     include ModelCompatibility
     include Utility
 
-    attr_reader :base, :search_attributes, :join_dependency
+    attr_reader :base, :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
@@ -39,6 +39,7 @@ module MetaSearch
       @opts = opts
       @join_dependency = build_join_dependency
       @search_attributes = {}
+      @errors = ActiveModel::Errors.new(self)
     end
 
     def relation
@@ -112,6 +113,25 @@ module MetaSearch
       self
     end
 
+    def respond_to?(method_name, include_private = false)
+      return true if super # Hopefully we've already defined the method.
+
+      # Curses! Looks like we'll need to do this the hard way.
+      method_name = method_name.to_s
+      if RELATION_METHODS.map(&:to_s).include?(method_name)
+        true
+      elsif method_name.match(/^meta_sort=?$/)
+        true
+      elsif match = method_name.match(/^(.*)\(([0-9]+).*\)$/)
+        method_name, index = match.captures
+        respond_to?(method_name)
+      elsif matches_named_method(method_name) || matches_attribute_method(method_name)
+        true
+      else
+        false
+      end
+    end
+
     private
 
     def method_missing(method_id, *args, &block)

data/lib/meta_search/helpers/form_builder.rb

@@ -5,7 +5,6 @@ module MetaSearch
 
   module Helpers
     module FormBuilder
-      extend ActiveSupport::Concern
 
       # Like other form_for field methods (text_field, hidden_field, password_field) etc,
       # but takes a list of hashes between the +method+ parameter and the trailing option hash,

data/lib/meta_search/model_compatibility.rb

@@ -1,23 +1,27 @@
 module MetaSearch
   # Just a little module to mix in so that ActionPack doesn't complain.
   module ModelCompatibility
-    def self.included(base) 
+    def self.included(base)
       base.extend ClassMethods
     end
-    
+
     # Force default "Update search" text
     def persisted?
       true
     end
-    
+
     def to_key
       nil
     end
-    
+
     def to_param
       nil
     end
-    
+
+    def to_model
+      self
+    end
+
     class Name < String
       attr_reader :singular, :plural, :element, :collection, :partial_path, :human
       alias_method :cache_key, :collection
@@ -32,11 +36,11 @@ module MetaSearch
         @partial_path = "#{@collection}/#{@element}".freeze
       end
     end
-    
-    module ClassMethods 
-      def model_name 
+
+    module ClassMethods
+      def model_name
         @_model_name ||= Name.new
-      end 
-    end 
+      end
+    end
   end
 end

data/lib/meta_search/searches/active_record.rb

@@ -4,23 +4,19 @@ require 'meta_search/builder'
 
 module MetaSearch::Searches
   module ActiveRecord
-    extend ActiveSupport::Concern
-    
-    included do
-      class_attribute :_metasearch_include_attributes, :_metasearch_exclude_attributes
-      class_attribute :_metasearch_include_associations, :_metasearch_exclude_associations
-      class_attribute :_metasearch_methods
-      self._metasearch_include_attributes =
-        self._metasearch_exclude_attributes =
-        self._metasearch_exclude_associations =
-        self._metasearch_include_associations = []
-      self._metasearch_methods = {}
-        
-      singleton_class.instance_eval do
-        alias_method :metasearch_include_attr, :attr_searchable
-        alias_method :metasearch_exclude_attr, :attr_unsearchable
-        alias_method :metasearch_include_assoc, :assoc_searchable
-        alias_method :metasearch_exclude_assoc, :assoc_unsearchable
+
+    def self.included(base)
+      base.extend ClassMethods
+
+      base.class_eval do
+        class_attribute :_metasearch_include_attributes, :_metasearch_exclude_attributes
+        class_attribute :_metasearch_include_associations, :_metasearch_exclude_associations
+        class_attribute :_metasearch_methods
+        self._metasearch_include_attributes =
+          self._metasearch_exclude_attributes =
+          self._metasearch_exclude_associations =
+          self._metasearch_include_associations = []
+        self._metasearch_methods = {}
       end
     end
 
@@ -29,15 +25,17 @@ module MetaSearch::Searches
       # MetaSearch::Builder, which behaves pretty much like an ActiveRecord::Relation,
       # in that it doesn't actually query the database until you do something that
       # requires it to do so.
-      def search(opts = {})
+      def metasearch(opts = {})
         opts ||= {} # to catch nil params
         search_options = opts.delete(:search_options) || {}
         builder = MetaSearch::Builder.new(self, search_options)
         builder.build(opts)
       end
 
+      alias_method :search, :metasearch unless respond_to?(:search)
+
       private
-      
+
       # Excludes model attributes from searchability. This means that searches can't be created against
       # these columns, whether the search is based on this model, or the model's attributes are being
       # searched by association from another model. If a Comment <tt>belongs_to :article</tt> but declares
@@ -62,7 +60,7 @@ module MetaSearch::Searches
           self._metasearch_include_attributes = (self._metasearch_include_attributes + [attr]).uniq
         end
       end
-      
+
       # Excludes model associations from searchability. This mean that searches can't be created against
       # these associations. An article that <tt>has_many :comments</tt> but excludes comments from
       # searching by declaring <tt>assoc_unsearchable :comments</tt> won't make any of the
@@ -74,7 +72,7 @@ module MetaSearch::Searches
           self._metasearch_exclude_associations = (self._metasearch_exclude_associations + [assoc]).uniq
         end
       end
-      
+
       # As with <tt>attr_searchable</tt> this is the whitelist version of
       # <tt>assoc_unsearchable</tt>
       def assoc_searchable(*args)
@@ -84,7 +82,7 @@ module MetaSearch::Searches
           self._metasearch_include_associations = (self._metasearch_include_associations + [assoc]).uniq
         end
       end
-      
+
       def search_methods(*args)
         opts = args.last.is_a?(Hash) ? args.pop : {}
         args.flatten.map(&:to_s).each do |arg|

data/lib/meta_search.rb

@@ -26,14 +26,19 @@ module MetaSearch
     ['not_in', 'ni', 'not_in', {:types => ALL_TYPES, :predicate => :not_in}],
     ['is_true', {:types => BOOLEANS, :skip_compounds => true}],
     ['is_false', {:types => BOOLEANS, :skip_compounds => true, :formatter => Proc.new {|param| !param}}],
-    ['is_present', {:types => (ALL_TYPES - BOOLEANS), :predicate => :not_eq_all, :splat_param => true, :skip_compounds => true, :cast => :boolean, :formatter => Proc.new {|param| [nil, '']}}],
-    ['is_blank', {:types => (ALL_TYPES - BOOLEANS), :predicate => :eq_any, :splat_param => true, :skip_compounds => true, :cast => :boolean, :formatter => Proc.new {|param| [nil, '']}}]
+    ['is_present', {:types => (NUMBERS + STRINGS), :predicate => :not_eq_all, :splat_param => true, :skip_compounds => true, :cast => :boolean, :formatter => Proc.new {|param| [nil, '']}}],
+    ['is_blank', {:types => (NUMBERS + STRINGS), :predicate => :eq_any, :splat_param => true, :skip_compounds => true, :cast => :boolean, :formatter => Proc.new {|param| [nil, '']}}],
+    ['is_null', {:types => ALL_TYPES, :skip_compounds => true, :cast => :boolean, :formatter => Proc.new {|param| nil}}],
+    ['is_not_null', {:types => ALL_TYPES, :predicate => :not_eq, :skip_compounds => true, :cast => :boolean, :formatter => Proc.new {|param| nil}}]
   ]
 
-  RELATION_METHODS = [:joins, :includes, :to_a, :all, :count, :to_sql, :paginate, :autojoin, :find_each, :first, :last, :each, :arel]
+  RELATION_METHODS = [:joins, :includes, :select, :order, :where, :having,
+                      :to_a, :all, :count, :length, :size, :to_sql, :debug_sql, :paginate,
+                      :find_each, :first, :last, :each, :arel]
 end
 
 require 'active_record'
+require 'active_support'
 require 'action_view'
 require 'action_controller'
 require 'meta_search/searches/active_record'

data/meta_search.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{meta_search}
-  s.version = "0.5.4"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ernie Miller"]
-  s.date = %q{2010-07-28}
+  s.date = %q{2010-08-24}
   s.description = %q{
       Allows simple search forms to be created against an AR3 model
       and its associations, has useful view helpers for sort links
@@ -62,7 +62,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://metautonomo.us/projects/metasearch/}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{ActiveRecord 3 object-based searching for your form_for enjoyment.}
   s.test_files = [
     "test/fixtures/company.rb",
@@ -80,25 +80,25 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_runtime_dependency(%q<activerecord>, [">= 3.0.0.beta4"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
-      s.add_runtime_dependency(%q<actionpack>, [">= 3.0.0.beta4"])
-      s.add_runtime_dependency(%q<arel>, [">= 0.4.0"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 3.0.0.rc2"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.0.rc2"])
+      s.add_runtime_dependency(%q<actionpack>, ["~> 3.0.0.rc2"])
+      s.add_runtime_dependency(%q<arel>, ["~> 1.0.0.rc1"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<activerecord>, [">= 3.0.0.beta4"])
-      s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
-      s.add_dependency(%q<actionpack>, [">= 3.0.0.beta4"])
-      s.add_dependency(%q<arel>, [">= 0.4.0"])
+      s.add_dependency(%q<activerecord>, ["~> 3.0.0.rc2"])
+      s.add_dependency(%q<activesupport>, ["~> 3.0.0.rc2"])
+      s.add_dependency(%q<actionpack>, ["~> 3.0.0.rc2"])
+      s.add_dependency(%q<arel>, ["~> 1.0.0.rc1"])
     end
   else
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<activerecord>, [">= 3.0.0.beta4"])
-    s.add_dependency(%q<activesupport>, [">= 3.0.0.beta4"])
-    s.add_dependency(%q<actionpack>, [">= 3.0.0.beta4"])
-    s.add_dependency(%q<arel>, [">= 0.4.0"])
+    s.add_dependency(%q<activerecord>, ["~> 3.0.0.rc2"])
+    s.add_dependency(%q<activesupport>, ["~> 3.0.0.rc2"])
+    s.add_dependency(%q<actionpack>, ["~> 3.0.0.rc2"])
+    s.add_dependency(%q<arel>, ["~> 1.0.0.rc1"])
   end
 end
 

data/test/fixtures/data_type.rb

@@ -1,4 +1,4 @@
 class DataType < ActiveRecord::Base
   belongs_to :company
-  metasearch_exclude_attr :str
+  attr_unsearchable :str
 end

data/test/test_search.rb

@@ -18,14 +18,30 @@ class TestSearch < Test::Unit::TestCase
         assert @s.get_association(:developers)
       end
 
+      should "respond_to? a search against a developer attribute" do
+        assert_respond_to @s, :developers_name_eq
+      end
+
       should "have a column named name" do
         assert @s.get_column(:name)
       end
 
+      should "respond_to? a search against name" do
+        assert_respond_to @s, :name_eq
+      end
+
+      should "respond_to? a search against backwards_name" do
+        assert_respond_to @s, :backwards_name
+      end
+
       should "exclude the column named updated_at" do
         assert_nil @s.get_column(:updated_at)
       end
 
+      should "not respond_to? updated_at" do
+        assert !@s.respond_to?(:updated_at), "The search responded to :updated_at"
+      end
+
       should "raise an error if we try to search on updated_at" do
         assert_raise NoMethodError do
           @s.updated_at_eq = [2009, 1, 1]
@@ -36,6 +52,10 @@ class TestSearch < Test::Unit::TestCase
         assert_nil @s.get_association(:notes)
       end
 
+      should "not respond_to? notes_note_eq" do
+        assert !@s.respond_to?(:notes_note_eq), "The search responded to :notes_note_eq"
+      end
+
       should "raise an error if we try to search on notes" do
         assert_raise NoMethodError do
           @s.notes_note_eq = 'Blah'
@@ -46,6 +66,14 @@ class TestSearch < Test::Unit::TestCase
         assert_nil @s.get_attribute(:data_types_str)
       end
 
+      should "not respond_to? data_types_str_eq" do
+        assert !@s.respond_to?(:data_types_str_eq), "The search responded to :data_types_str_eq"
+      end
+
+      should "respond_to? data_types_bln_eq" do
+        assert_respond_to @s, :data_types_bln_eq
+      end
+
       should "raise an error if we try to search data_types.str" do
         assert_raise NoMethodError do
           @s.data_types_str_eq = 'Blah'
@@ -665,7 +693,7 @@ class TestSearch < Test::Unit::TestCase
           @s.name_is_blank = true
         end
 
-        should "return 5 results" do
+        should "return 2 results" do
           assert_equal 2, @s.all.size
         end
 
@@ -673,6 +701,34 @@ class TestSearch < Test::Unit::TestCase
           assert_equal 0, @s.all.select {|r| r.name.present?}.size
         end
       end
+
+      context "where name is null" do
+        setup do
+          @s.name_is_null = true
+        end
+
+        should "return 1 result" do
+          assert_equal 1, @s.all.size
+        end
+
+        should "contain no results with a non-null name column" do
+          assert_equal 0, @s.all.select {|r| r.name != nil}.size
+        end
+      end
+
+      context "where name is not null" do
+        setup do
+          @s.name_is_not_null = true
+        end
+
+        should "return 6 results" do
+          assert_equal 6, @s.all.size
+        end
+
+        should "contain no results with a null name column" do
+          assert_equal 0, @s.all.select {|r| r.name = nil}.size
+        end
+      end
     end
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 4
-  version: 0.5.4
+  - 9
+  - 1
+  version: 0.9.1
 platform: ruby
 authors: 
 - Ernie Miller
@@ -14,14 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-28 00:00:00 -04:00
+date: 2010-08-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -34,63 +33,60 @@ dependencies:
   name: activerecord
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 3
         - 0
         - 0
-        - beta4
-        version: 3.0.0.beta4
+        - rc2
+        version: 3.0.0.rc2
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 3
         - 0
         - 0
-        - beta4
-        version: 3.0.0.beta4
+        - rc2
+        version: 3.0.0.rc2
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: actionpack
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 3
         - 0
         - 0
-        - beta4
-        version: 3.0.0.beta4
+        - rc2
+        version: 3.0.0.rc2
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: arel
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
         - 0
-        - 4
         - 0
-        version: 0.4.0
+        - rc1
+        version: 1.0.0.rc1
   type: :runtime
   version_requirements: *id005
 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    "
@@ -150,7 +146,6 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -158,7 +153,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -168,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: ActiveRecord 3 object-based searching for your form_for enjoyment.