evt-settings 2.1.0.1 → 2.1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73261dc36a7d4a3e69fe4e51ed24a47c45e10c4cc39dfca3b452f98d68ebd3f8
-  data.tar.gz: 6b7c4b23a627f0b680c8dc21d527bd061f463c49678d86d3b7f5ac9dd9ac131d
+  metadata.gz: '0861705e053ad84b0a2d9116a3e0d5b6e539bd7aa835922b5376050ef259b200'
+  data.tar.gz: 1e7fff33cbcef9d3c4715d9eac4902bb3f0ba4befc6db049d7924b4434e7fafd
 SHA512:
-  metadata.gz: 8ac46c3087b20da7d861d10d6c9965631bfa0685c11050f43593d94e1717690792694e1b9a80781bb7d74e98dce7c9581763927090beccb1db9b73ce5ad2e30c
-  data.tar.gz: 13e21915f9c651e87d991f6a03f5814a3452a1368b12b1d2081993b7bdfa4b140153088e73b081a7a6ec9678926a54536584e800a079fcd2c38fb9ec87f58ec5
+  metadata.gz: 2cd618935b2efa01fd828e0884a061c83880c67eea7ee8ae7553a1e2878d3df830afc7a7a16150c4b532bb4f6167ace0b3d37a48c4e9688d29d0382a2889d493
+  data.tar.gz: 105fc355cd83b9e5e5b7717e9d571cac1bc62f354ef995780831f9433df544885890cac4299e62b8950a4e732ab0d5108f5f392a3ef6375d292e163dd6733a3d

data/lib/settings.rb

@@ -1,13 +1,12 @@
 require 'pathname'
 require 'json'
 
-require 'log'
 require 'casing'
 require 'attribute'
 
-require 'settings/log'
 require 'settings/data_source'
 require 'settings/data_source/hash'
+require 'settings/data_source/env'
 require 'settings/data_source/file'
 require 'settings/data_source/build'
 require 'settings/registry'

data/lib/settings/data_source.rb

@@ -1,7 +1,5 @@
 class Settings
   class DataSource
-    include Log::Dependency
-
     attr_reader :source
 
     def initialize(source)

data/lib/settings/data_source/build.rb

@@ -10,6 +10,7 @@ class Settings
       def self.type(input=nil)
         return Settings::DataSource::Hash if input.is_a?(::Hash)
         return Settings::DataSource::File if input.is_a?(String) || input.nil?
+        return Settings::DataSource::Env if input.instance_of?(Object)
 
         raise Settings::Error, "Input is not supported: #{input}"
       end

data/lib/settings/data_source/env.rb

@@ -0,0 +1,11 @@
+class Settings
+  class DataSource
+    class Env < DataSource
+      def get_data
+        source.map do |k, v|
+          [k.downcase, v]
+        end.to_h
+      end
+    end
+  end
+end

data/lib/settings/data_source/file.rb

@@ -2,13 +2,9 @@ class Settings
   class DataSource
     class File < DataSource
       def self.canonize(source)
-        logger.trace { "Canonizing the file source (Source: #{source})" }
-
         canonized_filepath = canonize_filepath(source)
         validate(canonized_filepath)
 
-        logger.debug { "Canonized the file source (Source: #{source}, Canonized: #{canonized_filepath})" }
-
         canonized_filepath
       end
 
@@ -28,8 +24,6 @@ class Settings
         dirpath ||= Pathname.new(source)
         filepath ||= Pathname.new(source)
 
-        logger.debug { "Canonized the file source (#{source})" }
-
         pathname(filepath, dirpath)
       end
 
@@ -57,56 +51,32 @@ class Settings
       end
 
       def self.validate(pathname)
-        logger.trace { "Validating the pathname (#{pathname})" }
-
         pathname = Pathname.new(pathname)
 
         unless pathname.file?
-          msg = "Settings cannot be read from #{pathname}. The file doesn't exist."
-          logger.error { msg }
-          raise Settings::Error, msg
+          raise Settings::Error, "Settings cannot be read from #{pathname}. The file doesn't exist."
         end
-
-        logger.trace { "Validated the pathname (#{pathname})" }
-      end
-
-      def self.logger
-        @logger ||= Log.get(self)
       end
 
       def get_data
-        logger.trace { "Reading file: #{source}" }
         file = ::File.open(source)
-        data = JSON.load(file).tap do
-          logger.debug { "Read file: #{source}" }
-        end
+
+        data = JSON.load(file)
 
         hash_data_source = Hash.build data
         hash_data_source.get_data
       end
 
       module Defaults
-        def self.logger
-          @logger ||= Log.get(self)
-        end
-
         def self.filename
-          default_file = 'settings.json'
-          logger.debug { "Using the default settings file name (#{default_file})" }
-          default_file
+          'settings.json'
         end
       end
 
       module Directory
         module Defaults
-          def self.logger
-            @logger ||= Log.get(self)
-          end
-
           def self.pathname
-            default_dir = Dir.pwd
-            logger.debug { "Using the working directory default settings directory (#{default_dir})" }
-            default_dir
+            Dir.pwd
           end
         end
       end

data/lib/settings/data_source/hash.rb

@@ -1,10 +1,6 @@
 class Settings
   class DataSource
     class Hash < DataSource
-      def self.logger
-        @logger ||= Log.get(self)
-      end
-
       def get_data
         AssureStringKeys.(source)
       end

data/lib/settings/setting/assignment.rb

@@ -3,10 +3,6 @@ class Settings
     module Assignment
       extend self
 
-      def logger
-        @logger ||= Log.get(self)
-      end
-
       def assign(receiver, attribute, value, strict=false)
         settable = assure_settable(receiver, attribute, strict)
         if settable
@@ -17,11 +13,7 @@ class Settings
       end
 
       def assign_value(receiver, attribute, value)
-        logger.trace { "Assigning to #{attribute}" }
-        receiver.public_send("#{attribute}=", value).tap do
-          logger.debug { "Assigned to #{attribute}" }
-          logger.debug(tag: :data) { "#{attribute}: #{value}" }
-        end
+        receiver.public_send("#{attribute}=", value)
       end
 
       def setting?(receiver, attribute)
@@ -37,40 +29,22 @@ class Settings
         :"#{attribute.to_s}=" unless attribute.to_s.end_with? '='
       end
 
-      def digest(receiver, attribute, strict)
-        content = []
-        content << "Attribute: #{attribute}" if attribute
-        content << "Receiver: #{receiver.class.name}"
-        strict = "<not set>" if strict.nil?
-        content << "Strict: #{strict}"
-        content.join ', '
-      end
-
       module Object
         extend Assignment
 
-        def logger
-          @logger ||= Log.get(self)
-        end
-
         def self.assure_settable(receiver, attribute, strict=true)
-          logger.trace { "Approving attribute (#{digest(receiver, attribute, strict)})" }
-
           if strict
             setting = setting?(receiver, attribute)
             unless setting
-              logger.warn { "Can't set \"#{attribute}\". It isn't a setting of #{receiver.class.name}." }
               return false
             end
           end
 
           assignable = assignable? receiver, attribute
           unless assignable
-            logger.warn { "Can't set \"#{attribute}\". It isn't assignable to #{receiver.class.name}." }
             return false
           end
 
-          logger.debug { "\"#{attribute}\" can be set" }
           true
         end
       end
@@ -78,28 +52,19 @@ class Settings
       module Attribute
         extend Assignment
 
-        def logger
-          @logger ||= Log.get(self)
-        end
-
         def self.assure_settable(receiver, attribute, strict=true)
           if strict
             setting = setting? receiver, attribute
             unless setting
-              msg = "Can't set \"#{attribute}\". It isn't a setting of #{receiver.class.name}."
-              logger.error { msg }
-              raise msg
+              raise "Can't set \"#{attribute}\". It isn't a setting of #{receiver.class.name}."
             end
           end
 
-          assignable = assignable? receiver, attribute
+          assignable = assignable?(receiver, attribute)
           unless assignable
-            msg = "Can't set \"#{attribute}\". It isn't assignable to #{receiver.class.name}."
-            logger.error { msg }
-            raise msg
+            raise "Can't set \"#{attribute}\". It isn't assignable to #{receiver.class.name}."
           end
 
-          logger.debug { "\"#{attribute}\" can be set" }
           true
         end
       end

data/lib/settings/setting/macro.rb

@@ -2,13 +2,8 @@ class Settings
   module Setting
     module Macro
       def setting_macro(attribute)
-        logger = Log.get(self)
-
-        logger.trace { "Defining setting attribute: #{attribute}" }
         Attribute::Define.(self, attribute, :accessor)
-        Settings::Registry.register(self, attribute).tap do
-          logger.debug { "Defined setting attribute: #{attribute}" }
-        end
+        Settings::Registry.register(self, attribute)
       end
       alias :setting :setting_macro
     end

data/lib/settings/settings.rb

@@ -1,18 +1,12 @@
 class Settings
   class Error < RuntimeError; end
 
-  include Log::Dependency
-
   attr_reader :data
 
   def initialize(data)
     @data = data
   end
 
-  def self.logger
-    @logger ||= Log.get(self)
-  end
-
   def self.build(source=nil)
     source ||= implementer_source
 
@@ -28,20 +22,14 @@ class Settings
   end
 
   def self.implementer_source
-    logger.trace { "Getting data source from the implementer" }
-
-    unless self.respond_to? :data_source
-      logger.trace { "Implementer doesn't provide a data_source" }
+    unless self.respond_to?(:data_source)
       return nil
     end
 
-    self.data_source.tap do |data_source|
-      logger.trace { "Got data source from the implementer (#{data_source})" }
-    end
+    self.data_source
   end
 
   def set(receiver, *namespace, attribute: nil, strict: true)
-    logger.trace { "Setting #{receiver.class.name} (#{digest(namespace, attribute, strict)})" }
     unless attribute.nil?
       value = set_attribute(receiver, attribute, namespace, strict)
     else
@@ -51,8 +39,6 @@ class Settings
   end
 
   def set_attribute(receiver, attribute, namespace, strict)
-    logger.trace { "Setting #{receiver.class.name} attribute (#{digest(namespace, attribute, strict)})" }
-
     attribute = attribute.to_s if attribute.is_a?(Symbol)
 
     attribute_namespace = namespace.dup
@@ -61,35 +47,25 @@ class Settings
     value = get(attribute_namespace)
 
     if value.nil?
-      msg = "#{attribute_namespace} not found in the data"
-      logger.error { msg }
-      raise Settings::Error, msg
+      raise Settings::Error, "#{attribute_namespace} not found in the data"
     end
 
     Settings::Setting::Assignment::Attribute.assign(receiver, attribute.to_sym, value, strict)
 
-    logger.debug { "Set #{receiver.class.name} #{attribute} to #{value.inspect}" }
-
     value
   end
 
   def set_object(receiver, namespace, strict)
-    logger.trace { "Setting #{receiver.class.name} object (#{digest(namespace, nil, strict)})" }
-
     data = get(namespace)
 
     if data.nil?
-      msg = "#{namespace} not found in the data"
-      logger.error { msg }
-      raise Settings::Error, msg
+      raise Settings::Error, "#{namespace} not found in the data"
     end
 
     data.each do |attribute, value|
       Settings::Setting::Assignment::Object.assign(receiver, attribute.to_sym, value, strict)
     end
 
-    logger.debug { "Set #{receiver.class.name} object (#{digest(namespace, nil, strict)})" }
-
     receiver
   end
 
@@ -99,7 +75,6 @@ class Settings
 
   def get(*namespace)
     namespace.flatten!
-    logger.trace { "Getting #{namespace}" }
 
     keys = namespace.map { |n| n.is_a?(Symbol) ? n.to_s : n }
 
@@ -110,18 +85,6 @@ class Settings
       value = data.dig(*keys)
     end
 
-    logger.debug { "Got #{namespace}" }
-    logger.debug(tag: :data) { "#{namespace}: #{value.inspect}" }
-
     value
   end
-
-  def digest(namespace, attribute, strict)
-    content = []
-    content << "Namespace: #{namespace.join ', '}" unless namespace.empty?
-    content << "Attribute: #{attribute}" if attribute
-    strict = "<not set>" if strict.nil?
-    content << "Strict: #{strict}"
-    content.join ', '
-  end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: evt-settings
 version: !ruby/object:Gem::Version
-  version: 2.1.0.1
+  version: 2.1.1.5
 platform: ruby
 authors:
 - The Eventide Project
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-12-10 00:00:00.000000000 Z
+date: 2020-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: evt-log
+  name: evt-attribute
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -66,9 +66,9 @@ files:
 - lib/settings/controls/subject.rb
 - lib/settings/data_source.rb
 - lib/settings/data_source/build.rb
+- lib/settings/data_source/env.rb
 - lib/settings/data_source/file.rb
 - lib/settings/data_source/hash.rb
-- lib/settings/log.rb
 - lib/settings/registry.rb
 - lib/settings/setting.rb
 - lib/settings/setting/assignment.rb
@@ -78,7 +78,7 @@ homepage: https://github.com/eventide-project/settings
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -93,8 +93,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Settings data access and assignment
 test_files: []

data/lib/settings/log.rb

@@ -1,9 +0,0 @@
-class Settings
-  class Log < ::Log
-    def tag!(tags)
-      tags << :settings
-      tags << :library
-      tags << :verbose
-    end
-  end
-end