meta_where 1.0.3 → 1.0.4

data/.gitignore

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

data/Gemfile

@@ -0,0 +1,8 @@
+source "http://rubygems.org"
+gemspec
+
+gem 'arel', :git => 'git://github.com/rails/arel.git', :tag => 'v2.0.8.beta.20110131120940'
+git 'git://github.com/rails/rails.git', :branch => '3-0-stable' do
+  gem 'activesupport'
+  gem 'activerecord'
+end

data/Rakefile

@@ -1,76 +1,11 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "meta_where"
-    gem.summary = %Q{ActiveRecord 3 query syntax on steroids.}
-    gem.description = %Q{
-      MetaWhere offers the ability to call any Arel predicate methods
-      (with a few convenient aliases) on your Model's attributes instead
-      of the ones normally offered by ActiveRecord's hash parameters. It also
-      adds convenient syntax for order clauses, smarter mapping of nested hash
-      conditions, and a debug_sql method to see the real SQL your code is
-      generating without running it against the database. If you like the new
-      AR 3.0 query interface, you'll love it with MetaWhere.
-    }
-    gem.email = "ernie@metautonomo.us"
-    gem.homepage = "http://metautonomo.us/projects/metawhere/"
-    gem.authors = ["Ernie Miller"]
-    gem.add_development_dependency "shoulda"
-    gem.add_dependency "activerecord", "~> 3.0.4"
-    gem.add_dependency "activesupport", "~> 3.0.4"
-    gem.add_dependency "arel", "~> 2.0.8"
-    gem.post_install_message = <<END
-
-*** Thanks for installing MetaWhere! ***
-Be sure to check out http://metautonomo.us/projects/metawhere/ for a
-walkthrough of MetaWhere's features, and click the donate button if
-you're feeling especially appreciative. It'd help me justify this
-"open source" stuff to my lovely wife. :)
+require 'bundler'
+require 'rspec/core/rake_task'
+require 'rake/testtask'
 
-END
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.libs << 'vendor/rails/activerecord/lib'
-  test.libs << 'vendor/rails/activesupport/lib'
-  test.libs << 'vendor/arel/lib'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+  test.libs << 'test'
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-# Don't check dependencies since we're testing with vendored libraries
-# task :test => :check_dependencies
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "meta_where #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+task :default => :test

data/lib/meta_where.rb

@@ -44,10 +44,8 @@ require 'core_ext/hash'
 require 'meta_where/visitors/attribute'
 require 'meta_where/visitors/predicate'
 require 'meta_where/association_reflection'
-require 'meta_where/belongs_to_polymorphic_association'
 require 'meta_where/relation'
 require 'meta_where/join_dependency'
 ActiveRecord::Relation.send(:include, MetaWhere::Relation)
 ActiveRecord::Reflection::AssociationReflection.send(:include, MetaWhere::AssociationReflection)
-ActiveRecord::Associations::ClassMethods::JoinDependency.send(:include, MetaWhere::JoinDependency)
-ActiveRecord::Associations::BelongsToPolymorphicAssociation.send(:include, MetaWhere::BelongsToPolymorphicAssociation)
+ActiveRecord::Associations::ClassMethods::JoinDependency.send(:include, MetaWhere::JoinDependency)

data/lib/meta_where/join_dependency.rb

@@ -92,7 +92,7 @@ module MetaWhere
       ]
 
       if options[:conditions]
-        @join << interpolate_sql(sanitize_sql(options[:conditions], aliased_table_name))
+        @join << process_conditions(options[:conditions], aliased_table_name)
       end
 
       @join

data/lib/meta_where/relation.rb

@@ -237,13 +237,11 @@ module MetaWhere
     def collapse_wheres(arel, wheres)
       binaries = wheres.grep(Arel::Nodes::Binary)
 
-      groups = binaries.group_by do |binary|
-        [binary.class, binary.left]
-      end
+      groups = binaries.group_by {|b| [b.class, b.left]}
 
       groups.each do |_, bins|
         test = bins.inject(bins.shift) do |memo, expr|
-          memo.or(expr)
+          memo.and(expr)
         end
         arel = arel.where(test)
       end

data/lib/meta_where/version.rb

@@ -0,0 +1,3 @@
+module MetaWhere
+  VERSION = "1.0.4"
+end

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 'rake gemspec'
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "meta_where/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{meta_where}
-  s.version = "1.0.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Ernie Miller"]
-  s.date = %q{2011-02-10}
+  s.name        = "meta_where"
+  s.version     = MetaWhere::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Ernie Miller"]
+  s.email       = ["ernie@metautonomo.us"]
+  s.homepage    = "http://metautonomo.us/projects/metawhere"
+  s.summary     = %q{ActiveRecord 3 query syntax on steroids.}
   s.description = %q{
       MetaWhere offers the ability to call any Arel predicate methods
       (with a few convenient aliases) on your Model's attributes instead
@@ -19,62 +19,6 @@ Gem::Specification.new do |s|
       generating without running it against the database. If you like the new
       AR 3.0 query interface, you'll love it with MetaWhere.
     }
-  s.email = %q{ernie@metautonomo.us}
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-    ".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/belongs_to_polymorphic_association.rb",
-    "lib/meta_where/column.rb",
-    "lib/meta_where/compound.rb",
-    "lib/meta_where/condition.rb",
-    "lib/meta_where/condition_operators.rb",
-    "lib/meta_where/function.rb",
-    "lib/meta_where/join_dependency.rb",
-    "lib/meta_where/join_type.rb",
-    "lib/meta_where/not.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{
 *** Thanks for installing MetaWhere! ***
 Be sure to check out http://metautonomo.us/projects/metawhere/ for a
@@ -83,45 +27,22 @@ you're feeling especially appreciative. It'd help me justify this
 "open source" stuff to my lovely wife. :)
 
 }
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.0}
-  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"
+
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.rdoc"
   ]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
+  s.rubyforge_project = "meta_where"
 
-    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.0.4"])
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.4"])
-      s.add_runtime_dependency(%q<arel>, ["~> 2.0.8"])
-    else
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<activerecord>, ["~> 3.0.4"])
-      s.add_dependency(%q<activesupport>, ["~> 3.0.4"])
-      s.add_dependency(%q<arel>, ["~> 2.0.8"])
-    end
-  else
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<activerecord>, ["~> 3.0.4"])
-    s.add_dependency(%q<activesupport>, ["~> 3.0.4"])
-    s.add_dependency(%q<arel>, ["~> 2.0.8"])
-  end
-end
+  s.add_dependency 'activerecord', '~> 3.0.0'
+  s.add_dependency 'activesupport', '~> 3.0.0'
+  s.add_dependency 'arel', '~> 2.0.7'
+  s.add_development_dependency 'shoulda'
+  s.add_development_dependency 'sqlite3', '~> 1.3.3'
 
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end

data/test/helper.rb

@@ -1,4 +1,6 @@
-require 'rubygems'
+require "rubygems"
+require "bundler"
+Bundler.setup
 require 'test/unit'
 require 'shoulda'
 require 'active_record'
@@ -27,8 +29,5 @@ end
 
 Fixtures.create_fixtures(FIXTURES_PATH, ActiveRecord::Base.connection.tables)
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
 class Test::Unit::TestCase
 end

data/test/test_relations.rb

@@ -338,10 +338,10 @@ class TestRelations < Test::Unit::TestCase
       assert_same_elements Developer.all, query.all
     end
 
-    should "merge multiple conditions on the same column and predicate with ORs" do
-      assert_match /"developers"."name" = 'blah' OR "developers"."name" = 'blah2'/,
+    should "merge multiple conditions on the same column and predicate with ANDs" do
+      assert_match /"developers"."name" = 'blah' AND "developers"."name" = 'blah2'/,
                    @r.where(:name => 'blah').where(:name => 'blah2').to_sql
-      assert_match /"developers"."name" LIKE '%blah%' OR "developers"."name" LIKE '%blah2%'/,
+      assert_match /"developers"."name" LIKE '%blah%' AND "developers"."name" LIKE '%blah2%'/,
                    @r.where(:name.matches => '%blah%').where(:name.matches => '%blah2%').to_sql
     end
 
@@ -356,7 +356,7 @@ class TestRelations < Test::Unit::TestCase
       end
 
       should "eager load companies" do
-        assert_equal true, @r.all.first.instance_variables.include?(:@company)
+        assert_equal true, @r.all.first.company.loaded?
       end
     end
 
@@ -366,7 +366,7 @@ class TestRelations < Test::Unit::TestCase
       end
 
       should "eager load companies" do
-        assert_equal true, @r.all.first.instance_variables.include?(:@company)
+        assert_equal true, @r.all.first.company.loaded?
       end
     end
   end

metadata

@@ -2,7 +2,7 @@
 name: meta_where
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors: 
 - Ernie Miller
@@ -10,55 +10,67 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-10 00:00:00 -05:00
+date: 2011-02-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: activerecord
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
-  type: :development
+        version: 3.0.0
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.4
+        version: 3.0.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: arel
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.4
+        version: 2.0.7
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: arel
+  name: shoulda
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.0.8
-  type: :runtime
+        version: "0"
+  type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.3.3
+  type: :development
+  version_requirements: *id005
 description: "\n      MetaWhere offers the ability to call any Arel predicate methods\n      (with a few convenient aliases) on your Model's attributes instead\n      of the ones normally offered by ActiveRecord's hash parameters. It also\n      adds convenient syntax for order clauses, smarter mapping of nested hash\n      conditions, and a debug_sql method to see the real SQL your code is\n      generating without running it against the database. If you like the new\n      AR 3.0 query interface, you'll love it with MetaWhere.\n    "
-email: ernie@metautonomo.us
+email: 
+- ernie@metautonomo.us
 executables: []
 
 extensions: []
@@ -68,18 +80,17 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitmodules
+- .gitignore
 - 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/belongs_to_polymorphic_association.rb
 - lib/meta_where/column.rb
 - lib/meta_where/compound.rb
 - lib/meta_where/condition.rb
@@ -90,6 +101,7 @@ files:
 - lib/meta_where/not.rb
 - lib/meta_where/relation.rb
 - lib/meta_where/utility.rb
+- lib/meta_where/version.rb
 - lib/meta_where/visitors/attribute.rb
 - lib/meta_where/visitors/predicate.rb
 - lib/meta_where/visitors/visitor.rb
@@ -116,7 +128,7 @@ files:
 - test/test_base.rb
 - test/test_relations.rb
 has_rdoc: true
-homepage: http://metautonomo.us/projects/metawhere/
+homepage: http://metautonomo.us/projects/metawhere
 licenses: []
 
 post_install_message: "\n\
@@ -143,21 +155,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: "0"
 requirements: []
 
-rubyforge_project: 
-rubygems_version: 1.5.0
+rubyforge_project: meta_where
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: ActiveRecord 3 query syntax on steroids.
 test_files: 
+- 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

data/.gitmodules

@@ -1,6 +0,0 @@
-[submodule "vendor/arel"]
-	path = vendor/arel
-	url = git://github.com/rails/arel.git
-[submodule "vendor/rails"]
-	path = vendor/rails
-	url = git://github.com/rails/rails.git

data/VERSION

@@ -1 +0,0 @@
-1.0.3

data/lib/meta_where/belongs_to_polymorphic_association.rb

@@ -1,16 +0,0 @@
-module MetaWhere
-  module BelongsToPolymorphicAssociation
-    def self.included(base)
-      base.class_eval do
-        alias_method_chain :conditions, :metawhere
-        alias :sql_conditions :conditions_with_metawhere
-      end
-    end
-
-    # How does this even work in core? Oh, nevermind, it doesn't. Patch submitted. :)
-    def conditions_with_metawhere
-      @conditions ||= interpolate_sql(association_class.send(:sanitize_sql, @reflection.options[:conditions])) if @reflection.options[:conditions]
-    end
-
-  end
-end