meta_search 1.1.1 → 1.1.2

data/Gemfile

@@ -0,0 +1,4 @@
+source "https://rubygems.org"
+
+# Specify your gem's dependencies in miraculous.gemspec
+gemspec

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.1.0"
-    gem.add_dependency "activesupport", "~> 3.1.0"
+    gem.add_dependency "activerecord", "~> 3.1"
+    gem.add_dependency "activesupport", "~> 3.1"
     gem.add_dependency "polyamorous", "~> 0.5.0"
-    gem.add_dependency "actionpack", "~> 3.1.0"
+    gem.add_dependency "actionpack", "~> 3.1"
     gem.post_install_message = <<END
 
 *** Thanks for installing MetaSearch! ***
@@ -63,7 +63,7 @@ end
 
 task :default => :test
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/meta_search/helpers/url_helper.rb

@@ -27,7 +27,7 @@ module MetaSearch
         name = (args.size > 0 && !args.first.is_a?(Hash)) ? args.shift.to_s : builder.base.human_attribute_name(attr_name)
         prev_attr, prev_order = builder.search_attributes['meta_sort'].to_s.split('.')
 
-        options = args.first.is_a?(Hash) ? args.shift : {}
+        options = args.first.is_a?(Hash) ? args.shift.dup : {}
         current_order = prev_attr == attr_name ? prev_order : nil
 
         if options[:default_order] == :desc

data/meta_search.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "meta_search"
-  s.version = "1.1.1"
+  s.version = "1.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ernie Miller"]
@@ -67,23 +67,29 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       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_development_dependency(%q<rake>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_runtime_dependency(%q<activerecord>, ["~> 3.1"])
+      s.add_runtime_dependency(%q<activesupport>, ["~> 3.1"])
       s.add_runtime_dependency(%q<polyamorous>, ["~> 0.5.0"])
-      s.add_runtime_dependency(%q<actionpack>, ["~> 3.1.0"])
+      s.add_runtime_dependency(%q<actionpack>, ["~> 3.1"])
     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<rake>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<activerecord>, ["~> 3.1"])
+      s.add_dependency(%q<activesupport>, ["~> 3.1"])
       s.add_dependency(%q<polyamorous>, ["~> 0.5.0"])
-      s.add_dependency(%q<actionpack>, ["~> 3.1.0"])
+      s.add_dependency(%q<actionpack>, ["~> 3.1"])
     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<rake>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<activerecord>, ["~> 3.1"])
+    s.add_dependency(%q<activesupport>, ["~> 3.1"])
     s.add_dependency(%q<polyamorous>, ["~> 0.5.0"])
-    s.add_dependency(%q<actionpack>, ["~> 3.1.0"])
+    s.add_dependency(%q<actionpack>, ["~> 3.1"])
   end
 end
 

data/test/test_search.rb

@@ -953,6 +953,12 @@ class TestSearch < Test::Unit::TestCase
                      @s.all
       end
 
+      should "allow traversal of polymorphic associations" do
+        @s.notable_developer_type_company_name_starts_with = 'M'
+        assert_equal Company.find_by_name('Mission Data').developers.map(&:notes).flatten.sort {|a, b| a.id <=>b.id},
+                     @s.all.sort {|a, b| a.id <=> b.id}
+      end
+
       should "raise an error when attempting to search against polymorphic belongs_to association without a type" do
         assert_raises ::MetaSearch::PolymorphicAssociationMissingTypeError do
           @s.notable_name_contains = 'MetaSearch'

data/test/test_view_helpers.rb

@@ -432,4 +432,16 @@ class TestViewHelpers < ActionView::TestCase
       end
     end
   end
+  
+  context "Any search" do
+    setup do
+      @s = Company.search(:name_contains => 'foo')
+    end
+    
+    should "not modify passed-in parameters" do
+      params = { :controller => 'companies' }
+      sort_link(@s, :name, params)
+      assert_equal ({ :controller => 'companies' }), params
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meta_search
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,55 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-03 00:00:00.000000000Z
+date: 2012-01-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: meta_search
+  requirement: &70158115443080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70158115443080
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &70158115442480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70158115442480
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70158115441880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70158115441880
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70158115441300 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70158115441300
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70309382367880 !ruby/object:Gem::Requirement
+  requirement: &70158115440760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,32 +65,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70309382367880
+  version_requirements: *70158115440760
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70309382364060 !ruby/object:Gem::Requirement
+  requirement: &70158115440160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70309382364060
+  version_requirements: *70158115440160
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70309382359180 !ruby/object:Gem::Requirement
+  requirement: &70158115439620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70309382359180
+  version_requirements: *70158115439620
 - !ruby/object:Gem::Dependency
   name: polyamorous
-  requirement: &70309382354200 !ruby/object:Gem::Requirement
+  requirement: &70158115292100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,18 +98,18 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70309382354200
+  version_requirements: *70158115292100
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70309382347400 !ruby/object:Gem::Requirement
+  requirement: &70158115291600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70309382347400
+  version_requirements: *70158115291600
 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,6 +123,7 @@ files:
 - .document
 - .gitmodules
 - CHANGELOG
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile