monolens 0.5.2 → 0.6.1

data/spec/monolens/test_command.rb

@@ -37,6 +37,10 @@ module Monolens
       [FIXTURES/'map-upcase.lens.yml', FIXTURES/'names.json']
     end
 
+    let(:skip_before) do
+      false
+    end
+
     subject do
       begin
         command.call
@@ -45,6 +49,8 @@ module Monolens
     end
 
     before do
+      next if skip_before
+
       subject
     end
 
@@ -56,6 +62,10 @@ module Monolens
       JSON.parse(stdout.string)
     end
 
+    def reloaded_yaml
+      YAML.load(stdout.string)
+    end
+
     context 'with no option nor args' do
       let(:argv) do
         []
@@ -89,6 +99,47 @@ module Monolens
       end
     end
 
+    context 'when overriding the input file' do
+      let(:argv) do
+        ['--override', FIXTURES/'map-upcase.lens.yml', FIXTURES/'overrides.json']
+      end
+
+      let(:skip_before) do
+        true
+      end
+
+      before do
+        (FIXTURES/'overrides.json').write((FIXTURES/'names.json').read)
+        subject
+      end
+
+      it 'works as expected' do
+        expect(exit_status).to be_nil
+        expect(stdout.string).to be_empty
+        expect((FIXTURES/'overrides.json').load).to eql(['BERNARD', 'DAVID'])
+      end
+    end
+
+    context 'with --stdin instead of a file' do
+      let(:argv) do
+        ['--stdin', FIXTURES/'map-upcase.lens.yml']
+      end
+
+      let(:skip_before) do
+        true
+      end
+
+      before do
+        expect(command).to receive(:read_input).and_return((FIXTURES/'names.json').load)
+        subject
+      end
+
+      it 'works as expected' do
+        expect(exit_status).to be_nil
+        expect(reloaded_json).to eql(['BERNARD', 'DAVID'])
+      end
+    end
+
     context 'with --pretty' do
       let(:argv) do
         ['--pretty'] + file_args
@@ -101,18 +152,145 @@ module Monolens
       end
     end
 
+    context 'with --json' do
+      let(:argv) do
+        ['--json'] + file_args
+      end
+
+      it 'works as expected' do
+        expect(exit_status).to be_nil
+        expect(reloaded_json).to eql(['BERNARD', 'DAVID'])
+      end
+    end
+
+    context 'with --yaml' do
+      let(:argv) do
+        ['--yaml'] + file_args
+      end
+
+      it 'works as expected' do
+        expect(exit_status).to be_nil
+        expect(reloaded_yaml).to eql(['BERNARD', 'DAVID'])
+      end
+    end
+
+    context 'with --yaml and --stream' do
+      let(:argv) do
+        ['--yaml', '--stream'] + file_args
+      end
+
+      it 'works as expected' do
+        expect(exit_status).to be_nil
+        expect(stdout.string.gsub(/\n\.\.\.$/, '')).to eql(<<~YAML)
+        --- BERNARD
+        --- DAVID
+        YAML
+      end
+    end
+
+    context 'with --json and --stream' do
+      let(:argv) do
+        ['--json', '--stream'] + file_args
+      end
+
+      it 'works as expected' do
+        expect(exit_status).to be_nil
+        expect(stdout.string).to eql(<<~JSON)
+        "BERNARD"
+        "DAVID"
+        JSON
+      end
+    end
+
+    context 'with --map' do
+      let(:argv) do
+        ['--map'] + [FIXTURES/'upcase.lens.yml', FIXTURES/'names.json']
+      end
+
+      it 'works as expected' do
+        expect(exit_status).to be_nil
+        expect(reloaded_json).to eql(['BERNARD', 'DAVID'])
+      end
+    end
+
+    context 'with --literal' do
+      let(:argv) do
+        ['--literal'] + [FIXTURES/'literal.yml', FIXTURES/'names.json']
+      end
+
+      it 'works as expected' do
+        expect(exit_status).to be_nil
+        expect(reloaded_json).to eql('Bernard David')
+      end
+    end
+
+    context 'with --literal --map' do
+      let(:argv) do
+        ['--literal', '--map'] + [FIXTURES/'literal2.yml', FIXTURES/'names.json']
+      end
+
+      it 'works as expected' do
+        expect(exit_status).to be_nil
+        expect(reloaded_json).to eql(['Bernard', 'David'])
+      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
     end
 
+    context 'when yielding an error with --on-error=skip' do
+      let(:argv) do
+        ['--map', '--on-error=skip', FIXTURES/'upcase.lens.yml', FIXTURES/'names-with-null.json']
+      end
+
+      it 'works as expected' do
+        expect(exit_status).to be_nil
+        expect(reloaded_json).to eql(['BERNARD', 'DAVID'])
+      end
+    end
+
     context 'when yielding an error on a robust lens' do
       let(:argv) do
         [FIXTURES/'robust-map-upcase.lens.yml', FIXTURES/'names-with-null.json']

data/spec/monolens/test_error_traceability.rb

@@ -41,7 +41,7 @@ describe Monolens, 'error traceability' do
 
   context 'on array.map => object.values' do
     let(:lens) do
-      Monolens.lens('array.map' => { lenses: { 'object.values' => 'str.upcase' } })
+      Monolens.lens('array.map' => { lenses: { 'object.values' => ['str.upcase'] } })
     end
 
     subject do

data/spec/monolens/test_jsonpath.rb

@@ -0,0 +1,88 @@
+require 'spec_helper'
+
+module Monolens
+  describe Jsonpath do
+    def one(path, on)
+      Jsonpath.one(path, on, options)
+    end
+
+    def interpolate(str, on)
+      Jsonpath.interpolate(str, on, options)
+    end
+
+    let(:options) do
+      {}
+    end
+
+    describe 'one' do
+      it 'supports the root object' do
+        got = one('$', { name: 'Monolens' })
+        expect(got).to eql({ name: 'Monolens' })
+      end
+
+      it 'supports simplest expressions' do
+        got = one('$.name', { name: 'Monolens' })
+        expect(got).to eql('Monolens')
+      end
+
+      it 'supports sub accesses' do
+        got = one('$.lib.name', { lib: { name: 'Monolens' } })
+        expect(got).to eql('Monolens')
+      end
+
+      it 'supports array accesses' do
+        got = one('$[0].name', [{ name: 'Monolens' }])
+        expect(got).to eql('Monolens')
+      end
+
+      it 'supports quoted object accesses' do
+        got = one("$['name']", { name: 'Monolens' })
+        expect(got).to eql('Monolens')
+      end
+    end
+
+    describe 'interpolate' do
+      it 'supports simplest expressions' do
+        got = interpolate('Hello $.name', { name: 'Monolens' })
+        expect(got).to eql('Hello Monolens')
+      end
+
+      it 'supports parenthesized expressions' do
+        got = interpolate('Hello $(.name)', { name: 'Monolens' })
+        expect(got).to eql('Hello Monolens')
+      end
+    end
+
+    describe 'use_symbols: false' do
+      let(:options) do
+        { use_symbols: false }
+      end
+
+      it 'works with String keys' do
+        got = one('$.name', { 'name' => 'Monolens' })
+        expect(got).to eql('Monolens')
+      end
+    end
+
+    describe 'changing the root symbol' do
+      let(:options) do
+        { root_symbol: '<' }
+      end
+
+      it 'one keeps working' do
+        got = one('<.name', { name: 'Monolens' })
+        expect(got).to eql('Monolens')
+      end
+
+      it 'interpolate keeps working' do
+        got = interpolate('Hello <.name', { name: 'Monolens' })
+        expect(got).to eql('Hello Monolens')
+      end
+
+      it 'interpolate keeps supporting parentheses' do
+        got = interpolate('Hello <(.name)', { name: 'Monolens' })
+        expect(got).to eql('Hello Monolens')
+      end
+    end
+  end
+end

data/spec/monolens/test_lens.rb

@@ -28,7 +28,7 @@ describe Monolens, '.lens' do
   it 'raises an error if the lens namespace is not known' do
     expect {
       Monolens.lens('nosuchone.tp')
-    }.to raise_error(Monolens::Error, 'No such lens nosuchone.tp')
+    }.to raise_error(Monolens::Error, 'No such namespace nosuchone')
   end
 
   it 'raises an error if the lens is not known' do

data/spec/test_documentation.rb

@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+rx = %r{
+Applying the following lens:
+
+```yaml
+([^`]+)
+```
+
+to the following input:
+
+```yaml
+([^`]+)
+```
+
+will return:
+
+```yaml
+([^`]+)
+```
+}
+
+def yaml_load(input)
+  if YAML.respond_to?(:unsafe_load)
+    YAML.unsafe_load(input)
+  else
+    YAML.load(input)
+  end
+end
+
+Path.dir.parent.glob('documentation/**/*.md') do |file|
+  #next unless file.to_s =~ /literal/
+
+  describe file do
+    matches = file.read.scan(rx)
+
+    if matches.empty?
+      puts "WARN: missing or invalid example in #{file}"
+    else
+      matches.each do |example|
+        lens, input, output = example
+
+        it 'has correct examples' do
+          lens = Monolens.lens(yaml_load(lens))
+          input = yaml_load(input)
+          output = yaml_load(output)
+          expect(lens.call(input)).to eql(output)
+        end
+      end
+    end
+  end
+end

data/spec/test_monolens.rb

@@ -43,4 +43,24 @@ describe Monolens do
       expect(subject.call(input)).to eql(expected)
     end
   end
+
+  context 'on macro.yml' do
+    let(:file){ Path.dir/'fixtures/macro.yml' }
+
+    it 'works' do
+      input = [' Monolens ', ' Finitio ', '  Bmg']
+      expected = 'MONOLENS, FINITIO, BMG'
+      expect(subject.call(input)).to eql(expected)
+    end
+  end
+
+  context 'on recursive.yml' do
+    let(:file){ Path.dir/'fixtures/recursive.yml' }
+
+    it 'fails' do
+      expect {
+        subject
+      }.to raise_error(/No such lens core.join_them/)
+    end
+  end
 end

data/tasks/test.rake

@@ -6,6 +6,6 @@ namespace :test do
     t.rspec_opts = %w[-I. -Ilib -Ispec --pattern=spec/**/test_*.rb --color .]
   end
 
-  task :all => :"unit"
+  task :all => [:unit]
 end
 task :test => :"test:all"

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: monolens
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.1
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-20 00:00:00.000000000 Z
+date: 2022-07-15 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
@@ -68,7 +96,8 @@ dependencies:
         version: '0'
 description: Data transformations inspired by Cambria lenses
 email: blambeau@gmail.com
-executables: []
+executables:
+- monolens
 extensions: []
 extra_rdoc_files: []
 files:
@@ -78,77 +107,118 @@ files:
 - Rakefile
 - bin/monolens
 - lib/monolens.rb
-- lib/monolens/array.rb
-- lib/monolens/array/compact.rb
-- lib/monolens/array/join.rb
-- lib/monolens/array/map.rb
-- lib/monolens/check.rb
-- lib/monolens/check/not_empty.rb
-- lib/monolens/coerce.rb
-- lib/monolens/coerce/date.rb
-- lib/monolens/coerce/date_time.rb
-- lib/monolens/coerce/integer.rb
-- lib/monolens/coerce/string.rb
 - lib/monolens/command.rb
-- lib/monolens/core.rb
-- lib/monolens/core/chain.rb
-- lib/monolens/core/dig.rb
-- lib/monolens/core/mapping.rb
+- lib/monolens/command/tester.rb
 - lib/monolens/error.rb
 - lib/monolens/error_handler.rb
 - lib/monolens/file.rb
+- lib/monolens/jsonpath.rb
 - lib/monolens/lens.rb
 - lib/monolens/lens/fetch_support.rb
 - lib/monolens/lens/location.rb
 - lib/monolens/lens/options.rb
-- lib/monolens/object.rb
-- lib/monolens/object/extend.rb
-- lib/monolens/object/keys.rb
-- lib/monolens/object/rename.rb
-- lib/monolens/object/select.rb
-- lib/monolens/object/transform.rb
-- lib/monolens/object/values.rb
-- lib/monolens/skip.rb
-- lib/monolens/skip/null.rb
-- lib/monolens/str.rb
-- lib/monolens/str/downcase.rb
-- lib/monolens/str/split.rb
-- lib/monolens/str/strip.rb
-- lib/monolens/str/upcase.rb
+- lib/monolens/lens/signature.rb
+- lib/monolens/lens/signature/missing.rb
+- lib/monolens/macros.rb
+- lib/monolens/namespace.rb
+- lib/monolens/registry.rb
+- lib/monolens/stdlib.rb
+- lib/monolens/stdlib/array.rb
+- lib/monolens/stdlib/array/compact.rb
+- lib/monolens/stdlib/array/join.rb
+- lib/monolens/stdlib/array/map.rb
+- lib/monolens/stdlib/check.rb
+- lib/monolens/stdlib/check/not_empty.rb
+- lib/monolens/stdlib/coerce.rb
+- lib/monolens/stdlib/coerce/date.rb
+- lib/monolens/stdlib/coerce/date_time.rb
+- lib/monolens/stdlib/coerce/integer.rb
+- lib/monolens/stdlib/coerce/string.rb
+- lib/monolens/stdlib/core.rb
+- lib/monolens/stdlib/core/chain.rb
+- lib/monolens/stdlib/core/dig.rb
+- lib/monolens/stdlib/core/literal.rb
+- lib/monolens/stdlib/core/mapping.rb
+- lib/monolens/stdlib/object.rb
+- lib/monolens/stdlib/object/allbut.rb
+- lib/monolens/stdlib/object/extend.rb
+- lib/monolens/stdlib/object/keys.rb
+- lib/monolens/stdlib/object/merge.rb
+- lib/monolens/stdlib/object/rename.rb
+- lib/monolens/stdlib/object/select.rb
+- lib/monolens/stdlib/object/transform.rb
+- lib/monolens/stdlib/object/values.rb
+- lib/monolens/stdlib/skip.rb
+- lib/monolens/stdlib/skip/null.rb
+- lib/monolens/stdlib/str.rb
+- lib/monolens/stdlib/str/downcase.rb
+- lib/monolens/stdlib/str/split.rb
+- lib/monolens/stdlib/str/strip.rb
+- lib/monolens/stdlib/str/upcase.rb
+- lib/monolens/type.rb
+- lib/monolens/type/any.rb
+- lib/monolens/type/array.rb
+- lib/monolens/type/boolean.rb
+- lib/monolens/type/callback.rb
+- lib/monolens/type/coercible.rb
+- lib/monolens/type/diggable.rb
+- lib/monolens/type/emptyable.rb
+- lib/monolens/type/integer.rb
+- lib/monolens/type/lenses.rb
+- lib/monolens/type/map.rb
+- lib/monolens/type/object.rb
+- lib/monolens/type/responding.rb
+- lib/monolens/type/strategy.rb
+- lib/monolens/type/string.rb
+- lib/monolens/type/symbol.rb
 - lib/monolens/version.rb
 - spec/fixtures/coerce.yml
+- spec/fixtures/macro.yml
+- spec/fixtures/recursive.yml
 - spec/fixtures/simple.yml
 - spec/fixtures/transform.yml
-- spec/monolens/array/test_compact.rb
-- spec/monolens/array/test_join.rb
-- spec/monolens/array/test_map.rb
-- spec/monolens/check/test_not_empty.rb
-- spec/monolens/coerce/test_date.rb
-- spec/monolens/coerce/test_datetime.rb
-- spec/monolens/coerce/test_integer.rb
-- spec/monolens/coerce/test_string.rb
+- spec/monolens/command/literal.yml
+- spec/monolens/command/literal2.yml
 - spec/monolens/command/map-upcase.lens.yml
 - spec/monolens/command/names-with-null.json
 - spec/monolens/command/names.json
 - spec/monolens/command/robust-map-upcase.lens.yml
-- spec/monolens/core/test_dig.rb
-- spec/monolens/core/test_mapping.rb
+- 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/object/test_extend.rb
-- spec/monolens/object/test_keys.rb
-- spec/monolens/object/test_rename.rb
-- spec/monolens/object/test_select.rb
-- spec/monolens/object/test_transform.rb
-- spec/monolens/object/test_values.rb
-- spec/monolens/skip/test_null.rb
-- spec/monolens/str/test_downcase.rb
-- spec/monolens/str/test_split.rb
-- spec/monolens/str/test_strip.rb
-- spec/monolens/str/test_upcase.rb
+- spec/monolens/lens/test_signature.rb
+- spec/monolens/stdlib/array/test_compact.rb
+- spec/monolens/stdlib/array/test_join.rb
+- spec/monolens/stdlib/array/test_map.rb
+- spec/monolens/stdlib/check/test_not_empty.rb
+- spec/monolens/stdlib/coerce/test_date.rb
+- spec/monolens/stdlib/coerce/test_datetime.rb
+- spec/monolens/stdlib/coerce/test_integer.rb
+- spec/monolens/stdlib/coerce/test_string.rb
+- spec/monolens/stdlib/core/test_dig.rb
+- spec/monolens/stdlib/core/test_literal.rb
+- spec/monolens/stdlib/core/test_mapping.rb
+- spec/monolens/stdlib/object/test_allbut.rb
+- spec/monolens/stdlib/object/test_extend.rb
+- spec/monolens/stdlib/object/test_keys.rb
+- spec/monolens/stdlib/object/test_merge.rb
+- spec/monolens/stdlib/object/test_rename.rb
+- spec/monolens/stdlib/object/test_select.rb
+- spec/monolens/stdlib/object/test_transform.rb
+- spec/monolens/stdlib/object/test_values.rb
+- spec/monolens/stdlib/skip/test_null.rb
+- spec/monolens/stdlib/str/test_downcase.rb
+- spec/monolens/stdlib/str/test_split.rb
+- spec/monolens/stdlib/str/test_strip.rb
+- spec/monolens/stdlib/str/test_upcase.rb
 - spec/monolens/test_command.rb
 - spec/monolens/test_error_traceability.rb
+- spec/monolens/test_jsonpath.rb
 - spec/monolens/test_lens.rb
 - spec/spec_helper.rb
+- spec/test_documentation.rb
 - spec/test_monolens.rb
 - spec/test_readme.rb
 - tasks/gem.rake
@@ -172,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

data/lib/monolens/core.rb

@@ -1,23 +0,0 @@
-module Monolens
-  module Core
-    def chain(parts)
-      Chain.new(parts)
-    end
-    module_function :chain
-
-    def dig(options)
-      Dig.new(options)
-    end
-    module_function :dig
-
-    def mapping(options)
-      Mapping.new(options)
-    end
-    module_function :mapping
-
-    Monolens.define_namespace 'core', self
-  end
-end
-require_relative 'core/chain'
-require_relative 'core/dig'
-require_relative 'core/mapping'