rb-konfig 0.1.1 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d4f1c0da5f57c267a60744219db12cf6367dbbab95f3565b80fae2b0b4b44bb
-  data.tar.gz: 7edcd4ef1a08f53bce1fa4df0472ad1f52edb01734af8f0ccbc7d1bac5befbfb
+  metadata.gz: d856585bd2b6c9b421964eb757e4dbc60b8a1e4a033e817c91353da2b9c0cc7a
+  data.tar.gz: c924badaff2dc5a2140c9559b4ea97c573590404593c050be3ca32ed7d66a15c
 SHA512:
-  metadata.gz: 7684f9dc14ff341145b701277d8e0a06fc9d11a027b1ab7d9fb707f09654510e6065bd04b25c3da12f6de51ad707b7bbae1357a659779d30d693e64d8943e53d
-  data.tar.gz: 24e20e5a45290d8351cf4da66b1a51fc8082b630826155db9f594907f08b457b4602e081277a4bed42937425f6074ab18ef382be9e9c23d357636ca5511200d2
+  metadata.gz: d180c690f4d3747ce7da2aa8e459c0d8df4a3241ec3853c439bc70c0a69b8a6ddb15f65f137fc4724e1b993df25d36eb2ddc4dd653f957f8a465a2bbf0dc82d0
+  data.tar.gz: e3702b812b5eaa692db87f3eb737c4b77981410c448bc304828fc085249c8134db2aa0b1df6f90f19e73e00565efea3a7eec231fe2c2299cf5cb36f44ecbd869

data/.gitignore

@@ -50,3 +50,4 @@ build-iPhoneSimulator/
 .rvmrc
 /.byebug_history
 /.idea
+/.DS_Store

data/.ruby-version

@@ -1,2 +1,2 @@
-ruby-2.5.5
+3.0.0
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rb-konfig (0.1.1)
+    rb-konfig (0.1.5)
       activesupport (>= 4)
       dry-schema (~> 1.3)
       thor (~> 0.20)

data/README.md

@@ -84,6 +84,7 @@ You can change or reach the following from `Konfig.configuration`
 * `mode`: No default value
 * `workdir`: No default value
 * `schema`: Configuration validation schema. If available, the loaded, merged and parsed configuration is validated against this schema. See [Dry-Schema](https://dry-rb.org/gems/dry-schema/) for more information.
+* `fail_on_validation`: Fail if schema validation fails
 
 ### Data types
 
@@ -92,7 +93,6 @@ The directory mode, supports the following data types in files and tries to retu
 - Integer
 - Float
 - String
-- Date time
 - Boolean
 - JSON
 - Null (see above)

data/konfig.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activesupport", ">= 4"
   spec.add_dependency "dry-schema", "~> 1.3"
-  spec.add_dependency "thor", "~> 0.20"
+  spec.add_dependency "thor", "~> 1.0"
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/konfig.rb

@@ -22,6 +22,7 @@ module Konfig
     attr_writer :workdir
     attr_writer :env_prefix
     attr_writer :logger
+    attr_writer :fail_on_validation
 
     def namespace
       @namespace || "Settings"
@@ -44,12 +45,13 @@ module Konfig
     end
 
     def logger
-      @logger if @logger
+      return @logger if @logger
       if defined?(Rails) && Rails.logger
-        Rails.logger
+        @logger = Rails.logger
       else
-        Logger.new(STDOUT)
+        @logger = Logger.new(STDOUT)
       end
+      @logger
     end
 
     def schema=(value)
@@ -82,6 +84,10 @@ module Konfig
 
     def nil_word
       @nil_word || "null"
-    end
+	end
+
+	def fail_on_validation
+		@fail_on_validation.nil? ? true : @fail_on_validation
+	end
   end
 end

data/lib/konfig/directory_provider.rb

@@ -1,5 +1,4 @@
 require_relative "config_provider"
-require "date"
 require "json"
 
 module Konfig

data/lib/konfig/option.rb

@@ -32,7 +32,11 @@ module Konfig
 
         unless v_res.success?
           error = Konfig::ValidationError.format(v_res)
-          raise Konfig::ValidationError.new("Config validation failed:\n\n#{error}")
+          if Konfig.configuration.fail_on_validation
+            raise Konfig::ValidationError.new("Config validation failed:\n\n#{error}")
+          else
+            Konfig.configuration.logger.error "Config validation failed:\n\n#{error}"
+          end
         end
       end
     end
@@ -90,8 +94,7 @@ module Konfig
       s = self.class.new
 
       h.each do |k, v|
-        k = k.to_s if !k.respond_to?(:to_sym) && k.respond_to?(:to_s)
-        s.new_ostruct_member(k)
+        k = k.to_s if !k.respond_to?(:to_sym) && k.respond_to?(:to_s)        
 
         if v.is_a?(Hash)
           v = v["type"] == "hash" ? v["contents"] : __convert(v)
@@ -99,7 +102,7 @@ module Konfig
           v = v.collect { |e| e.instance_of?(Hash) ? __convert(e) : e }
         end
 
-        s.send("#{k}=".to_sym, v)
+        s[k] = v
       end
       s
     end

data/lib/konfig/utils.rb

@@ -10,9 +10,12 @@ module Konfig
     lambda { |value| Integer(value) rescue NIL_VALUE }, # integer
     lambda { |value| Float(value) rescue NIL_VALUE }, # float
     lambda { |value| (["true", "false"].include?(value)) ? (value == "true") : NIL_VALUE }, # boolean
-    lambda { |value| DateTime.parse(value) rescue NIL_VALUE }, # date time
     lambda { |value| (value == Konfig.configuration.nil_word && Konfig.configuration.allow_nil) ? nil : NIL_VALUE }, # nil value
     lambda do |value|
+      value = value.strip
+      # on some platforms, JSON.parse returns value for integer and floats. This is incorrect https://www.json.org/
+      return NIL_VALUE if !value.start_with?("[") && !value.start_with?("{")
+
       result = JSON.parse(value, { symbolize_names: true })
       if result == nil && !Konfig.configuration.allow_nil
         return NIL_VALUE
@@ -22,7 +25,10 @@ module Konfig
     rescue
       NIL_VALUE
     end, # json
-    lambda { |value| value }, # string. should always be the last one
+    lambda do |value| # string. should always be the last one
+      # in case we have a string, clean it up. For example, quotes in strings should be escaped or will be removed
+      Konfig::Utils.remove_quotations(value)
+    end,
   ]
 
   class Utils
@@ -36,5 +42,11 @@ module Konfig
 
       raise UnsupportedValueType, "'#{value}' is unsupported type"
     end
+
+    def self.remove_quotations(str)
+      str = str.slice(1..-1) if str.start_with?('"') || str.start_with?('\'')
+      str = str.slice(0..-2) if str.end_with?('"') || str.end_with?('\'')
+      return str
+    end
   end
 end

data/lib/konfig/version.rb

@@ -1,3 +1,3 @@
 module Konfig
-  VERSION ||= "0.1.1"
+  VERSION ||= "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rb-konfig
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.6
 platform: ruby
 authors:
 - Khash Sajadi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2021-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.20'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +164,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '11.0'
-description: 
+description:
 email:
 - hello@cloud66.com
 executables:
@@ -204,7 +204,7 @@ licenses: []
 metadata:
   homepage_uri: https://github.com/cloud66-oss/konfig/
   source_code_uri: https://github.com/cloud66-oss/konfig/
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -219,9 +219,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Konfig is a Kubernetes friendly Rails configuration gem
 test_files: []