data_steroid 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1ea709eb2675cbdd294ab7d4e55977e918488d0
-  data.tar.gz: 3eec8d55cdd716cb92de5110b8fe85f8f2d6c59b
+  metadata.gz: 59842d190176ed422fb4baa089f77b1dbb2ba9cf
+  data.tar.gz: 02c1e18b97161ead5132dd70eedeff68c497f6f2
 SHA512:
-  metadata.gz: 175d002dac45ff1aa456ee6fe96de540e2dc95f28845287dee63ec9c15ea517a9195e03cb7b0afa821a92280a496601165c29c06d80172f6ab8405e9be474007
-  data.tar.gz: 9cf46386c6b0c24f1bf703d5866a49f2adde8556028d4d0a86c560f4b151382e000b6f2194d1045e0e22be7cca1ebb2d117af1a5e96c7c7eb404caffc800f7a7
+  metadata.gz: fcccfc7abdd22fc883a8f9057b0f93e1a1090c68f95ccab24def10b70f43c0bdf592404c6433e0f19102a3a0f223fa17f9bf23f2853256373c53d76f44df7519
+  data.tar.gz: 351c9e24e803548c9171840cfa22e7d7d790a8d0b2eb84be0942169590fd52c4efa50562a3e35de7fd7373c0280c037c5cbae55d7e6c9b57022b6893953e741b

data/lib/data_steroid/properties.rb

@@ -102,9 +102,13 @@ module DataSteroid
     class_methods do
       protected
 
+      # Type might be defined like this:
+      #   property :time_field, Time, default: -> { Time.now }
+      # or like this:
+      #   property :time_field, type: Time, default: -> { Time.now }
       def add_property(name, *args)
-        options = args[-1].is_a?(Hash) ? args[-1].slice(:default) : {}
-        options[:type] = args[0] if args[0]
+        options = args[-1].is_a?(Hash) ? args[-1] : {}
+        options[:type] = args[0] if args[0] && !(args[0].is_a?(Hash) && args[0].key?(:default))
         properties[name.to_s] = options
         create_accessors(name, options)
         self

data/lib/data_steroid/version.rb

@@ -1,5 +1,5 @@
 module DataSteroid
   # version string
   # @api public
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_steroid
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Fabio Tomio