aub-record_filter 0.1.0 → 0.1.1

data/VERSION.yml

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

data/lib/record_filter/dsl/restriction.rb

@@ -8,13 +8,18 @@ module RecordFilter
         @column, @negated, @operator = column, negated, nil
       end
 
-      [:equal_to, :is_null, :less_than, :greater_than, :in, :between].each do |operator|
+      [:equal_to, :is_null, :less_than, :less_than_or_equal_to, :greater_than, :greater_than_or_equal_to, :in, :between].each do |operator|
         define_method(operator) do |*args|
           @value = args[0] 
           @operator = operator
           self
         end
       end
+
+      alias_method :gt, :greater_than
+      alias_method :gte, :greater_than_or_equal_to
+      alias_method :lt, :less_than
+      alias_method :lte, :less_than_or_equal_to
     end
   end
 end

data/lib/record_filter/restrictions.rb

@@ -44,12 +44,24 @@ module RecordFilter
       end
     end
 
+    class LessThanOrEqualTo < Base
+      def to_positive_sql
+        "#{@column_name} <= ?"
+      end
+    end
+
     class GreaterThan < Base
       def to_positive_sql
         "#{@column_name} > ?"
       end
     end
 
+    class GreaterThanOrEqualTo < Base
+      def to_positive_sql
+        "#{@column_name} >= ?"
+      end
+    end
+
     class In < Base
       def to_positive_sql
         "#{@column_name} IN (?)"

data/spec/restrictions_spec.rb

@@ -20,18 +20,19 @@ describe 'RecordFilter restrictions' do
     Post.last_find.should == { :conditions => [%q{("posts".permalink = ?) AND ("posts".blog_id = ?)}, 'blog-post', 3] }
   end
 
-  it 'should filter for less than' do
-    Post.filter do
-      with(:created_at).less_than Time.parse('2009-01-03 23:02:00')
-    end.inspect
-    Post.last_find.should == { :conditions => [%q{"posts".created_at < ?}, Time.parse('2009-01-03 23:02:00')] }
-  end
+  it 'should filter by comparison operators' do
+    [[:greater_than, :gt, '>'], [:less_than, :lt, '<'], 
+     [:less_than_or_equal_to, :lte, '<='], [:greater_than_or_equal_to, :gte, '>=']].each do |set|
+       Post.filter do
+         with(:created_at).send(set[0], Time.parse('2009-01-03 23:02:00'))
+       end.inspect
+       Post.last_find.should == { :conditions => ["\"posts\".created_at #{set[2]} ?", Time.parse('2009-01-03 23:02:00')] }
 
-  it 'should filter for greater than' do
-    Post.filter do
-      with(:created_at).greater_than Time.parse('2008-01-03 23:23:00')
-    end.inspect
-    Post.last_find.should == { :conditions => [%q{"posts".created_at > ?}, Time.parse('2008-01-03 23:23:00')] }
+       Post.filter do
+         with(:created_at).send(set[1], Time.parse('2009-01-03 23:02:00'))
+       end.inspect
+       Post.last_find.should == { :conditions => ["\"posts\".created_at #{set[2]} ?", Time.parse('2009-01-03 23:02:00')] }
+     end
   end
 
   it 'should filter for in' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aub-record_filter
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Mat Brown
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-16 00:00:00 -07:00
+date: 2009-04-17 00:00:00 -07:00
 default_executable: 
 dependencies: []