ultra_config 0.10.3 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b50e04004e0d87906974b4219a94a3dd017ba295
-  data.tar.gz: 1644257a95dd792b4bbaabf48a90a10844421b57
+  metadata.gz: 52234a8d4ae01dd19e6828c14d09a2af1acab2e3
+  data.tar.gz: 2ad472cfa2349d68b08159f46794ffa6ca471cf5
 SHA512:
-  metadata.gz: 773c90ae3b237cb57182b090e27f6e92318627bac547cbbee26437c217841a685742bab8d5af4dbb55151ad95db8f331a2bd9752f89648c5534007b7494545b6
-  data.tar.gz: 0add8b7940f40224edea51a25fdcef0aab0fc9e99898d81863f8b6bc6dcf71e366c7803700ffe4078e949f95209dbbf3fb1ee31862a34c9a93e9912353066445
+  metadata.gz: f195f6529ae3f645dee2e71535b22849b759763662f9b2675370fd020b0e92d77c834c857341c6042b66dfac270f24231b00899f79e582b3404b3f87652d8235
+  data.tar.gz: b8f9d9b9bf802db40187d93865dd3e5414b97f165e7369357f03ef23f6321401241d6e969a570d10344d99c94d0588c779aa75dfa77557901812dd662911f1f5

data/lib/ultra_config/config.rb

@@ -1,26 +1,34 @@
-require_relative 'validator'
+require_relative 'validation'
 require_relative 'settings'
 
 module UltraConfig
   class Config
+    include Validation
+
     attr_reader :value
 
-    def initialize(default_value, options = {}, &block)
-      @validation = block
+    def initialize(options = {}, &block)
+      @config_block = block
 
+      @value = options[:default] || nil
       @sanitize = options[:sanitize] || false
-
-      self.value=(default_value)
+      @error_msg = options[:error_msg]
     end
 
     def value=(value)
-      validate(value)
-
-      @value = value
+      @intermediate_value = value
+      self.instance_eval(&@config_block) if @config_block
+      type_safety(Settings.type_safety) unless @type_safety_checked
+      @value = @intermediate_value
+    rescue UltraConfig::Validation::ValidationError
+      raise UltraConfig::Validation::ValidationError.new(msg: @error_msg)
+    ensure
+      @type_safety_checked = false
+      @intermediate_value = nil
     end
 
-    def validate(new_value)
-      Validator.validate(@value, new_value, &@validation)
+    def set(&block)
+      @intermediate_value = yield(@intermediate_value)
     end
 
     def sanitize?

data/lib/ultra_config/namespace.rb

@@ -25,8 +25,8 @@ module UltraConfig
       define_singleton_method(name) { @objects[name] }
     end
 
-    def config(name, default = nil, options = {}, &block)
-      @objects[name] = Config.new(default, options, &block)
+    def config(name, options = {}, &block)
+      @objects[name] = Config.new(options, &block)
       define_singleton_method("#{name}=") { |value| @objects[name].value = value }
       define_singleton_method(name) { @objects[name].value }
     end

data/lib/ultra_config/validation.rb

@@ -0,0 +1,41 @@
+require_relative 'utilities/boolean'
+
+module UltraConfig
+  module Validation
+    include Boolean
+
+    class ValidationError < StandardError;
+      def initialize(msg: nil)
+        super
+      end
+    end
+
+    class TypeValidationError < ValidationError; end
+
+    def type_safety(type)
+      @type_safety_checked = true
+
+      return unless type == :strong
+      return if @value.nil?
+      return if @value.is_a?(Boolean) && @intermediate_value.is_a?(Boolean)
+
+      raise TypeValidationError if @value.class != @intermediate_value.class
+    end
+
+    def one_of(list)
+      raise ValidationError unless list.include?(@intermediate_value)
+    end
+
+    def match(regexp)
+      raise ValidationError unless regexp.match(@intermediate_value)
+    end
+
+    def range(low, high)
+      raise ValidationError unless (@intermediate_value >= low && @intermediate_value <= high)
+    end
+
+    def custom(&block)
+      raise ValidationError unless block.call(@intermediate_value)
+    end
+  end
+end

data/ultra_config.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'ultra_config'
-  spec.version       = '0.10.3'
+  spec.version       = '0.11.0'
   spec.authors       = ['Gregory Kuruc']
   spec.email         = ['gjk910327@gmail.com']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ultra_config
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.11.0
 platform: ruby
 authors:
 - Gregory Kuruc
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-13 00:00:00.000000000 Z
+date: 2018-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,7 +69,7 @@ files:
 - lib/ultra_config/namespace.rb
 - lib/ultra_config/settings.rb
 - lib/ultra_config/utilities/boolean.rb
-- lib/ultra_config/validator.rb
+- lib/ultra_config/validation.rb
 - ultra_config.gemspec
 homepage: https://github.com/SpyMachine/UltraConfig
 licenses:

data/lib/ultra_config/validator.rb

@@ -1,51 +0,0 @@
-require_relative 'utilities/boolean'
-
-module UltraConfig
-  class Validator
-    extend Boolean
-
-    class ValidationError < StandardError; end
-    class TypeValidationError < ValidationError; end
-
-    def self.validate(old, new, &validation)
-      @old_value = old
-      @test_value = new
-
-      return if @test_value.nil?
-
-      self.instance_eval(&validation) if validation
-
-      type_safety(Settings.type_safety) unless @explicit_type_safety
-    ensure
-      @test_value = nil
-      @old_value = nil
-      @explicit_type_safety = false
-    end
-
-    def self.type_safety(type)
-      @explicit_type_safety = true
-      return unless type == :strong
-
-      return if @old_value.nil?
-      return if @old_value.is_a?(Boolean) && @test_value.is_a?(Boolean)
-
-      raise TypeValidationError if @old_value.class != @test_value.class
-    end
-
-    def self.one_of(list)
-      raise ValidationError unless list.include?(@test_value)
-    end
-
-    def self.match(regexp)
-      raise ValidationError unless regexp.match(@test_value)
-    end
-
-    def self.range(low, high)
-      raise ValidationError unless (@test_value >= low && @test_value <= high)
-    end
-
-    def self.custom(&block)
-      raise ValidationError unless block.call(@test_value)
-    end
-  end
-end