meta_search 0.9.9 → 0.9.9.1

data/CHANGELOG

@@ -1,3 +1,8 @@
+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
+
 Changes since 0.9.8 (2010-10-20):
   * ARel 2.x and Rails 3.0.2 compatability
   * sort_link uses search_key from builder. Search_key defaults to "search"

data/VERSION

@@ -1 +1 @@
-0.9.9
+0.9.9.1

data/lib/meta_search.rb

@@ -45,6 +45,8 @@ 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::ClassMethods::JoinDependency.send(:include, MetaSearch::JoinDependency)
 ActiveRecord::Base.send(:include, MetaSearch::Searches::ActiveRecord)
 ActionView::Helpers::FormBuilder.send(:include, MetaSearch::Helpers::FormBuilder)

data/lib/meta_search/helpers/form_helper.rb

@@ -4,9 +4,9 @@ module MetaSearch
       def apply_form_for_options!(object_or_array, options)
         if object_or_array.is_a?(MetaSearch::Builder)
           builder = object_or_array
-          url = polymorphic_path(object_or_array.base)
+          options[:url] ||= polymorphic_path(object_or_array.base)
         elsif object_or_array.is_a?(Array) && (builder = object_or_array.detect {|o| o.is_a?(MetaSearch::Builder)})
-          url = polymorphic_path(object_or_array.map {|o| o.is_a?(MetaSearch::Builder) ? o.base : o})
+          options[:url] ||= polymorphic_path(object_or_array.map {|o| o.is_a?(MetaSearch::Builder) ? o.base : o})
         else
           super and return
         end
@@ -17,7 +17,6 @@ module MetaSearch
           :method => :get }
         options[:html] ||= {}
         options[:html].reverse_merge!(html_options)
-        options[:url] ||= url
       end
     end
   end

data/lib/meta_search/locale/en.yml

@@ -0,0 +1,23 @@
+en:
+  meta_search:
+    predicates:
+      equals: "%{attribute} equals"
+      does_not_equal: "%{attribute} doesn't equal"
+      contains: "%{attribute} contains"
+      does_not_contain: "%{attribute} doesn't contain"
+      starts_with: "%{attribute} starts with"
+      does_not_start_with: "%{attribute} doesn't start with"
+      ends_with: "%{attribute} ends with"
+      does_not_end_with: "%{attribute} doesn't end with"
+      greater_than: "%{attribute} greater than"
+      less_than: "%{attribute} less than"
+      greater_than_or_equal_to: "%{attribute} greater than or equal to"
+      less_than_or_equal_to: "%{attribute} less than or equal to"
+      in: "%{attribute} is one of"
+      not_in: "%{attribute} isn't one of"
+      is_true: "%{attribute} is true"
+      is_false: "%{attribute} is false"
+      is_present: "%{attribute} is present"
+      is_blank: "%{attribute} is blank"
+      is_null: "%{attribute} is null"
+      is_not_null: "%{attribute} isn't null"

data/lib/meta_search/model_compatibility.rb

@@ -1,3 +1,5 @@
+require 'meta_search/utility'
+
 module MetaSearch
 
   module ModelCompatibility
@@ -24,7 +26,7 @@ module MetaSearch
   end
 
   class Name < String
-    attr_reader :singular, :plural, :element, :collection, :partial_path, :human, :param_key, :route_key
+    attr_reader :singular, :plural, :element, :collection, :partial_path, :human, :param_key, :route_key, :i18n_key
     alias_method :cache_key, :collection
 
     def initialize
@@ -37,13 +39,34 @@ module MetaSearch
       @partial_path = "#{@collection}/#{@element}".freeze
       @param_key = "search".freeze
       @route_key = "searches".freeze
+      @i18n_key = :meta_search
     end
   end
 
   module ClassMethods
+    include Utility
+
     def model_name
       @_model_name ||= Name.new
     end
+
+    def human_attribute_name(attribute, options = {})
+      method_name = preferred_method_name(attribute)
+
+      defaults = [:"meta_search.attributes.#{klass.model_name.i18n_key}.#{method_name || attribute}"]
+
+      if method_name
+        predicate = Where.get(method_name)[:name]
+        predicate_attribute = method_name.sub(/_#{predicate}=?$/, '')
+        defaults << :"meta_search.predicates.#{predicate}"
+      end
+
+      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)
+      I18n.translate(defaults.shift, options)
+    end
   end
 
 end

data/lib/meta_search/searches/active_record.rb

@@ -4,6 +4,7 @@ require 'meta_search/builder'
 
 module MetaSearch
   module Searches
+
     module ActiveRecord
 
       def self.included(base)
@@ -27,7 +28,7 @@ module MetaSearch
         # in that it doesn't actually query the database until you do something that
         # requires it to do so.
         def metasearch(params = nil, opts = nil)
-          builder = MetaSearch::Builder.new(self, opts || {})
+          builder = Searches.for(self).new(self, opts || {})
           builder.build(params || {})
         end
 
@@ -92,5 +93,24 @@ module MetaSearch
         alias_method :search_method, :search_methods
       end
     end
+
+    def self.for(klass)
+      DISPATCH[klass]
+    end
+
+    private
+
+    DISPATCH = Hash.new do |hash, klass|
+      class_name = klass.name.gsub('::', '_')
+      hash[klass] = module_eval <<-RUBY_EVAL
+        class #{class_name} < MetaSearch::Builder
+          def self.klass
+            ::#{klass}
+          end
+        end
+
+        #{class_name}
+      RUBY_EVAL
+    end
   end
 end

data/meta_search.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{meta_search}
-  s.version = "0.9.9"
+  s.version = "0.9.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-11-15}
+  s.date = %q{2010-11-16}
   s.description = %q{
       Allows simple search forms to be created against an AR3 model
       and its associations, has useful view helpers for sort links
@@ -18,49 +18,48 @@ Gem::Specification.new do |s|
   s.email = %q{ernie@metautonomo.us}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     ".gitmodules",
-     "CHANGELOG",
-     "Gemfile",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/meta_search.rb",
-     "lib/meta_search/builder.rb",
-     "lib/meta_search/exceptions.rb",
-     "lib/meta_search/helpers.rb",
-     "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/method.rb",
-     "lib/meta_search/model_compatibility.rb",
-     "lib/meta_search/searches/active_record.rb",
-     "lib/meta_search/utility.rb",
-     "lib/meta_search/where.rb",
-     "meta_search.gemspec",
-     "test/fixtures/companies.yml",
-     "test/fixtures/company.rb",
-     "test/fixtures/data_type.rb",
-     "test/fixtures/data_types.yml",
-     "test/fixtures/developer.rb",
-     "test/fixtures/developers.yml",
-     "test/fixtures/developers_projects.yml",
-     "test/fixtures/note.rb",
-     "test/fixtures/notes.yml",
-     "test/fixtures/project.rb",
-     "test/fixtures/projects.yml",
-     "test/fixtures/schema.rb",
-     "test/helper.rb",
-     "test/locales/en.yml",
-     "test/locales/es.yml",
-     "test/test_search.rb",
-     "test/test_view_helpers.rb"
+    ".gitmodules",
+    "CHANGELOG",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/meta_search.rb",
+    "lib/meta_search/builder.rb",
+    "lib/meta_search/exceptions.rb",
+    "lib/meta_search/helpers.rb",
+    "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",
+    "lib/meta_search/searches/active_record.rb",
+    "lib/meta_search/utility.rb",
+    "lib/meta_search/where.rb",
+    "meta_search.gemspec",
+    "test/fixtures/companies.yml",
+    "test/fixtures/company.rb",
+    "test/fixtures/data_type.rb",
+    "test/fixtures/data_types.yml",
+    "test/fixtures/developer.rb",
+    "test/fixtures/developers.yml",
+    "test/fixtures/developers_projects.yml",
+    "test/fixtures/note.rb",
+    "test/fixtures/notes.yml",
+    "test/fixtures/project.rb",
+    "test/fixtures/projects.yml",
+    "test/fixtures/schema.rb",
+    "test/helper.rb",
+    "test/locales/es.yml",
+    "test/locales/flanders.yml",
+    "test/test_search.rb",
+    "test/test_view_helpers.rb"
   ]
   s.homepage = %q{http://metautonomo.us/projects/metasearch/}
   s.post_install_message = %q{
@@ -71,20 +70,19 @@ you're feeling especially appreciative. It'd help me justify this
 "open source" stuff to my lovely wife. :)
 
 }
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   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"
+    "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

data/test/helper.rb

@@ -25,7 +25,7 @@ end
 
 Fixtures.create_fixtures(FIXTURES_PATH, ActiveRecord::Base.connection.tables)
 
-I18n.load_path = Dir[File.join(File.dirname(__FILE__), 'locales', '*.{rb,yml}')]
+I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'locales', '*.yml')]
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/locales/flanders.yml

@@ -0,0 +1,11 @@
+flanders:
+  activerecord:
+    attributes:
+      company:
+        name: "Company name-diddly"
+  meta_search:
+    predicates:
+      contains: "%{attribute} contains-diddly"
+    attributes:
+      developer:
+        name_contains: "Developer name-diddly contains-aroonie"

data/test/test_view_helpers.rb

@@ -32,6 +32,39 @@ class TestViewHelpers < ActionView::TestCase
     @controller = @controller.new
   end
 
+  context "A search against Company and a search against Developer" do
+    setup do
+      @s1 = Company.search
+      @s2 = Developer.search
+      form_for @s1 do |f|
+        @f1 = f
+      end
+
+      form_for @s2 do |f|
+        @f2 = f
+      end
+    end
+
+    should "use the default localization for predicates" do
+      assert_match /Name isn't null/, @f1.label(:name_is_not_null)
+    end
+
+    context "in the Flanders locale" do
+      setup do
+        I18n.locale = :flanders
+      end
+
+      teardown do
+        I18n.locale = nil
+      end
+
+      should "localize according to their bases" do
+        assert_match /Company name-diddly contains-diddly/, @f1.label(:name_contains)
+        assert_match /Developer name-diddly contains-aroonie/, @f2.label(:name_like)
+      end
+    end
+  end
+
   context "A previously-filled search form" do
     setup do
       @s = Company.search

metadata

@@ -6,7 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 9
-  version: 0.9.9
+  - 1
+  version: 0.9.9.1
 platform: ruby
 authors: 
 - Ernie Miller
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-15 00:00:00 -05:00
+date: 2010-11-16 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,10 +102,8 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - .gitmodules
 - CHANGELOG
-- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -117,6 +116,7 @@ files:
 - 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
 - lib/meta_search/searches/active_record.rb
@@ -136,8 +136,8 @@ files:
 - test/fixtures/projects.yml
 - test/fixtures/schema.rb
 - test/helper.rb
-- test/locales/en.yml
 - test/locales/es.yml
+- test/locales/flanders.yml
 - test/test_search.rb
 - test/test_view_helpers.rb
 has_rdoc: true
@@ -150,8 +150,8 @@ post_install_message: "\n\
   walkthrough of MetaSearch's features, and click the donate button if\n\
   you're feeling especially appreciative. It'd help me justify this\n\
   \"open source\" stuff to my lovely wife. :)\n\n"
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC

data/Gemfile

@@ -1,3 +0,0 @@
-source :rubygems
-
-gemspec

data/test/locales/en.yml

@@ -1,36 +0,0 @@
-en:
-  date:
-    formats:
-      # Use the strftime parameters for formats.
-      # When no format has been given, it uses default.
-      # You can provide other formats here if you like!
-      default: "%Y-%m-%d"
-      short: "%b %d"
-      long: "%B %d, %Y"
-
-    day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
-    abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
-
-    # Don't forget the nil at the beginning; there's no such thing as a 0th month
-    month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
-    abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
-    # Used in date_select and datetime_select.
-    order:
-      - :year
-      - :month
-      - :day
-
-  time:
-    formats:
-      default: "%a, %d %b %Y %H:%M:%S %z"
-      short: "%d %b %H:%M"
-      long: "%B %d, %Y %H:%M"
-    am: "am"
-    pm: "pm"
-
-# Used in array.to_sentence.
-  support:
-    array:
-      words_connector: ", "
-      two_words_connector: " and "
-      last_word_connector: ", and "