lib/yaks/mapper/config.rb in yaks-0.4.2 vs lib/yaks/mapper/config.rb in yaks-0.4.3

@@ -1,64 +1,44 @@
 module Yaks
   class Mapper
     class Config
       include Equalizer.new(:type, :attributes, :links, :associations)
+      include FP::Updatable.new(:type, :attributes, :links, :associations)
 
       attr_reader :links, :associations
 
       def initialize(type, attributes, links, associations)
         @type         = type
         @attributes   = attributes
         @links        = links
         @associations = associations
       end
 
-      def updated(updates)
-        self.class.new(
-          updates.fetch(:type)         { type         },
-          updates.fetch(:attributes)   { attributes   },
-          updates.fetch(:links)        { links        },
-          updates.fetch(:associations) { associations }
-        )
-      end
-
       def type(type = Undefined)
         return @type if type.equal?(Undefined)
-        updated(type: type)
+        update(type: type)
       end
 
       def attributes(*attrs)
         return @attributes if attrs.empty?
-        updated(
-          attributes: @attributes + attrs
-        )
+        update(attributes: @attributes + attrs.map(&Attribute.method(:new)))
       end
 
       def link(rel, template, options = {})
-        updated(
-          links: @links + [Link.new(rel, template, options)]
-        )
+        update(links: @links + [Link.new(rel, template, options)])
       end
 
+      def add_association(type, name, options)
+        update(associations: @associations + [type.new(options.merge(name: name))])
+      end
+
       def has_one(name, options = {})
         add_association(HasOne, name, options)
       end
 
       def has_many(name, options = {})
         add_association(HasMany, name, options)
       end
 
-      def add_association(type, name, options)
-        updated(
-          associations: @associations + [
-            type.new(
-              name,
-              options.fetch(:mapper)            { Undefined },
-              options.fetch(:rel)               { Undefined },
-              options.fetch(:collection_mapper) { Undefined },
-            )
-          ]
-        )
-      end
     end
   end
 end