appfuel 0.5.12 → 0.5.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0364e623e6f2573b4c821a242437a15b6085718
-  data.tar.gz: b9231f2ba15988e210b61a68fcd60eeff9c7e631
+  metadata.gz: 9042cb7e13be9707fd722aa2fd93103b573c8194
+  data.tar.gz: 3c37b1b8ce0dd9f390628d1132a2678142562056
 SHA512:
-  metadata.gz: f211340b01ed7b283b2d0999822021f85689a0c92bce670c2340238b7ea9f8e159913aaded2c258253c41b5c17bcb0a4ab229dbe395c5ee63cda7f1fdbe12057
-  data.tar.gz: 42fdce54686c9a8f11e7a791a4f0db2935d24bd8a52690f6270b19874122eda216f9013d1e8c30214907dab97ce0771b7d7a962550878fbd8f36a1e25d4473fc
+  metadata.gz: c98a4ec95b9ecffc0d92a5cf3911b694524318376ea78b4cdc4fe1367c1e3d9e013fe5d1279e405ffae2af0617cec4623f84adb756d29b7f74947f95c5a38d3e
+  data.tar.gz: 9584eb1c0f2d96c2296565ed0725e1f0d5da2ddfeeaaacd1d4963ce359919c8dd18225792c41c2d91d0d664a968ea36ec1b0c90c21eb2d385a12744a2f2a3cf4

data/CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file. (Pending ap
 
 
 # Releases
+## [[0.5.12]](https://github.com/rsb/appfuel/releases/tag/0.5.13) 2017-08-01
+### Fixed
+- when you override an entity attribute it fails to initialize when value is
+  undefined
+
 ## [[0.5.12]](https://github.com/rsb/appfuel/releases/tag/0.5.12) 2017-07-31
 ### Fixed
 - `dynamodb adapter` `index` does not check for existing prefix

data/lib/appfuel/domain/entity.rb

@@ -189,17 +189,12 @@ module Appfuel
       end
 
       def initialize_value(key, type, input)
-        if (input == Types::Undefined || input == nil) && type.default?
-          input = type[nil]
-        end
-        # manual overrides have to manually type check themselves
-        setter = "#{key}="
-        return send(setter, input) if respond_to?(setter)
-
-        if input != Types::Undefined && input != nil
-          input = type[input]
+        input = handle_default_value(input, type)
+        if respond_to?("#{key}=")
+          return handle_defined_setter(key, input)
         end
 
+        input = type_check_value(type, input)
         instance_variable_set("@#{key}", input)
       rescue => e
         msg   = "#{domain_name} could not assign :#{key} #{e.message}"
@@ -208,6 +203,30 @@ module Appfuel
         raise error
       end
 
+      def handle_defined_setter(key, input)
+        return if undefined?(input)
+        send("#{key}=", input)
+      end
+
+      def handle_default_value(input, type)
+        return input unless type.default?
+        if undefined?(input) || input.nil?
+          return type[nil]
+        end
+        input
+      end
+
+      def type_check_value(type, input)
+        if !undefined?(input) && !input.nil?
+          input = type[input]
+        end
+        input
+      end
+
+      def setter_defined?(key)
+        respond_to?("#{key}=")
+      end
+
       def define_getter(key)
         return if respond_to?(key)
         define_singleton_method(key) do
@@ -232,6 +251,10 @@ module Appfuel
       end
 
 
+      def undefined?(value)
+        Types::Undefined
+      end
+
       def is_entity?(value, type)
         value.respond_to?(:domain_name) && value.domain_name == type.domain_name
       end

data/lib/appfuel/version.rb

@@ -1,3 +1,3 @@
 module Appfuel
-  VERSION = "0.5.12"
+  VERSION = "0.5.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appfuel
 version: !ruby/object:Gem::Version
-  version: 0.5.12
+  version: 0.5.13
 platform: ruby
 authors:
 - Robert Scott-Buccleuch
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord