ardb 0.18.0 → 0.19.0

data/lib/ardb/relation_spy.rb

@@ -11,6 +11,12 @@ module Ardb
       @offset_value, @limit_value = nil, nil
     end
 
+    def initialize_copy(copied_from)
+      super
+      @applied = copied_from.applied.dup
+      @results = copied_from.results.dup
+    end
+
     def ==(other)
       other.kind_of?(self.class) ? @applied == other.applied : super
     end
@@ -18,6 +24,7 @@ module Ardb
     # ActiveRecord::QueryMethods
 
     [ :select,
+      :from,
       :includes, :joins,
       :where,
       :group, :having,
@@ -58,18 +65,20 @@ module Ardb
 
     def except(*skips)
       skips = skips.map(&:to_sym)
-      @applied.reject!{ |a| skips.include?(a.type) }
-      @limit_value    = nil if skips.include?(:limit)
-      @offset_value   = nil if skips.include?(:offset)
-      self
+      self.dup.tap do |r|
+        r.applied.reject!{ |a| skips.include?(a.type) }
+        r.limit_value    = nil if skips.include?(:limit)
+        r.offset_value   = nil if skips.include?(:offset)
+      end
     end
 
     def only(*onlies)
       onlies = onlies.map(&:to_sym)
-      @applied.reject!{ |a| !onlies.include?(a.type) }
-      @limit_value    = nil unless onlies.include?(:limit)
-      @offset_value   = nil unless onlies.include?(:offset)
-      self
+      self.dup.tap do |r|
+        r.applied.reject!{ |a| !onlies.include?(a.type) }
+        r.limit_value    = nil unless onlies.include?(:limit)
+        r.offset_value   = nil unless onlies.include?(:offset)
+      end
     end
 
     # ActiveRecord::FinderMethods

data/lib/ardb/version.rb

@@ -1,3 +1,3 @@
 module Ardb
-  VERSION = "0.18.0"
+  VERSION = "0.19.0"
 end

data/test/unit/relation_spy_tests.rb

@@ -14,6 +14,7 @@ class Ardb::RelationSpy
     should have_accessors :results
     should have_accessors :limit_value, :offset_value
     should have_imeths :select
+    should have_imeths :from
     should have_imeths :includes, :joins
     should have_imeths :where
     should have_imeths :order, :reverse_order
@@ -31,6 +32,12 @@ class Ardb::RelationSpy
       assert_equal nil, subject.offset_value
     end
 
+    should "dup its applied and results arrays when copied" do
+      new_relation_spy = subject.dup
+      assert_not_same subject.applied, new_relation_spy.applied
+      assert_not_same subject.results, new_relation_spy.results
+    end
+
     should "be comparable using there applied collections" do
       other_relation = Ardb::RelationSpy.new
       other_relation.select :column_a
@@ -57,6 +64,21 @@ class Ardb::RelationSpy
 
   end
 
+  class FromTests < UnitTests
+    desc "from"
+    setup do
+      @relation_spy.from "some SQL"
+      @applied = subject.applied.first
+    end
+
+    should "have added a from applied expression with the passed args" do
+      assert_instance_of AppliedExpression, @applied
+      assert_equal :from, @applied.type
+      assert_equal [ "some SQL" ], @applied.args
+    end
+
+  end
+
   class IncludesTests < UnitTests
     desc "includes"
     setup do
@@ -270,9 +292,14 @@ class Ardb::RelationSpy
   class ExceptTests < WithExpressionsTests
     desc "except"
 
+    should "return a new relation spy" do
+      new_relation_spy = subject.except(:select)
+      assert_not_same subject, new_relation_spy
+    end
+
     should "remove any applied expressions in the passed types" do
-      subject.except(:includes, :where, :group, :offset)
-      applied_types = subject.applied.map(&:type)
+      relation_spy = subject.except(:includes, :where, :group, :offset)
+      applied_types = relation_spy.applied.map(&:type)
       [ :select, :joins, :order, :having, :limit ].each do |type|
         assert_includes type, applied_types
       end
@@ -282,17 +309,17 @@ class Ardb::RelationSpy
     end
 
     should "unset the limit value if limit is included in the passed types" do
-      subject.except(:select)
-      assert_not_nil subject.limit_value
-      subject.except(:limit)
-      assert_nil subject.limit_value
+      relation_spy = subject.except(:select)
+      assert_not_nil relation_spy.limit_value
+      relation_spy = subject.except(:limit)
+      assert_nil relation_spy.limit_value
     end
 
     should "unset the offset value if offset is included in the passed types" do
-      subject.except(:select)
-      assert_not_nil subject.offset_value
-      subject.except(:offset)
-      assert_nil subject.offset_value
+      relation_spy = subject.except(:select)
+      assert_not_nil relation_spy.offset_value
+      relation_spy = subject.except(:offset)
+      assert_nil relation_spy.offset_value
     end
 
   end
@@ -300,9 +327,14 @@ class Ardb::RelationSpy
   class OnlyTests < WithExpressionsTests
     desc "only"
 
+    should "return a new relation spy" do
+      new_relation_spy = subject.only(:select)
+      assert_not_same subject, new_relation_spy
+    end
+
     should "remove any applied expressions not in the passed types" do
-      subject.only(:includes, :where, :group, :offset)
-      applied_types = subject.applied.map(&:type)
+      relation_spy = subject.only(:includes, :where, :group, :offset)
+      applied_types = relation_spy.applied.map(&:type)
       [ :includes, :where, :group, :offset ].each do |type|
         assert_includes type, applied_types
       end
@@ -312,17 +344,17 @@ class Ardb::RelationSpy
     end
 
     should "unset the limit value if limit is not included in the passed types" do
-      subject.only(:limit)
-      assert_not_nil subject.limit_value
-      subject.only(:select)
-      assert_nil subject.limit_value
+      relation_spy = subject.only(:limit)
+      assert_not_nil relation_spy.limit_value
+      relation_spy = subject.only(:select)
+      assert_nil relation_spy.limit_value
     end
 
     should "unset the offset value if offset is not included in the passed types" do
-      subject.only(:offset)
-      assert_not_nil subject.offset_value
-      subject.only(:select)
-      assert_nil subject.offset_value
+      relation_spy = subject.only(:offset)
+      assert_not_nil relation_spy.offset_value
+      relation_spy = subject.only(:select)
+      assert_nil relation_spy.offset_value
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ardb
 version: !ruby/object:Gem::Version 
-  hash: 87
+  hash: 83
   prerelease: 
   segments: 
   - 0
-  - 18
+  - 19
   - 0
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors: 
 - Kelly Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-02-18 00:00:00 Z
+date: 2014-03-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement