val 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9247cdb7fe4d2b3a94295af7b84796bab9cd79b2
-  data.tar.gz: eac3b09428e4dc6ba85899ff2654c22c12e5763f
+  metadata.gz: e559084125a92229a00c3246d741fa71bb48cf8b
+  data.tar.gz: 4f1c1546d4735de70bc66f83402f9f092a17ac4a
 SHA512:
-  metadata.gz: 062e46a526133f70db1bffa87b4d0c765f61de4bc511738f4ba1b7753060bb626488e4b9aa8de340e05bf0333e412ecd453e839e3f2e1ae492923d6878f6a9f0
-  data.tar.gz: 9489c6a848da693fc028ae4a4c5579c0a9c3b329f40e17df79d3c5af3811f5320e2c5aadc6cd8827b647dcc3abfb5ee300a405077ee34fbea1e2aef17a4698a5
+  metadata.gz: 1165ae24e8e37316a5e33006980eccc368a4d3e7bb860fb8596b65ae28b6685a904f19a3509fe7d0b466091bcc13d5839ebf44ed32bd3f6189b3133ab3a70f26
+  data.tar.gz: cd434a87fb8e363a16a1a1de9b567cc1aa5e9303eba6a6ead4bf354a2fed06690eb0ae85c71233fcdb07093de5c22969b483fd03699950b937b6e870edd843c5

data/lib/val.rb

@@ -1,55 +1,39 @@
 class Val
   module DSL
-    def OR *all
-      Op::OR[*all]
-    end
-    
     def val &block
       self.class.new &block
     end
     
-    def key name, *conditions
-      first = conditions.first
-    
-      if [Module, Val, NilClass].any? &[first, :is_a?]
-        type = first
-        @conditions << Key.new(name, type)
-      else
-        @conditions.concat conditions.map { |array|
-          ArrayCondition.new name, array
-        }
-      end
+    
+    def is array
+      @claims << Claim.new(array)
     end
     
     def is_a type
-      condition = -> value { value.is_a? type }
-      @conditions << condition
+      is [:is_a?, type]
     end
     
-    def is array
-      condition = -> value {
-        begin
-          array.to_proc === value
-        rescue TypeError, ArgumentError
-          false
-        end
-      }
-      @conditions << condition
+    def key name, *conditions
+      conditions = [NotNil] if conditions.empty?
+      @claims += conditions.map { |condition| Key.new name, condition }
     end
     
-    def m name
-      condition = -> value {
-        value.respond_to? name
-      }
-      @conditions << condition
+    
+    def OR *values
+      claim = -> it { values.any? &[:===, it] }
+      @claims << claim
     end
-  end
-
-  module Op
-    OR = -> *values do
-      -> value do
-        values.any? &[:===, value]
-      end
+    
+    def NOT question
+      claim = -> it { not it.send question }
+      @claims << claim
+    end
+    
+    
+    def m name, &block
+      message = Message.new name
+      message.instance_exec &block if block_given?
+      @claims << message
     end
   end
 
@@ -58,46 +42,237 @@ class Val
   include DSL
   
   def initialize &block
-    @conditions = []
-    result = instance_exec &block
-    if @conditions.empty?
-      condition = result
-      @conditions << condition
-    end
+    @claims = []
+    instance_exec &block if block_given?
+  end
+  
+  attr_reader :claims
+  
+  def to_val
+    self
   end
   
   def === value
-    @conditions.all? &[:===, value]
+    claims.all? &[:===, value]
+  end
+  
+  def [] value
+    Instance.new self, value
   end
   
   Bool = new { OR(true, false) }
+  NotNil = new { NOT :nil? }
 
-  class ArrayCondition
-    def initialize name, array
-      @name, @proc = name, array.to_proc
+  class Claim
+    def initialize array
+      @array = array
+      @proc = array.to_proc
+    end
+    
+    def proc
+      @proc
+    end
+    
+    def to_a
+      @array
     end
     
     def === value
-      @proc === value[@name]
-    rescue ArgumentError
-      false
+      self[value].ok?
+    end
+    
+    def [] value
+      Instance.new self, value
+    end
+    
+    class Instance
+      attr_reader :type, :value, :error
+    
+      def initialize type, value
+        @type, @value = type, value
+        @ok = type.proc === value
+      rescue
+        @error = $!
+        @ok = false
+      end
+    
+      def ok?
+        @ok
+      end
+    end
+  end
+
+  module CoreExt
+    class ::Object
+      def to_val
+        type = Val.new
+        type.is [self, :===]
+        type
+      end
+    end
+    
+    class ::Array
+      def to_val
+        type = Val.new
+        type.is self
+        type
+      end
+    end
+  end
+
+  class Instance
+    def initialize type, value
+      @claims = type.claims.map &[value]
+      @ok = @claims.all? &:ok?
+    
+      set_all_instances_of_type Key::Instance
+      set_all_instances_of_type Message::Instance
+    
+      @type, @value = type, value
+    end
+    
+    
+    attr_reader :claims, :type, :value
+    attr_reader :keys, :messages,
+      :present_keys, :missing_keys,
+      :present_messages, :missing_messages
+    
+    
+    def m name
+      messages[name]
+    end
+    
+    def key key
+      keys[key]
     end
+    
+    
+    def ok?
+      @ok
+    end
+    
+    private
+      def set_all_instances_of_type type
+        instances = @claims.grep type
+        plural_name = "#{type.name.split('::')[1].downcase}s"
+    
+        unless instances.empty?
+          instance_variable_set :"@#{plural_name}",
+            instances.map { |instance| [instance.name, instance] }.to_h
+    
+          present_instances, missing_instances = instances.partition &:ok?
+          instance_variable_set :"@present_#{plural_name}", present_instances.map(&:name)
+          instance_variable_set :"@missing_#{plural_name}", missing_instances.map(&:name)
+        end
+      end
   end
 
   class Key
-    def initialize name, type
-      @name, @type = name, type
+    attr_reader :name, :type
+    
+    def initialize name, condition
+      @name, @type = name, condition.to_val
     end
     
     def === value
-      value.respond_to?(:[]) && value[@name] && valid_type?(value[@name])
+      self[value].ok?
+    end
+    
+    def [] it
+      Instance.new self, it
+    end
+    
+    class Instance
+      attr_reader :type, :name, :value, :error
+    
+      def initialize key, it
+        @name, @type = key.name, key.type
+        @value = it[@name]
+    
+        @ok = @type === @value
+      rescue
+        @error = $!
+        @ok = false
+      end
+    
+      def ok?
+        @ok
+      end
+    end
+  end
+
+  class Message
+    def initialize name
+      @name = name
+      @arrows = []
+    end
+    
+    attr_reader :name, :arrows
+    
+    def arrow &block
+      @arrows << Arrow.new(@name, &block)
     end
     
-    def valid_type? name
-      if @type
-        @type === name
-      else
-        true
+    def === value
+      self[value].ok?
+    end
+    
+    def [] value
+      Instance.new self, value
+    end
+    
+    class Arrow
+      def initialize name, &block
+        @name = name
+        instance_exec &block if block_given?
+      end
+    
+      attr_reader :name, :input, :expected_output
+    
+      def from *all
+        @input = all
+      end
+    
+      def to one
+        @expected_output = one
+      end
+    
+      def [] value
+        Instance.new self, value
+      end
+    
+      class Instance
+        def initialize type, value
+          @actual_output = value.send type.name, *type.input
+          @ok = @actual_output == type.expected_output
+        rescue
+          @error = $!
+        end
+    
+        attr_reader :error
+    
+        def ok?
+          @ok
+        end
+      end
+    end
+    
+    class Instance
+      def initialize type, value
+        @name = type.name
+        @available = value.respond_to? @name
+        @arrows = type.arrows.map &[value]
+        @ok = @available && @arrows.all?(&:ok?)
+      end
+    
+      attr_reader :name, :arrows
+    
+      def available?
+        @available
+      end
+    
+      def ok?
+        @ok
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: val
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Anatoly Chernow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-08 00:00:00.000000000 Z
+date: 2017-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: to_proc
@@ -50,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Validate values of Ruby objects.