frise 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86558df34daa0ba92e7e7a1863ceb5124ea52c39dc82a85924c4db1bd89cf127
-  data.tar.gz: fd286367be54e292a6df52daa6f5255810d6e3980bce538d0c2391d5fdab9ca9
+  metadata.gz: 68f89536d127f91e812a1c23258ad32ca3d4331970c9af0632cb3f95fce06e52
+  data.tar.gz: 129230d3c50d29a25f4e060bfdf4e839d19aa579607c6bead51acf6237ac9c20
 SHA512:
-  metadata.gz: c48f86d8190c30bf650055dfa7749ecdf9d2545f4a6c34593c29e402c0da06dd5420eb8244c3f112f8501564a5bf26798acae2fbeb006c10bb1c4eb5dc4e7c1a
-  data.tar.gz: 679a4edb6364662160f4e1d6872c8949e3fd6338433da50de5a109addec0a31dec69b3013ca4038fbb40283383b15f160ecf4723c546dea53ab6a8d75db6f77c
+  metadata.gz: 61f5a83ff2ba3e17ae022dbac6639fa3a316c4739685ed3cec8634a9a12789dd280c4373763bdebea85d82821b02856327df0df6fbb423d55affb8010252ec64
+  data.tar.gz: bc65274a574e25cdbe6142bd7bc2dbe7d6d9275143c211987845dc916156ebe2f0d3ff5739490ea177b67157545b6c5c4aef0a96bbe6dfbaa6f9061c35fcfd73

data/.github/workflows/CI.yml

@@ -0,0 +1,40 @@
+name: CI
+
+on: [ push, pull_request ]
+
+jobs:
+  test:
+
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ 2.6, 2.7, 3 ]
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Install dependencies
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake
+      - name: Coveralls Parallel
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.github_token }}
+          flag-name: ${{ matrix.ruby }}
+          parallel: true
+
+  finish:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      - name: Coveralls Finished
+        uses: coverallsapp/github-action@master
+        with:
+          github-token: ${{ secrets.github_token }}
+          parallel-finished: true

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: '2.3'
+  NewCops: enable
 Layout/EmptyLineAfterGuardClause:
   Enabled: false
 Metrics:

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 0.5.1 (March 28, 2022)
+
+- Breaking changes
+  - Increase minimum required ruby version to 2.6.0 ([#22](https://github.com/velocidi/frise/pull/22)).
+- Bug fixes
+  - Fix YAML.safe_load call arguments error in ruby 3.1 ([#26](https://github.com/velocidi/frise/pull/26)).
+
 ### 0.4.1 (July 7, 2020)
 
 - New features

data/frise.gemspec

@@ -18,14 +18,15 @@ Gem::Specification.new do |spec|
     f.match(%r{^(test|spec|features|example)/})
   end
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.3.0'
+  spec.required_ruby_version = '>= 2.6.0'
 
   spec.add_dependency 'liquid', '~> 4.0'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'coveralls', '~> 0.8'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.9'
-  spec.add_development_dependency 'rubocop', '0.77.0'
-  spec.add_development_dependency 'simplecov', '~> 0.16'
+  spec.add_development_dependency 'rubocop', '~> 1.10'
+  spec.add_development_dependency 'simplecov', '~> 0.18'
+  spec.add_development_dependency 'simplecov-lcov', '0.8.0'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 end

data/lib/frise/defaults_loader.rb

@@ -10,21 +10,20 @@ module Frise
   class DefaultsLoader
     SYMBOLS = %w[$all $optional].freeze
 
-    def initialize(include_sym: '$include', content_include_sym: '$content_include', schema_sym: '$schema', delete_sym: '$delete')
+    def initialize(
+      include_sym: '$include',
+      content_include_sym: '$content_include',
+      schema_sym: '$schema',
+      delete_sym: '$delete'
+    )
+
       @include_sym = include_sym
       @content_include_sym = content_include_sym
       @schema_sym = schema_sym
       @delete_sym = delete_sym
     end
 
-    def widened_class(obj)
-      class_name = obj.class.to_s
-      return 'String' if class_name == 'Hash' && !obj[@content_include_sym].nil?
-      return 'Boolean' if %w[TrueClass FalseClass].include? class_name
-      return 'Integer' if %w[Fixnum Bignum].include? class_name
-      class_name
-    end
-
+    # rubocop:disable Lint/DuplicateBranch
     def merge_defaults_obj(config, defaults)
       config_class = widened_class(config)
       defaults_class = widened_class(defaults)
@@ -35,7 +34,8 @@ module Frise
       elsif config.nil?
         if defaults_class != 'Hash' then defaults
         elsif defaults['$optional'] then nil
-        else merge_defaults_obj({}, defaults)
+        else
+          merge_defaults_obj({}, defaults)
         end
 
       elsif config == @delete_sym
@@ -60,12 +60,13 @@ module Frise
 
       elsif defaults_class != config_class
         raise "Cannot merge config #{config.inspect} (#{widened_class(config)}) " \
-          "with default #{defaults.inspect} (#{widened_class(defaults)})"
+              "with default #{defaults.inspect} (#{widened_class(defaults)})"
 
       else
         config
       end
     end
+    # rubocop:enable Lint/DuplicateBranch
 
     def merge_defaults_obj_at(config, at_path, defaults)
       at_path.reverse.each { |key| defaults = { key => defaults } }
@@ -81,5 +82,15 @@ module Frise
       defaults = Parser.parse(defaults_file, symbol_table) || {}
       merge_defaults_obj_at(config, at_path, defaults)
     end
+
+    private
+
+    def widened_class(obj)
+      class_name = obj.class.to_s
+      return 'String' if class_name == 'Hash' && !obj[@content_include_sym].nil?
+      return 'Boolean' if %w[TrueClass FalseClass].include? class_name
+      return 'Integer' if %w[Fixnum Bignum].include? class_name
+      class_name
+    end
   end
 end

data/lib/frise/loader/lazy.rb

@@ -12,11 +12,9 @@ module Frise
         @__target_object__ ||= @callable.call
       end
 
-      # rubocop:disable Style/MethodMissingSuper
       def method_missing(method_name, *args, &block)
         __target_object__.send(method_name, *args, &block)
       end
-      # rubocop:enable Style/MethodMissingSuper
 
       def respond_to_missing?(method_name, include_private = false)
         __target_object__.respond_to?(method_name, include_private)

data/lib/frise/loader.rb

@@ -50,7 +50,7 @@ module Frise
     private
 
     def process_includes(config, at_path, root_config, global_vars, include_confs_stack = [])
-      return config unless config.class == Hash
+      return config unless config.instance_of?(Hash)
 
       # process $content_include directives
       config, content_include_confs = extract_content_include(config, at_path)
@@ -69,26 +69,27 @@ module Frise
       config, next_include_confs = extract_include(config, at_path)
       include_confs = next_include_confs + include_confs_stack
       res = if include_confs.empty?
-              config.map { |k, v| [k, process_includes(v, at_path + [k], root_config, global_vars)] }.to_h
+              config.to_h { |k, v| [k, process_includes(v, at_path + [k], root_config, global_vars)] }
             else
               Lazy.new do
                 include_conf = include_confs.first
-                rest_include_confs = include_confs[1..-1]
+                rest_include_confs = include_confs[1..]
                 symbol_table = build_symbol_table(root_config, at_path, config, global_vars, include_conf)
                 included_config = Parser.parse(include_conf['file'], symbol_table)
                 config = @defaults_loader.merge_defaults_obj(config, included_config)
-                process_includes(config, at_path, merge_at(root_config, at_path, config), global_vars, rest_include_confs)
+                process_includes(config, at_path, merge_at(root_config, at_path, config), global_vars,
+                                 rest_include_confs)
               end
             end
       @delete_sym.nil? ? res : omit_deleted(res)
     end
 
     def process_schema_includes(schema, at_path, global_vars)
-      return schema unless schema.class == Hash
+      return schema unless schema.instance_of?(Hash)
 
       schema, included_schemas = extract_include(schema, at_path)
       if included_schemas.empty?
-        schema.map { |k, v| [k, process_schema_includes(v, at_path + [k], global_vars)] }.to_h
+        schema.to_h { |k, v| [k, process_schema_includes(v, at_path + [k], global_vars)] }
       else
         included_schemas.each do |defaults_conf|
           schema = Parser.parse(defaults_conf['file'], global_vars).merge(schema)
@@ -98,13 +99,13 @@ module Frise
     end
 
     def process_schemas(config, at_path, global_vars)
-      return config unless config.class == Hash
+      return config unless config.instance_of?(Hash)
 
-      config = config.map do |k, v|
+      config = config.to_h do |k, v|
         new_v = process_schemas(v, at_path + [k], global_vars)
         return nil if !v.nil? && new_v.nil?
         [k, new_v]
-      end.to_h
+      end
 
       config, schema_files = extract_schema(config, at_path)
       schema_files.each do |schema_file|
@@ -149,10 +150,10 @@ module Frise
       end
     end
 
-    def extract_special(config, key, at_path)
+    def extract_special(config, key, at_path, &block)
       case config[key]
       when nil then [config, []]
-      when Array then [config.reject { |k| k == key }, config[key].map { |e| yield e }]
+      when Array then [config.reject { |k| k == key }, config[key].map(&block)]
       else raise "At #{build_path(at_path)}: illegal value for #{key}: #{config[key].inspect}"
       end
     end
@@ -165,6 +166,7 @@ module Frise
     end
 
     # returns the config without the keys whose values are @delete_sym
+    # @delete_sym given as array elements are not handled.
     def omit_deleted(config)
       config.each_with_object({}) do |(k, v), new_hash|
         if v.is_a?(Hash)
@@ -182,7 +184,7 @@ module Frise
     #   - `global_vars`: the global variables
     #   - `include_conf`: the $include or $content_include configuration
     def build_symbol_table(root_config, at_path, config, global_vars, include_conf)
-      extra_vars = (include_conf['vars'] || {}).map { |k, v| [k, root_config.dig(*v.split('.'))] }.to_h
+      extra_vars = (include_conf['vars'] || {}).transform_values { |v| root_config.dig(*v.split('.')) }
       extra_consts = include_conf['constants'] || {}
 
       omit_deleted(config ? merge_at(root_config, at_path, config) : root_config)

data/lib/frise/parser.rb

@@ -10,7 +10,7 @@ module Frise
     class << self
       def parse(file, symbol_table = nil)
         return nil unless File.file? file
-        YAML.safe_load(parse_as_text(file, symbol_table), [], [], true) || {}
+        YAML.safe_load(parse_as_text(file, symbol_table), aliases: true) || {}
       end
 
       def parse_as_text(file, symbol_table = nil)

data/lib/frise/validator.rb

@@ -14,6 +14,8 @@ module Frise
     attr_reader :errors
 
     def initialize(root, validators = nil)
+      super()
+
       @root = root
       @validators = validators
       @errors = []
@@ -33,7 +35,7 @@ module Frise
 
     def get_full_schema(schema)
       case schema
-      when Hash then
+      when Hash
         default_type = schema[:enum] || schema[:one_of] ? 'Object' : 'Hash'
         { type: default_type }.merge(schema)
       when Symbol then { type: 'Object', validate: schema }
@@ -93,7 +95,7 @@ module Frise
     def validate_enum(full_schema, obj, path)
       if full_schema[:enum] && !full_schema[:enum].include?(obj)
         add_validation_error(path, "invalid value #{obj.inspect}. " \
-          "Accepted values are #{full_schema[:enum].map(&:inspect).join(', ')}")
+                                   "Accepted values are #{full_schema[:enum].map(&:inspect).join(', ')}")
         return false
       end
       true
@@ -124,7 +126,7 @@ module Frise
     def validate_remaining_keys(full_schema, obj, path, processed_keys)
       expected_types = get_expected_types(full_schema)
       if expected_types.size == 1 && expected_types[0].ancestors.member?(Enumerable)
-        hash = obj.is_a?(Hash) ? obj : Hash[obj.map.with_index { |x, i| [i, x] }]
+        hash = obj.is_a?(Hash) ? obj : obj.map.with_index { |x, i| [i, x] }.to_h
         hash.each do |key, value|
           validate_object(path, key, full_schema[:all_keys]) if full_schema[:all_keys] && !key.is_a?(Symbol)
 
@@ -156,8 +158,8 @@ module Frise
     def self.parse_symbols(obj)
       case obj
       when Array then obj.map { |e| parse_symbols(e) }
-      when Hash then Hash[obj.map { |k, v| [parse_symbols(k), parse_symbols(v)] }]
-      when String then obj.start_with?('$') ? obj[1..-1].to_sym : obj
+      when Hash then obj.to_h { |k, v| [parse_symbols(k), parse_symbols(v)] }
+      when String then obj.start_with?('$') ? obj[1..].to_sym : obj
       else obj
       end
     end
@@ -166,7 +168,17 @@ module Frise
       validate_obj_at(config, [], schema, **options)
     end
 
-    def self.validate_obj_at(config, at_path, schema, path_prefix: nil, validators: nil, print: nil, fatal: nil, raise_error: nil)
+    def self.validate_obj_at(
+      config,
+      at_path,
+      schema,
+      path_prefix: nil,
+      validators: nil,
+      print: nil,
+      fatal: nil,
+      raise_error: nil
+    )
+
       schema = parse_symbols(schema)
       at_path.reverse.each { |key| schema = { key => schema, :allow_unknown_keys => true } }
 
@@ -202,6 +214,8 @@ module Frise
     attr_reader :errors
 
     def initialize(errors)
+      super()
+
       @errors = errors
     end
   end

data/lib/frise/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Frise
-  VERSION = '0.4.1'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frise
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.1
 platform: ruby
 authors:
 - Velocidi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-07 00:00:00.000000000 Z
+date: 2022-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -39,86 +39,86 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.77.0
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.77.0
+        version: '0.18'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.16'
-description: 
+        version: 0.8.0
+description:
 email:
 - hello@velocidi.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/CI.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -135,8 +135,9 @@ files:
 homepage: https://github.com/velocidi/frise
 licenses:
 - Apache-2.0
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -144,15 +145,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Ruby config library with schema validation, default values and templating
 test_files: []

data/.travis.yml

@@ -1,10 +0,0 @@
-language: ruby
-cache: bundler
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-before_install:
-  - gem install bundler