yaks 0.6.0.alpha.1 → 0.6.0

data/spec/unit/yaks/mapper/class_methods_spec.rb

@@ -4,6 +4,7 @@ RSpec.describe Yaks::Mapper::ClassMethods do
   subject(:mapper_class) do
     Class.new do
       extend Yaks::Mapper::ClassMethods
+      config Yaks::Mapper::Config.new
       attributes :foo, :bar
       link :some_rel, 'http://some_link'
       has_one :thing
@@ -53,7 +54,7 @@ RSpec.describe Yaks::Mapper::ClassMethods do
 
   it 'should register links' do
     expect(mapper_class.config.links).to eq [
-      Yaks::Mapper::Link.new(:some_rel, 'http://some_link', {})
+      Yaks::Mapper::Link.new(rel: :some_rel, template: 'http://some_link')
     ]
   end
 
@@ -64,4 +65,19 @@ RSpec.describe Yaks::Mapper::ClassMethods do
     ]
   end
 
+  describe '#config' do
+    it 'should allow getting the config' do
+      expect(subject.config).to be_a Yaks::Mapper::Config
+    end
+
+    it 'should allow setting the config' do
+      subject.config(:foo)
+      expect(subject.config).to be :foo
+    end
+
+    it 'raise an exception when the config is nil' do
+      expect { subject.config(nil) }.to raise_exception
+    end
+  end
+
 end

data/spec/unit/yaks/mapper/config_spec.rb

@@ -3,10 +3,18 @@ require 'spec_helper'
 RSpec.describe Yaks::Mapper::Config do
   Undefined = Yaks::Undefined
 
-  subject(:config) { described_class.new(nil, [], [], []) }
+  subject(:config) { described_class.new }
 
   describe '#initialize' do
-    subject(:config) { described_class.new('foo', [:a], [:b], [:c]) }
+    subject(:config) do
+      described_class.new(
+        type:         'foo',
+        attributes:   [:a],
+        links:        [:b],
+        associations: [:c]
+      )
+    end
+
 
     its(:type)         { should eql 'foo' }
     its(:attributes)   { should eql [:a] }
@@ -58,8 +66,8 @@ RSpec.describe Yaks::Mapper::Config do
       }
 
       it 'should have the links in the link list' do
-        expect(config.links).to include Yaks::Mapper::Link.new(:profile, '/profile/foo', {})
-        expect(config.links).to include Yaks::Mapper::Link.new(:self, '/foo/bar/{id}', {})
+        expect(config.links).to include Yaks::Mapper::Link.new(rel: :profile, template: '/profile/foo')
+        expect(config.links).to include Yaks::Mapper::Link.new(rel: :self, template: '/foo/bar/{id}')
       end
     end
 
@@ -72,8 +80,8 @@ RSpec.describe Yaks::Mapper::Config do
 
       it 'should have the links in the defined order' do
         expect(config.links).to eql [
-          Yaks::Mapper::Link.new(:self, '/foo/self', {}),
-          Yaks::Mapper::Link.new(:self, '/foo/me', {})
+          Yaks::Mapper::Link.new(rel: :self, template: '/foo/self'),
+          Yaks::Mapper::Link.new(rel: :self, template: '/foo/me')
         ]
       end
     end
@@ -85,7 +93,7 @@ RSpec.describe Yaks::Mapper::Config do
 
       it 'should have the association configured' do
         expect(config.associations).to eq [
-          Yaks::Mapper::HasOne.new(name: :mother, mapper: Yaks::Mapper)
+          Yaks::Mapper::HasOne.new(name: :mother, item_mapper: Yaks::Mapper)
         ]
       end
     end
@@ -118,7 +126,7 @@ RSpec.describe Yaks::Mapper::Config do
 
       it 'should have the association configured' do
         expect(config.associations).to eq [
-          Yaks::Mapper::HasMany.new(name: :shoes, mapper: Yaks::Mapper)
+          Yaks::Mapper::HasMany.new(name: :shoes, item_mapper: Yaks::Mapper)
         ]
       end
     end

data/spec/unit/yaks/mapper/has_many_spec.rb

@@ -10,7 +10,7 @@ RSpec.describe Yaks::Mapper::HasMany do
       type 'closet'
       has_many :shoes,
         rel: 'http://foo/shoes',
-        mapper: Class.new(Yaks::Mapper) { type 'shoe' ; attributes :size, :color }
+        item_mapper: Class.new(Yaks::Mapper) { type 'shoe' ; attributes :size, :color }
     end
   end
 
@@ -70,12 +70,25 @@ RSpec.describe Yaks::Mapper::HasMany do
 
   describe '#collection_mapper' do
     let(:collection_mapper) { Yaks::Undefined }
-    subject(:has_many)  { described_class.new(name: :name, mapper: :mapper, rel: :rel, collection_mapper: collection_mapper) }
+
+    subject(:has_many)  { described_class.new(name: :name, item_mapper: :mapper, rel: :rel, collection_mapper: collection_mapper) }
 
     context 'when the collection mapper is undefined' do
       it 'should derive one from collection and policy' do
         expect(has_many.collection_mapper([], Yaks::DefaultPolicy.new)).to equal Yaks::CollectionMapper
       end
+
+      it 'should return nil if no policy is given' do
+        expect(has_many.collection_mapper([])).to be_nil
+      end
+
+      it 'should return nil if no collection is given' do
+        expect(has_many.collection_mapper(nil, Yaks::DefaultPolicy.new)).to be_nil
+      end
+
+      it 'should return nil if no params are given' do
+        expect(has_many.collection_mapper).to be_nil
+      end
     end
 
     context 'when the collection mapper is specified' do

data/spec/unit/yaks/mapper/has_one_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe Yaks::Mapper::HasOne do
   subject(:has_one)  do
     described_class.new(
       name: :author,
-      mapper: association_mapper,
+      item_mapper: association_mapper,
       rel: 'http://rel'
     )
   end

data/spec/unit/yaks/mapper/link_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 RSpec.describe Yaks::Mapper::Link do
   include_context 'yaks context'
 
-  subject(:link) { described_class.new(rel, template, options) }
+  subject(:link) { described_class.create(rel, template, options) }
 
   let(:rel)      { :next }
   let(:template) { '/foo/bar/{x}/{y}' }
@@ -29,7 +29,7 @@ RSpec.describe Yaks::Mapper::Link do
   describe '#add_to_resource' do
     it 'should add itself to the resource' do
       expect(link.add_to_resource(Yaks::Resource.new, mapper, yaks_context)).to eql(
-        Yaks::Resource.new(links: [Yaks::Resource::Link.new(:next, "/foo/bar/3/4", {})])
+        Yaks::Resource.new(links: [Yaks::Resource::Link.new(rel: :next, uri: "/foo/bar/3/4")])
       )
     end
 
@@ -193,4 +193,14 @@ RSpec.describe Yaks::Mapper::Link do
     end
   end
 
+  describe '.create' do
+    it 'should take positional arguments' do
+      expect(Yaks::Mapper::Link.create(:foo, :bar, {baz: 3}))
+        .to eql Yaks::Mapper::Link.new(rel: :foo, template: :bar, options: {baz: 3})
+    end
+
+    it 'should default options' do
+      expect(Yaks::Mapper::Link.create(:foo, :bar).options).to eql({})
+    end
+  end
 end

data/spec/unit/yaks/mapper_spec.rb

@@ -51,12 +51,12 @@ RSpec.describe Yaks::Mapper do
 
       it 'should map the link' do
         expect(resource.links).to eq [
-          Yaks::Resource::Link.new(:profile, 'http://foo/bar', {})
+          Yaks::Resource::Link.new(rel: :profile, uri: 'http://foo/bar')
         ]
       end
 
       it 'should use the link in the resource' do
-        expect(resource.links).to include Yaks::Resource::Link.new(:profile, 'http://foo/bar', {})
+        expect(resource.links).to include Yaks::Resource::Link.new(rel: :profile, uri: 'http://foo/bar')
       end
 
       context 'with the same link rel defined multiple times' do
@@ -70,10 +70,10 @@ RSpec.describe Yaks::Mapper do
 
         it 'should map all the links' do
           expect(resource.links).to eq [
-            Yaks::Resource::Link.new(:profile, 'http://foo/bar', {}),
-            Yaks::Resource::Link.new(:self, 'http://foo/bam', {}),
-            Yaks::Resource::Link.new(:self, 'http://foo/baz', {}),
-            Yaks::Resource::Link.new(:self, 'http://foo/baq', {})
+            Yaks::Resource::Link.new(rel: :profile, uri: 'http://foo/bar'),
+            Yaks::Resource::Link.new(rel: :self, uri: 'http://foo/bam'),
+            Yaks::Resource::Link.new(rel: :self, uri: 'http://foo/baz'),
+            Yaks::Resource::Link.new(rel: :self, uri: 'http://foo/baq')
           ]
         end
       end
@@ -201,7 +201,34 @@ RSpec.describe Yaks::Mapper do
         )
       end
     end
-  end
+
+    context 'with a control' do
+      before do
+        mapper_class.module_eval do
+          control :foo_control do
+            field :bar_field, label: 'a label', type: 'number', value: 7
+          end
+        end
+      end
+
+      it 'should render the control' do
+        expect(mapper.call(fake))
+          .to eql Yaks::Resource.new(
+                    type: 'foo',
+                    controls: [
+                      Yaks::Resource::Control.new(
+                        name: :foo_control,
+                        fields: [
+                          Yaks::Resource::Control::Field.new(
+                            name: :bar_field,
+                            label: 'a label',
+                            type: 'number',
+                            value: 7
+                          )])])
+      end
+    end
+
+  end # describe '#call'
 
   describe '.mapper_name' do
     context 'with a type configured' do
@@ -267,30 +294,32 @@ RSpec.describe Yaks::Mapper do
     end
   end
 
-  describe '#map_links' do
-    let(:link) { fake('Link') }
-
+  shared_examples 'something that can be added to a resource' do
     it 'should receive a context' do
-      stub(link).add_to_resource(any_args) {|r,_,_| Yaks::Resource.new}
+      stub(object).add_to_resource(any_args) {|r,_,_| Yaks::Resource.new}
 
-      mapper.config.links[0..-1] = [link]
       mapper.call(instance)
 
-      expect(link).to have_received.add_to_resource(any(Yaks::Resource), mapper, yaks_context)
+      expect(object).to have_received.add_to_resource(any(Yaks::Resource), mapper, yaks_context)
     end
   end
 
-  describe '#map_subresources' do
-    let(:association) { fake('Association') }
-
-    it 'should receive a context' do
-      stub(association).add_to_resource(any_args) {|r,_,_| Yaks::Resource.new}
+  describe '#map_links' do
+    let(:object) { fake('Link') }
+    before { mapper.config(mapper.config.append_to(:links, object)) }
+    it_should_behave_like 'something that can be added to a resource'
+  end
 
-      mapper.config.associations[0..-1] = [association]
-      mapper.call(instance)
+  describe '#map_subresources' do
+    let(:object) { fake('Association') }
+    before { mapper.config(mapper.config.append_to(:associations, object)) }
+    it_should_behave_like 'something that can be added to a resource'
+  end
 
-      expect(association).to have_received.add_to_resource(any(Yaks::Resource), mapper, yaks_context)
-    end
+  describe '#map_controls' do
+    let(:object) { fake('Control') }
+    before { mapper.config(mapper.config.append_to(:controls, object)) }
+    it_should_behave_like 'something that can be added to a resource'
   end
 
   describe '#mapper_stack' do

data/spec/unit/yaks/resource/link_spec.rb

@@ -1,7 +1,8 @@
 require 'spec_helper'
 
 RSpec.describe Yaks::Resource::Link do
-  subject(:link) { described_class.new(rel, uri, options) }
+  subject(:link) { described_class.new(rel: rel, uri: uri, options: options) }
+
   let(:rel)      { :foo_rel }
   let(:uri)      { 'http://api.example.org/rel/foo' }
   let(:options)  { { title: 'mr. spectacular' } }

data/spec/unit/yaks/resource_spec.rb

@@ -33,18 +33,18 @@ RSpec.describe Yaks::Resource do
     let(:init_opts) {
       {
         links: [
-          Yaks::Resource::Link.new(:profile, '/foo/bar/profile', {}),
-          Yaks::Resource::Link.new(:self, '/foo/bar', {})
+          Yaks::Resource::Link.new(rel: :profile, uri: '/foo/bar/profile'),
+          Yaks::Resource::Link.new(rel: :self, uri: '/foo/bar')
         ]
       }
     }
     its(:links) { should eql [
-        Yaks::Resource::Link.new(:profile, '/foo/bar/profile', {}),
-        Yaks::Resource::Link.new(:self, '/foo/bar', {})
+        Yaks::Resource::Link.new(rel: :profile, uri: '/foo/bar/profile'),
+        Yaks::Resource::Link.new(rel: :self, uri: '/foo/bar')
       ]
     }
 
-    its(:self_link) { should eql Yaks::Resource::Link.new(:self, '/foo/bar', {}) }
+    its(:self_link) { should eql Yaks::Resource::Link.new(rel: :self, uri: '/foo/bar') }
   end
 
   context 'with subresources' do
@@ -95,14 +95,21 @@ RSpec.describe Yaks::Resource do
     let(:init_opts) {
       { links:
         [
-          Yaks::Resource::Link.new(:self, 'foo', {}),
-          Yaks::Resource::Link.new(:self, 'bar', {}),
-          Yaks::Resource::Link.new(:profile, 'baz', {})
+          Yaks::Resource::Link.new(rel: :self, uri: 'foo'),
+          Yaks::Resource::Link.new(rel: :self, uri: 'bar'),
+          Yaks::Resource::Link.new(rel: :profile, uri: 'baz')
         ]
       }
     }
     it 'should return the last self link' do
-      expect(resource.self_link).to eql Yaks::Resource::Link.new(:self, 'bar', {})
+      expect(resource.self_link).to eql Yaks::Resource::Link.new(rel: :self, uri: 'bar')
+    end
+  end
+
+  describe '#add_control' do
+    it 'should append to the controls' do
+      expect(resource.add_control(:a_control))
+        .to eq Yaks::Resource.new(controls: [:a_control])
     end
   end
 end

data/spec/unit/yaks/runner_spec.rb

@@ -69,13 +69,13 @@ RSpec.describe Yaks::Runner do
     end
 
     it 'should pick the one given in the options if no header matches' do
-      rack_env = { 'HTTP_ACCEPT' => 'text/html, application/json' }
+      rack_env = { 'HTTP_ACCEPT' => 'text/xml, application/json' }
       runner = described_class.new(object: nil, config: config, options: { format: :hal, env: rack_env })
       expect(runner.format_class).to equal Yaks::Format::Hal
     end
 
     it 'should fall back to the default when no mime type is recognized' do
-      rack_env = { 'HTTP_ACCEPT' => 'text/html, application/json' }
+      rack_env = { 'HTTP_ACCEPT' => 'text/xml, application/json' }
       runner = described_class.new(object: nil, config: config, options: { env: rack_env })
       expect(runner.format_class).to equal Yaks::Format::CollectionJson
     end
@@ -253,6 +253,26 @@ RSpec.describe Yaks::Runner do
     end
   end
 
+  describe '#primitivizer' do
+    describe 'with a non json based format' do
+      let(:config) do
+        Yaks::Config.new do
+          default_format :html
+        end
+      end
+
+      it 'should return the identity function' do
+        expect(runner.primitivizer.call(:foo)).to eql :foo
+      end
+    end
+
+    describe 'with a json based format' do
+      it 'should return the primitivizer' do
+        expect(runner.primitivizer.call(:foo)).to eql "foo"
+      end
+    end
+  end
+
   it 'should memoize' do
     expect(runner.formatter).to be runner.formatter
   end

data/spec/unit/yaks/serializer_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+RSpec.describe Yaks::Serializer do
+  after do
+    Yaks::Serializer.instance_variable_set("@serializers", nil)
+  end
+
+  it 'allows registering serializers' do
+    Yaks::Serializer.register(:some_format, :some_serializer)
+    expect(Yaks::Serializer.all[:some_format]).to equal :some_serializer
+  end
+
+  it 'should by default have a serializer for JSON' do
+    expect(Yaks::Serializer.all[:json].call([1,2,3])).to eql "[\n  1,\n  2,\n  3\n]"
+  end
+
+  it 'should warn when registering a key again' do
+    expect { Yaks::Serializer.register(:json, :foo) }.to raise_exception /Serializer for json already registered/
+  end
+end

data/spec/unit/yaks/stateful_builder_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+RSpec.describe Yaks::StatefulBuilder do
+  class Buildable
+    include Yaks::Attributes.new(:foo, :bar)
+
+    def self.create(foo, bar)
+      new(foo: foo, bar: bar)
+    end
+
+    def finalize
+      update(foo: 7, bar: 8)
+    end
+
+    def wrong_type(x, y)
+      "foo #{x} #{y}"
+    end
+
+  end
+
+  subject { Yaks::StatefulBuilder.new(Buildable, [:foo, :bar, :update, :finalize, :wrong_type]) }
+
+  it 'should keep state' do
+    expect(
+      subject.create(3, 4) do
+        foo 7
+        update bar: 6
+      end.to_h
+    ).to eql(foo: 7, bar: 6)
+  end
+
+  it 'should unwrap again' do
+    expect( subject.create(3, 4) { finalize } ).to eql Buildable.new(foo: 7, bar: 8)
+  end
+
+  describe 'kind_of?' do
+    it 'should test if the returned thing is of the right type' do
+      expect { subject.create(3, 4) { wrong_type(1,'2') }}.to raise_exception Yaks::IllegalState, 'Buildable#wrong_type(1, "2") returned "foo 1 2". Expected instance of Buildable'
+    end
+  end
+end

data/yaks.gemspec

@@ -38,4 +38,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'mutant'
   gem.add_development_dependency 'rspec-its'
   gem.add_development_dependency 'benchmark-ips'
+  gem.add_development_dependency 'yaks-html'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaks
 version: !ruby/object:Gem::Version
-  version: 0.6.0.alpha.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Arne Brasseur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-19 00:00:00.000000000 Z
+date: 2014-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inflection
@@ -220,6 +220,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: yaks-html
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Serialize to hypermedia. HAL, JSON-API, etc.
 email:
 - arne@arnebrasseur.net
@@ -231,34 +245,40 @@ files:
 - README.md
 - Rakefile
 - lib/yaks.rb
+- lib/yaks/attributes.rb
 - lib/yaks/breaking_changes.rb
 - lib/yaks/collection_mapper.rb
 - lib/yaks/collection_resource.rb
 - lib/yaks/config.rb
 - lib/yaks/config/dsl.rb
+- lib/yaks/configurable.rb
 - lib/yaks/default_policy.rb
+- lib/yaks/errors.rb
 - lib/yaks/format.rb
 - lib/yaks/format/collection_json.rb
 - lib/yaks/format/hal.rb
+- lib/yaks/format/halo.rb
 - lib/yaks/format/json_api.rb
 - lib/yaks/fp.rb
 - lib/yaks/fp/callable.rb
-- lib/yaks/fp/hash_updatable.rb
-- lib/yaks/fp/updatable.rb
 - lib/yaks/mapper.rb
 - lib/yaks/mapper/association.rb
 - lib/yaks/mapper/association_mapper.rb
 - lib/yaks/mapper/attribute.rb
 - lib/yaks/mapper/class_methods.rb
 - lib/yaks/mapper/config.rb
+- lib/yaks/mapper/control.rb
 - lib/yaks/mapper/has_many.rb
 - lib/yaks/mapper/has_one.rb
 - lib/yaks/mapper/link.rb
 - lib/yaks/null_resource.rb
 - lib/yaks/primitivize.rb
 - lib/yaks/resource.rb
+- lib/yaks/resource/control.rb
 - lib/yaks/resource/link.rb
 - lib/yaks/runner.rb
+- lib/yaks/serializer.rb
+- lib/yaks/stateful_builder.rb
 - lib/yaks/util.rb
 - lib/yaks/version.rb
 - spec/acceptance/acceptance_spec.rb
@@ -268,6 +288,7 @@ files:
 - spec/integration/map_to_resource_spec.rb
 - spec/json/confucius.collection.json
 - spec/json/confucius.hal.json
+- spec/json/confucius.halo.json
 - spec/json/confucius.json_api.json
 - spec/json/john.hal.json
 - spec/json/plant_collection.collection.json
@@ -283,19 +304,20 @@ files:
 - spec/support/pet_peeve_mapper.rb
 - spec/support/shared_contexts.rb
 - spec/support/youtypeit_models_mappers.rb
+- spec/unit/yaks/attributes_spec.rb
 - spec/unit/yaks/collection_mapper_spec.rb
 - spec/unit/yaks/collection_resource_spec.rb
 - spec/unit/yaks/config/dsl_spec.rb
 - spec/unit/yaks/config_spec.rb
+- spec/unit/yaks/configurable_spec.rb
 - spec/unit/yaks/default_policy/derive_mapper_from_object_spec.rb
 - spec/unit/yaks/default_policy_spec.rb
 - spec/unit/yaks/format/collection_json_spec.rb
 - spec/unit/yaks/format/hal_spec.rb
+- spec/unit/yaks/format/html_spec.rb
 - spec/unit/yaks/format/json_api_spec.rb
 - spec/unit/yaks/format_spec.rb
 - spec/unit/yaks/fp/callable_spec.rb
-- spec/unit/yaks/fp/hash_updatable_spec.rb
-- spec/unit/yaks/fp/updatable_spec.rb
 - spec/unit/yaks/fp_spec.rb
 - spec/unit/yaks/mapper/association_mapper_spec.rb
 - spec/unit/yaks/mapper/association_spec.rb
@@ -311,6 +333,8 @@ files:
 - spec/unit/yaks/resource/link_spec.rb
 - spec/unit/yaks/resource_spec.rb
 - spec/unit/yaks/runner_spec.rb
+- spec/unit/yaks/serializer_spec.rb
+- spec/unit/yaks/stateful_builder_spec.rb
 - spec/unit/yaks/util_spec.rb
 - spec/yaml/confucius.yaml
 - spec/yaml/youtypeitwepostit.yaml
@@ -330,12 +354,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Serialize to hypermedia. HAL, JSON-API, etc.
@@ -347,6 +371,7 @@ test_files:
 - spec/integration/map_to_resource_spec.rb
 - spec/json/confucius.collection.json
 - spec/json/confucius.hal.json
+- spec/json/confucius.halo.json
 - spec/json/confucius.json_api.json
 - spec/json/john.hal.json
 - spec/json/plant_collection.collection.json
@@ -362,19 +387,20 @@ test_files:
 - spec/support/pet_peeve_mapper.rb
 - spec/support/shared_contexts.rb
 - spec/support/youtypeit_models_mappers.rb
+- spec/unit/yaks/attributes_spec.rb
 - spec/unit/yaks/collection_mapper_spec.rb
 - spec/unit/yaks/collection_resource_spec.rb
 - spec/unit/yaks/config/dsl_spec.rb
 - spec/unit/yaks/config_spec.rb
+- spec/unit/yaks/configurable_spec.rb
 - spec/unit/yaks/default_policy/derive_mapper_from_object_spec.rb
 - spec/unit/yaks/default_policy_spec.rb
 - spec/unit/yaks/format/collection_json_spec.rb
 - spec/unit/yaks/format/hal_spec.rb
+- spec/unit/yaks/format/html_spec.rb
 - spec/unit/yaks/format/json_api_spec.rb
 - spec/unit/yaks/format_spec.rb
 - spec/unit/yaks/fp/callable_spec.rb
-- spec/unit/yaks/fp/hash_updatable_spec.rb
-- spec/unit/yaks/fp/updatable_spec.rb
 - spec/unit/yaks/fp_spec.rb
 - spec/unit/yaks/mapper/association_mapper_spec.rb
 - spec/unit/yaks/mapper/association_spec.rb
@@ -390,6 +416,8 @@ test_files:
 - spec/unit/yaks/resource/link_spec.rb
 - spec/unit/yaks/resource_spec.rb
 - spec/unit/yaks/runner_spec.rb
+- spec/unit/yaks/serializer_spec.rb
+- spec/unit/yaks/stateful_builder_spec.rb
 - spec/unit/yaks/util_spec.rb
 - spec/yaml/confucius.yaml
 - spec/yaml/youtypeitwepostit.yaml

data/lib/yaks/fp/hash_updatable.rb

@@ -1,19 +0,0 @@
-module Yaks
-  module FP
-
-    class HashUpdatable < Module
-      # @param [Array] attributes
-      # @return [Symbol]
-      def initialize(*attributes)
-        define_method :update do |updates|
-          self.class.new(
-            attributes.each_with_object({}) {|attr, hsh|
-              hsh[attr] = updates.fetch(attr) { send(attr) }
-            }
-          )
-        end
-      end
-    end
-
-  end
-end

data/lib/yaks/fp/updatable.rb

@@ -1,17 +0,0 @@
-module Yaks
-  module FP
-
-    class Updatable < Module
-      # @param [Array] attributes
-      # @return [Symbol]
-      def initialize(*attributes)
-        define_method :update do |updates|
-          self.class.new(
-            *attributes.map {|attr| updates.fetch(attr) { send(attr) }}
-          )
-        end
-      end
-    end
-
-  end
-end