d_struct 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6322dce3ef90ced40580ed199de3b4bd7a956f54
-  data.tar.gz: db08338cebec0db8b7a0514ea4f6ed294159fed6
+  metadata.gz: a6840c5eae09929cb404d64d4ec3dd2b1e938319
+  data.tar.gz: b5f360621350357630d59731b41eb633a0a7d245
 SHA512:
-  metadata.gz: d46d82dfbdd681acf51542621dad92fd425f7e4a202c5e29e0f8d1615ac7c08d41c76d3ac105c2f3a892458036f3ff61993eb33d485720c5749568bb5e79c59c
-  data.tar.gz: 65c7277fd77a7e87cd66172183d5416c70952c70998b27ee431b737e7b2dca86d8997f0116baa081b711447cf4b60f950de6b52baa309436520876bd1993b813
+  metadata.gz: 558a57a25c18473e104a4a8584247689ab118341c0a6614a71abd217cebf9b6de994ffdebd07dd8d345928071f459c2c9e3b8514db80764b316d03226f700f1a
+  data.tar.gz: 050007957695b98443da669bfefac051ea780ae3afeb9f9a227e49acf6fe65fe976124f13582e75a75c96e4e9a60b9c660f58afa4de6acc401f7a9af45bd2d2f

data/README.md

@@ -25,18 +25,28 @@
   
   # unknown key
   struct = MyStruct.new({unknown_key: '123'})
+  struct.add_validation_schema MyValidationSchema
   puts struct.valid? # => false
   puts struct.errors # => {unknown_key: 'unknown key'}
   
   # missing keys
   struct = MyStruct.new({})
+  struct.add_validation_schema MyValidationSchema
   puts struct.valid? # => false
   puts struct.errors # => {:string=>["is missing"], :int=>["is missing"], :bool=>["is missing"], :arr=>["is missing"]}
   
   # invalid values
   struct = MyStruct.new({string: nil, int: nil, bool: nil, arr: nil})
+  struct.add_validation_schema MyValidationSchema
   puts struct.valid? # => false
   puts struct.errors # => {:string=>["must be filled"], :int=>["must be filled"], :bool=>["must be filled"], :arr=>["must be filled"]}
+  
+  # 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.add_validation_schema Schema1, Schema2
+  puts struct.valid? # => true
 ```
 
 ## Installation

data/lib/d_struct/d_struct.rb

@@ -4,7 +4,6 @@ module DStruct
   class DStruct
 
     attr_reader :to_h
-    attr_accessor :validation_schema
 
     def self.attributes(attributes_hash)
       @attributes_readers   = attributes_hash.values.flatten
@@ -54,12 +53,13 @@ module DStruct
       end
     end
 
-    def add_validation_schema(schema)
-      @validation_schema = schema
+    def add_validation_schema(*schema)
+      @validation_schemas << schema
     end
 
     def initialize(attributes_hash)
       @to_h = {}
+      @validation_schemas = []
       attributes_hash.each do |k,v|
         begin
           send("#{k}=", v)
@@ -71,9 +71,9 @@ module DStruct
     end
 
     def errors
-      return @errors if @errors           # unknown key
-      return {} unless validation_schema  # no schema
-      @errors ||= validation_schema.call(to_h).messages
+      return @errors if @errors               # unknown key
+      return {} if @validation_schemas == []  # no schemas
+      @errors ||= @validation_schemas.flatten.reduce({}){|errors, schema| errors.update(schema.call(to_h).messages)}
     end
 
     def valid?

data/lib/d_struct/version.rb

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

metadata

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