meta_search 1.0.1 → 1.0.2

data/CHANGELOG

@@ -1,3 +1,11 @@
+Changes since 1.0.1 (2011-01-18):
+  * Include all non-boolean types in is_present and is_blank, to match
+    documentation
+  * Avoid setting alias to collection_check_boxes and check_boxes against
+    the base. Fixes issues with SimpleForm compatibility.
+  * Delegate page method to relation, for Kaminari support.
+  * Don't check for existence of attributes if the table doesn't exist yet.
+
 Changes since 1.0.0 (2011-01-17):
   * Update polymorphic join support to play nicely with MetaWhere
 

data/README.rdoc

@@ -33,7 +33,7 @@ In your view:
     <%= f.submit %>
   <% end %>
 
-Options for the search method are documented at MetaSearch::Searches::Base.
+Options for the search method are documented at MetaSearch::Searches::ActiveRecord.
 
 == "Wheres", and what they're good for
 

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/meta_search/helpers/form_builder.rb

@@ -8,10 +8,8 @@ module MetaSearch
 
       def self.included(base)
         # Only take on the check_boxes method names if someone else (Hi, José!) hasn't grabbed them.
-        base.class_eval do
-          alias_method :check_boxes, :checks unless method_defined?(:check_boxes)
-          alias_method :collection_check_boxes, :collection_checks unless method_defined?(:collection_check_boxes)
-        end
+        alias_method :check_boxes, :checks unless method_defined?(:check_boxes)
+        alias_method :collection_check_boxes, :collection_checks unless method_defined?(:collection_check_boxes)
       end
 
       # Like other form_for field methods (text_field, hidden_field, password_field) etc,

data/lib/meta_search/join_dependency.rb

@@ -27,7 +27,7 @@ module MetaSearch
         case associations
         when Symbol, String
           reflection = parent.reflections[associations.to_s.intern] or
-            raise ConfigurationError, "Association named '#{ association }' was not found; perhaps you misspelled it?"
+            raise ConfigurationError, "Association named '#{ associations }' was not found; perhaps you misspelled it?"
           unless (association = find_join_association(reflection, parent)) && (!polymorphic_class || association.active_record == polymorphic_class)
             @reflections << reflection
             if reflection.options[:polymorphic]

data/lib/meta_search/searches/active_record.rb

@@ -27,6 +27,17 @@ module MetaSearch
         # 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.
+        #
+        # Options:
+        #
+        # * +params+ - a hash of valid searches with keys that are valid according to
+        #   the docs in MetaSearch::Where.
+        # * +opts+ - A hash of additional information that will be passed through to
+        #   the search's Builder object. +search_key+, if present, will override the
+        #   default param name, 'search', in any sort_links generated by this Builder.
+        #   All other keys are passed untouched to the builder, and available from the
+        #   Builder's +options+ reader for use in :if blocks supplied to attr_searchable
+        #   and friends.
         def metasearch(params = nil, opts = nil)
           builder = Searches.for(self).new(self, opts || {})
           builder.build(params || {})
@@ -67,15 +78,17 @@ module MetaSearch
         # like <tt>:user_id_equals</tt>, nor will an Article.search accept the parameter
         # <tt>:comments_user_id_equals</tt>.
         def attr_unsearchable(*args)
-          opts = args.extract_options!
-          args.flatten.each do |attr|
-            attr = attr.to_s
-            raise(ArgumentError, "No persisted attribute (column) named #{attr} in #{self}") unless self.columns_hash.has_key?(attr)
-            self._metasearch_exclude_attributes = self._metasearch_exclude_attributes.merge(
-              attr => {
-                :if => opts[:if]
-              }
-            )
+          if table_exists?
+            opts = args.extract_options!
+            args.flatten.each do |attr|
+              attr = attr.to_s
+              raise(ArgumentError, "No persisted attribute (column) named #{attr} in #{self}") unless self.columns_hash.has_key?(attr)
+              self._metasearch_exclude_attributes = self._metasearch_exclude_attributes.merge(
+                attr => {
+                  :if => opts[:if]
+                }
+              )
+            end
           end
         end
 
@@ -83,15 +96,17 @@ module MetaSearch
         # <tt>attr_searchable</tt> and <tt>attr_unsearchable</tt> are present, the latter
         # is ignored.
         def attr_searchable(*args)
-          opts = args.extract_options!
-          args.flatten.each do |attr|
-            attr = attr.to_s
-            raise(ArgumentError, "No persisted attribute (column) named #{attr} in #{self}") unless self.columns_hash.has_key?(attr)
-            self._metasearch_include_attributes = self._metasearch_include_attributes.merge(
-              attr => {
-                :if => opts[:if]
-              }
-            )
+          if table_exists?
+            opts = args.extract_options!
+            args.flatten.each do |attr|
+              attr = attr.to_s
+              raise(ArgumentError, "No persisted attribute (column) named #{attr} in #{self}") unless self.columns_hash.has_key?(attr)
+              self._metasearch_include_attributes = self._metasearch_include_attributes.merge(
+                attr => {
+                  :if => opts[:if]
+                }
+              )
+            end
           end
         end
 

data/lib/meta_search.rb

@@ -26,8 +26,8 @@ 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 => (NUMBERS + STRINGS), :predicate => :not_eq_all, :skip_compounds => true, :cast => :boolean, :formatter => Proc.new {|param| [nil, '']}}],
-    ['is_blank', {:types => (NUMBERS + STRINGS), :predicate => :eq_any, :skip_compounds => true, :cast => :boolean, :formatter => Proc.new {|param| [nil, '']}}],
+    ['is_present', {:types => (ALL_TYPES - BOOLEANS), :predicate => :not_eq_all, :skip_compounds => true, :cast => :boolean, :formatter => Proc.new {|param| [nil, '']}}],
+    ['is_blank', {:types => (ALL_TYPES - BOOLEANS), :predicate => :eq_any, :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}}]
   ]
@@ -36,7 +36,7 @@ module MetaSearch
     # Query construction
     :joins, :includes, :select, :order, :where, :having, :group,
     # Results, debug, array methods
-    :to_a, :all, :length, :size, :to_sql, :debug_sql, :paginate,
+    :to_a, :all, :length, :size, :to_sql, :debug_sql, :paginate, :page,
     :find_each, :first, :last, :each, :arel, :in_groups_of, :group_by,
     # Calculations
     :count, :average, :minimum, :maximum, :sum

data/meta_search.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{meta_search}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ernie Miller"]
-  s.date = %q{2011-01-18}
+  s.date = %q{2011-03-14}
   s.description = %q{
       Allows simple search forms to be created against an AR3 model
       and its associations, has useful view helpers for sort links
@@ -71,7 +71,7 @@ you're feeling especially appreciative. It'd help me justify this
 
 }
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.3}
   s.summary = %q{Object-based searching (and more) for simply creating search forms.}
   s.test_files = [
     "test/fixtures/company.rb",
@@ -86,7 +86,6 @@ you're feeling especially appreciative. It'd help me justify this
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: meta_search
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
+  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors: 
 - Ernie Miller
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-18 00:00:00 -05:00
+date: 2011-03-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,8 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -38,10 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 2
         version: 3.0.2
   type: :runtime
   version_requirements: *id002
@@ -53,10 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 2
         version: 3.0.2
   type: :runtime
   version_requirements: *id003
@@ -68,10 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 2
         version: 3.0.2
   type: :runtime
   version_requirements: *id004
@@ -83,10 +65,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 2
         version: 2.0.2
   type: :runtime
   version_requirements: *id005
@@ -158,21 +136,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Object-based searching (and more) for simply creating search forms.