ardb 0.15.0 → 0.16.0

data/lib/ardb/relation_spy.rb

@@ -3,17 +3,20 @@ module Ardb
   class RelationSpy
 
     attr_reader :applied
+    attr_accessor :order_values, :reverse_order_value
+    attr_accessor :limit_value, :offset_value
     attr_accessor :results
 
     def initialize
       @applied, @results = [], []
-      @offset, @limit = 0, nil
+      @order_values = []
+      @reverse_order_value = nil
+      @offset_value, @limit_value = nil, nil
     end
 
     [ :select,
       :joins,
       :where,
-      :order,
       :group, :having,
       :merge
     ].each do |type|
@@ -25,34 +28,32 @@ module Ardb
 
     end
 
+    def order(*args)
+      @order_values += args
+      @applied << AppliedExpression.new(:order, args)
+      self
+    end
+
     def limit(value)
-      @limit = value ? value.to_i : nil
+      @limit_value = value ? value.to_i : nil
       @applied << AppliedExpression.new(:limit, [ value ])
       self
     end
 
     def offset(value)
-      @offset = value ? value.to_i : 0
+      @offset_value = value ? value.to_i : 0
       @applied << AppliedExpression.new(:offset, [ value ])
       self
     end
 
     def all
-      @results[@offset, (@limit || @results.size)] || []
+      @results[(@offset_value || 0), (@limit_value || @results.size)] || []
     end
 
     def count
       all.size
     end
 
-    def limit_value
-      @limit
-    end
-
-    def offset_value
-      @offset
-    end
-
     def ==(other)
       @applied == other.applied
     end

data/lib/ardb/version.rb

@@ -1,3 +1,3 @@
 module Ardb
-  VERSION = "0.15.0"
+  VERSION = "0.16.0"
 end

data/test/unit/relation_spy_tests.rb

@@ -12,16 +12,19 @@ class Ardb::RelationSpy
 
     should have_readers :applied
     should have_accessors :results
+    should have_accessors :order_values, :reverse_order_value
+    should have_accessors :limit_value, :offset_value
     should have_imeths :select, :joins, :where, :order, :group, :having, :merge
     should have_imeths :limit, :offset
     should have_imeths :all, :count
-    should have_imeths :limit_value, :offset_value
 
     should "default it's attributes" do
       assert_equal [],  subject.applied
       assert_equal [],  subject.results
+      assert_equal [],  subject.order_values
+      assert_equal nil, subject.reverse_order_value
       assert_equal nil, subject.limit_value
-      assert_equal 0,   subject.offset_value
+      assert_equal nil, subject.offset_value
     end
 
     should "add an applied expression using `select`" do
@@ -60,6 +63,12 @@ class Ardb::RelationSpy
       assert_equal [ :column_a, :column_b ], applied_expression.args
     end
 
+    should "add args to it's `order_values` using `order" do
+      subject.order :column_a, :column_b
+      assert_includes :column_a, subject.order_values
+      assert_includes :column_b, subject.order_values
+    end
+
     should "add an applied expression using `group`" do
       subject.group :column_a, :column_b
       assert_equal 1, subject.applied.size

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ardb
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 95
   prerelease: 
   segments: 
   - 0
-  - 15
+  - 16
   - 0
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-11-18 00:00:00 Z
+date: 2014-01-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement