frise 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5923c848338d6a2f7dfc35211200ab51a789ad9e9967742e4eb57430346785e9
-  data.tar.gz: e08f1fdf3a14fe288ad67a0baa6a9e557294de9ac5ea814426e9b92792b1be95
+  metadata.gz: 59666a0c683f8357e7da23de68bd0cc07b386299943e772dd40d9d641ac2d8c7
+  data.tar.gz: 6827402a3f207d909845c0fa386f61cd3d32b989206e15d22b58202830406c88
 SHA512:
-  metadata.gz: a578f2042b86832986bed1cecbe435330e509e2f6f166ff7302c3eeca37e445bc7acbbcbd4fe16d3cf9c23be68603cd9d4e13f17c508edaeff5e96169b41eaa9
-  data.tar.gz: 1c4378dcec5e8738f25248d6a45fcc96b4392f7144995e08d57407abd3bf1ad5bfe506fe6e1117aa4caef7900dcedfba9dc8b4267b1c4cd6d273c5395313cd2f
+  metadata.gz: 75c11d0c64a9d0a7f37c3b7702ab2000c09d76900c8c58477bc2426ea47ef766b3c03f77c0fd15928fd55a636009fe33f6e2e19efe8f6454945a3a22ea8b86b3
+  data.tar.gz: 582bb37e6e27f4da44aa496321abf66def05ca151218680c776772fc893824f03ab61ed6e11d3c2006853bd627d53f378eb79f3190033d69869a8ee574184177

data/.rubocop.yml

@@ -1,8 +1,10 @@
 AllCops:
   TargetRubyVersion: '2.3'
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
 Metrics:
   Enabled: false
-Naming/UncommunicativeBlockParamName:
+Naming/BlockParameterName:
   Enabled: false
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   Enabled: false

data/.travis.yml

@@ -1,5 +1,9 @@
 language: ruby
+cache: bundler
 rvm:
   - 2.3
   - 2.4
   - 2.5
+  - 2.6
+before_install:
+  - gem install bundler

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+### 0.4.0 (November 29, 2019)
+
+- Breaking changes
+  - Recursive inclusions now respect the hierarchy of configuration files, avoiding inclusions lower
+    in the hiearchy to be resolved before ones higher in the hierarchy
+    ([#14](https://github.com/velocidi/frise/pull/14)).
+- Bug fixes
+  - Fix error messages from validations happening deeper in the config hierarchy, that were wrongly
+    missing the first character in their path ([#16](https://github.com/velocidi/frise/pull/16)).
+
 ### 0.3.0 (April 16, 2018)
 
 - Breaking changes

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright 2017 ShiftForward, S.A. [http://www.shiftforward.eu]
+Copyright 2017-2019 Velocidi [http://www.velocidi.com/]
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not
 use this file except in compliance with the License. You may obtain a copy of

data/frise.gemspec

@@ -7,11 +7,11 @@ require 'frise/version'
 Gem::Specification.new do |spec|
   spec.name          = 'frise'
   spec.version       = Frise::VERSION
-  spec.authors       = ['ShiftForward']
-  spec.email         = ['info@shiftforward.eu']
+  spec.authors       = ['Velocidi']
+  spec.email         = ['hello@velocidi.com']
 
   spec.summary       = 'Ruby config library with schema validation, default values and templating'
-  spec.homepage      = 'https://github.com/ShiftForward/frise'
+  spec.homepage      = 'https://github.com/velocidi/frise'
   spec.license       = 'Apache-2.0'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -22,10 +22,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'liquid', '~> 4.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.14'
-  spec.add_development_dependency 'coveralls', '~> 0.8.21'
-  spec.add_development_dependency 'rake', '~> 12.3'
-  spec.add_development_dependency 'rspec', '~> 3.4'
-  spec.add_development_dependency 'rubocop', '0.55.0'
-  spec.add_development_dependency 'simplecov', '~> 0.14.1'
+  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'
 end

data/lib/frise/loader.rb

@@ -46,7 +46,7 @@ module Frise
 
     private
 
-    def process_includes(config, at_path, root_config, global_vars)
+    def process_includes(config, at_path, root_config, global_vars, include_confs_stack = [])
       return config unless config.class == Hash
 
       # process $content_include directives
@@ -63,20 +63,18 @@ module Frise
       end
 
       # process $include directives
-      config, include_confs = extract_include(config, at_path)
+      config, next_include_confs = extract_include(config, at_path)
+      include_confs = next_include_confs + include_confs_stack
       if include_confs.empty?
         config.map { |k, v| [k, process_includes(v, at_path + [k], root_config, global_vars)] }.to_h
       else
         Lazy.new do
-          include_confs.each do |include_conf|
-            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)
-            config = process_includes(config, at_path, merge_at(root_config, at_path, config), global_vars)
-          end
-          updated_root_config = merge_at(root_config, at_path, config)
-          config.map { |k, v| [k, process_includes(v, at_path + [k], updated_root_config, global_vars)] }.to_h
+          include_conf = include_confs.first
+          rest_include_confs = include_confs[1..-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)
         end
       end
     end

data/lib/frise/loader/lazy.rb

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

data/lib/frise/validator.rb

@@ -27,7 +27,7 @@ module Frise
     end
 
     def add_validation_error(path, msg)
-      logged_path = path.empty? ? '<root>' : path[1..-1]
+      logged_path = path.empty? ? '<root>' : path
       @errors << "At #{logged_path}: #{msg}"
     end
 
@@ -37,13 +37,13 @@ module Frise
         default_type = schema[:enum] || schema[:one_of] ? 'Object' : 'Hash'
         { type: default_type }.merge(schema)
       when Symbol then { type: 'Object', validate: schema }
-      when Array then
+      when Array
         if schema.size == 1
           { type: 'Array', all: schema[0] }
         else
           (raise "Invalid schema: #{schema.inspect}")
         end
-      when String then
+      when String
         if schema.end_with?('?')
           { type: schema[0..-2], optional: true }
         else
@@ -83,8 +83,8 @@ module Frise
       if full_schema[:validate]
         begin
           @validators.method(full_schema[:validate]).call(@root, obj)
-        rescue StandardError => ex
-          add_validation_error(path, ex.message)
+        rescue StandardError => e
+          add_validation_error(path, e.message)
         end
       end
       true
@@ -115,7 +115,7 @@ module Frise
     def validate_spec_keys(full_schema, obj, path, processed_keys)
       full_schema.each do |spec_key, spec_value|
         next if spec_key.is_a?(Symbol)
-        validate_object("#{path}.#{spec_key}", obj[spec_key], spec_value)
+        validate_object(path.empty? ? spec_key : "#{path}.#{spec_key}", obj[spec_key], spec_value)
         processed_keys << spec_key
       end
       true
@@ -126,13 +126,11 @@ module Frise
       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.each do |key, value|
-          if full_schema[:all_keys] && !key.is_a?(Symbol)
-            validate_object(path, key, full_schema[:all_keys])
-          end
+          validate_object(path, key, full_schema[:all_keys]) if full_schema[:all_keys] && !key.is_a?(Symbol)
 
           next if processed_keys.member? key
           if full_schema[:all]
-            validate_object("#{path}.#{key}", value, full_schema[:all])
+            validate_object(path.empty? ? key : "#{path}.#{key}", value, full_schema[:all])
           elsif !full_schema[:allow_unknown_keys]
             add_validation_error(path, "unknown key: #{key}")
           end

data/lib/frise/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frise
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
-- ShiftForward
+- Velocidi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-16 00:00:00.000000000 Z
+date: 2019-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -30,87 +30,87 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.21
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.21
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.55.0
+        version: 0.77.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.55.0
+        version: 0.77.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.1
+        version: '0.16'
 description: 
 email:
-- info@shiftforward.eu
+- hello@velocidi.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -132,7 +132,7 @@ files:
 - lib/frise/parser.rb
 - lib/frise/validator.rb
 - lib/frise/version.rb
-homepage: https://github.com/ShiftForward/frise
+homepage: https://github.com/velocidi/frise
 licenses:
 - Apache-2.0
 metadata: {}
@@ -152,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Ruby config library with schema validation, default values and templating