d_struct 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6840c5eae09929cb404d64d4ec3dd2b1e938319
-  data.tar.gz: b5f360621350357630d59731b41eb633a0a7d245
+  metadata.gz: 44d2409d6e32c4db67d6177a56e95256c0a72d41
+  data.tar.gz: 111559d2c1675f950ea5efee6b4a2334eef1e9dc
 SHA512:
-  metadata.gz: 558a57a25c18473e104a4a8584247689ab118341c0a6614a71abd217cebf9b6de994ffdebd07dd8d345928071f459c2c9e3b8514db80764b316d03226f700f1a
-  data.tar.gz: 050007957695b98443da669bfefac051ea780ae3afeb9f9a227e49acf6fe65fe976124f13582e75a75c96e4e9a60b9c660f58afa4de6acc401f7a9af45bd2d2f
+  metadata.gz: 74076d4f0a020913f7e15290a33e4f13ca9192313b353947887e7f7fbf1e764488d8f58f6002c21b02d907c2eb104cce41c5854ea41adc4af678590c5bf8e13a
+  data.tar.gz: 4068d291ffa1438324dc838996e4402e22c0d41d36f986989878459d69af6b3f74c2a89c146dd6a132dac8bf6f9a903c8936cb3319332722c62f95129a90e6e2

data/README.md

@@ -16,10 +16,17 @@
     key(:arr).required(:array?)
   end
   
-  # initialize with hash
-  struct = MyStruct.new({string: 'abc', int: 123, bool: true, arr: [1]})
+  # initialize without casting
+  struct = MyStruct.new({string: '123', int: 123, bool: true, arr: [1], date: Date.today})
   struct.add_validation_schema MyValidationSchema
-  puts struct.to_h   # => {string: 'abc', int: 123, bool: true, arr: [1]}
+  puts struct.to_h   # => {string: '123', int: 123, bool: true, arr: [1], #<Date: 2016-03-22 ...>}
+  puts struct.valid? # => true
+  puts struct.errors # => {}
+  
+  # initialize with casting
+  struct = MyStruct.new({string: 123, int: '123', bool: 'true', arr: 1, date: '2016-03-22'})
+  struct.add_validation_schema MyValidationSchema
+  puts struct.to_h   # => {string: '123', int: 123, bool: true, arr: [1], #<Date: 2016-03-22 ...>}
   puts struct.valid? # => true
   puts struct.errors # => {}
   
@@ -44,7 +51,7 @@
   # multiple schemas
   Schema1 = Dry::Validation.Schema{key(:string).required(:str?)}
   Schema2 = Dry::Validation.Schema{key(:int).required(:int?)}
-  struct = MyStruct.new({string: 'abc', int: 123})
+  struct = MyStruct.new({string: '123', int: 123})
   struct.add_validation_schema Schema1, Schema2
   puts struct.valid? # => true
 ```

data/lib/d_struct/d_struct.rb

@@ -9,8 +9,9 @@ module DStruct
       @attributes_readers   = attributes_hash.values.flatten
       @string_attributes    = attributes_hash[:strings]   || []
       @integer_attributes   = attributes_hash[:integers]  || []
-      @booleans_attributes  = attributes_hash[:booleans]  || []
-      @array_attributes     = attributes_hash[:arrays]  || []
+      @boolean_attributes  = attributes_hash[:booleans]   || []
+      @array_attributes     = attributes_hash[:arrays]    || []
+      @date_attributes      = attributes_hash[:dates]     || []
 
       # generate readers
       attr_reader *@attributes_readers
@@ -19,7 +20,7 @@ module DStruct
       @string_attributes.each do |string_attr|
         define_method "#{string_attr}=" do |str_arg|
           value = str_arg.to_s
-          instance_variable_set("@#{string_attr}", str_arg)
+          instance_variable_set("@#{string_attr}", value)
           @to_h[string_attr] = value
         end
       end
@@ -32,13 +33,10 @@ module DStruct
         end
       end
 
-      @booleans_attributes.each do |boolean_attr|
+      @boolean_attributes.each do |boolean_attr|
         define_method "#{boolean_attr}=" do |boolean_arg|
-          value = case boolean_arg
-                  when TrueClass  then true
-                  when FalseClass then false
-                  else nil
-                  end
+          value = !!boolean_arg
+          value = nil if boolean_arg.nil?
           instance_variable_set("@#{boolean_attr}", value)
           @to_h[boolean_attr] = value
         end
@@ -51,6 +49,14 @@ module DStruct
           @to_h[arr_attr] = value
         end
       end
+
+      @date_attributes.each do |date_attr|
+        define_method "#{date_attr}=" do |date_arg|
+          value = (Date.parse(date_arg.to_s) rescue nil)
+          instance_variable_set("@#{date_attr}", value)
+          @to_h[date_attr] = value
+        end
+      end
     end
 
     def add_validation_schema(*schema)
@@ -76,6 +82,7 @@ module DStruct
       @errors ||= @validation_schemas.flatten.reduce({}){|errors, schema| errors.update(schema.call(to_h).messages)}
     end
 
+    # call once, it is cached in @errors
     def valid?
       errors.empty?
     end

data/lib/d_struct/version.rb

@@ -1,3 +1,3 @@
 module DStruct
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: d_struct
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Damir Roso
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-19 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler