monolens 0.6.0 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 836c097ee70c9517d08ce544cbd1cd9b600a846b
-  data.tar.gz: 1af2f7a32e00bef2e3d69a0451f94c367e83d5d6
+SHA256:
+  metadata.gz: e0de27df8fbe83531b35a1b3c4b92d94669108ef10f17df849d9127a07698ad2
+  data.tar.gz: abf82eebdd9511578b0cd73524430335f9b9c8ecb60fe74598eec3e6c0d5f5e5
 SHA512:
-  metadata.gz: dd6e356d995c5e1d28b9f46491abec5a95ccaa8f1efaa463600dbe4b146a97ad5ef56ecb19b69be000c24f91a4bb74afde5cbf0ce15ebcda8fd9b7b262e72e53
-  data.tar.gz: e78d2ce7b2cfc47d83bd53ae179b1ae29d24c9edc78a131b1d2b085ab6a1d35cf2cdb3edccca256c58a937510b7d0de4440847a15b56e2d288ff2e5e9b0140a9
+  metadata.gz: 3909ab4f03d872d0083884ddea46e3d2546caeef268c83e1145204789050c89e34cd219161a672e07a5b34727c40f21a23be501b85ea7aaed2dd9c1eb54abf66
+  data.tar.gz: 394d89daddae630912035d43eefc6ab1a591a45eee3b305b203983cc40c673ad83feb65a3c9510d9a6534311f5c70af7726c83356a64cc6c35a4d2e6949512ee

data/lib/monolens/command/tester.rb

@@ -0,0 +1,95 @@
+require 'minitest'
+require 'paint'
+module Monolens
+  class Command
+    class Tester
+      include Minitest::Assertions
+
+      def initialize(command)
+        @command = command
+        @nb_tests = 0
+        @nb_successes = 0
+        @nb_errors = 0
+        @nb_failures = 0
+        Paint.mode = command.use_paint? ? Paint.detect_mode : 0
+      end
+      attr_accessor :nb_tests, :nb_successes, :nb_errors, :nb_failures
+
+      def call(lens)
+        fail!("No tests found (#{lens.class})") unless lens.is_a?(Monolens::File)
+
+        self.nb_tests = lens.examples.size
+        details = []
+        lens.examples.each_with_index do |example, i|
+          test_one(lens, example, i, details)
+        end
+
+        stdout.puts("\n")
+        stdout.puts("\n") unless details.empty?
+        details.each do |message|
+          stdout.puts(message)
+        end
+
+        success = nb_errors == 0 && nb_failures == 0
+        stdout.puts(success ? green(last_sentence) : red(last_sentence))
+
+        do_exit(1) unless success
+      end
+
+    private
+
+      def last_sentence
+        sentence = "\n"
+        sentence << plural('test', nb_tests) << ". "
+        sentence << plural('success', nb_successes) << ", "
+        sentence << plural('failure', nb_failures) << ", "
+        sentence << plural('error', nb_errors) << "."
+      end
+
+      def test_one(lens, example, i, details = [])
+        input, output = example[:input], example[:output]
+        result = lens.call(input)
+        if result == output
+          self.nb_successes += 1
+          stdout.print(green ".")
+        else
+          self.nb_failures += 1
+          stdout.print(red "F")
+          details << "Failure on example #{1+i}:\n#{diff output, result}"
+        end
+      rescue Monolens::Error => ex
+        self.nb_errors += 1
+        stdout.print("E")
+        details << "Error on example #{1+i}: #{ex.message}"
+      end
+
+      def green(s)
+        Paint[s, :green]
+      end
+
+      def red(s)
+        Paint[s, :red]
+      end
+
+      def plural(who, nb)
+        if nb > 1
+          "#{nb} #{who}s"
+        else
+          "#{nb} #{who}"
+        end
+      end
+
+      [
+        :stdout,
+        :stderr,
+        :do_exit,
+        :fail!
+      ].each do |name|
+        define_method(name) do |*args, &bl|
+          @command.send(name, *args, &bl)
+        end
+      end
+
+    end
+  end
+end

data/lib/monolens/command.rb

@@ -16,14 +16,21 @@ module Monolens
       @stream = false
       @fail_strategy = 'fail'
       @override = false
+      @execute_tests = false
       #
       @input_file = nil
       @use_stdin = false
+      #
+      @use_paint = true
     end
     attr_reader :argv, :stdin, :stdout, :stderr
     attr_reader :pretty, :stream, :override
     attr_reader :enclose_map, :fail_strategy
     attr_reader :input_file, :use_stdin
+    attr_reader :use_paint
+    alias :use_paint? :use_paint
+    attr_reader :execute_tests
+    alias :execute_tests? :execute_tests
 
     def self.call(argv, stdin = $stdin, stdout = $stdout, stderr = $stderr)
       new(argv, stdin, stdout, stderr).call
@@ -31,21 +38,30 @@ module Monolens
 
     def call
       lens, @input_file = options.parse!(argv)
-      show_help_and_exit if lens.nil? || (@input_file.nil? && !use_stdin)
+      show_help_and_exit if lens.nil? || (@input_file.nil? && !use_stdin && !execute_tests?)
 
-      lens_data, input = read_file(lens), read_input
-      lens = build_lens(lens_data)
-      error_handler = ErrorHandler.new
-      result = lens.call(input, error_handler: error_handler)
+      lens = build_lens(read_file(lens))
+      if execute_tests?
+        execute_tests!(lens)
+      else
+        input = read_input
+        error_handler = ErrorHandler.new
+        result = lens.call(input, error_handler: error_handler)
 
-      unless error_handler.empty?
-        stderr.puts(error_handler.report)
-      end
+        unless error_handler.empty?
+          stderr.puts(error_handler.report)
+        end
 
-      output_result(result) if result
+        output_result(result) if result
+      end
     rescue Monolens::LensError => ex
       stderr.puts("[#{ex.location.join('/')}] #{ex.message}")
-      do_exit(-2)
+      do_exit(1)
+    end
+
+    def execute_tests!(lens)
+      require_relative 'command/tester'
+      Tester.new(self).call(lens)
     end
 
     def read_input
@@ -130,6 +146,12 @@ module Monolens
         opts.on('--override', 'Write output back to the input file') do
           @override = true
         end
+        opts.on('--test', 'Execute tests embedded in the lens file') do
+          @execute_tests = true
+        end
+        opts.on('--[no-]paint', 'Do (not) paint error messages') do |flag|
+          @use_paint = flag
+        end
       end
     end
 
@@ -150,7 +172,7 @@ module Monolens
             }
           }
         end
-      end
+      end unless execute_tests?
       Monolens.lens(lens_data)
     end
 

data/lib/monolens/file.rb

@@ -6,10 +6,15 @@ module Monolens
       version: [Type::Any, true],
       macros: [Type::Map.of(Type::Name, Type::Any), false],
       lenses: [Type::Lenses, true],
+      examples: [Type::Array.of(Type::Map.of(Type::Name, Type::Any)), false],
     })
 
     def call(arg, world = {})
       option(:lenses).call(arg, world)
     end
+
+    def examples
+      option(:examples, [])
+    end
   end
 end

data/lib/monolens/stdlib/core/mapping.rb

@@ -8,12 +8,18 @@ module Monolens
         values: [Type::Object, false],    # deprecated
         default: [Type::Any, false],
         fallback: [Type::Callback, false],
+        key_hash: [Type::Lenses, false],
         on_missing: [Type::Strategy.missing(%w{default fail fallback keep null}), false]
       })
 
       def call(arg, world = {})
+        original_arg = arg
+        if key_hash = option(:key_hash, nil)
+          arg = key_hash.call(arg, world)
+        end
+
         option(:defn, option(:values, {})).fetch(arg) do
-          on_missing(arg, world)
+          on_missing(original_arg, world)
         end
       end
 

data/lib/monolens/version.rb

@@ -2,7 +2,7 @@ module Monolens
   module Version
     MAJOR = 0
     MINOR = 6
-    TINY  = 0
+    TINY  = 2
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

data/spec/monolens/command/test-ko-complex.yml

@@ -0,0 +1,15 @@
+---
+version: '1.0'
+lenses:
+- array.map:
+    lenses:
+    - core.literal:
+        defn:
+          name: $.name
+examples:
+- input:
+  - name: Monolens
+  - name: Bmg
+  output:
+  - name: Monolens
+  - name: BMG

data/spec/monolens/command/test-ko.lens.yml

@@ -0,0 +1,13 @@
+---
+version: '1.0'
+lenses:
+- str.upcase
+examples:
+- input:
+    Monolens
+  output:
+    Monolens
+- input:
+    Monolens
+  output:
+    MONOLENS

data/spec/monolens/command/test-ok.lens.yml

@@ -0,0 +1,9 @@
+---
+version: '1.0'
+lenses:
+- str.upcase
+examples:
+- input:
+    Monolens
+  output:
+    MONOLENS

data/spec/monolens/stdlib/core/test_mapping.rb

@@ -21,6 +21,47 @@ describe Monolens, 'core.mapping' do
     end
   end
 
+  context 'with key_hash option' do
+    let(:mapping) do
+      {
+        'key_hash' => 'str.downcase',
+        'defn' => { 'todo' => 'open' }
+      }
+    end
+
+    subject do
+      Monolens.lens('core.mapping' => mapping)
+    end
+
+    it 'replaces the value by its mapped' do
+      expect(subject.call('todo')).to eql('open')
+    end
+
+    it 'uses the key_hash before looking for mapping' do
+      expect(subject.call('TODO')).to eql('open')
+    end
+
+    it 'raises if not found' do
+      expect {
+        subject.call('nosuchone')
+      }.to raise_error(Monolens::LensError)
+    end
+
+    context 'with on_missing: keep' do
+      subject do
+        Monolens.lens('core.mapping' => mapping.merge('on_missing' => 'keep'))
+      end
+
+      it 'keeps it if missing' do
+        expect(subject.call('nosuchone')).to eql('nosuchone')
+      end
+
+      it 'keeps the original one, not the key_hashed one' do
+        expect(subject.call('NOSUCHONE')).to eql('NOSUCHONE')
+      end
+    end
+  end
+
   context 'on_missing: default' do
     subject do
       Monolens.lens('core.mapping' => mapping.merge('on_missing' => 'default', 'default' => 'foo'))

data/spec/monolens/test_command.rb

@@ -235,13 +235,46 @@ module Monolens
       end
     end
 
+    context 'with --paint --test (ignoring --map, --literal)' do
+      let(:argv) do
+        ['--map', '--literal', '--paint', '--test', FIXTURES/'test-ok.lens.yml']
+      end
+
+      it 'works as expected' do
+        expect(stdout.string).to match(/1 test. 1 success, 0 failure, 0 error./)
+        expect(exit_status).to be_nil
+      end
+    end
+
+    context 'with --no-paint --test' do
+      let(:argv) do
+        ['--no-paint', '--test', FIXTURES/'test-ok.lens.yml']
+      end
+
+      it 'works as expected' do
+        expect(stdout.string).to eql(".\n\n1 test. 1 success, 0 failure, 0 error.\n")
+        expect(exit_status).to be_nil
+      end
+    end
+
+    context 'with --no-paint --test with failures' do
+      let(:argv) do
+        ['--no-paint', '--test', FIXTURES/'test-ko.lens.yml']
+      end
+
+      it 'works as expected' do
+        expect(stdout.string).to eql("F.\n\nFailure on example 1:\nExpected: \"Monolens\"\n  Actual: \"MONOLENS\"\n\n2 tests. 1 success, 1 failure, 0 error.\n")
+        expect(exit_status).to eql(1)
+      end
+    end
+
     context 'when yielding an error' do
       let(:argv) do
         [FIXTURES/'map-upcase.lens.yml', FIXTURES/'names-with-null.json']
       end
 
       it 'works as expected' do
-        expect(exit_status).to eql(-2)
+        expect(exit_status).to eql(1)
         expect(stdout.string).to eql('')
         expect(stderr.string).to eql("[1] String expected, got NilClass\n")
       end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: monolens
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.2
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-08 00:00:00.000000000 Z
+date: 2022-09-29 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.16'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.16'
+- !ruby/object:Gem::Dependency
+  name: paint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +108,7 @@ files:
 - bin/monolens
 - lib/monolens.rb
 - lib/monolens/command.rb
+- lib/monolens/command/tester.rb
 - lib/monolens/error.rb
 - lib/monolens/error_handler.rb
 - lib/monolens/file.rb
@@ -154,6 +183,9 @@ files:
 - spec/monolens/command/names-with-null.json
 - spec/monolens/command/names.json
 - spec/monolens/command/robust-map-upcase.lens.yml
+- spec/monolens/command/test-ko-complex.yml
+- spec/monolens/command/test-ko.lens.yml
+- spec/monolens/command/test-ok.lens.yml
 - spec/monolens/command/upcase.lens.yml
 - spec/monolens/lens/test_options.rb
 - spec/monolens/lens/test_signature.rb
@@ -210,8 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Data transformations inspired by Cambria lenses