mumuki-text-runner 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff637b59a63ae832dbb1707f9ca1c5fd43a1df4a70531d307626449007e59e1c
-  data.tar.gz: a936a8b9382eb3219615f006fd41b7c2c551b33a5f220bdf087faf6fb8b94770
+  metadata.gz: b2b935fa7c9c7cccead52aa65543db209da093b16779b51944ccf4f5053412d5
+  data.tar.gz: 14ef6d6d43802dcd76008c27d5275452b09b5c668454163fecec74fe7c90304e
 SHA512:
-  metadata.gz: 4ac21ef25b3fb829eb341bde542388285436dccb5f24f99a541579ccf78528ced3d45b2c037124df368fe51d1bdaa018885ea38b32d05871860dda3f3fa35259
-  data.tar.gz: edb1488843f13aa4046ed7d695425067a1069d965119e80cea903da2ca6c0c64e88ba75263af341e656fd975cacf8fac346fb8f5f801b4faed1cc1f7aaedce63
+  metadata.gz: badaa8753e28b572c4adf18559c83f0f1a0ba4797397aa38bd525374be68022771a716c9c09565430ffee2695ee9f3543d2b98ebb46d28d2b3f7384cdb2b146e
+  data.tar.gz: 39c00537548e07b45e900519ff0b5e784a8baa34fd9c0055a2d5b0aac2a6d513ffc8f93470621fd042486034ea37c24e130729a1663c1362a91e5dbcb1286d51

data/lib/checker.rb

@@ -1,17 +1,39 @@
 class TextChecker < Mumukit::Metatest::Checker
-  def self.compare(relation_hash)
-    raise 'Invalid hash arity' if relation_hash.size != 1
-    type = relation_hash.keys.first
-    comparator_class = relation_hash.values.first
-    define_method "check_#{type}".to_sym do |test, config|
-      comparator_class
+  require_relative './comparators/comparator'
+  require_relative './comparators/equality_comparator'
+  require_relative './comparators/contain_comparator'
+  require_relative './comparators/regexp_comparator'
+  require_relative './comparators/valid_ip_comparator'
+
+  require_relative './options/ignore_whitespace'
+  require_relative './options/ignore_case'
+
+  COMPARATORS = {
+    match: TextChecker::RegexpComparator,
+    equal: TextChecker::EqualityComparator,
+    contain: TextChecker::ContainComparator,
+    valid_ip: TextChecker::ValidIpComparator
+  }
+
+  def check_assertion(key, input, config, example)
+    if key == :keys
+      check_keys input, config, example
+    else
+      check_comparators key, input, config
+    end
+  end
+
+  def check_comparators(key, input, config)
+    COMPARATORS[key]
         .new(config.is_a?(Hash) ? config : {expected: config})
-        .compare(test[:source])
+        .compare(input[:source])
         .try { |error| fail error }
-    end
   end
 
-  compare :match => RegexpComparator
-  compare :equal => EqualityComparator
-  compare :contain => ContainComparator
+  def check_keys(input, config, example)
+    source_hash = YAML.load(input[:source]).with_indifferent_access
+      config.each do |subkey, subconfig|
+        check_assertions({source: source_hash[subkey]}, subconfig, example)
+    end
+  end
 end

data/lib/comparators/comparator.rb

@@ -1,21 +1,22 @@
-class Comparator
-  def initialize(opts)
-    @expected = opts[:expected]
-    @error_message = opts[:error]
-    @config = opts
-    setup if respond_to?(:setup, true)
+class TextChecker::Comparator
+  def initialize(config = {})
+    @config = config
   end
 
   def compare(source)
-    @error_message || error_message(source) unless success?(source)
+    @config[:error] || error_message(source) unless success?(transform(source))
+  end
+
+  def expected
+    transform @config[:expected]
   end
 
   private
 
   def modifiers
     modifiers = []
-    modifiers << IgnoreWhitespace if @config[:ignore_whitespace]
-    modifiers << IgnoreCase if @config[:ignore_case]
+    modifiers << TextChecker::IgnoreWhitespace if @config[:ignore_whitespace]
+    modifiers << TextChecker::IgnoreCase if @config[:ignore_case]
     modifiers
   end
 

data/lib/comparators/contain_comparator.rb

@@ -1,11 +1,11 @@
-class ContainComparator < Comparator
-
-  private
+class TextChecker::ContainComparator < TextChecker::Comparator
 
   def success?(source)
-    transform(source).include? transform(@expected)
+    source.include? expected.to_s
   end
 
+  private
+
   def error_message(source)
     I18n.t 'contain.failure', actual: source
   end

data/lib/comparators/equality_comparator.rb

@@ -1,11 +1,11 @@
-class EqualityComparator < Comparator
-
-  private
+class TextChecker::EqualityComparator < TextChecker::Comparator
 
   def success?(source)
-    transform(source) == transform(@expected)
+    source == expected.to_s
   end
 
+  private
+
   def error_message(source)
     I18n.t 'equality.failure', actual: source
   end

data/lib/comparators/regexp_comparator.rb

@@ -1,20 +1,13 @@
-class RegexpComparator < Comparator
-
-  private
+class TextChecker::RegexpComparator < TextChecker::Comparator
 
   def success?(source)
-    !!@expected_regexp.match(source)
+    !!Regexp.new(expected).match(source)
   end
 
-  def setup
-    @expected_regexp = eval_regexp(@expected)
-  end
+  private
+
 
   def error_message(source)
     I18n.t 'expression.failure', actual: source
   end
-
-  def eval_regexp(expression)
-    Regexp.new(expression)
-  end
 end

data/lib/comparators/valid_ip_comparator.rb

@@ -0,0 +1,14 @@
+class TextChecker::ValidIpComparator < TextChecker::Comparator
+
+    def success?(source)
+      !!REGEXP.match(source)
+    end
+
+  private
+
+  REGEXP = /^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/i
+
+  def error_message(source)
+    I18n.t 'valid_ip.failure', actual: source
+  end
+end

data/lib/locales/en.yml

@@ -5,3 +5,5 @@ en:
     failure: '**%{actual}** does not contain the right value.'
   expression:
       failure: '**%{actual}** does not match the expected expression.'
+  valid_ip:
+    failure: '**%{actual}** is not a valid IP address.'

data/lib/locales/es.yml

@@ -4,4 +4,6 @@ es:
   contain:
     failure: '**%{actual}** no contiene el valor correcto.'
   expression:
-      failure: '**%{actual}** no coincide con la expresión correcta.'
+    failure: '**%{actual}** no coincide con la expresión correcta.'
+  valid_ip:
+    failure: '**%{actual}** no es una dirección IP válida.'

data/lib/options/ignore_case.rb

@@ -1,7 +1,5 @@
-module IgnoreCase
-  class << self
-    def apply(text)
-      text.downcase
-    end
+module TextChecker::IgnoreCase
+  def self.apply(text)
+    text.downcase
   end
 end

data/lib/options/ignore_whitespace.rb

@@ -1,7 +1,5 @@
-module IgnoreWhitespace
-  class << self
-    def apply(text)
-      text.delete(' ')
-    end
+module TextChecker::IgnoreWhitespace
+  def self.apply(text)
+    text.delete(' ')
   end
 end

data/lib/text_runner.rb

@@ -12,12 +12,4 @@ require_relative './version_hook'
 require_relative './metadata_hook'
 require_relative './test_hook'
 
-require_relative './comparators/comparator'
-require_relative './comparators/equality_comparator'
-require_relative './comparators/contain_comparator'
-require_relative './comparators/regexp_comparator'
-
-require_relative './options/ignore_whitespace'
-require_relative './options/ignore_case'
-
 require_relative './checker'

data/lib/version_hook.rb

@@ -1,3 +1,3 @@
 module TextVersionHook
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-text-runner
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-27 00:00:00.000000000 Z
+date: 2018-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '2.27'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +120,7 @@ files:
 - lib/comparators/contain_comparator.rb
 - lib/comparators/equality_comparator.rb
 - lib/comparators/regexp_comparator.rb
+- lib/comparators/valid_ip_comparator.rb
 - lib/locales/en.yml
 - lib/locales/es.yml
 - lib/metadata_hook.rb
@@ -148,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Text Runner for Mumuki