evt-validate 0.3.1.5 → 0.4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e3e1a1fde821b71c368e1e4242b2f47b12d7a946
-  data.tar.gz: 77cf00ea476c194c064b3812d752045e95248755
+SHA256:
+  metadata.gz: c4007f5c5b6c47b27fb02f00385666d2dbb8e4a7c94462df15b3dc9c962e721a
+  data.tar.gz: c33abd287c42e13184c3bcce29be9be0435a6bef70331518739706d13a0561e8
 SHA512:
-  metadata.gz: 2516f350c561ce3cc7aa99e10670ae7b952f57c50ea94ff135ebe72c292d7b072813c319aee531ca9b06728d757dfb2f72bad5c8d7f1a442fa791277991cb0c9
-  data.tar.gz: d5ecde2e546e169c6e797701a6fa6b4748163e7a96e4021cc69f8fcd6bf1497fd5994232b695ed8c97e83a4eb2e5e70b12b95b0d970ec6b58217298936ce5e89
+  metadata.gz: fa2d75dca4d0c483cd400dd39c12ea6b610dccb03f727cfc820594759588e0bc32270169405ba7b8efa3c64b14d725b545e490a1702b6ef7e0af0b4f8a438efc
+  data.tar.gz: 567fabcb67cd490de52377cd73a5b4893b20249bb5f450e5eec2fcd1b2d7c3a594a5f68aad311364bd4f0b3a6b5a054c77bb7e73a70e4236c04c8d821d7df93f

data/lib/validate.rb

@@ -1 +1,3 @@
+require 'reflect'
+
 require 'validate/validate'

data/lib/validate/controls.rb

@@ -1,3 +1,5 @@
+require 'validate/controls/validate/default'
+require 'validate/controls/validate/scenarios'
 require 'validate/controls/validator/default'
 require 'validate/controls/validator/state'
 require 'validate/controls/validator/not_boolean_result'

data/lib/validate/controls/validate/default.rb

@@ -0,0 +1,19 @@
+module Validate
+  module Controls
+    module Validate
+      module Default
+        def self.example
+          Example.new
+        end
+
+        class Example
+          module Validate
+            def self.call(subject)
+              true
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/validate/controls/validate/scenarios.rb

@@ -0,0 +1,37 @@
+ module Validate
+  module Controls
+    module Validate
+      module Scenarios
+        def self.example
+          Example.new
+        end
+
+        class Example
+          module Validate
+            def self.some_scenario
+              SomeScenario
+            end
+
+            def self.some_other_scenario
+              SomeOtherScenario
+            end
+
+            module SomeScenario
+              def self.call(subject, state)
+                state << :some_scenario
+                false
+              end
+            end
+
+            module SomeOtherScenario
+              def self.call(subject, state)
+                state << :some_other_scenario
+                true
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/validate/validate.rb

@@ -1,28 +1,66 @@
 module Validate
   extend self
 
-  class Error < RuntimeError; end
+  Error = Class.new(RuntimeError)
 
   def call(subject, state=nil, scenario: nil, scenarios: nil)
-    validator = validator(subject)
-
     if scenarios.nil?
       scenarios = scenario
     end
-    scenarios = Array(scenarios)
+    scenario_names = Array(scenarios)
+
+    validator_reflection = validator_reflection(subject)
 
-    if scenarios.empty?
-      validate(validator, subject, state)
+    if scenario_names.empty?
+      validator = validator_reflection.constant
+      validate(validator_reflection.constant, subject, state)
     else
-      validate_scenarios(validator, subject, state, scenarios)
+      validate_scenarios(validator_reflection, subject, state, scenario_names)
     end
   end
 
-  def validate_scenarios(validator, subject, state, scenarios)
+  def validator_reflection(subject)
+    subject_constant = Reflect.subject_constant(subject)
+
+    validator_name = validator_name(subject_constant)
+
+    if validator_name.nil?
+      raise Error, "#{subject_constant.name} doesn't have a Validate or Validator namespace"
+    end
+
+    Reflect.(subject, validator_name, strict: true)
+  end
+
+  def validator_name(subject_constant)
+    if validate_const?(subject_constant)
+      return :Validate
+    elsif validator_const?(subject_constant)
+      return :Validator
+    else
+      return nil
+    end
+  end
+
+  def validate_const?(subject_constant)
+    Reflect.constant?(subject_constant, :Validate)
+  end
+
+  def validator_const?(subject_constant)
+    Reflect.constant?(subject_constant, :Validator)
+  end
+
+  def validate_scenarios(validator_reflection, subject, state, scenario_names)
     result = true
-    scenarios.each do |scenario|
-      scenario_validator = scenario(validator, scenario)
-      result = result & validate(scenario_validator, subject, state)
+    scenario_names.each do |scenario_name|
+      scenario_reflection = validator_reflection.get(scenario_name, strict: false)
+
+      if scenario_reflection.nil?
+        raise Error, "#{validator_reflection.constant.name} doesn't have a `#{scenario_name}' scenario accessor"
+      end
+
+      validator = scenario_reflection.constant
+
+      result = result & validate(validator, subject, state)
     end
 
     result
@@ -49,48 +87,4 @@ module Validate
 
     result
   end
-
-  def validator(subject)
-    subject_const = subject_const(subject)
-
-    assure_validator(subject_const)
-    get_validator(subject_const)
-  end
-
-  def subject_const(subject)
-    [Module, Class].include?(subject.class) ? subject : subject.class
-  end
-
-  def assure_validator(subject_const)
-    unless validator_const?(subject_const)
-      raise Error, "#{subject_const.name} doesn't have a `Validator' namespace"
-    end
-  end
-
-  def validator_const?(subject_const)
-    subject_const.const_defined?(:Validator)
-  end
-
-  def get_validator(subject_const)
-    subject_const.const_get(:Validator)
-  end
-
-  def scenario(validator, scenario)
-    assure_scenario(validator, scenario)
-    get_scenario(validator, scenario)
-  end
-
-  def assure_scenario(validator, scenario)
-    unless scenario_method?(validator, scenario)
-      raise Error, "#{validator.name} doesn't have a `#{scenario}' scenario method"
-    end
-  end
-
-  def scenario_method?(validator, scenario)
-    validator.respond_to?(scenario)
-  end
-
-  def get_scenario(validator, scenario)
-    validator.public_send(scenario)
-  end
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: evt-validate
 version: !ruby/object:Gem::Version
-  version: 0.3.1.5
+  version: 0.4.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-01 00:00:00.000000000 Z
+date: 2018-04-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: evt-reflect
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test_bench
   requirement: !ruby/object:Gem::Requirement
@@ -34,6 +48,8 @@ files:
 - lib/validate/controls.rb
 - lib/validate/controls/no_scenario_accessor.rb
 - lib/validate/controls/no_validator.rb
+- lib/validate/controls/validate/default.rb
+- lib/validate/controls/validate/scenarios.rb
 - lib/validate/controls/validator/default.rb
 - lib/validate/controls/validator/not_boolean_result.rb
 - lib/validate/controls/validator/scenario.rb
@@ -60,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Interface and protocol for validating and validation discovery