frise 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89f413918114d497ca91dc779d1e02e5abe17283c50541a2c5f41e530262a1c8
-  data.tar.gz: 249420e836978cd01c7639ba72d9bb8d23bafde1e36c0bd2f2a4d39325a4bb5a
+  metadata.gz: 1faacd4d96a4fcdaaa2133b658a422a1c5e232d33592d99429dc57f2e540162b
+  data.tar.gz: 2e36a6db49fb71cff79c0a60c255703f41bf08d7e2779c86b4530cc813082cac
 SHA512:
-  metadata.gz: 013403a018b4536d8d4a15359a7f95dc8aaab9962313206666653d8b3fb6f6a59d2e4b9e43502480da9d19a1e5fa2b8a4b080fa6aa6837d52a7c99bd33f9ea44
-  data.tar.gz: 21e416ce8cb88cafcd7ac40b715ab574cd028a7ffc094f85785c0a8cb116ae73763df6380f0cc9f25935cb81d938a1f5f763b831d69dfa13da7e24ec22235ed0
+  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,9 @@
+### 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

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

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   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/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.6.0'
+  VERSION = '0.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frise
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Velocidi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-07 00:00:00.000000000 Z
+date: 2023-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -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
@@ -154,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