record_filter 0.9.13 → 0.9.14

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 9
-:patch: 13
+:patch: 14

data/lib/record_filter/conjunctions.rb

@@ -50,7 +50,7 @@ module RecordFilter
 
       def add_restriction(column_name, operator, value, options={})
         check_column_exists!(column_name)
-        restriction = RestrictionFactory.build(operator, "#{@table_name}.#{column_name}", value, options)
+        restriction = RestrictionFactory.build(operator, "#{@table_name}.#{column_name}", value, @table, options)
         self << restriction
       end
 

data/lib/record_filter/join.rb

@@ -50,6 +50,7 @@ module RecordFilter
         dsl_restriction.operator,
         "#{@right_table.table_alias}.#{dsl_restriction.column}",
         dsl_restriction.value,
+        @right_table,
         :negated => dsl_restriction.negated)
       @right_table.model_class.merge_conditions(restriction.to_conditions)
     end

data/lib/record_filter/restriction_factory.rb

@@ -13,8 +13,8 @@ module RecordFilter
       :like => Restrictions::Like
     }
 
-    def self.build(operator, column_name, value, options)
-      OPERATOR_HASH[operator].new(column_name, value, options)
+    def self.build(operator, column_name, value, table, options)
+      OPERATOR_HASH[operator].new(column_name, value, table, options)
     end
   end
 end

data/lib/record_filter/restrictions.rb

@@ -1,13 +1,19 @@
 module RecordFilter
   module Restrictions # :nodoc: all
     class Base
-      def initialize(column_name, value, options={})
-        @column_name, @value, @negated = column_name, value, !!options.delete(:negated)
+      include ColumnParser
+
+      def initialize(column_name, value, table, options={})
+        @column_name, @value, @table, @negated = column_name, value, table, !!options.delete(:negated)
         @value = @value.id if @value.kind_of?(ActiveRecord::Base)
       end
 
       def to_conditions
-        @value.nil? ? [to_sql] : [to_sql, @value]
+        if @value.nil? || @value.is_a?(Hash)
+          [to_sql]
+        else
+          [to_sql, @value]
+        end
       end
 
       def to_sql
@@ -17,15 +23,26 @@ module RecordFilter
       def to_negative_sql
         "NOT (#{to_positive_sql})"
       end
+
+      def value_hash_as_column_or_question_mark
+        if @value.is_a?(Hash)
+          column, table = parse_column_in_table(@value, @table)
+          if (table.has_column(column))
+            "#{table.table_alias}.#{column}"
+          end
+        else
+          '?'
+        end
+      end
     end
 
     class EqualTo < Base
       def to_positive_sql
-        "#{@column_name} = ?"
+        "#{@column_name} = #{value_hash_as_column_or_question_mark}"
       end
 
       def to_negative_sql
-        "#{@column_name} <> ?"
+        "#{@column_name} <> #{value_hash_as_column_or_question_mark}"
       end
     end
 
@@ -41,35 +58,35 @@ module RecordFilter
 
     class LessThan < Base
       def to_positive_sql
-        "#{@column_name} < #{@value.nil? ? 'NULL' : '?'}"
+        "#{@column_name} < #{@value.nil? ? 'NULL' : value_hash_as_column_or_question_mark}"
       end
     end
 
     class LessThanOrEqualTo < Base
       def to_positive_sql
-        "#{@column_name} <= #{@value.nil? ? 'NULL' : '?'}"
+        "#{@column_name} <= #{@value.nil? ? 'NULL' : value_hash_as_column_or_question_mark}"
       end
     end
 
     class GreaterThan < Base
       def to_positive_sql
-        "#{@column_name} > #{@value.nil? ? 'NULL' : '?'}"
+        "#{@column_name} > #{@value.nil? ? 'NULL' : value_hash_as_column_or_question_mark}"
       end
     end
 
     class GreaterThanOrEqualTo < Base
       def to_positive_sql
-        "#{@column_name} >= #{@value.nil? ? 'NULL' : '?'}"
+        "#{@column_name} >= #{@value.nil? ? 'NULL' : value_hash_as_column_or_question_mark}"
       end
     end
 
     class In < Base
       def to_positive_sql
-        "#{@column_name} IN (?)"
+        "#{@column_name} IN (#{value_hash_as_column_or_question_mark})"
       end
 
       def to_negative_sql
-        "#{@column_name} NOT IN (?)"
+        "#{@column_name} NOT IN (#{value_hash_as_column_or_question_mark})"
       end
 
       def to_conditions
@@ -86,11 +103,11 @@ module RecordFilter
 
     class Like < Base
       def to_positive_sql
-        "#{@column_name} LIKE ?"
+        "#{@column_name} LIKE #{value_hash_as_column_or_question_mark}"
       end
 
       def to_negative_sql
-        "#{@column_name} NOT LIKE ?"
+        "#{@column_name} NOT LIKE #{value_hash_as_column_or_question_mark}"
       end
     end
   end

data/record_filter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{record_filter}
-  s.version = "0.9.13"
+  s.version = "0.9.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aubrey Holland", "Mat Brown"]
-  s.date = %q{2009-11-10}
+  s.date = %q{2009-12-21}
   s.description = %q{RecordFilter is a Pure-ruby criteria API for building complex queries in ActiveRecord. It supports queries that are built on the fly as well as named filters that can be added to objects and chained to create complex queries. It also gets rid of the nasty hard-coded SQL that shows up in most ActiveRecord code with a clean API that makes queries simple and intuitive to build.}
   s.email = %q{aubreyholland@gmail.com}
   s.extra_rdoc_files = [

data/spec/restrictions_spec.rb

@@ -248,4 +248,20 @@ describe 'RecordFilter restrictions' do
     end.inspect
     Comment.last_find.should == { :readonly => false, :conditions => "(\"comments\".offensive = 't') AND (\"comments\".post_id = #{Post.first.id})" }
   end
+
+  it 'should allow a hash as the value for the restriction and use that as the name of a table' do
+    Blog.filter do
+      having(:comments)
+      with(:created_at).gt(:comments => :created_at)
+    end.inspect
+    Blog.last_find[:conditions].should == [%q(("blogs".created_at > blogs__posts__comments.created_at))]
+  end
+
+  it 'should allow a hash as the value for the restriction and use that as the name of a table alias' do
+    Blog.filter do
+      having(:comments, :alias => 'cmts')
+      with(:created_at).gt('cmts' => :created_at)
+    end.inspect
+    Blog.last_find[:conditions].should == [%q(("blogs".created_at > cmts.created_at))]
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: record_filter
 version: !ruby/object:Gem::Version 
-  version: 0.9.13
+  version: 0.9.14
 platform: ruby
 authors: 
 - Aubrey Holland
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-10 00:00:00 -05:00
+date: 2009-12-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency