ethos 0.2.0.beta15 → 0.2.0.beta16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4004a378fc014fe0520a7aad3c6e1f7a54f6c20d
-  data.tar.gz: bc94babcb920eb31b9b0688e67d97070dff813fd
+  metadata.gz: 30021531347aa3283fa03db99b755239d3a847cf
+  data.tar.gz: 1274e0cd1da645983056901612dcd7f5d98494fe
 SHA512:
-  metadata.gz: d6f5ffdff1f91775a6f790c8128fd755f334ceca215f654e481dc1a6c80ec9976f0212d6efb52e2aab5e70e449d737d504ef8afe0940c30d7281c5d9e1962732
-  data.tar.gz: 550df24d7388d397c8e7b87ef3e57043568b570d05432490d13460ef3e4b50948b085ab3247272f3cdde31ceb64c332c8ca3a23d524231be4a45807f36470e1c
+  metadata.gz: 17c0daf1764105d5547db68b695cfeeb28ac45c37b59338ea8042ddb9b00925a17717cefef6959a298b4474e726fcd7b24fcfd1e66965a49eb173608bef55968
+  data.tar.gz: 263c37452568386b36c15659c7888bec2d9ee1430333b9d2dddaed4eed1f2cd75a0bd4cf60c8ff75ad7895c1eda5908f40d559f0c5f8ef86a9d84a7fb18be7ed

data/lib/ethos/attributes.rb

@@ -28,14 +28,20 @@ module Ethos
 
     def [](key)
       memoize key do
-        type = schema.attributes[key][:type]
+        scheme = schema.attributes[key]
+        value = current[key]
 
-        raw = current[key]
-        raw = schema.attributes[key][:nothing] if raw.nil?
+        type = scheme[:type]
 
-        value = Ethos::Type.cast raw, type
+        if value.nil?
+          nothing = scheme[:nothing]
 
-        schema.attributes[key][:extensions].each do |extension|
+          value = nothing.is_a?(Proc) ? nothing.call : nothing
+        end
+
+        value = Ethos::Type.cast value, type
+
+        scheme[:extensions].each do |extension|
           value.instance_eval &extension
         end
 

data/lib/ethos/version.rb

@@ -1,3 +1,3 @@
 module Ethos
-  VERSION = '0.2.0.beta15'
+  VERSION = '0.2.0.beta16'
 end

data/spec/ethos/entity.rb

@@ -99,6 +99,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ethos
 version: !ruby/object:Gem::Version
-  version: 0.2.0.beta15
+  version: 0.2.0.beta16
 platform: ruby
 authors:
 - Erol Fornoles
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Lightweight entity library for Ruby