id 0.0.9 → 0.0.10

data/.rspec

@@ -0,0 +1 @@
+-I .

data/.ruby-version

@@ -0,0 +1 @@
+ree-1.8.7-2012.02

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 gemspec
 gem 'test-unit'
 gem 'json', '~> 1.7.7'
+gem 'money', '3.7.1'

data/Gemfile.lock

@@ -20,10 +20,10 @@ GEM
     diff-lcs (1.2.1)
     i18n (0.6.4)
     json (1.7.7)
-    money (5.1.1)
-      i18n (~> 0.6.0)
+    money (3.7.1)
+      i18n (~> 0.4)
     multi_json (1.7.3)
-    optional (0.0.6)
+    optional (0.0.7)
     rspec (2.13.0)
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
@@ -44,6 +44,7 @@ PLATFORMS
 DEPENDENCIES
   id!
   json (~> 1.7.7)
+  money (= 3.7.1)
   rspec
   simplecov
   test-unit

data/README.md

@@ -58,3 +58,8 @@ Types are inferred from the association name unless one is specified.
 You can even set fields on nested models in this way:
 
     person.hat.set(color: 'red') # => returns a new person object with a new hat object with its color set to red
+
+#### Avoiding nils
+
+`id` tries to avoid nils entirely, by using the Option pattern found in many functional programming languages and implemented [here](http://github.com/rsslldnphy/optional).
+Just mark optional fields as `optional: true` and their accessors will return either `Some[value]` or `None`.

data/id.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
   s.name          = 'id'
-  s.version       = '0.0.9'
+  s.version       = '0.0.10'
   s.date          = '2013-03-28'
   s.summary       = "Simple models based on hashes"
   s.description   = "Developed at On The Beach Ltd. Contact russell.dunphy@onthebeach.co.uk"
   s.authors       = ["Russell Dunphy", "Radek Molenda"]
-  s.email         = ['russell@russelldunphy.com', 'radek.molenda@gmail.com']
+  s.email         = ['rssll@rsslldnphy.com', 'radek.molenda@gmail.com']
   s.files         = `git ls-files`.split($\)
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ["lib"]

data/lib/id.rb

@@ -4,4 +4,19 @@ require 'active_support/core_ext/string/inflections'
 require 'active_support/core_ext/hash/except'
 require 'optional'
 require 'money'
-require_relative 'id/all'
+require 'id/missing_attribute_error'
+require 'id/hashifier'
+require 'id/model/definer'
+require 'id/model/descriptor'
+require 'id/model/type_casts'
+require 'id/model/field'
+require 'id/model/association'
+require 'id/model/has_one'
+require 'id/model/has_many'
+require 'id/model'
+require 'id/timestamps'
+require 'id/form'
+require 'id/form/active_model_form'
+require 'id/form/descriptor'
+require 'id/form/field_with_form_support'
+require 'id/form/field_form'

data/lib/id/form.rb

@@ -0,0 +1,21 @@
+module Id
+  module Form
+
+    def as_form
+      @form_object ||= self.class.form_object.new(self)
+    end
+
+    def errors
+      as_form.errors
+    end
+
+    def valid?
+      as_form.valid?
+    end
+
+    def self.included(base)
+      base.extend(Descriptor)
+    end
+
+  end
+end

data/lib/id/{model/form.rb → form/active_model_form.rb}

@@ -1,6 +1,6 @@
 module Id
-  module Model
-    class Form
+  module Form
+    class ActiveModelForm
       include ActiveModel::Validations
       include ActiveModel::Conversion
       extend  ActiveModel::Naming

data/lib/id/form/descriptor.rb

@@ -0,0 +1,27 @@
+module Id
+  module Form
+    module Descriptor
+
+      def field(f, options={})
+        FieldWithFormSupport.new(self, f, options).define
+      end
+
+      def form &block
+        form_object.send :instance_exec, &block
+      end
+
+      def form_object
+        base = self
+        @form_object ||= Class.new(ActiveModelForm) do
+          eingenclass = class << self
+            self
+          end
+          eingenclass.send(:define_method, :model_name) do
+            ActiveModel::Name.new(self, nil, base.name)
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/id/form/field_form.rb

@@ -0,0 +1,14 @@
+class FieldForm
+
+  def self.define(field)
+    field.model.form_object.instance_eval do
+      define_method field.name do
+        memoize field.name do
+          Option[model.send(field.name)].flatten.value_or nil if model.data.has_key? field.key
+        end
+      end
+      attr_writer field.name
+    end
+  end
+
+end

data/lib/id/form/field_with_form_support.rb

@@ -0,0 +1,12 @@
+module Id
+  module Form
+    class FieldWithFormSupport < Id::Model::Field
+
+      def hook_define
+        FieldForm.define(self)
+      end
+
+    end
+  end
+end
+

data/lib/id/model.rb

@@ -23,18 +23,6 @@ module Id
       data.hash
     end
 
-    def as_form
-      @form_object ||= self.class.form_object.new(self)
-    end
-
-    def errors
-      as_form.errors
-    end
-
-    def valid?
-      as_form.valid?
-    end
-
     private
 
     def self.included(base)
@@ -42,7 +30,7 @@ module Id
     end
 
     def memoize(f, &b)
-      instance_variable_get("@#{f}") || instance_variable_set("@#{f}", b.call)
+      instance_variable_get("@#{f}") || instance_variable_set("@#{f}", b.call(data))
     end
 
   end

data/lib/id/model/association.rb

@@ -26,7 +26,9 @@ module Id
         end
 
         def parent
-          @parent ||= constants.find { |c| c.const_defined? child }
+          @parent ||= constants.find do |c|
+            c.ancestors.find { |anc| anc.const_defined? child }
+          end
         end
 
         def constants

data/lib/id/model/definer.rb

@@ -0,0 +1,23 @@
+module Id
+  module Model
+    class Definer
+
+      def self.method_memoize(context, name, &value_block)
+        method(context, name) do |object|
+          object.instance_eval do
+            memoize(name, &value_block)
+          end
+        end
+      end
+
+      def self.method(context, name, &value_block)
+        context.instance_eval do
+          define_method name do
+            value_block.call(self)
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/id/model/descriptor.rb

@@ -3,48 +3,19 @@ module Id
     module Descriptor
 
       def field(f, options={})
-        (options[:optional] ? FieldOption : Field).new(self, f, options).define
+        Field.new(self, f, options).define
       end
 
       def has_one(f, options={})
-        (options[:optional] ? HasOneOption : HasOne).new(self, f, options).define
+        HasOne.new(self, f, options).define
       end
 
       def has_many(f, options={})
         HasMany.new(self, f, options).define
       end
 
-      def compound_field(f, fields, options={})
-        CompoundField.new(self, f, fields, options).define
-      end
-
-      def builder
-        builder_class.new(self)
-      end
-
-      def form &block
-        form_object.send :instance_exec, &block
-      end
-
-      def form_object
-        base = self
-        @form_object ||= Class.new(Form) do
-          instance_exec do
-            define_singleton_method :model_name do
-              ActiveModel::Name.new(self, nil, base.name)
-            end
-          end
-        end
-      end
-
       def to_proc
-        ->(data) { new data }
-      end
-
-      private
-
-      def builder_class
-        @builder_class ||= Class.new { include Builder }
+        lambda { |data| new data }
       end
 
     end

data/lib/id/model/field.rb

@@ -8,41 +8,22 @@ module Id
         @options = options
       end
 
-      def define_form_field
-        field = self
-        model.form_object.send :define_method, name do
-          memoize field.name do
-            Option[model.send(field.name)].flatten.value_or nil if model.data.has_key? field.key
-          end
-        end
-        model.form_object.send :attr_writer, name
-      end
-
-      def define_getter
-        field = self
-        model.send :define_method, name do
-          memoize field.name do
-            field.cast data.fetch(field.key, &field.default_value)
-          end
-        end
+      def define
+        Definer.method_memoize(model, name) { |data| value_of(data) }
+        Definer.method(model, "#{name}?") { |obj| presence_of(obj.data) }
+        hook_define
       end
 
-      def define_setter
-        model.send(:builder_class).define_setter name
+      def hook_define
       end
 
-      def define_is_present
-        field = self
-        model.send :define_method, "#{name}?" do
-          data.has_key?(field.key) && !data.fetch(field.key).nil?
-        end
+      def value_of(data)
+        value = data.fetch(key, &default_value)
+        optional ? Option[value].map{ |d| cast d } : cast(value)
       end
 
-      def define
-        define_getter
-        define_setter
-        define_is_present
-        define_form_field
+      def presence_of(data)
+        data.has_key?(key) && !data.fetch(key).nil?
       end
 
       def cast(value)
@@ -71,21 +52,10 @@ module Id
       def optional?
         options.fetch(:optional, false)
       end
+      alias_method :optional, :optional?
 
       attr_reader :model, :name, :options
-    end
 
-    class FieldOption < Field
-      def define_getter
-        field = self
-        model.send :define_method, name do
-          memoize field.name do
-            Option[data.fetch(field.key, &field.default_value)].map do |d|
-              field.cast d
-            end
-          end
-        end
-      end
     end
   end
 end

data/lib/id/model/has_many.rb

@@ -2,13 +2,8 @@ module Id
   module Model
     class HasMany < Association
 
-      def define_getter
-        field = self
-        model.send :define_method, name do
-          memoize field.name do
-            data.fetch(field.key, []).map { |r| field.type.new(r) }
-          end
-        end
+      def value_of(data)
+        data.fetch(key, []).map { |r| type.new(r) }
       end
 
     end

data/lib/id/model/has_one.rb

@@ -2,27 +2,13 @@ module Id
   module Model
     class HasOne < Association
 
-      def define_getter
-        field = self
-        model.send :define_method, name do
-          memoize field.name do
-            child = data.fetch(field.key) { raise MissingAttributeError, field.key }
-            field.type.new(child) unless child.nil?
-          end
-        end
-      end
-
-    end
-
-    class HasOneOption < Association
-
-      def define_getter
-        field = self
-        model.send :define_method, name do
-          memoize field.name do
-            child = data.fetch(field.key, nil)
-            child.nil? ? None : Some[field.type.new(child)]
-          end
+      def value_of(data)
+        if optional?
+          child = data.fetch(field.key, nil)
+          child.nil? ? None : Some[field.type.new(child)]
+        else
+          child = data.fetch(key) { raise MissingAttributeError, key }
+          type.new(child) unless child.nil?
         end
       end
 

data/lib/id/timestamps.rb

@@ -1,23 +1,20 @@
 module Id
   module Timestamps
-
     def self.included(base)
       base.field :created_at
       base.field :updated_at
     end
 
     def initialize(data = {})
-      super data.merge(_timestamps data)
+      super data.merge(:created_at => data.fetch('created_at', Time.now))
     end
 
-    private
-
-    def _timestamps(data, now=Time.now)
-      {
-        created_at: data.fetch('created_at', now),
-        updated_at: now
-      }
+    def set(values)
+      self.class.new(super.data.merge(:updated_at => Time.now))
     end
 
+    def unset(*keys)
+      self.class.new(super.data.merge(:updated_at => Time.now))
+    end
   end
 end

data/spec/lib/id/model/association_spec.rb

@@ -11,7 +11,7 @@ describe Id::Model::Association do
     end
   end
 
-  let (:model) { stub(name: "Foo::Bar::Baz::Quux") }
+  let (:model) { stub(:name => "Foo::Bar::Baz::Quux") }
   let (:has_one) { Id::Model::Association.new(model, "yak", {}) }
 
   describe "hierarchy" do

data/spec/lib/id/model/form_spec.rb

@@ -2,13 +2,14 @@ require 'spec_helper'
 
 class Gerbil
   include Id::Model
+  include Id::Form
 
   field :name
   field :paws
 
   form do
     validates_presence_of :name
-    validates_length_of :name, maximum: 4
+    validates_length_of :name, :maximum => 4
   end
 
   def name_in_caps
@@ -21,7 +22,7 @@ module Id
   module Model
     describe Form do
 
-      let (:gerbil) { Gerbil.new(name: 'Berty') }
+      let (:gerbil) { Gerbil.new(:name => 'Berty') }
       let (:form)   { gerbil.as_form }
 
       subject { gerbil.as_form }

data/spec/lib/id/model_spec.rb

@@ -5,28 +5,20 @@ class NestedModel
   field :yak
 end
 
-class CompboundElementModel
-  include Id::Model
-  field :plugh
-  field :thud
-end
-
 class TestModel
   include Id::Model
 
   field :foo
-  field :bar, key: 'baz'
-  field :qux, optional: true
-  field :quux, default: false
-  field :date_of_birth, optional: true, type: Date
-  field :empty_date, optional: true, type: Date
-  field :christmas, default: Date.new(2014,12,25), type: Date
-  field :quxx, optional: true
-
-  compound_field :corge, {plugh: 'foo', thud: 'quux'}, type: CompboundElementModel
-
-  has_one :aliased_model, type: NestedModel
-  has_one :nested_model, key: 'aliased_model'
+  field :bar, :key => 'baz'
+  field :qux, :optional => true
+  field :quux, :default => false
+  field :date_of_birth, :optional => true, :type => Date
+  field :empty_date, :optional => true, :type => Date
+  field :christmas, :default => Date.new(2014,12,25), :type => Date
+  field :quxx, :optional => true
+
+  has_one :aliased_model, :type => NestedModel
+  has_one :nested_model, :key => 'aliased_model'
   has_one :extra_nested_model
   has_one :test_model
   has_many :nested_models
@@ -38,19 +30,19 @@ class TestModel
 end
 
 describe Id::Model do
-  let (:model) { TestModel.new(foo: 3,
-                               baz: 6,
-                               quxx: 8,
-                               test_model: {},
-                               date_of_birth: '06-06-1983',
-                               aliased_model: { 'yak' => 11},
-                               nested_models: [{ 'yak' => 11}, { yak: 14 }],
-                               extra_nested_model: { cats: "MIAOW" }) }
+  let (:model) { TestModel.new(:foo => 3,
+                               :baz => 6,
+                               :quxx => 8,
+                               :test_model => {},
+                               :date_of_birth => '06-06-1983',
+                               :aliased_model => { 'yak' => 11},
+                               :nested_models => [{ 'yak' => 11}, { :yak => 14 }],
+                               :extra_nested_model => { :cats => "MIAOW" }) }
 
 
   describe ".new" do
     it 'converts any passed id models to their hash representations' do
-      new_model = TestModel.new(test_model: model)
+      new_model = TestModel.new(:test_model => model)
       new_model.test_model.data.should eq model.data
     end
   end
@@ -96,16 +88,6 @@ describe Id::Model do
 
   end
 
-  describe ".compound_field" do
-    it 'defines an accessor on the model' do
-      model.corge.should be_a CompboundElementModel
-    end
-
-    it 'deals with default values' do
-      model.corge.thud.should be_false
-    end
-  end
-
   describe ".has_one" do
     it "allows nested models" do
       model.aliased_model.should be_a NestedModel
@@ -134,14 +116,14 @@ describe Id::Model do
 
   describe "#set" do
     it "creates a new model with the provided values changed" do
-      model.set(foo: 999).should be_a TestModel
-      model.set(foo: 999).foo.should eq 999
+      model.set(:foo => 999).should be_a TestModel
+      model.set(:foo => 999).foo.should eq 999
     end
   end
 
   describe "#unset" do
     it 'returns a new basket minus the passed key' do
-      expect { model.set(foo: 999, bar: 555).unset(:foo, :bar).foo }.to raise_error Id::MissingAttributeError, "foo"
+      expect { model.set(:foo => 999, :bar => 555).unset(:foo, :bar).foo }.to raise_error Id::MissingAttributeError, "foo"
     end
 
     it 'does not error if the key to be removed does not exist' do
@@ -151,7 +133,7 @@ describe Id::Model do
 
   describe "#fields are present methods" do
     it 'allows you to check if fields are present' do
-      model = TestModel.new(foo: 1)
+      model = TestModel.new(:foo => 1)
       model.foo?.should be_true
       model.bar?.should be_false
     end
@@ -159,38 +141,38 @@ describe Id::Model do
 
   describe "#==" do
     it 'is equal to another id model with the same data' do
-      one = TestModel.new(foo: 1)
-      two = TestModel.new(foo: 1)
+      one = TestModel.new(:foo => 1)
+      two = TestModel.new(:foo => 1)
       one.should eq two
     end
 
     it 'is not equal to two models with different data' do
-      one = TestModel.new(foo: 1)
-      two = TestModel.new(foo: 2)
+      one = TestModel.new(:foo => 1)
+      two = TestModel.new(:foo => 2)
       one.should_not eq two
     end
   end
 
   describe "#hash" do
     it 'allows id models to be used as hash keys' do
-      one = TestModel.new(foo: 1)
-      two = TestModel.new(foo: 1)
+      one = TestModel.new(:foo => 1)
+      two = TestModel.new(:foo => 1)
       hash = { one => :found }
       hash[two].should eq :found
     end
     it 'they are different keys if the data is different' do
-      one = TestModel.new(foo: 1)
-      two = TestModel.new(foo: 2)
+      one = TestModel.new(:foo => 1)
+      two = TestModel.new(:foo => 2)
       hash = { one => :found }
       hash[two].should be_nil
       hash[one].should eq :found
     end
   end
 
-  describe ".to_proc" do
-    it 'allows eta expansion of the class name to its constructor' do
-      [{foo: 1}].map(&TestModel).first.should be_a TestModel
-      [{foo: 1}].map(&TestModel).first.foo.should eq 1
+  describe "#to_proc" do
+    it 'eta expands the model class into its constructor' do
+      [{},{}].map(&TestModel).all? { |m| m.is_a? TestModel }.should be_true
     end
   end
+
 end

data/spec/lib/id/timestamps_spec.rb

@@ -11,18 +11,14 @@ end
 module Id
   describe Timestamps do
 
-    let (:model) { TimeStampedModel.new(foo: 999, bar: 666) }
+    let(:model) { TimeStampedModel.new(:foo => 999, :bar => 666) }
 
     it 'should have a created_at date' do
       model.created_at.should be_a Time
     end
 
-    it 'should have an updated_at date' do
-      model.updated_at.should be_a Time
-    end
-
     it 'should update the updated at when set is called' do
-      updated = model.set(foo: 123)
+      updated = model.set(:foo => 123)
       expect(updated.created_at).to be < updated.updated_at
     end
 

data/spec/lib/mike_spec.rb

@@ -4,7 +4,7 @@ class Mike
   include Id::Model
 
   field :cat
-  field :dog, optional: true
+  field :dog, :optional => true
 
   def catdog
     dog.value_or cat
@@ -13,7 +13,7 @@ class Mike
 end
 
 describe "Foobar" do
-  let (:mike) { Mike.new(cat: 'pooface') }
+  let (:mike) { Mike.new(:cat => 'pooface') }
   it 'returns cat' do
     mike.catdog.should eq 'pooface'
   end

data/spec/spec_helper.rb

@@ -1,11 +1,6 @@
-require 'simplecov'
-SimpleCov.start do
-  add_filter '/spec'
-end
-
 require 'rspec'
-require_relative '../lib/id'
-require_relative 'support/active_model_lint'
+require 'lib/id'
+require 'support/active_model_lint'
 
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: id
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -110,39 +110,40 @@ dependencies:
         version: '0'
 description: Developed at On The Beach Ltd. Contact russell.dunphy@onthebeach.co.uk
 email:
-- russell@russelldunphy.com
+- rssll@rsslldnphy.com
 - radek.molenda@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- .ruby-version
 - Gemfile
 - Gemfile.lock
 - LICENSE.md
 - README.md
 - id.gemspec
 - lib/id.rb
-- lib/id/all.rb
+- lib/id/form.rb
+- lib/id/form/active_model_form.rb
+- lib/id/form/descriptor.rb
+- lib/id/form/field_form.rb
+- lib/id/form/field_with_form_support.rb
 - lib/id/hashifier.rb
 - lib/id/missing_attribute_error.rb
 - lib/id/model.rb
-- lib/id/model/all.rb
 - lib/id/model/association.rb
-- lib/id/model/builder.rb
-- lib/id/model/compound_field.rb
+- lib/id/model/definer.rb
 - lib/id/model/descriptor.rb
 - lib/id/model/field.rb
-- lib/id/model/form.rb
 - lib/id/model/has_many.rb
 - lib/id/model/has_one.rb
 - lib/id/model/type_casts.rb
 - lib/id/timestamps.rb
 - spec/lib/id/model/association_spec.rb
-- spec/lib/id/model/builder_spec.rb
 - spec/lib/id/model/field_spec.rb
 - spec/lib/id/model/form_spec.rb
-- spec/lib/id/model/has_one_spec.rb
 - spec/lib/id/model/type_casts_spec.rb
 - spec/lib/id/model_spec.rb
 - spec/lib/id/timestamps_spec.rb
@@ -175,10 +176,8 @@ specification_version: 3
 summary: Simple models based on hashes
 test_files:
 - spec/lib/id/model/association_spec.rb
-- spec/lib/id/model/builder_spec.rb
 - spec/lib/id/model/field_spec.rb
 - spec/lib/id/model/form_spec.rb
-- spec/lib/id/model/has_one_spec.rb
 - spec/lib/id/model/type_casts_spec.rb
 - spec/lib/id/model_spec.rb
 - spec/lib/id/timestamps_spec.rb

data/lib/id/all.rb

@@ -1,5 +0,0 @@
-require_relative 'missing_attribute_error'
-require_relative 'hashifier'
-require_relative 'model/all'
-require_relative 'model'
-require_relative 'timestamps'

data/lib/id/model/all.rb

@@ -1,9 +0,0 @@
-require_relative 'descriptor'
-require_relative 'type_casts'
-require_relative 'field'
-require_relative 'association'
-require_relative 'has_one'
-require_relative 'has_many'
-require_relative 'builder'
-require_relative 'compound_field'
-require_relative 'form'

data/lib/id/model/builder.rb

@@ -1,45 +0,0 @@
-module Id
-  module Model
-    module Builder
-
-      def initialize(model, data={})
-        @model = model
-        @data = data
-      end
-
-      def build
-        model.new data
-      end
-
-      private
-
-      def set(f, value)
-        self.class.new(model, data.merge(f.to_s => ensure_hash(value)))
-      end
-
-      def ensure_hash(value)
-        case value
-        when Id::Model then value.data
-        when Array then value.map { |v| ensure_hash(v) }
-        else value end
-      end
-
-      attr_reader :model, :data
-
-      def self.included(base)
-        base.extend(FieldBuilder)
-      end
-
-      module FieldBuilder
-
-        def define_setter(f)
-          define_method f do |value|
-            set(f, value)
-          end
-        end
-
-      end
-
-    end
-  end
-end

data/lib/id/model/compound_field.rb

@@ -1,23 +0,0 @@
-module Id
-  module Model
-    class CompoundField < Association
-
-      def initialize(model, name, fields, options)
-        @fields = fields
-        super(model, name, options)
-      end
-
-      def define_getter
-        field = self
-        model.send :define_method, name do
-          memoize field.name do
-            compound = Hash[field.fields.map { |k,v| [k.to_s, send(v) { raise MissingAttributeError, k.to_s }]}]
-            field.type.new(compound)
-          end
-        end
-      end
-
-      attr_accessor :fields
-    end
-  end
-end

data/spec/lib/id/model/builder_spec.rb

@@ -1,45 +0,0 @@
-require 'spec_helper'
-
-class BuilderModel
-  include Id::Model
-
-  field :foo
-  field :bar
-  has_one :nested_builder_model
-  has_many :nested_builder_models
-
-  class NestedBuilderModel
-    include Id::Model
-
-    field :baz
-  end
-
-end
-
-module Id
-  describe Model::Builder do
-
-    it 'models can be built using a builder' do
-      BuilderModel.builder.build.should be_a BuilderModel
-    end
-
-    it 'defines chainable setter methods for each field' do
-      model = BuilderModel.builder.foo(4).bar("hello cat").build
-      model.foo.should eq 4
-      model.bar.should eq "hello cat"
-    end
-
-    it 'allows setting of has_one associations using their respective builders' do
-      nested_model = BuilderModel::NestedBuilderModel.builder.baz(:quux).build
-      model = BuilderModel.builder.nested_builder_model(nested_model).build
-      model.nested_builder_model.baz.should eq :quux
-    end
-
-    it 'allows setting of has_many associations using their respective builders' do
-      nested_model = BuilderModel::NestedBuilderModel.builder.baz(:quux).build
-      model = BuilderModel.builder.nested_builder_models([nested_model]).build
-      model.nested_builder_models.first.baz.should eq :quux
-    end
-
-  end
-end

data/spec/lib/id/model/has_one_spec.rb

@@ -1,29 +0,0 @@
-require 'spec_helper'
-
-class Cat
-  include Id::Model
-end
-
-class OptionalModel
-  include Id::Model
-
-  has_one :cat, optional: true
-end
-
-module Id
-  module Model
-
-    describe HasOneOption do
-
-      it 'returns a none if the key is missing' do
-        OptionalModel.new({}).cat.should be_none
-      end
-
-      it 'returns a some if the key is there' do
-        OptionalModel.new(cat: {}).cat.should be_some(Cat)
-      end
-
-    end
-
-  end
-end