id 0.0.12 → 0.1

data/spec/lib/id/model_spec.rb

@@ -1,196 +1,46 @@
 require 'spec_helper'
-require 'date'
-
-class OptionalModel
-  include Id::Model
-  field :buzz
-end
-
-class NestedModel
-  include Id::Model
-  field :yak
-end
-
-class TestModel
-  include Id::Model
-
-  field :foo
-  field :bar, :key => 'baz'
-  field :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_one :optional_model, :optional => true
-  has_many :nested_models
-
-  class ExtraNestedModel
-    include Id::Model
-    field :cats
-  end
-end
 
 describe Id::Model do
-  let (:model) { TestModel.new(:foo => 3,
-                               :baz => 6,
-                               :quxx => 8,
-                               :test_model => {},
-                               :date_of_birth => '06-06-1983',
-                               :optional_model => { 'yak' => 11},
-                               :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.test_model.data.should eq model.data
-    end
-  end
-
-  describe ".field" do
-    it 'defines an accessor on the model' do
-      model.foo.should eq 3
-    end
-
-    it 'allows key aliases' do
-      model.bar.should eq 6
-    end
-
-    it 'allows default values' do
-      model.quux.should be_false
-    end
 
-    describe "optional flag" do
-      context 'when field is not in hash' do
-        it 'is None' do
-          expect(model.qux).to eq None
-        end
-
-      end
-      context 'when field is in hash' do
-        it 'is Some' do
-          expect(model.quxx).to eq Some[8]
-        end
-
-      end
-    end
-
-    describe "typecast option" do
-      it 'typecasts to the provided type if a cast exists' do
-        model.date_of_birth.should be_some Date
-        model.christmas.should be_a Date
-      end
-
-      it 'should work for empty optional fields' do
-        model.empty_date.should be_none
-      end
-    end
-
-  end
-
-  describe ".has_one" do
-    it "allows nested models" do
-      model.aliased_model.should be_a NestedModel
-    end
-    it "allows nested models" do
-      model.nested_model.should be_a NestedModel
-      model.nested_model.yak.should eq 11
-    end
-    it "allows associations to be nested within the class" do
-      model.extra_nested_model.should be_a TestModel::ExtraNestedModel
-      model.extra_nested_model.cats.should eq 'MIAOW'
-    end
-    it "allows recursively defined models" do
-      model.test_model.should be_a TestModel
-    end
-
-    it "allows optional models" do
-      model.optional_model.should be_some
-    end
-
-    it "allows optional models with correct values" do
-      model.optional_model.should eq Some[OptionalModel.new(:yak => 11)]
-    end
-  end
-
-  describe ".has_many" do
-    it 'creates an array of nested models' do
-      model.nested_models.should be_a Array
-      model.nested_models.first.should be_a NestedModel
-      model.nested_models.first.yak.should eq 11
-      model.nested_models.last.yak.should eq 14
-    end
-  end
-
-  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
-    end
+  it 'is used by including the module' do
+    c = Class.new { include Id::Model ; field :cats }.new(cats: 3)
+    expect(c.cats).to eq 3
   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"
-    end
-
-    it 'does not error if the key to be removed does not exist' do
-      expect { model.unset(:not_in_hash) }.to_not raise_error
-    end
+  it 'can have fields set on it after creation - creating a new instance' do
+    c = Class.new { include Id::Model ; field :cats }.new(cats: 3)
+    expect(c.cats).to eq 3
+    d = c.set(cats: 4)
+    expect(c.cats).to eq 3
+    expect(d.cats).to eq 4
   end
 
-  describe "#fields are present methods" do
-    it 'allows you to check if fields are present' do
-      model = TestModel.new(:foo => 1, :baz => false)
-      model.foo?.should be_true
-      model.bar?.should be_false
-      model.baz?.should be_false
-    end
+  it 'can have fields removed from it after creation - creating a new instance' do
+    c = Class.new { include Id::Model ; field :cats }.new(cats: 3)
+    expect(c.cats).to eq 3
+    d = c.unset(:cats)
+    expect(c.cats).to eq 3
+    expect { d.cats }.to raise_error Id::MissingAttributeError
   end
 
-  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.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.should_not eq two
-    end
+  it 'is equal to models with the same data' do
+    c = Class.new { include Id::Model ; field :cats }.new(cats: 3)
+    d = Class.new { include Id::Model ; field :cats }.new(cats: 3)
+    expect(c).to eq d
   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)
-      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)
-      hash = { one => :found }
-      hash[two].should be_nil
-      hash[one].should eq :found
-    end
+  it 'is not equal to models with different data' do
+    c = Class.new { include Id::Model ; field :cats }.new(cats: 3)
+    d = Class.new { include Id::Model ; field :cats }.new(cats: 4)
+    expect(c).not_to eq d
   end
 
-  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
+  it 'can be used as keys in a hash' do
+    c = Class.new { include Id::Model ; field :cats }.new(cats: 3)
+    d = Class.new { include Id::Model ; field :cats }.new(cats: 3)
+    e = Class.new { include Id::Model ; field :cats }.new(cats: 4)
+    hash = { c => 10, e => 12 }
+    expect(hash[d]).to eq 10
+    expect(hash[e]).to eq 12
   end
-
 end

data/spec/lib/id/timestamps_spec.rb

@@ -1,31 +1,33 @@
 require 'spec_helper'
 
-class TimeStampedModel
-  include Id::Model
-  include Id::Timestamps
+describe Id::Timestamps do
+  let (:c) { Class.new { include Id::Model; include Id::Timestamps; field :foo } }
 
-  field :foo
-  field :bar
-end
+  let (:created) { Time.parse('2013-10-18 09:52:05 +0100') }
+  let (:updated) { Time.parse('2013-10-18 09:57:35 +0100') }
 
-module Id
-  describe Timestamps do
+  before do
+    Time.stubs(:now).returns(created, updated)
+  end
 
-    let(:model) { TimeStampedModel.new(:foo => 999, :bar => 666) }
+  it 'sets the created_at at creation' do
+    expect(c.new.created_at).to be created
+  end
 
-    it 'should have a created_at date' do
-      model.created_at.should be_a Time
-    end
+  it 'sets the updated_at at creation' do
+    expect(c.new.updated_at).to be created
+  end
 
-    it 'should update the updated at when set is called' do
-      updated = model.set(:foo => 123)
-      expect(updated.created_at).to be < updated.updated_at
-    end
+  it 'sets the updated_at after set is called' do
+    expect(c.new.set(foo: 3).updated_at).to be updated
+  end
 
-    it 'should update the updated at when unset is called' do
-      updated = model.unset(:foo)
-      expect(updated.created_at).to be < updated.updated_at
-    end
+  it 'sets the updated_at after unset is called' do
+    expect(c.new(foo: 3).unset(:foo).updated_at).to be updated
+  end
 
+  it 'does not re-set the created_at when the model is updated' do
+    expect(c.new.set(foo: 3).created_at).to be created
   end
+
 end

data/spec/lib/id/validations_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+describe Id::Validations do
+
+  class ValidationModel
+    include Id::Model
+    include Id::Form
+
+    field :cats
+    validates_presence_of :cats
+  end
+
+  it 'delegates validations to the active model class' do
+    model = ValidationModel.new
+    expect(model).not_to be_valid
+    expect(model.errors.messages).to eq ({ cats: ["can't be blank"] })
+  end
+end

data/spec/spec_helper.rb

@@ -1,9 +1,15 @@
 require 'rspec'
-require 'lib/id'
-require 'support/active_model_lint'
+require 'simplecov'
+require 'coveralls'
 
+SimpleCov.start do
+  add_filter 'spec'
+end
+
+require 'spec/support/dummy_rails_form_builder'
+require 'id'
 
-RSpec.configure do |config|
-  config.order = :rand
-  config.color_enabled = true
+RSpec.configure do |c|
+  c.order = :rand
+  c.mock_with :mocha
 end

data/spec/support/dummy_rails_form_builder.rb

@@ -0,0 +1,9 @@
+module ActionView
+  module Helpers
+    class FormBuilder
+      def initialize(object_name, object, template, options)
+        :initialized
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: id
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: '0.1'
 platform: ruby
 authors:
 - Russell Dunphy
@@ -81,6 +81,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  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'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -95,7 +109,35 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: Developed at On The Beach Ltd. Contact russell.dunphy@onthebeach.co.uk
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  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'
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  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: Easily convert hashes to Ruby objects. Originally developed at www.onthebeach.co.uk.
 email:
 - rssll@rsslldnphy.com
 - radek.molenda@gmail.com
@@ -112,33 +154,40 @@ files:
 - README.md
 - id.gemspec
 - lib/id.rb
+- lib/id/active_model.rb
+- lib/id/association.rb
+- lib/id/boolean.rb
+- lib/id/coercion.rb
+- lib/id/eta_expansion.rb
+- lib/id/field.rb
+- lib/id/field/definition.rb
+- lib/id/field/summary.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/form_backwards_compatibility.rb
 - lib/id/hashifier.rb
-- lib/id/missing_attribute_error.rb
 - lib/id/model.rb
-- lib/id/model/association.rb
-- lib/id/model/definer.rb
-- lib/id/model/descriptor.rb
-- lib/id/model/field.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/field_spec.rb
-- spec/lib/id/model/form_spec.rb
-- spec/lib/id/model/type_casts_spec.rb
+- lib/id/validations.rb
+- spec/examples/cat_spec.rb
+- spec/lib/id/active_model_spec.rb
+- spec/lib/id/association_spec.rb
+- spec/lib/id/boolean_spec.rb
+- spec/lib/id/coercion_spec.rb
+- spec/lib/id/eta_expansion_spec.rb
+- spec/lib/id/field/definition_spec.rb
+- spec/lib/id/field/summary_spec.rb
+- spec/lib/id/field_spec.rb
+- spec/lib/id/form_spec.rb
+- spec/lib/id/hashifier_spec.rb
 - spec/lib/id/model_spec.rb
 - spec/lib/id/timestamps_spec.rb
-- spec/lib/mike_spec.rb
+- spec/lib/id/validations_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model_lint.rb
-homepage: http://github.com/onthebeach/id
-licenses: []
+- spec/support/dummy_rails_form_builder.rb
+homepage: http://github.com/rsslldnphy/id
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -161,12 +210,21 @@ signing_key:
 specification_version: 4
 summary: Simple models based on hashes
 test_files:
-- spec/lib/id/model/association_spec.rb
-- spec/lib/id/model/field_spec.rb
-- spec/lib/id/model/form_spec.rb
-- spec/lib/id/model/type_casts_spec.rb
+- spec/examples/cat_spec.rb
+- spec/lib/id/active_model_spec.rb
+- spec/lib/id/association_spec.rb
+- spec/lib/id/boolean_spec.rb
+- spec/lib/id/coercion_spec.rb
+- spec/lib/id/eta_expansion_spec.rb
+- spec/lib/id/field/definition_spec.rb
+- spec/lib/id/field/summary_spec.rb
+- spec/lib/id/field_spec.rb
+- spec/lib/id/form_spec.rb
+- spec/lib/id/hashifier_spec.rb
 - spec/lib/id/model_spec.rb
 - spec/lib/id/timestamps_spec.rb
-- spec/lib/mike_spec.rb
+- spec/lib/id/validations_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model_lint.rb
+- spec/support/dummy_rails_form_builder.rb
+has_rdoc: