frise 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41db8000684dfb7ee23cc7f26a790a57bb38ad76
-  data.tar.gz: 782cf2ff2d3866a754950fd8edd3735a1bb1f425
+  metadata.gz: 658ef151a4948ba72f32f7dc5b51f5ddb3e6fb69
+  data.tar.gz: 8b7498f11685e3c5d1a4bbce70c732d8a62e8eb6
 SHA512:
-  metadata.gz: c37c19e1f9edbad815b30d52f867d4344fd3b3da8a376e30236814a47ddd579b889459b1a702190fe5d1c1d2b99afdc3abef685f54a062616ea632872640a5e2
-  data.tar.gz: c9c87e93dbd3b361a5632431ac8f83650749c7d1de090c3397299b403cda7e1a986767356d8795dc3cf037f9461227a8287dd3870df79a573031ee5928d31931
+  metadata.gz: 998d82e9c1a58efb14b5edd44deb4c85c62ced21cec664f29cffa3753f3742fc9e876fad96c9c3902fa2fc6a55d57622695bfe579acb6abb246695f8f7fe8b91
+  data.tar.gz: f1a5e4ee436e6081a93fd204cfd7ee434aeb3d6ada5e90853f42467cf6339ca8a6c4dbc0b8d4b335d4e1d75e211e965736f84010cc3ffb31e6c37b668fafce9c

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+### 0.2.0 (unreleased)
+
+- New features
+  - New schema types `$enum` and `$one_of` for specifying enumerations and values with multiple
+    possible schemas ([#5](https://github.com/ShiftForward/frise/pull/5)).
+- Bug fixes
+  - Deal correctly with non-existing schema files in the load path
+    ([#4](https://github.com/ShiftForward/frise/pull/4)).
+
+### 0.1.0 (August 10, 2017)
+
+Initial version.

data/README.md

@@ -1,6 +1,7 @@
 # Frise
 [![Build Status](https://travis-ci.org/ShiftForward/frise.svg?branch=master)](https://travis-ci.org/ShiftForward/frise)
 [![Coverage Status](https://coveralls.io/repos/github/ShiftForward/frise/badge.svg?branch=master)](https://coveralls.io/github/ShiftForward/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
 parsing the files themselves, it also:

data/lib/frise/defaults_loader.rb

@@ -56,12 +56,12 @@ module Frise
       end
 
       def merge_defaults(config, defaults_file, symbol_table = config)
-        defaults = Parser.parse(defaults_file, symbol_table)
+        defaults = Parser.parse(defaults_file, symbol_table) || {}
         merge_defaults_obj(config, defaults)
       end
 
       def merge_defaults_at(config, at_path, defaults_file, symbol_table = config)
-        defaults = Parser.parse(defaults_file, symbol_table)
+        defaults = Parser.parse(defaults_file, symbol_table) || {}
         merge_defaults_obj_at(config, at_path, defaults)
       end
     end

data/lib/frise/loader.rb

@@ -16,7 +16,7 @@ module Frise
     end
 
     def load(config_file, exit_on_fail = true, symbol_table = {})
-      config = Parser.parse(config_file, symbol_table)
+      config = Parser.parse(config_file, symbol_table) || {}
       config_name = File.basename(config_file)
 
       @pre_loaders.each do |pre_loader|

data/lib/frise/parser.rb

@@ -7,7 +7,7 @@ module Frise
   module Parser
     class << self
       def parse(file, symbol_table = nil)
-        return {} unless File.file? file
+        return nil unless File.file? file
         content = File.open(file).read
         content = Liquid::Template.parse(content).render symbol_table if symbol_table
         YAML.safe_load(content, [], [], true) || {}

data/lib/frise/validator.rb

@@ -32,7 +32,9 @@ module Frise
 
     def get_full_schema(schema)
       case schema
-      when Hash then schema
+      when Hash then
+        default_type = schema[:enum] || schema[:one_of] ? 'Object' : 'Hash'
+        { type: default_type }.merge(schema)
       when Symbol then { type: 'Object', validate: schema }
       when Array then
         if schema.size == 1
@@ -87,6 +89,28 @@ module Frise
       true
     end
 
+    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(', ')}")
+        return false
+      end
+      true
+    end
+
+    def validate_one_of(full_schema, obj, path)
+      if full_schema[:one_of]
+        full_schema[:one_of].each do |schema_opt|
+          opt_validator = Validator.new(@root, @validators)
+          opt_validator.validate_object(path, obj, schema_opt)
+          return true if opt_validator.errors.empty?
+        end
+        add_validation_error(path, "#{obj.inspect} does not match any of the possible schemas")
+        return false
+      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)
@@ -122,6 +146,8 @@ module Frise
       return unless validate_optional(full_schema, obj, path)
       return unless validate_type(full_schema, obj, path)
       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)
 
       processed_keys = Set.new
       return unless validate_spec_keys(full_schema, obj, path, processed_keys)
@@ -156,12 +182,12 @@ module Frise
     end
 
     def self.validate(config, schema_file, options = {})
-      schema = parse_symbols(Parser.parse(schema_file))
+      schema = parse_symbols(Parser.parse(schema_file) || { allow_unknown_keys: true })
       validate_obj(config, schema, options)
     end
 
     def self.validate_at(config, at_path, schema_file, options = {})
-      schema = parse_symbols(Parser.parse(schema_file))
+      schema = parse_symbols(Parser.parse(schema_file) || { allow_unknown_keys: true })
       at_path.reverse.each { |key| schema = { key => schema, :allow_unknown_keys => true } }
       validate_obj(config, schema, options)
     end

data/lib/frise/version.rb

@@ -1,3 +1,3 @@
 module Frise
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: frise
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - ShiftForward
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2017-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -119,6 +119,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md