record_filter 0.9.14 → 0.9.15

data/VERSION.yml

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

data/lib/record_filter/conjunctions.rb

@@ -26,7 +26,9 @@ module RecordFilter
               step.join_class, step.join_type, step.table_alias, step.conditions)
             result.add_conjunction(create_from(step.conjunction, join.right_table))
           when DSL::Limit
-            result.add_limit_and_offset(step.limit, step.offset)
+            result.add_limit(step.limit)
+          when DSL::Offset
+            result.add_offset(step.offset)
           when DSL::Order
             result.add_order(step.column, step.direction)
           when DSL::GroupBy
@@ -80,8 +82,12 @@ module RecordFilter
         @table.group_by_column(column_name)
       end
 
-      def add_limit_and_offset(limit, offset)
-        @limit, @offset = limit, offset
+      def add_limit(limit)
+        @limit = limit
+      end
+
+      def add_offset(offset)
+        @offset = offset
       end
 
       def set_distinct(value)

data/lib/record_filter/dsl/conjunction.rb

@@ -33,8 +33,12 @@ module RecordFilter
         dsl
       end
 
-      def add_limit(limit, offset)
-        @steps << Limit.new(limit, offset)
+      def add_limit(limit)
+        @steps << Limit.new(limit)
+      end
+
+      def add_offset(offset)
+        @steps << Offset.new(offset)
       end
 
       def add_order(column, direction)

data/lib/record_filter/dsl/dsl.rb

@@ -19,7 +19,8 @@ module RecordFilter
       #
       # @public
       def limit(limit, offset=nil)
-        @conjunction.add_limit(limit, offset)
+        @conjunction.add_limit(limit)
+        @conjunction.add_offset(offset) if offset
         nil
       end
 
@@ -37,7 +38,7 @@ module RecordFilter
       #
       # @public
       def offset(offset)
-        @conjunction.add_limit(nil, offset)
+        @conjunction.add_offset(offset)
         nil
       end
 

data/lib/record_filter/dsl/limit.rb

@@ -2,10 +2,10 @@ module RecordFilter
   module DSL
     class Limit # :nodoc: all
 
-      attr_reader :limit, :offset
+      attr_reader :limit
 
-      def initialize(limit, offset)
-        @limit, @offset = limit, offset
+      def initialize(limit)
+        @limit = limit
       end
     end
   end

data/lib/record_filter/dsl/offset.rb

@@ -0,0 +1,12 @@
+module RecordFilter
+  module DSL
+    class Offset # :nodoc: all
+
+      attr_reader :offset
+
+      def initialize(offset)
+        @offset = offset
+      end
+    end
+  end
+end

data/lib/record_filter/dsl.rb

@@ -1,4 +1,4 @@
-%w(class_join conjunction conjunction_dsl dsl dsl_factory group_by join join_dsl join_condition limit named_filter order restriction).each { |file| require File.join(File.dirname(__FILE__), 'dsl', file) }
+%w(class_join conjunction conjunction_dsl dsl dsl_factory group_by join join_dsl join_condition limit named_filter offset order restriction).each { |file| require File.join(File.dirname(__FILE__), 'dsl', file) }
 
 module RecordFilter
   # The DSL module defines the structure of the criteria API used in calls to

data/record_filter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{record_filter}
-  s.version = "0.9.14"
+  s.version = "0.9.15"
 
   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-12-21}
+  s.date = %q{2010-01-04}
   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 = [
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
      "lib/record_filter/dsl/join_dsl.rb",
      "lib/record_filter/dsl/limit.rb",
      "lib/record_filter/dsl/named_filter.rb",
+     "lib/record_filter/dsl/offset.rb",
      "lib/record_filter/dsl/order.rb",
      "lib/record_filter/dsl/restriction.rb",
      "lib/record_filter/filter.rb",

data/spec/limits_and_ordering_spec.rb

@@ -91,6 +91,20 @@ describe 'filter qualifiers' do
       end
     end
 
+    describe 'with both a limit and an offset' do
+      before do
+        Post.filter do
+          limit(10)
+          offset(8)
+        end.inspect
+      end
+
+      it 'should add the limit and offset to the parameters' do
+        Post.last_find[:offset].should == 8
+        Post.last_find[:limit].should == 10
+      end
+    end
+
     describe 'offsetting named scopes' do
       before do
         @post = Class.new(Post)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: record_filter
 version: !ruby/object:Gem::Version 
-  version: 0.9.14
+  version: 0.9.15
 platform: ruby
 authors: 
 - Aubrey Holland
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 -05:00
+date: 2010-01-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,6 +65,7 @@ files:
 - lib/record_filter/dsl/join_dsl.rb
 - lib/record_filter/dsl/limit.rb
 - lib/record_filter/dsl/named_filter.rb
+- lib/record_filter/dsl/offset.rb
 - lib/record_filter/dsl/order.rb
 - lib/record_filter/dsl/restriction.rb
 - lib/record_filter/filter.rb