break out of extract_association_attributes! early

lib/neo4j/active_node/has_n.rb

@@ -95,6 +95,10 @@ def associations
         @associations ||= {}
       end
 
+      def associations_keys
+        @associations_keys ||= []
+      end
+
       # make sure the inherited classes inherit the <tt>_decl_rels</tt> hash
       def inherited(klass)
         klass.instance_variable_set(:@associations, associations.clone)
@@ -265,6 +269,7 @@ def default_association_query_proxy(name)
       end
 
       def build_association(macro, direction, name, options)
+        associations_keys << name
         Neo4j::ActiveNode::HasN::Association.new(macro, direction, name, options).tap do |association|
           @associations ||= {}
           @associations[name] = association

lib/neo4j/active_node/property.rb

@@ -12,10 +12,18 @@ module ClassMethods
       # Extracts keys from attributes hash which are associations of the model
       # TODO: Validate separately that relationships are getting the right values?  Perhaps also store the values and persist relationships on save?
       def extract_association_attributes!(attributes)
-        attributes.each_with_object({}) do |(key, value), result|
+        return unless contains_association?(attributes)
+        attributes.each_with_object({}) do |(key, _value), result|
           result[key] = attributes.delete(key) if self.association?(key)
         end
       end
+
+      private
+
+      def contains_association?(attributes)
+        attributes.each_key { |key| return true if associations_keys.include?(key) }
+        false
+      end
     end
   end
 end