meta_where 0.9.0 → 0.9.2

data/.gitmodules

@@ -1,6 +1,6 @@
-[submodule "vendor/rails"]
-	path = vendor/rails
-	url = git://github.com/rails/rails.git
 [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/CHANGELOG

@@ -1,3 +1,11 @@
+Changes since 0.9.1 (2010-08-25):
+  * Fix missing .any? on method chain in check for mw in association macros.
+
+Changes since 0.9.0 (2010-08-24):
+  * Check for use of MetaWhere in association macros. This won't work as expected
+    so it's better to raise a helpful error than create a potentially confusing
+    behavior.
+
 Changes since 0.5.2 (2010-07-09):
   * Removed autojoin. Inner joins have side-effects. Newbies are the ones who aremost
     likely to use autojoin, and they're also the ones least likely to understand why
@@ -10,6 +18,12 @@ Changes since 0.5.2 (2010-07-09):
   * Improved merge functonality. It shouldn't have ever required someone to do an
     autojoin to begin with. Now it just works. If you're merging two relations, you
     should expect to only get results that have a match on both sides.
+  * Attempt to gracefully degrade in the case where a MetaWhere::Column is expected
+    to be a normal symbol. Return the column name in #to_s.
+  * Fix order clauses when constructing a limited_ids_condition for postgresql.
+  * Fix problems with cache_classes == false on certain server configurations. Also
+    handle self-join with a merge of two identical classes and a second param.
+  * Drop ActiveSupport::Concern and only use alias_method_chain when needed.
 
 Changes since 0.5.1 (2010-06-22):
   * Added debug_sql method to Relations. Lets you see the actual SQL that

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.9.2

data/lib/meta_where.rb

@@ -21,7 +21,9 @@ require 'meta_where/compound'
 require 'core_ext/symbol'
 require 'core_ext/hash'
 require 'meta_where/builder'
+require 'meta_where/association_reflection'
 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)

data/lib/meta_where/association_reflection.rb

@@ -0,0 +1,51 @@
+module MetaWhere
+  class MetaWhereInAssociationError < StandardError; end
+
+  module AssociationReflection
+
+    def initialize(macro, name, options, active_record)
+      super
+
+      if options.has_key?(:conditions)
+        ensure_no_metawhere_in_conditions(options[:conditions])
+      end
+    end
+
+    private
+
+    def ensure_no_metawhere_in_conditions(obj)
+      case obj
+      when Hash
+        if obj.keys.grep(MetaWhere::Column).any?
+          raise MetaWhereInAssociationError, <<END
+The :#{name} association  has a MetaWhere::Column in its :conditions. \
+If you actually needed to access conditions other than equality, then you most \
+likely meant to set up a scope or method, instead. Associations only work with \
+standard equality conditions, since they can be used to create records as well.
+END
+        end
+
+        obj.values.each do |v|
+          case v
+          when MetaWhere::Condition, Array, Hash
+            ensure_no_metawhere_in_conditions(v)
+          end
+        end
+      when Array
+        obj.each do |v|
+          case v
+          when MetaWhere::Condition, Array, Hash
+            ensure_no_metawhere_in_conditions(v)
+          end
+        end
+      when MetaWhere::Condition
+        raise MetaWhereInAssociationError, <<END
+The :#{name} association has a MetaWhere::Condition in its :conditions. \
+If you actually needed to access conditions other than equality, then you most \
+likely meant to set up a scope or method, instead. Associations only work with \
+standard equality conditions, since they can be used to create records as well.
+END
+      end
+    end
+  end
+end

data/lib/meta_where/column.rb

@@ -39,15 +39,9 @@ module MetaWhere
       [column, method].hash
     end
 
-    # Play "nicely" with expand_hash_conditions_for_aggregates
+    # Play nicely with expand_hash_conditions_for_aggregates
     def to_sym
-      self
+      "#{column}.#{method}".to_sym
     end
-
-    # Let's degrade hracefully if someone expects us to be a symbol or something
-    def to_s
-      @column
-    end
-
   end
 end

data/meta_where.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{meta_where}
-  s.version = "0.9.0"
+  s.version = "0.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-08-24}
+  s.date = %q{2010-08-26}
   s.description = %q{
       MetaWhere offers the ability to call any Arel predicate methods
       (with a few convenient aliases) on your Model's attributes instead
@@ -38,6 +38,7 @@ Gem::Specification.new do |s|
      "lib/core_ext/symbol.rb",
      "lib/core_ext/symbol_operators.rb",
      "lib/meta_where.rb",
+     "lib/meta_where/association_reflection.rb",
      "lib/meta_where/builder.rb",
      "lib/meta_where/column.rb",
      "lib/meta_where/compound.rb",
@@ -53,6 +54,8 @@ Gem::Specification.new do |s|
      "test/fixtures/developer.rb",
      "test/fixtures/developers.yml",
      "test/fixtures/developers_projects.yml",
+     "test/fixtures/invalid_company.rb",
+     "test/fixtures/invalid_developer.rb",
      "test/fixtures/note.rb",
      "test/fixtures/notes.yml",
      "test/fixtures/people.yml",
@@ -61,6 +64,7 @@ Gem::Specification.new do |s|
      "test/fixtures/projects.yml",
      "test/fixtures/schema.rb",
      "test/helper.rb",
+     "test/test_base.rb",
      "test/test_relations.rb"
   ]
   s.homepage = %q{http://metautonomo.us/projects/metawhere/}
@@ -72,11 +76,14 @@ Gem::Specification.new do |s|
     "test/fixtures/company.rb",
      "test/fixtures/data_type.rb",
      "test/fixtures/developer.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/helper.rb",
+     "test/test_base.rb",
      "test/test_relations.rb"
   ]
 

data/test/fixtures/invalid_company.rb

@@ -0,0 +1,4 @@
+class InvalidCompany < ActiveRecord::Base
+  set_table_name 'companies'
+  has_many :developers, :conditions => {:name.matches => '%Miller'}
+end

data/test/fixtures/invalid_developer.rb

@@ -0,0 +1,4 @@
+class InvalidDeveloper < ActiveRecord::Base
+  set_table_name 'developers'
+  has_many :notes, :as => :notable, :conditions => [:note.eq % 'GIPE']
+end

data/test/test_base.rb

@@ -0,0 +1,21 @@
+require 'helper'
+
+class TestBase < Test::Unit::TestCase
+  should "raise nothing when an association's conditions hash doesn't use MetaWhere" do
+    assert_nothing_raised do
+      Company.all
+    end
+  end
+
+  should "raise an exception when MetaWhere::Columns are in :conditions of an association" do
+    assert_raises MetaWhere::MetaWhereInAssociationError do
+      InvalidCompany.all
+    end
+  end
+
+  should "raise an exception when MetaWhere::Conditions are in :conditions of an association" do
+    assert_raises MetaWhere::MetaWhereInAssociationError do
+      InvalidDeveloper.all
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 0
-  version: 0.9.0
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Ernie Miller
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 -04:00
+date: 2010-08-26 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,6 +101,7 @@ files:
 - lib/core_ext/symbol.rb
 - lib/core_ext/symbol_operators.rb
 - lib/meta_where.rb
+- lib/meta_where/association_reflection.rb
 - lib/meta_where/builder.rb
 - lib/meta_where/column.rb
 - lib/meta_where/compound.rb
@@ -116,6 +117,8 @@ files:
 - test/fixtures/developer.rb
 - test/fixtures/developers.yml
 - test/fixtures/developers_projects.yml
+- test/fixtures/invalid_company.rb
+- test/fixtures/invalid_developer.rb
 - test/fixtures/note.rb
 - test/fixtures/notes.yml
 - test/fixtures/people.yml
@@ -124,6 +127,7 @@ files:
 - test/fixtures/projects.yml
 - test/fixtures/schema.rb
 - test/helper.rb
+- test/test_base.rb
 - test/test_relations.rb
 has_rdoc: true
 homepage: http://metautonomo.us/projects/metawhere/
@@ -161,9 +165,12 @@ test_files:
 - test/fixtures/company.rb
 - test/fixtures/data_type.rb
 - test/fixtures/developer.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/helper.rb
+- test/test_base.rb
 - test/test_relations.rb