in_place_relation 0.0.2 → 0.1.0

data/lib/in_place_relation/version.rb

@@ -1,3 +1,3 @@
 module InPlaceRelation
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/in_place_relation.rb

@@ -9,9 +9,12 @@ require "in_place_relation/version"
 #
 # you can do this
 # rel = SomeModel.where( ... ).in_place
-# rel.joins!().where!() if x
-# rel.select!() unless y
+# rel.joins().where() if x
+# rel.select() unless y
 # rel.all
+#
+# and get original relation with:
+# rel.relation   # ActiveRecord::Relation
 module InPlaceRelation
 
   module Methods
@@ -25,14 +28,10 @@ module InPlaceRelation
 
     attr_reader :relation
     
-    METHODS_TO_WRAP = ActiveRecord::Relation::ASSOCIATION_METHODS + ActiveRecord::Relation::MULTI_VALUE_METHODS + ActiveRecord::Relation::SINGLE_VALUE_METHODS
+    METHODS_TO_WRAP = ActiveRecord::Relation::ASSOCIATION_METHODS + ActiveRecord::Relation::MULTI_VALUE_METHODS + ActiveRecord::Relation::SINGLE_VALUE_METHODS + [:merge]
 
     METHODS_TO_WRAP.each do |meth|
       define_method( meth ) do |*args|
-        return @relation.send( meth, *args )
-      end
-
-      define_method( "#{meth}!" ) do |*args|
         @relation = @relation.send( meth, *args )
         return self
       end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Marek Janukowicz/Starware
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-22 00:00:00 +01:00
+date: 2011-11-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency