mumuki-text-runner 1.1.0 → 1.2.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZGJhYTFkYjAyOGRiZDZmMWQxMjcyZGIwNjU5OTVlNjRkZmMwZDlkZA==
-  data.tar.gz: !binary |-
-    N2JkZmE5ZDRhYzY1YzM5MDZjNGJkMmRhNzM3MDM0ZjIxZTYwNjlkMA==
+SHA256:
+  metadata.gz: ff637b59a63ae832dbb1707f9ca1c5fd43a1df4a70531d307626449007e59e1c
+  data.tar.gz: a936a8b9382eb3219615f006fd41b7c2c551b33a5f220bdf087faf6fb8b94770
 SHA512:
-  metadata.gz: !binary |-
-    YzIwYTQ3OTYyY2Q0MzVhZmY4OTliNzE0YmI0ZWVlN2RlZTdmOTBkNzJjYjMx
-    YzIxMDkxZWI1MWU4MjVjNzcyZWIxMDcwYmQzMjk3ZmQ2ODdkYzI5NWU4MWU5
-    N2VhYmUxYzJiM2U2OTgxYzEzMGQ2ZmQ0MjlhZDg5NzRlODk0MGM=
-  data.tar.gz: !binary |-
-    YzVmZDZiMGNiOTAxZjY4NWVjMGRkNGNlYzQ0NzM2YTRlYmVkYTE1YTVjNGNm
-    YjBiN2Q1MWJlNjNjNWU1ZmM5NDcwODc5NDcxZTRhNDgzODBjYmFkM2UxYTVh
-    YTEzZWM1NDdlMDdhNDNjNTNhZDRlOWI1ZDJiOGU0YTJiNDRhYjQ=
+  metadata.gz: 4ac21ef25b3fb829eb341bde542388285436dccb5f24f99a541579ccf78528ced3d45b2c037124df368fe51d1bdaa018885ea38b32d05871860dda3f3fa35259
+  data.tar.gz: edb1488843f13aa4046ed7d695425067a1069d965119e80cea903da2ca6c0c64e88ba75263af341e656fd975cacf8fac346fb8f5f801b4faed1cc1f7aaedce63

data/lib/checker.rb

@@ -1,7 +1,17 @@
 class TextChecker < Mumukit::Metatest::Checker
-  def check_equal(test, config)
-    actual = test[:source]
-    comparer = EqualityComparer.new(config)
-    fail comparer.locale_error_message unless comparer.satisfies?(actual)
+  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
+        .new(config.is_a?(Hash) ? config : {expected: config})
+        .compare(test[:source])
+        .try { |error| fail error }
+    end
   end
+
+  compare :match => RegexpComparator
+  compare :equal => EqualityComparator
+  compare :contain => ContainComparator
 end

data/lib/comparators/comparator.rb

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

data/lib/comparators/contain_comparator.rb

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

data/lib/comparators/equality_comparator.rb

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

data/lib/comparators/regexp_comparator.rb

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

data/lib/locales/en.yml

@@ -1,3 +1,7 @@
 en:
   equality:
     failure: '**%{actual}** is not the right value.'
+  contain:
+    failure: '**%{actual}** does not contain the right value.'
+  expression:
+      failure: '**%{actual}** does not match the expected expression.'

data/lib/locales/es.yml

@@ -1,3 +1,7 @@
 es:
   equality:
     failure: '**%{actual}** no es el valor correcto.'
+  contain:
+    failure: '**%{actual}** no contiene el valor correcto.'
+  expression:
+      failure: '**%{actual}** no coincide con la expresión correcta.'

data/lib/metadata_hook.rb

@@ -1,13 +1,13 @@
 class TextMetadataHook < Mumukit::Hook
   def metadata
     { language: {
-      name: 'text',
-      icon: { type: 'devicon', name: 'code' },
-      extension: 'txt',
-      test_framework: {
         name: 'text',
-        test_extension: 'yml'
-      }
+        icon: { type: 'devicon', name: 'code' },
+        extension: 'txt',
+        test_framework: {
+            name: 'text',
+            test_extension: 'yml'
+        }
     } }
   end
 end

data/lib/test_hook.rb

@@ -2,7 +2,7 @@ require 'mumukit/hook'
 
 class TextTestHook < Mumukit::Hook
   def compile(request)
-    {source: request[:content].strip, examples: parse_test(request[:test])}
+    { source: request[:content].strip, examples: parse_test(request[:test]) }
   end
 
   def run!(test_definition)
@@ -23,15 +23,14 @@ class TextTestHook < Mumukit::Hook
     else
       parse_single_scenario_test(parsed_test)
     end
-
   end
 
   def parse_single_scenario_test(parsed_test)
-    [{name: 'test',
-      postconditions: {equal: {
-        expected: parsed_test['equal'],
-        ignore_case: parsed_test['ignore_case'].present?,
-        ignore_whitespace: parsed_test['ignore_whitespace'].present?}}
+    [{ name: 'test',
+       postconditions: { equal: {
+           expected: parsed_test['equal'],
+           ignore_case: parsed_test['ignore_case'].present?,
+           ignore_whitespace: parsed_test['ignore_whitespace'].present? } }
      }]
   end
 

data/lib/text_runner.rb

@@ -8,11 +8,16 @@ Mumukit.configure do |config|
   config.content_type = 'markdown'
 end
 
+require_relative './version_hook'
 require_relative './metadata_hook'
 require_relative './test_hook'
 
-require_relative './checker'
+require_relative './comparators/comparator'
+require_relative './comparators/equality_comparator'
+require_relative './comparators/contain_comparator'
+require_relative './comparators/regexp_comparator'
 
-require_relative './comparers/equality_comparer'
 require_relative './options/ignore_whitespace'
 require_relative './options/ignore_case'
+
+require_relative './checker'

data/lib/version_hook.rb

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

metadata

@@ -1,99 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: mumuki-text-runner
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-12 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mumukit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mumukit-bridge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '3.1'
 description: 
 email:
 - franco@mumuki.org
@@ -102,7 +116,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/checker.rb
-- lib/comparers/equality_comparer.rb
+- lib/comparators/comparator.rb
+- lib/comparators/contain_comparator.rb
+- lib/comparators/equality_comparator.rb
+- lib/comparators/regexp_comparator.rb
 - lib/locales/en.yml
 - lib/locales/es.yml
 - lib/metadata_hook.rb
@@ -110,6 +127,7 @@ files:
 - lib/options/ignore_whitespace.rb
 - lib/test_hook.rb
 - lib/text_runner.rb
+- lib/version_hook.rb
 homepage: http://github.com/mumuki/mumuki-text-server
 licenses:
 - MIT
@@ -120,17 +138,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Text Runner for Mumuki

data/lib/comparers/equality_comparer.rb

@@ -1,29 +0,0 @@
-class EqualityComparer
-  def initialize(config)
-    opts = config
-    opts = { expected: config } unless config.is_a? Hash
-    @expected = opts[:expected]
-    parse_options(opts)
-  end
-
-  def satisfies?(source)
-    @actual = transform(source)
-    @actual == transform(@expected)
-  end
-
-  def locale_error_message
-    I18n.t 'equality.failure', actual: @actual
-  end
-
-  private
-
-  def transform(source)
-    @modifiers.inject(source) { |text, modifier| modifier.apply(text) }
-  end
-
-  def parse_options(config)
-    @modifiers = []
-    @modifiers << IgnoreWhitespace if config[:ignore_whitespace]
-    @modifiers << IgnoreCase if config[:ignore_case]
-  end
-end