aub-record_filter 0.9.4 → 0.9.5

data/VERSION.yml

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

data/lib/record_filter/conjunctions.rb

@@ -15,7 +15,7 @@ module RecordFilter
         dsl_conjunction.steps.each do |step|
           case step
           when DSL::Restriction 
-            result.add_restriction(step.column, step.operator, step.value, :negated => step.negated)
+            handle_restriction_step(step, result, table, true)
           when DSL::Conjunction 
             result.add_conjunction(create_from(step, table)) 
           when DSL::Join
@@ -50,7 +50,6 @@ module RecordFilter
         check_column_exists!(column_name)
         restriction = RestrictionFactory.build(operator, "#{@table_name}.#{column_name}", value, options)
         self << restriction
-        restriction
       end
 
       def add_conjunction(conjunction)
@@ -128,6 +127,17 @@ module RecordFilter
           raise ColumnNotFoundException.new("The column #{column_name} was not found in #{@table.table_name}.")
         end
       end
+
+      def self.handle_restriction_step(step, conjunction, table, follow_conjunctions=true)
+        if ((cr = step.conjuncted_restriction) && follow_conjunctions)
+          restriction_conjunction = create_from(DSL::Conjunction.new(nil, step.conjuncted_restriction_type), table)
+          handle_restriction_step(step, restriction_conjunction, table, false)
+          handle_restriction_step(cr, restriction_conjunction, table, true)
+          conjunction.add_conjunction(restriction_conjunction)
+        else
+          conjunction.add_restriction(step.column, step.operator, step.value, :negated => step.negated)
+        end
+      end
     end
 
     class AnyOf < Base

data/lib/record_filter/dsl/restriction.rb

@@ -23,6 +23,7 @@ module RecordFilter
     class Restriction
 
       attr_reader :column, :negated, :operator, :value # :nodoc:
+      attr_reader :conjuncted_restriction_type, :conjuncted_restriction # :nodoc:
 
       DEFAULT_VALUE = Object.new
 
@@ -47,6 +48,7 @@ module RecordFilter
       # @public
       def initialize(column, value=DEFAULT_VALUE) # :nodoc:
         @column, @negated, @operator = column, false, nil
+        @conjuncted_restriction, @conjuncted_restriction_type = nil, nil
         take_value(value)
       end
 
@@ -258,6 +260,46 @@ module RecordFilter
         self
       end
 
+      # Create a secondary OR restriction that will be conjuncted with the current one. This
+      # function allows you to easily create restrictions on one line that would otherwise
+      # require the use of any_of and is intended as a space-saver.
+      # 
+      # ==== Example
+      #
+      # with(:expired_at).greater_than(Time.now).or.is_null
+      #
+      # # conditions => ['expired_at > ? OR expired_at IS NULL', Time.now]
+      #
+      # ==== Returns
+      # Restriction::
+      #   A new restriction object that this one will be OR'ed with.
+      #
+      # @public
+      def or
+        @conjuncted_restriction_type = :any_of
+        @conjuncted_restriction = Restriction.new(@column)
+      end
+
+      # Create a secondary AND restriction that will be conjuncted with the current one. This
+      # function allows you to easily create restrictions on one line that would otherwise
+      # require the use of all_of and is intended as a space-saver.
+      # 
+      # ==== Example
+      #
+      # with(:expired_at).greater_than(Time.now).and.less_than(3.days.from_now)
+      #
+      # # conditions => ['expired_at > ? AND expired_at < ?', Time.now, 3.days.from_now]
+      #
+      # ==== Returns
+      # Restriction::
+      #   A new restriction object that this one will be OR'ed with.
+      #
+      # @public
+      def and
+        @conjuncted_restriction_type = :all_of
+        @conjuncted_restriction = Restriction.new(@column)
+      end
+
       protected
 
       def take_value(value) # :nodoc:

data/spec/restrictions_spec.rb

@@ -214,4 +214,25 @@ describe 'RecordFilter restrictions' do
     end.inspect
     Post.last_find.should == { :conditions => [%q("posts".permalink <> ?), 'Post'] }
   end
+
+  it 'should work correctly for one-line ORs with is_null' do
+    Post.filter do
+      with(:permalink, 'abc').or.is_null
+    end.inspect
+    Post.last_find.should == { :conditions => [%q(("posts".permalink = ?) OR ("posts".permalink IS NULL)), 'abc'] }
+  end
+
+  it 'should work correctly for one-line ANDs with is_null' do
+    Post.filter do
+      with(:id).gt(56).and.lt(200)
+    end.inspect
+    Post.last_find.should == { :conditions => [%q(("posts".id > ?) AND ("posts".id < ?)), 56, 200] }
+  end
+
+  it 'should work properly with multiple one-line conjunctions' do
+    Post.filter do
+      with(:id).gt(56).and.lt(200).or.gt(500).or.lt(15)
+    end.inspect
+    Post.last_find.should == { :conditions => [%q(("posts".id > ?) AND (("posts".id < ?) OR (("posts".id > ?) OR ("posts".id < ?)))), 56, 200, 500, 15] } 
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aub-record_filter
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Aubrey Holland
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-09 00:00:00 -07:00
+date: 2009-05-11 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -66,7 +66,7 @@ files:
 - spec/test.db
 - test/performance_test.rb
 - test/test.db
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/aub/record_filter/tree/master
 post_install_message: 
 rdoc_options: