meta_where 0.9.9 → 0.9.9.2

data/VERSION

@@ -1 +1 @@
-0.9.9
+0.9.9.2

data/lib/meta_where/utility.rb

@@ -20,8 +20,12 @@ module MetaWhere
 
     def args_for_predicate(value)
       case value
-      when ActiveRecord::Associations::AssociationCollection, ActiveRecord::Relation
-        value.to_a
+      when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::Relation
+        value.to_a.map { |x|
+          x.respond_to?(:quoted_id) ? x.quoted_id : x
+        }
+      when ActiveRecord::Base
+        value.quoted_id
       else
         value
       end
@@ -29,7 +33,7 @@ module MetaWhere
 
     def method_from_value(value)
       case value
-      when Array, Range, ActiveRecord::Associations::AssociationCollection, ActiveRecord::Relation
+      when Array, Range, ActiveRecord::Associations::AssociationCollection, ActiveRecord::Relation, Arel::Relation
         :in
       else
         :eq

data/meta_where.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_where}
-  s.version = "0.9.9"
+  s.version = "0.9.9.2"
 
   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-17}
   s.description = %q{
       MetaWhere offers the ability to call any Arel predicate methods
       (with a few convenient aliases) on your Model's attributes instead
@@ -22,56 +22,54 @@ 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/core_ext/hash.rb",
-     "lib/core_ext/symbol.rb",
-     "lib/core_ext/symbol_operators.rb",
-     "lib/meta_where.rb",
-     "lib/meta_where/association_reflection.rb",
-     "lib/meta_where/column.rb",
-     "lib/meta_where/compound.rb",
-     "lib/meta_where/condition.rb",
-     "lib/meta_where/function.rb",
-     "lib/meta_where/join_dependency.rb",
-     "lib/meta_where/join_type.rb",
-     "lib/meta_where/relation.rb",
-     "lib/meta_where/utility.rb",
-     "lib/meta_where/visitors/attribute.rb",
-     "lib/meta_where/visitors/predicate.rb",
-     "lib/meta_where/visitors/visitor.rb",
-     "meta_where.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/fixed_bid_project.rb",
-     "test/fixtures/invalid_company.rb",
-     "test/fixtures/invalid_developer.rb",
-     "test/fixtures/note.rb",
-     "test/fixtures/notes.yml",
-     "test/fixtures/people.yml",
-     "test/fixtures/person.rb",
-     "test/fixtures/project.rb",
-     "test/fixtures/projects.yml",
-     "test/fixtures/schema.rb",
-     "test/fixtures/time_and_materials_project.rb",
-     "test/helper.rb",
-     "test/test_base.rb",
-     "test/test_relations.rb"
+    ".gitmodules",
+    "CHANGELOG",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/core_ext/hash.rb",
+    "lib/core_ext/symbol.rb",
+    "lib/core_ext/symbol_operators.rb",
+    "lib/meta_where.rb",
+    "lib/meta_where/association_reflection.rb",
+    "lib/meta_where/column.rb",
+    "lib/meta_where/compound.rb",
+    "lib/meta_where/condition.rb",
+    "lib/meta_where/function.rb",
+    "lib/meta_where/join_dependency.rb",
+    "lib/meta_where/join_type.rb",
+    "lib/meta_where/relation.rb",
+    "lib/meta_where/utility.rb",
+    "lib/meta_where/visitors/attribute.rb",
+    "lib/meta_where/visitors/predicate.rb",
+    "lib/meta_where/visitors/visitor.rb",
+    "meta_where.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/fixed_bid_project.rb",
+    "test/fixtures/invalid_company.rb",
+    "test/fixtures/invalid_developer.rb",
+    "test/fixtures/note.rb",
+    "test/fixtures/notes.yml",
+    "test/fixtures/people.yml",
+    "test/fixtures/person.rb",
+    "test/fixtures/project.rb",
+    "test/fixtures/projects.yml",
+    "test/fixtures/schema.rb",
+    "test/fixtures/time_and_materials_project.rb",
+    "test/helper.rb",
+    "test/test_base.rb",
+    "test/test_relations.rb"
   ]
   s.homepage = %q{http://metautonomo.us/projects/metawhere/}
   s.post_install_message = %q{
@@ -82,25 +80,24 @@ 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{ActiveRecord 3 query syntax on steroids.}
   s.test_files = [
     "test/fixtures/company.rb",
-     "test/fixtures/data_type.rb",
-     "test/fixtures/developer.rb",
-     "test/fixtures/fixed_bid_project.rb",
-     "test/fixtures/invalid_company.rb",
-     "test/fixtures/invalid_developer.rb",
-     "test/fixtures/note.rb",
-     "test/fixtures/person.rb",
-     "test/fixtures/project.rb",
-     "test/fixtures/schema.rb",
-     "test/fixtures/time_and_materials_project.rb",
-     "test/helper.rb",
-     "test/test_base.rb",
-     "test/test_relations.rb"
+    "test/fixtures/data_type.rb",
+    "test/fixtures/developer.rb",
+    "test/fixtures/fixed_bid_project.rb",
+    "test/fixtures/invalid_company.rb",
+    "test/fixtures/invalid_developer.rb",
+    "test/fixtures/note.rb",
+    "test/fixtures/person.rb",
+    "test/fixtures/project.rb",
+    "test/fixtures/schema.rb",
+    "test/fixtures/time_and_materials_project.rb",
+    "test/helper.rb",
+    "test/test_base.rb",
+    "test/test_relations.rb"
   ]
 
   if s.respond_to? :specification_version then

data/test/test_relations.rb

@@ -303,4 +303,16 @@ class TestRelations < Test::Unit::TestCase
       end
     end
   end
+
+  context "A Developer relation" do
+    setup do
+      @r = Developer.scoped
+    end
+
+    should "allow a hash with another relation as a value" do
+      query = @r.where(:company_id => Company.where(:name.matches => '%i%'))
+      assert_match /IN \(1, 2, 3\)/, query.to_sql
+      assert_same_elements Developer.all, query.all
+    end
+  end
 end

metadata

@@ -6,7 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 9
-  version: 0.9.9
+  - 2
+  version: 0.9.9.2
 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-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,10 +87,8 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - .gitmodules
 - CHANGELOG
-- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -142,8 +141,8 @@ post_install_message: "\n\
   walkthrough of MetaWhere'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