lib/representable/hash_methods.rb in representable-2.1.8 vs lib/representable/hash_methods.rb in representable-2.2.0

@@ -1,24 +1,27 @@
 module Representable
   module HashMethods
     def create_representation_with(doc, options, format)
-      bin   = representable_mapper(format, options).bindings.first
-      hash  = filter_keys_for(represented, options)
+      hash  = filter_keys_for!(represented, options) # FIXME: this modifies options and replicates logic from Representable.
+      bin   = representable_mapper(format, options).bindings(represented, options).first
+
       bin.render_fragment(hash, doc) # TODO: Use something along Populator, which does
     end
 
     def update_properties_from(doc, options, format)
-      bin   = representable_mapper(format, options).bindings.first
-      hash  = filter_keys_for(doc, options)
+      hash  = filter_keys_for!(doc, options)
+      bin   = representable_mapper(format, options).bindings(represented, options).first
 
       value = Deserializer::Hash.new(bin).call(hash)
       # value = bin.deserialize_from(hash)
       represented.replace(value)
     end
 
   private
-    def filter_keys_for(hash, options)
-      return hash unless props = options[:exclude] || options[:include]
-      hash.reject { |k,v| options[:exclude] ? props.include?(k.to_sym) : !props.include?(k.to_sym) }
+    def filter_keys_for!(hash, options)
+      excluding = options[:exclude]
+      # TODO: use same filtering method as in normal representer in Representable#create_representation_with.
+      return hash unless props = options.delete(:exclude) || options.delete(:include)
+      hash.reject { |k,v| excluding ? props.include?(k.to_sym) : !props.include?(k.to_sym) }
     end
   end
 end