evt-settings 1.0.0.0 → 1.1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b662f4360590c38fc8b3a371fc338116973a0b7165778d739c8a46c1a3ddd06
-  data.tar.gz: 75aced59eb4a2452434a06463d2f55fbe83d33f25d13058ab2b2d999ca377778
+  metadata.gz: d0abfcafdd139db015431e84676760b936413ad7696992d6af088399ae8a5e2d
+  data.tar.gz: fe15fdf903dc1ccc275b56acc430397fb69fef737cc778ffd1cd41de2d15a743
 SHA512:
-  metadata.gz: ef866a762a34fa31311135ad85835404789d3cc8d3c3dfed71b9616d4cb13ca977130ec48c558f63ad9c4b8ad1f4729ed248112eb0ffeaa6df215341125f24b7
-  data.tar.gz: 1d169da8fbc126cdedcadc971d94b1179a6b93384bef0a4377149e3546de7b0ce03a4503e4769e28e1a2d216a76132300acd4e73254b7e92f797c1802c76e636
+  metadata.gz: 398a50b88b43b5994140d9cc71041c5dfd683ccf0108ea0b083131e91f16cba7870ca9fd9b31dcf222ff1ace5205e42de554b4b7d5d2586c406c1cff45131892
+  data.tar.gz: 36db77a43d48881b8d77c5d95122990c1c9894caf1b0f44bd5da42f419c93c2be7a3824601172a82d3945382dd8ab262e7594e17b7c6ec5a98a3ed355d7fb1c8

data/lib/settings.rb

@@ -4,10 +4,9 @@ require 'json'
 require 'log'
 require 'casing'
 require 'attribute'
-require 'confstruct'
 
 require 'settings/log'
-require 'settings/data_source/data_source'
+require 'settings/data_source'
 require 'settings/data_source/hash'
 require 'settings/data_source/file'
 require 'settings/data_source/build'

data/lib/settings/controls.rb

@@ -1,3 +1,4 @@
 require 'settings/controls/subject'
 require 'settings/controls/data_source'
+require 'settings/controls/data'
 require 'settings/controls/settings'

data/lib/settings/controls/data.rb

@@ -0,0 +1,54 @@
+class Settings
+  module Controls
+    module Data
+      module Flat
+        module Single
+          def self.example
+            {
+              'some_setting' => 'some value'
+            }
+          end
+        end
+
+        module Multiple
+          def self.example
+            {
+              'some_setting' => 'some value',
+              'some_other_setting' => 'some other value',
+            }
+          end
+        end
+      end
+
+      module Hierarchical
+        def self.example
+          {
+            'some_namespace' => {
+              'some_setting' => 'some value'
+            }
+          }
+        end
+      end
+
+      module CamelCaseKeys
+        def self.example
+          {
+            'someNamespace' => {
+              'someSetting' => 'some value'
+            }
+          }
+        end
+      end
+
+      module SymbolKeys
+        def self.example
+          {
+            :some_namespace => {
+              :some_setting => 'some value'
+            }
+          }
+        end
+      end
+    end
+  end
+end

data/lib/settings/controls/data_source.rb

@@ -7,9 +7,17 @@ class Settings
         end
 
         def self.data
-          {
-            some_setting: 'some value'
-          }
+          Data::Flat::Single.example
+        end
+
+        module SymbolKeys
+          def self.example
+            ::Settings::DataSource::Hash.build(data)
+          end
+
+          def self.data
+            Data::SymbolKeys.example
+          end
         end
       end
 

data/lib/settings/controls/settings.rb

@@ -3,84 +3,44 @@ class Settings
     module Settings
       module SettingAttribute
         def self.example
-          ::Settings.new(data)
+          ::Settings.build(data)
         end
 
         def self.data
-          {
-            "some_setting" => "some value"
-          }
+          Data::Flat::Single.example
         end
       end
 
-      module SettingAttributes
+      module PartialMatch
         def self.example
-          ::Settings.new(data)
+          ::Settings.build(data)
         end
 
         def self.data
-          {
-            "some_setting" => "some value",
-            "some_other_setting" => "some other value",
-            "yet_another_setting" => "yet another value"
-          }
-        end
-
-        module Partial
-          def self.example
-            ::Settings.new(data)
-          end
-
-          def self.data
-            {
-              "some_setting" => "some value",
-              "some_other_setting" => "some other value",
-            }
-          end
+          Data::Flat::Multiple.example
         end
       end
 
-      module AccessorAttribute
+      module Namespace
         def self.example
-          ::Settings.new(data)
+          ::Settings.build(data)
         end
 
         def self.data
-          {
-            "some_accessor_attribute" => "some accessor value"
-          }
+          Data::Hierarchical.example
         end
       end
 
-      module Namespace
+      module AccessorAttribute
         def self.example
-          ::Settings.new(data)
+          ::Settings.build(data)
         end
 
         def self.data
           {
-            "some_namespace" => {
-              "some_setting" => "some value"
-            }
+            'some_accessor_attribute' => 'some accessor value'
           }
         end
-
-        module Override
-          def self.example
-            s = ::Settings.build(Namespace.data)
-            s.override(data)
-            s
-          end
-
-          def self.data
-            {
-              "some_namespace" => {
-                "some_setting" => "some overridden value",
-                "some_other_setting" => "some other value"
-              }
-            }
-          end
-        end
       end
     end
   end

data/lib/settings/{data_source/data_source.rb → data_source.rb}

@@ -7,5 +7,11 @@ class Settings
     def initialize(source)
       @source = source
     end
+
+    def self.build(source=nil)
+      source = canonize(source) if respond_to? :canonize
+
+      new(source)
+    end
   end
 end

data/lib/settings/data_source/file.rb

@@ -1,22 +1,18 @@
 class Settings
   class DataSource
     class File < DataSource
-      def self.build(source=nil)
-        canonical = canonical(source)
-        validate(canonical)
+      def self.canonize(source)
+        logger.trace { "Canonizing the file source (Source: #{source})" }
 
-        new(canonical)
-      end
+        canonized_filepath = canonize_filepath(source)
+        validate(canonized_filepath)
 
-      def self.canonical(source)
-        logger.trace { "Canonizing the file source (#{source})" }
+        logger.debug { "Canonized the file source (Source: #{source}, Canonized: #{canonized_filepath})" }
 
-        canonize(source).tap do |instance|
-          logger.debug { "Canonized the file source (#{source})" }
-        end
+        canonized_filepath
       end
 
-      def self.canonize(source)
+      def self.canonize_filepath(source)
         return default_filepath if source.nil?
         return source if full_path?(source)
 
@@ -32,6 +28,8 @@ class Settings
         dirpath ||= Pathname.new(source)
         filepath ||= Pathname.new(source)
 
+        logger.debug { "Canonized the file source (#{source})" }
+
         pathname(filepath, dirpath)
       end
 
@@ -83,8 +81,6 @@ class Settings
           logger.debug { "Read file: #{source}" }
         end
 
-        data = Casing::Underscore.(data)
-
         hash_data_source = Hash.build data
         hash_data_source.get_data
       end

data/lib/settings/data_source/hash.rb

@@ -5,14 +5,27 @@ class Settings
         @logger ||= Log.get(self)
       end
 
-      def self.build(source)
-        new(source)
+      def get_data
+        AssureStringKeys.(source)
       end
 
-      def get_data
-        logger.trace { "Converting the raw source data to Confstruct" }
-        Confstruct::Configuration.new(source).tap do |instance|
-          logger.debug { "Converted the raw source data to Confstruct" }
+      module AssureStringKeys
+        def self.call(data)
+          new_data = {}
+
+          data.each do |key, value|
+            new_key = key.to_s
+
+            if value.is_a?(::Hash)
+              new_value = self.(value)
+            else
+              new_value = value
+            end
+
+            new_data[new_key] = new_value
+          end
+
+          new_data
         end
       end
     end

data/lib/settings/settings.rb

@@ -20,6 +20,8 @@ class Settings
 
     data = data_source.get_data
 
+    data = Casing::Underscore.(data)
+
     instance = new(data)
 
     instance
@@ -38,21 +40,6 @@ class Settings
     end
   end
 
-  def override(override_data)
-    logger.trace { "Overriding settings data" }
-    res = data.push!(override_data)
-    logger.debug { "Overrode settings data" }
-    logger.debug(tag: :data) { "Override data #{override_data}" }
-    res
-  end
-
-  def reset
-    logger.trace { "Resetting overridden settings data" }
-    res = data.pop!
-    logger.debug { "Reset overridden settings data" }
-    res
-  end
-
   def set(receiver, *namespace, attribute: nil, strict: true)
     logger.trace { "Setting #{receiver.class.name} (#{digest(namespace, attribute, strict)})" }
     unless attribute.nil?
@@ -114,9 +101,14 @@ class Settings
     namespace.flatten!
     logger.trace { "Getting #{namespace}" }
 
-    string_keys = namespace.map { |n| n.is_a?(String) ? n : n.to_s }
+    keys = namespace.map { |n| n.is_a?(Symbol) ? n.to_s : n }
 
-    value = string_keys.inject(data) {|memo, k| memo ? memo[k] : nil }
+    value = nil
+    if keys.empty?
+      value = data
+    else
+      value = data.dig(*keys)
+    end
 
     logger.debug { "Got #{namespace}" }
     logger.debug(tag: :data) { "#{namespace}: #{value.inspect}" }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-settings
 version: !ruby/object:Gem::Version
-  version: 1.0.0.0
+  version: 1.1.0.1
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-04 00:00:00.000000000 Z
+date: 2019-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-log
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: confstruct
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: test_bench
   requirement: !ruby/object:Gem::Requirement
@@ -74,11 +60,12 @@ extra_rdoc_files: []
 files:
 - lib/settings.rb
 - lib/settings/controls.rb
+- lib/settings/controls/data.rb
 - lib/settings/controls/data_source.rb
 - lib/settings/controls/settings.rb
 - lib/settings/controls/subject.rb
+- lib/settings/data_source.rb
 - lib/settings/data_source/build.rb
-- lib/settings/data_source/data_source.rb
 - lib/settings/data_source/file.rb
 - lib/settings/data_source/hash.rb
 - lib/settings/log.rb
@@ -106,8 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Settings data access and assignment