lib/cistern/model.rb in cistern-2.8.2 vs lib/cistern/model.rb in cistern-2.10.0

@@ -12,10 +12,10 @@
   end
 
   def self.cistern_model(cistern, klass, name)
     cistern.const_get(:Collections).module_eval <<-EOS, __FILE__, __LINE__
       def #{name}(attributes={})
-    #{klass.name}.new(attributes.merge(cistern: self))
+    #{klass.name}.new({cistern: self}.merge(attributes))
       end
     EOS
   end
 
   module ClassMethods