ethos 0.2.0.beta10 → 0.2.0.beta11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19ef51a80ed7e8e3fb2045448dc275aaa4ea5681
-  data.tar.gz: 646c11a4562490daf0e42c7bba3955b652b59aff
+  metadata.gz: 99cd1b8a90c428cda94c068cd4d4a5d870e7a99e
+  data.tar.gz: cb33a0ce5ba5e44949ee83be7a474447e2de73fc
 SHA512:
-  metadata.gz: 33752ccbcfd4ffebec355244b0705cff6151077066dfb2f40bc2206d74c21cd70b4430f55b65983487b52de57bbcb8ae6790878da7d2fffe1c655b98b2aadf48
-  data.tar.gz: 55cbd2c752db32f19830105c09cb5bef80cf2b308069ca43b933afd6a21740ef095db38628ad35a1f641a0fb08c8ba7e6ac2f0883530436773b615362550f787
+  metadata.gz: 3d118062efe920c99f05d5dcc89d0fc66d5e1ef68594d1af2a642314b851a545674b8bbb23d032aa852f9d4cd845593a612cafe916fbe5b360e56dc1dd0e5ba0
+  data.tar.gz: 014147ee67124c927f940cfd594f00e608699576c55b8172071af0cadadb966e6a2ccb49346c958a0abdb6fde7148c2c54142c34d17886f29a84311b40ce8885

data/lib/ethos/attributes.rb

@@ -32,7 +32,12 @@ module Ethos
 
     def [](key)
       memoize key do
-        value = Ethos::Type.cast current[key], schema.attributes[key][:type]
+        type = schema.attributes[key][:type]
+
+        raw = current[key]
+        raw = schema.attributes[key][:nothing] if raw.nil?
+
+        value = Ethos::Type.cast raw, type
 
         schema.attributes[key][:extensions].each do |extension|
           value.instance_eval &extension

data/lib/ethos/entity.rb

@@ -9,8 +9,8 @@ module Ethos
         @_schema ||= Ethos::Schema.new
       end
 
-      def attribute(key, type, default: nil, &extension)
-        schema.define key, type, default: default, extensions: [extension].compact
+      def attribute(key, type, default: nil, nothing: nil, &extension)
+        schema.define key, type, default: default, nothing: nothing, extensions: [extension].compact
 
         reader = :"#{key}"
         writer = :"#{key}="
@@ -25,7 +25,7 @@ module Ethos
       end
 
       def collection(key, type)
-        attribute key, Ethos::Collection, default: []
+        attribute key, Ethos::Collection, nothing: []
 
         schema.attributes[key][:extensions].push Proc.new { self.type = type }
       end

data/lib/ethos/schema.rb

@@ -8,10 +8,11 @@ module Ethos
       @_defaults ||= {}
     end
 
-    def define(key, type, default: nil, extensions: [])
+    def define(key, type, default: nil, nothing: nil, extensions: [])
       attributes[key] = {
         type: type,
         default: default,
+        nothing: nothing,
         extensions: extensions
       }
 

data/lib/ethos/version.rb

@@ -1,3 +1,3 @@
 module Ethos
-  VERSION = '0.2.0.beta10'
+  VERSION = '0.2.0.beta11'
 end

data/spec/ethos/entity.rb

@@ -71,6 +71,34 @@ scope do
   end
 end
 
+scope do
+  setup do
+    class Entity
+      prepend Ethos::Entity
+
+      attribute :value, Integer, nothing: 1
+    end
+  end
+
+  spec do
+    entity = Entity.new
+
+    asserts(entity.value) == 1
+  end
+
+  spec do
+    entity = Entity.new value: nil
+
+    asserts(entity.value) == 1
+  end
+
+  spec do
+    entity = Entity.new value: 2
+
+    asserts(entity.value) == 2
+  end
+end
+
 scope do
   setup do
     class Entity

data/spec/ethos/schema.rb

@@ -8,7 +8,7 @@ scope do
   end
 
   spec do
-    asserts(schema.attributes[:value]) == {type: Integer, default: nil, extensions: []}
+    asserts(schema.attributes[:value]) == {type: Integer, default: nil, nothing: nil, extensions: []}
   end
 
   spec do
@@ -22,7 +22,7 @@ scope do
   end
 
   spec do
-    asserts(schema.attributes[:value]) == {type: Integer, default: 1, extensions: []}
+    asserts(schema.attributes[:value]) == {type: Integer, default: 1, nothing: nil, extensions: []}
   end
 
   spec do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ethos
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta10
+  version: 0.2.0.beta11
 platform: ruby
 authors:
 - Erol Fornoles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler