meta_where 1.0.1 → 1.0.2

data/CHANGELOG

@@ -1,3 +1,9 @@
+Changes since 1.0.1 (2011-01-18):
+  * Fix *_all behavior to not result in ORs when collapse_wheres is called
+  * Add support for NOT operator (-) on hashes, conditions, and compound
+    conditions. Unary NOTs the condition, binary does an AND NOT between
+    on the second condition.
+
 Changes since 1.0.0 (2011-01-17):
   * Update polymorphic join support to play nicely with MetaSearch
 

data/Rakefile

@@ -19,9 +19,9 @@ begin
     gem.homepage = "http://metautonomo.us/projects/metawhere/"
     gem.authors = ["Ernie Miller"]
     gem.add_development_dependency "shoulda"
-    gem.add_dependency "activerecord", "~> 3.0.2"
-    gem.add_dependency "activesupport", "~> 3.0.2"
-    gem.add_dependency "arel", "~> 2.0.2"
+    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! ***

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/core_ext/hash.rb

@@ -1,10 +1,5 @@
-class Hash
-
-  def |(other)
-    MetaWhere::Or.new(self, other)
-  end
+require 'meta_where/condition_operators'
 
-  def &(other)
-    MetaWhere::And.new(self, other)
-  end
-end
+class Hash
+  include MetaWhere::ConditionOperators
+end

data/lib/meta_where/compound.rb

@@ -1,19 +1,15 @@
+require 'meta_where/condition_operators'
+
 module MetaWhere
   class Compound
+    include ConditionOperators
+
     attr_reader :condition1, :condition2
 
     def initialize(condition1, condition2)
       @condition1 = condition1
       @condition2 = condition2
     end
-
-    def |(other)
-      Or.new(self, other)
-    end
-
-    def &(other)
-      And.new(self, other)
-    end
   end
 
   class Or < Compound
@@ -21,4 +17,4 @@ module MetaWhere
 
   class And < Compound
   end
-end
+end

data/lib/meta_where/condition.rb

@@ -1,8 +1,10 @@
 require 'meta_where/utility'
+require 'meta_where/condition_operators'
 
 module MetaWhere
   class Condition
-    include MetaWhere::Utility
+    include ConditionOperators
+    include Utility
 
     attr_reader :column, :value, :method
 
@@ -21,18 +23,10 @@ module MetaWhere
 
     alias_method :eql?, :==
 
-    def |(other)
-      Or.new(self, other)
-    end
-
-    def &(other)
-      And.new(self, other)
-    end
-
     # Play "nicely" with expand_hash_conditions_for_aggregates
     def to_sym
       self
     end
   end
 
-end
+end

data/lib/meta_where/condition_operators.rb

@@ -0,0 +1,19 @@
+module MetaWhere
+  module ConditionOperators
+    def |(other)
+      Or.new(self, other)
+    end
+
+    def &(other)
+      And.new(self, other)
+    end
+
+    def -(other)
+      And.new(self, Not.new(other))
+    end
+
+    def -@
+      Not.new(self)
+    end
+  end
+end

data/lib/meta_where/join_dependency.rb

@@ -23,7 +23,7 @@ module MetaWhere
       case associations
       when Symbol, String
         reflection = parent.reflections[associations.to_s.intern] or
-          raise ConfigurationError, "Association named '#{ association }' was not found; perhaps you misspelled it?"
+          raise ConfigurationError, "Association named '#{ associations }' was not found; perhaps you misspelled it?"
         unless (association = find_join_association(reflection, parent)) && (!klass || association.active_record == klass)
           @reflections << reflection
           if reflection.options[:polymorphic]

data/lib/meta_where/not.rb

@@ -0,0 +1,13 @@
+require 'meta_where/condition_operators'
+
+module MetaWhere
+  class Not
+    include ConditionOperators
+
+    attr_reader :expr
+
+    def initialize(expr)
+      @expr = expr
+    end
+  end
+end

data/lib/meta_where/relation.rb

@@ -257,12 +257,7 @@ module MetaWhere
 
     def flatten_predicates(predicates, visitor)
       predicates.map {|p|
-        predicate = visitor.can_accept?(p) ? visitor.accept(p) : p
-        if predicate.is_a?(Arel::Nodes::Grouping) && predicate.expr.is_a?(Arel::Nodes::And)
-          flatten_predicates([predicate.expr.left, predicate.expr.right], visitor)
-        else
-          predicate
-        end
+        visitor.can_accept?(p) ? visitor.accept(p) : p
       }.flatten.uniq
     end
 

data/lib/meta_where/visitors/predicate.rb

@@ -5,7 +5,7 @@ module MetaWhere
     class Predicate < Visitor
 
       def self.visitables
-        [Hash, Array, MetaWhere::Or, MetaWhere::And, MetaWhere::Condition, MetaWhere::Function]
+        [Hash, Array, MetaWhere::Or, MetaWhere::And, MetaWhere::Not, MetaWhere::Condition, MetaWhere::Function]
       end
 
       def visit_Hash(o, parent)
@@ -16,7 +16,7 @@ module MetaWhere
           if value.is_a?(Hash)
             association = association_from_parent_and_column(parent, column)
             accept(value, association || column)
-          elsif [MetaWhere::Condition, MetaWhere::And, MetaWhere::Or].include?(value.class)
+          elsif [MetaWhere::Condition, MetaWhere::And, MetaWhere::Or, MetaWhere::Not].include?(value.class)
             association = association_from_parent_and_column(parent, column)
             accept(value, association || column)
           elsif value.is_a?(Array) && !value.empty? && value.all? {|v| can_accept?(v)}
@@ -77,6 +77,10 @@ module MetaWhere
         accept(o.condition1, parent).and(accept(o.condition2, parent))
       end
 
+      def visit_MetaWhere_Not(o, parent)
+        accept(o.expr, parent).not
+      end
+
       def visit_MetaWhere_Condition(o, parent)
         table = tables[parent]
 
@@ -142,4 +146,4 @@ module MetaWhere
 
     end
   end
-end
+end

data/lib/meta_where.rb

@@ -26,11 +26,16 @@ module MetaWhere
     require 'core_ext/symbol_operators'
   end
 end
+
 require 'arel'
 require 'active_record'
 require 'active_support'
+
+# TODO: Trim this down, as the individual files should be
+# handling their requires.
 require 'meta_where/column'
 require 'meta_where/condition'
+require 'meta_where/not'
 require 'meta_where/compound'
 require 'meta_where/function'
 require 'meta_where/join_type'

data/meta_where.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{meta_where}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ernie Miller"]
-  s.date = %q{2011-01-18}
+  s.date = %q{2011-02-09}
   s.description = %q{
       MetaWhere offers the ability to call any Arel predicate methods
       (with a few convenient aliases) on your Model's attributes instead
@@ -41,9 +41,11 @@ Gem::Specification.new do |s|
     "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",
@@ -82,7 +84,7 @@ you're feeling especially appreciative. It'd help me justify this
 
 }
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{ActiveRecord 3 query syntax on steroids.}
   s.test_files = [
     "test/fixtures/company.rb",
@@ -102,25 +104,24 @@ you're feeling especially appreciative. It'd help me justify this
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     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.2"])
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.2"])
-      s.add_runtime_dependency(%q<arel>, ["~> 2.0.2"])
+      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.2"])
-      s.add_dependency(%q<activesupport>, ["~> 3.0.2"])
-      s.add_dependency(%q<arel>, ["~> 2.0.2"])
+      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.2"])
-    s.add_dependency(%q<activesupport>, ["~> 3.0.2"])
-    s.add_dependency(%q<arel>, ["~> 2.0.2"])
+    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
 

data/test/test_relations.rb

@@ -115,6 +115,14 @@ class TestRelations < Test::Unit::TestCase
       assert_equal @r.where(:name.like % 'Advanced%').all, @r.where('name LIKE ?', 'Advanced%').all
     end
 
+    should "handle *_any predicates by creating or conditions" do
+      assert_match %r{ OR }, @r.where(:name.matches_any => ['%e%', '%a%']).to_sql
+    end
+
+    should "handle *_all predicates by creating AND conditions" do
+      assert_match %r{ AND }, @r.where(:name.matches_all => ['%e%', '%a%']).to_sql
+    end
+
     should "allow | and & for compound predicates" do
       assert_equal @r.where(:name.like % 'Advanced%' | :name.like % 'Init%').all,
                    @r.where('name LIKE ? OR name LIKE ?', 'Advanced%', 'Init%').all
@@ -122,6 +130,16 @@ class TestRelations < Test::Unit::TestCase
                    @r.where('name LIKE ? AND name LIKE ?', 'Mission%', '%Data').all
     end
 
+    should "create an AND NOT on binary minus between conditions" do
+      assert_equal @r.where(:name.like % 'Mission%' - :name.like % '%Data').all,
+                   @r.where('name LIKE ? AND name NOT LIKE ?', 'Mission%', '%Data').all
+    end
+
+    should "create a NOT on unary minus on condition" do
+      assert_equal @r.where(-(:name.like % '%Data')).all,
+                   @r.where('name NOT LIKE ?', '%Data').all
+    end
+
     should "allow nested conditions hashes to have array values" do
       assert_equal @r.joins(:data_types).where(:data_types => {:dec => 2..5}).all,
                    @r.joins(:data_types).where(:data_types => [:dec >= 2, :dec <= 5]).all
@@ -142,6 +160,11 @@ class TestRelations < Test::Unit::TestCase
                    @r.joins(:data_types).where(:data_types => ((:dec >= 2) | (:bln >> true))).all
     end
 
+    should "allow nested conditions hashes to have MetaWhere::Not values" do
+      assert_equal @r.joins(:data_types).where(:data_types => [:dec.gteq % 2 - :bln.eq % true]).all,
+                   @r.joins(:data_types).where(:data_types => ((:dec >= 2) - (:bln >> true))).all
+    end
+
     should "allow combinations of options that no sane developer would ever try to use" do
       assert_equal @r.find_all_by_name('Initech'),
                    @r.joins(:data_types, :developers => [:projects, :notes]).

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: meta_where
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 1
-  version: 1.0.1
+  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors: 
 - Ernie Miller
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-18 00:00:00 -05:00
+date: 2011-02-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,8 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -38,11 +32,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 2
-        version: 3.0.2
+        version: 3.0.4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -53,11 +43,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 2
-        version: 3.0.2
+        version: 3.0.4
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -68,11 +54,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 2
-        version: 2.0.2
+        version: 2.0.8
   type: :runtime
   version_requirements: *id004
 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    "
@@ -101,9 +83,11 @@ files:
 - 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
@@ -150,21 +134,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: ActiveRecord 3 query syntax on steroids.