structural 0.1.0 → 0.2.0

data/lib/structural.rb

@@ -3,6 +3,7 @@ require 'money'
 
 require 'structural/version'
 require 'structural/missing_attribute_error'
+require 'structural/invalid_default_type_error'
 require 'structural/hashifier'
 require 'structural/model/definer'
 require 'structural/model/descriptor'

data/lib/structural/invalid_default_type_error.rb

@@ -0,0 +1,4 @@
+module Structural
+  class InvalidDefaultTypeError < StandardError
+  end
+end

data/lib/structural/model/has_one.rb

@@ -2,9 +2,22 @@ module Structural
   module Model
     class HasOne < Association
       def value_of(data)
-        child = data.fetch(key) { raise MissingAttributeError, key }
+        child = data.fetch(key, &default_value)
         type.new(child) unless child.nil?
       end
+
+      def default
+        valid_type_check(super)
+      end
+
+      private
+
+      def valid_type_check(v)
+        case v
+        when Hash then v
+        when Proc then valid_type_check(v.call)
+        else raise Structural::InvalidDefaultTypeError end
+      end
     end
   end
 end

data/lib/structural/version.rb

@@ -1,3 +1,3 @@
 module Structural
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/spec/lib/structural/model_spec.rb

@@ -3,6 +3,14 @@ require 'spec_helper'
 class NestedModel
   include Structural::Model
   field :yak
+  field :name, :default => nil
+  field :surname, :default => nil
+end
+
+class SeparateClass
+  def self.as_hash
+    { :name => 'Michael' }
+  end
 end
 
 class TestModel
@@ -15,10 +23,16 @@ class TestModel
   field :date_of_birth, :type => Date
   field :empty_date, :type => Date
   field :christmas, :default => Date.new(2014,12,25), :type => Date
+  field :time_stamp, :type => Time
 
   has_one :aliased_model, :type => NestedModel
   has_one :nested_model, :key => 'aliased_model'
   has_one :extra_nested_model
+  has_one :nested_with_invalid_default, :default => nil
+  has_one :nested_with_hash_default, :default => { name: 'Michael' }, :type => NestedModel
+  has_one :nested_with_hash_proc_default, :default => Proc.new { SeparateClass.as_hash }, :type => NestedModel
+  has_one :nested_with_invalid_proc_default, :default => Proc.new { SeparateClass.new }, :type => NestedModel
+  has_one :missing_nested_without_default
   has_one :test_model
   has_many :nested_models
 
@@ -39,7 +53,8 @@ describe Structural::Model do
       :date_of_birth => '06-06-1983',
       :aliased_model => {'yak' => 11},
       :nested_models => [{'yak' => 11}, {:yak => 14}],
-      :extra_nested_model => { :cats => "MIAOW" }
+      :extra_nested_model => { :cats => "MIAOW" },
+      :time_stamp => '2015-01-27T13:13:13+00:00'
     )
   end
 
@@ -73,24 +88,67 @@ describe Structural::Model do
         model.date_of_birth.should be_a Date
         model.christmas.should be_a Date
       end
+
+      it 'parses the date correctly' do
+        model.date_of_birth.should eql Date.new(1983, 6, 6)
+      end
+
+      it 'parses the time correctly' do
+        model.time_stamp.should eql Time.new(2015, 1, 27, 13, 13, 13, '+00:00')
+      end
     end
   end
 
   describe ".has_one" do
-    it "allows nested models" do
+    it 'allows nested models' do
       model.aliased_model.should be_a NestedModel
     end
-    it "allows nested models" do
+
+    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
+
+    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
+
+    it 'allows recursively defined models' do
       model.test_model.should be_a TestModel
     end
+
+    it 'allows default values as a hash' do
+      model.nested_with_hash_default.name.should eq 'Michael'
+      model.nested_with_hash_default.surname.should be_nil
+    end
+
+    context 'when passing a Proc as a default' do
+      it 'allows the default' do
+        model.nested_with_hash_proc_default.name.should eq 'Michael'
+        model.nested_with_hash_default.surname.should be_nil
+      end
+
+      context 'when the Proc does not return a Hash' do
+        it 'raises an error' do
+          expect {
+            model.nested_with_invalid_proc_default
+          }.to raise_error(Structural::InvalidDefaultTypeError)
+        end
+      end
+    end
+
+    it 'fails if passed a non-hash as default' do
+      expect {
+        model.nested_with_invalid_default
+      }.to raise_error(Structural::InvalidDefaultTypeError)
+    end
+
+    it 'fails for missing associations without defaults' do
+      expect {
+        model.missing_nested_without_default
+      }.to raise_error(Structural::MissingAttributeError)
+    end
   end
 
   describe ".has_many" do

metadata

@@ -1,125 +1,137 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: structural
-version: !ruby/object:Gem::Version
-  version: 0.1.0
+version: !ruby/object:Gem::Version 
+  hash: 23
+  prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
-authors:
+authors: 
 - Russell Dunphy
 - Radek Molenda
 - Jon Doveston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2017-02-20 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: money
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: activesupport
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: yard
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: redcarpet
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: bundler
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 6
+        version: "1.6"
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: A cut down fork of the Id gem developed at On The Beach Ltd.
-email:
+email: 
 - jon.doveston@onthebeach.co.uk
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- ".gitignore"
-- ".ruby-version"
-- ".travis.yml"
+
+files: 
+- .gitignore
+- .ruby-version
+- .travis.yml
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.md
@@ -127,6 +139,7 @@ files:
 - Rakefile
 - lib/structural.rb
 - lib/structural/hashifier.rb
+- lib/structural/invalid_default_type_error.rb
 - lib/structural/missing_attribute_error.rb
 - lib/structural/model.rb
 - lib/structural/model/association.rb
@@ -146,33 +159,43 @@ files:
 - spec/spec_helper.rb
 - structural.gemspec
 homepage: https://github.com/onthebeach/structural
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Simple models based on hashes
-test_files:
+test_files: 
 - spec/lib/structural/model/association_spec.rb
 - spec/lib/structural/model/field_spec.rb
 - spec/lib/structural/model/type_casts_spec.rb
 - spec/lib/structural/model_spec.rb
 - spec/lib/structural/timestamps_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: d2e683ae4dc0a1839b52352576db3fc726201321
-  data.tar.gz: 947df1932b578c7c5e786b2e6baf4463f2d10312
-SHA512:
-  metadata.gz: c4da802d16a95c7d4b5516697fb9c6c76687032686e693830c6c3f8b44a3aa47c3f9adb3ca9341ccf378afafb0e75b118ac186ed612d9ab7fa274efefffcd4a7
-  data.tar.gz: a1f58451da825b7bc071958150407011f743d2ab4411692095b6197a0a3377a749ca6de810170b1098dfa525457e00ff83e398ece251d3d2d7b1088e9dbc5e26