frise 0.5.1 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68f89536d127f91e812a1c23258ad32ca3d4331970c9af0632cb3f95fce06e52
-  data.tar.gz: 129230d3c50d29a25f4e060bfdf4e839d19aa579607c6bead51acf6237ac9c20
+  metadata.gz: 1faacd4d96a4fcdaaa2133b658a422a1c5e232d33592d99429dc57f2e540162b
+  data.tar.gz: 2e36a6db49fb71cff79c0a60c255703f41bf08d7e2779c86b4530cc813082cac
 SHA512:
-  metadata.gz: 61f5a83ff2ba3e17ae022dbac6639fa3a316c4739685ed3cec8634a9a12789dd280c4373763bdebea85d82821b02856327df0df6fbb423d55affb8010252ec64
-  data.tar.gz: bc65274a574e25cdbe6142bd7bc2dbe7d6d9275143c211987845dc916156ebe2f0d3ff5739490ea177b67157545b6c5c4aef0a96bbe6dfbaa6f9061c35fcfd73
+  metadata.gz: 72b08fa1c24a177b8c8fe1086e2eb7782faa1b9b08346080cec5b609577704375e31631d8bfc1c962c7c7d6f81f9b0af38d6aefe2350c117ac6c7a425479cf3e
+  data.tar.gz: 4115d96508ceeebbf472bc845285334c47b70ec3318e567442fbea3720f41dafabfc6b92910f9212eeb3b5473f60488b69c89f57cc1339f63f0b10aa6dc33570

data/.github/workflows/CI.yml

@@ -9,10 +9,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ 2.6, 2.7, 3 ]
+        ruby:
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - '3.1'
+          - '3.2'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -24,8 +29,10 @@ jobs:
         run: bundle exec rake
       - name: Coveralls Parallel
         uses: coverallsapp/github-action@master
+        env:
+          # We're concatenating the run ID with the run attempt so that each run has a different ID for Coveralls.
+          COVERALLS_SERVICE_JOB_ID: '${{ github.run_id }} ${{ github.run_attempt }}'
         with:
-          github-token: ${{ secrets.github_token }}
           flag-name: ${{ matrix.ruby }}
           parallel: true
 
@@ -35,6 +42,9 @@ jobs:
     steps:
       - name: Coveralls Finished
         uses: coverallsapp/github-action@master
+        env:
+          # We're concatenating the run ID with the run attempt so that each run has a different ID for Coveralls.
+          COVERALLS_SERVICE_JOB_ID: '${{ github.run_id }} ${{ github.run_attempt }}'
         with:
-          github-token: ${{ secrets.github_token }}
           parallel-finished: true
+          carryforward: '2.6,2.7,3.0,3.1,3.2'

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/
@@ -9,3 +8,4 @@
 /tmp/
 
 *.iml
+.DS_Store

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+### 0.6.1 (June 13, 2023)
+
+- New features
+  - New schema type `$constant` for specifying values with a single possible instance
+    ([#32](https://github.com/adzerk/frise/pull/32)).
+
+### 0.6.0 (April 7, 2022)
+
+- Breaking changes
+  - Liquid parsing is now strict ([#29](https://github.com/velocidi/frise/pull/29)).
+  - Update liquid gem to `5.3.0` ([#29](https://github.com/velocidi/frise/pull/29)).
+
+- New features
+  - Add `json` liquid filter ([#28](https://github.com/velocidi/frise/pull/28)).
+
 ### 0.5.1 (March 28, 2022)
 
 - Breaking changes

data/Gemfile.lock

@@ -0,0 +1,71 @@
+PATH
+  remote: .
+  specs:
+    frise (0.6.1.pre)
+      liquid (~> 5.3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ast (2.4.2)
+    diff-lcs (1.5.0)
+    docile (1.4.0)
+    liquid (5.3.0)
+    parallel (1.23.0)
+    parser (3.2.2.3)
+      ast (~> 2.4.1)
+      racc
+    racc (1.7.0)
+    rainbow (3.1.1)
+    rake (13.0.6)
+    regexp_parser (2.8.1)
+    rexml (3.2.5)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.10.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.29.0)
+      parser (>= 3.2.1.0)
+    ruby-progressbar (1.13.0)
+    simplecov (0.22.0)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov-lcov (0.8.0)
+    simplecov_json_formatter (0.1.4)
+    unicode-display_width (2.4.2)
+
+PLATFORMS
+  arm64-darwin-22
+  x86_64-linux
+
+DEPENDENCIES
+  bundler (~> 2.0)
+  frise!
+  rake (~> 13.0)
+  rspec (~> 3.9)
+  rubocop (~> 1.10.0)
+  simplecov (~> 0.18)
+  simplecov-lcov (= 0.8.0)
+
+BUNDLED WITH
+   2.4.12

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright 2017-2019 Velocidi [http://www.velocidi.com/]
+Copyright 2017-2023 Kevel [https://www.kevel.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/README.md

@@ -1,6 +1,6 @@
 # Frise
-[![Build Status](https://travis-ci.org/velocidi/frise.svg?branch=master)](https://travis-ci.org/velocidi/frise)
-[![Coverage Status](https://coveralls.io/repos/github/velocidi/frise/badge.svg?branch=master)](https://coveralls.io/github/velocidi/frise?branch=master)
+[![Build Status](https://github.com/adzerk/frise/actions/workflows/CI.yml/badge.svg?branch=master)](https://github.com/adzerk/frise/actions/workflows/CI.yml)
+[![Coverage Status](https://coveralls.io/repos/github/adzerk/frise/badge.svg?branch=master)](https://coveralls.io/github/adzerk/frise?branch=master)
 [![Gem Version](https://badge.fury.io/rb/frise.svg)](https://badge.fury.io/rb/frise)
 
 Frise is a library for loading configuration files as native Ruby structures. Besides reading and

data/frise.gemspec

@@ -20,12 +20,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.6.0'
 
-  spec.add_dependency 'liquid', '~> 4.0'
+  spec.add_dependency 'liquid', '~> 5.3.0'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.9'
-  spec.add_development_dependency 'rubocop', '~> 1.10'
+  spec.add_development_dependency 'rubocop', '~> 1.10.0'
   spec.add_development_dependency 'simplecov', '~> 0.18'
   spec.add_development_dependency 'simplecov-lcov', '0.8.0'
   spec.metadata['rubygems_mfa_required'] = 'true'

data/lib/frise/parser.rb

@@ -16,7 +16,12 @@ module Frise
       def parse_as_text(file, symbol_table = nil)
         return nil unless File.file? file
         content = File.read(file)
-        content = Liquid::Template.parse(content).render with_internal_vars(file, symbol_table) if symbol_table
+        template = Liquid::Template.parse(content, error_mode: :strict)
+        if symbol_table
+          content = template.render!(with_internal_vars(file, symbol_table), {
+                                       strict_filters: true
+                                     })
+        end
         content
       end
 

data/lib/frise/validator.rb

@@ -36,7 +36,7 @@ module Frise
     def get_full_schema(schema)
       case schema
       when Hash
-        default_type = schema[:enum] || schema[:one_of] ? 'Object' : 'Hash'
+        default_type = schema[:enum] || schema[:one_of] || schema.key?(:constant) ? 'Object' : 'Hash'
         { type: default_type }.merge(schema)
       when Symbol then { type: 'Object', validate: schema }
       when Array
@@ -114,6 +114,14 @@ module Frise
       true
     end
 
+    def validate_constant(full_schema, obj, path)
+      if full_schema.key?(:constant) && full_schema[:constant] != obj
+        add_validation_error(path, "invalid value #{obj.inspect}. " \
+                                   "The only accepted value is #{full_schema[:constant]}")
+      end
+      true
+    end
+
     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)
@@ -149,6 +157,7 @@ module Frise
       return unless validate_custom(full_schema, obj, path)
       return unless validate_enum(full_schema, obj, path)
       return unless validate_one_of(full_schema, obj, path)
+      return unless validate_constant(full_schema, obj, path)
 
       processed_keys = Set.new
       return unless validate_spec_keys(full_schema, obj, path, processed_keys)

data/lib/frise/version.rb

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

data/lib/frise.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'liquid/liquid'
+
 require 'frise/defaults_loader'
 require 'frise/loader/lazy'
 require 'frise/loader'

data/lib/liquid/json_filter.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'json'
+
+# Converts a variable into its JSON representation
+module JsonFilter
+  def json(object)
+    JSON.dump(object)
+  end
+end

data/lib/liquid/liquid.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require 'liquid'
+
+require_relative 'json_filter'
+
+Liquid::Template.register_filter(JsonFilter)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frise
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.1
 platform: ruby
 authors:
 - Velocidi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-28 00:00:00.000000000 Z
+date: 2023-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 5.3.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 1.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +121,7 @@ files:
 - ".rubocop.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -132,6 +133,8 @@ files:
 - lib/frise/parser.rb
 - lib/frise/validator.rb
 - lib/frise/version.rb
+- lib/liquid/json_filter.rb
+- lib/liquid/liquid.rb
 homepage: https://github.com/velocidi/frise
 licenses:
 - Apache-2.0
@@ -152,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: Ruby config library with schema validation, default values and templating