altair 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0902fce40d561d547f971d15c31b80c550b5d5468b7e7c64626e5a5575036893'
-  data.tar.gz: a6f21dfa539d694e8dc990d07cb5c686d4d404cdf9bbf4d5bfeebadc07b3c66b
+  metadata.gz: 13d64e2a23cad244436c6240bc23bdcbdd2cf8bc7103ccdb69c81dab9a2302ab
+  data.tar.gz: 664e4188da6eca6eb6b2c500b53fe483a23531f25ab8e05def994a108c3d5ba1
 SHA512:
-  metadata.gz: f0456b48dd5bb4e6d8e5f0f778154249275157a483ed6397da64b16af2410017923f9d2768e2f7d13a3fd9727e5d41b6a067c594b84f03d418535efc64168454
-  data.tar.gz: 7cc62af703ef1425ab49bde4fd903aaca715cc77826416cf633a6153488d5bad32dc01489d564f87b7a290a06cbf63db09584f6157ddd2e7a8185a52faa7dbec
+  metadata.gz: b4b6766b3c0153246fb9c4dd0796d0bf8835953da282c7c764b43fd22fb0e490ef0aa7c6a68cada8d594f231d53fc7ae7a10f2b96207a1a710cdaf022f36028a
+  data.tar.gz: dbb23aecc815dde06aeb09b7f63727c1efef2f9f5deed0f101658a46076a166ec2071841864d3aad7265b0cad51447fe8190fcbacfbea672eb2ca53c2646c8d4

data/lib/altair.rb

@@ -1,6 +1,7 @@
 require 'boolean'
 require 'altair/field'
 require 'altair/document'
+require 'altair/schema'
 require 'altair/validation_error'
 require 'altair/conversion_error'
 
@@ -18,6 +19,7 @@ module Altair
 
   def default_validators
     {
+      required: Proc.new { |flag, value| flag == !value.nil? },
       min: Proc.new { |bound, value| bound <= value },
       max: Proc.new { |bound, value| value <= bound },
       more_than: Proc.new { |bound, value| bound < value },

data/lib/altair/document.rb

@@ -4,19 +4,30 @@ module Altair
   class Document < IndifferentHash
     attr_accessor :fields
   
-    def initialize(fields, data = {})
+    def initialize(fields, data = IndifferentHash.new)
       @fields = fields
   
       fields.each do |key, field|
         case field
         when Hash
           define_singleton_method(:"#{key}") { get(key) }
-          self[key] = Document.new(field, data[key] || {})
+          self[key] = Document.new(field, data[key] || IndifferentHash.new)
         when Field
           define_singleton_method(:"#{key}") { get(key) }
           define_singleton_method(:"#{key}=") { |value| set(key, value) }
-  
-          set(key, data[key])
+        end
+      end
+
+      apply(data)
+    end
+
+    def apply(data)
+      data.each do |key, value|
+        case fields[key]
+        when Hash
+          self[key].apply data[key]
+        when Field
+          set(key, value)
         end
       end
     end
@@ -28,5 +39,16 @@ module Altair
     def set(key, value)
       self[key] = fields[key].parse! value
     end
+
+    def validate! (options = {})
+      fields.each do |key, field|
+        case field
+        when Hash
+          self[key].validate! options
+        when Field
+          field.validate! self[key], options
+        end
+      end
+    end
   end
 end

data/lib/altair/field.rb

@@ -11,15 +11,15 @@ module Altair
       @options = options
     end
   
-    def parse!(value)
-      validate! begin
-        Altair.converter[value.class][type].call(value)
+    def parse!(value, args = {})
+      begin
+        resolve_proc(Altair.converter[value.class][type], value)
       rescue
         raise ConversionError.new(type, value)
       end
     end
 
-    def validate!(value)
+    def validate!(value, args = {})
       Altair.validators.each do |name, validator|
         if options.has_key? name
           raise ValidationError.new(name, value) unless validator.call(resolve_proc(options[name]), value)

data/lib/altair/schema.rb

@@ -0,0 +1,27 @@
+require 'altair'
+require 'indifferent-hash'
+
+module Altair
+  class Schema < IndifferentHash
+    def initialize(fields)
+      Schema.parse fields, self
+    end
+
+    def self.parse(fields, result = IndifferentHash.new)
+      fields.each do |key, field|
+        result[key] = case field
+        when Hash
+          if field.has_key? :type
+            Altair::Field.new(field)
+          else
+            parse field
+          end
+        else
+          Altair::Field.new(type: field)
+        end
+      end
+
+      result
+    end
+  end
+end

data/lib/utils.rb

@@ -1,7 +1,7 @@
-def resolve_proc(value)
+def resolve_proc(value, *args)
   case value
   when Proc
-    value.call
+    value.call(*args)
   else
     value
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: altair
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Felipe Cabrera
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2019-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: indifferent-hash
@@ -34,6 +34,7 @@ files:
 - lib/altair/conversion_error.rb
 - lib/altair/document.rb
 - lib/altair/field.rb
+- lib/altair/schema.rb
 - lib/altair/validation_error.rb
 - lib/boolean.rb
 - lib/utils.rb