app-configs 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1445b70f46129c976ec7ff670035c80c77291eba1756b3bda209dd6fbf4855c
-  data.tar.gz: 7a4d16f7f67add7f2fdf4bb0657893d35322aea7f47f1e05075b3a5e55835bfe
+  metadata.gz: 1604af5697161e0aee809f766c8925509481a4f54ed767986739dcdaea6dc906
+  data.tar.gz: 66ae81383a077848a80c9ea8241611408dbda5cb5eb2eaf43e30f1df44dbcc8a
 SHA512:
-  metadata.gz: 9e8e58aaf80be49bb8c0250b79ae25d1527f20a30dac2d7868720a72ee5238e11527793f00c8c1aa1ba454ddb20c9f10ae1832d446540c05a2bf4865cb5dc4eb
-  data.tar.gz: 78b2f709f4ba63113963f5b35a9194a99ff698f713925d2ce2c2beea74c71a568a32a0fb57876ad42404e2d094080b8b2a58dbac95237a6d0886889630cb4269
+  metadata.gz: 2c9e4056085ab2ed012e8e92c202a3a601083148b6deb19f6ae940103024b606edb109087f0d6064b19ad5eeec26013d936ceee14b282cdfab4e1dc390a73bf2
+  data.tar.gz: 4f61dd7411ad7f0dba986cd05fdb2c3aad58cf5deeef38f019e94a8e80558e9f6a4d8dcef4af03770cd9409c59c6ea9182b9fef02011862446e5ee7edd0ce269

data/lib/app/config.rb

@@ -1,13 +1,26 @@
 require "app/config/version"
 require "app/config/base"
-require "app/config/deeply"
 
 module App
   module Config
     class Error < StandardError; end
 
+    DEFAULT_PATH  =  "$ROOT/config/defaults:$ROOT/config:$ROOT/var"
+
     class  <<  self
-      include App::Config::Base
+      def new( *args, **opts )
+        type  =  args.shift || :YAML
+        case  type.to_sym
+        when  :RUBY
+          App::Config::RUBY.new( **opts )
+        when  :YAML
+          App::Config::YAML.new( **opts )
+        when  :JSON
+          App::Config::JSON.new( **opts )
+        else
+          raise  App::Config::Error, "unknown type: #{type}"
+        end
+      end
     end
 
     autoload  :RUBY, "app/config/ruby"

data/lib/app/config/base.rb

@@ -2,26 +2,12 @@
 module App
   module Config
 
-    class Error < StandardError; end
-
-    DEFAULT_PATH  =  "$ROOT/config/defaults:$ROOT/config:$ROOT/var"
-
     module Base
-
-      def new( *args, **opts )
-        type  =  args.shift || :YAML
-        case  type.to_sym
-        when  :RUBY
-          App::Config::RUBY.new( **opts )
-        when  :YAML
-          App::Config::YAML.new( **opts )
-        when  :JSON
-          App::Config::JSON.new( **opts )
-        else
-          raise  App::Config::Error, "unknown type: #{type}"
+      def initialize
+        self.default_proc  =  proc do |hash, key|
+          hash[key]  =  {}
         end
       end
-
     end
 
   end

data/lib/app/config/deeply.rb

@@ -1,191 +1,196 @@
+# frozen_string_literal: true
 
-## deeply_symbolize_keys
+module Deeply
 
-class Hash
-  def deeply_symbolize_keys!
-    temp  =  self.deeply_symbolize_keys
-    self.clear
-    self.merge!( temp )
-  end
+  ## deeply_symbolize_keys
+
+  refine Hash do
+    def deeply_symbolize_keys!
+      temp  =  self.deeply_symbolize_keys
+      self.clear
+      self.merge!( temp )
+    end
 
-  def deeply_symbolize_keys
-    self.each_with_object({}) do |(key, obj), hash|
-      k  =  key.to_s.to_sym
-      case  obj
-      when  Array, Hash
-        hash[k]  =  obj.deeply_symbolize_keys
-      else
-        hash[k]  =  obj
+    def deeply_symbolize_keys
+      self.each_with_object({}) do |(key, obj), hash|
+        k  =  key.to_s.to_sym
+        case  obj
+        when  Array, Hash
+          hash[k]  =  obj.deeply_symbolize_keys
+        else
+          hash[k]  =  obj
+        end
       end
     end
   end
-end
 
-class Array
-  def deeply_symbolize_keys!
-    temp  =  self.deeply_symbolize_keys
-    self.clear
-    self.push( *temp )
-  end
+  refine Array do
+    def deeply_symbolize_keys!
+      temp  =  self.deeply_symbolize_keys
+      self.clear
+      self.push( *temp )
+    end
 
-  def deeply_symbolize_keys
-    self.map do |obj|
-      case  obj
-      when  Array, Hash
-        obj.deeply_symbolize_keys
-      else
-        obj.dup
+    def deeply_symbolize_keys
+      self.map do |obj|
+        case  obj
+        when  Array, Hash
+          obj.deeply_symbolize_keys
+        else
+          obj.dup
+        end
       end
     end
   end
-end
 
 
-## deeply_stringify_keys
+  ## deeply_stringify_keys
 
-class Hash
-  def deeply_stringify_keys!
-    temp  =  self.deeply_stringify_keys
-    self.clear
-    self.merge!( temp )
-  end
+  refine Hash do
+    def deeply_stringify_keys!
+      temp  =  self.deeply_stringify_keys
+      self.clear
+      self.merge!( temp )
+    end
 
-  def deeply_stringify_keys
-    self.each_with_object({}) do |(key, obj), hash|
-      k  =  key.to_s
-      case  obj
-      when  Array, Hash
-        hash[k]  =  obj.deeply_stringify_keys
-      else
-        hash[k]  =  obj
+    def deeply_stringify_keys
+      self.each_with_object({}) do |(key, obj), hash|
+        k  =  key.to_s
+        case  obj
+        when  Array, Hash
+          hash[k]  =  obj.deeply_stringify_keys
+        else
+          hash[k]  =  obj
+        end
       end
     end
   end
-end
 
-class Array
-  def deeply_stringify_keys!
-    temp  =  self.deeply_stringify_keys
-    self.clear
-    self.push( *temp )
-  end
+  refine Array do
+    def deeply_stringify_keys!
+      temp  =  self.deeply_stringify_keys
+      self.clear
+      self.push( *temp )
+    end
 
-  def deeply_stringify_keys
-    self.map do |obj|
-      case  obj
-      when  Array, Hash
-        obj.deeply_stringify_keys
-      else
-        obj.dup
+    def deeply_stringify_keys
+      self.map do |obj|
+        case  obj
+        when  Array, Hash
+          obj.deeply_stringify_keys
+        else
+          obj.dup
+        end
       end
     end
   end
-end
 
 
-## deeply_merge
+  ## deeply_merge
 
-class Hash
-  def deeply_merge( hash )
-    raise  ArgumentError( "type invalid. : %s" % hash )    unless  hash.is_a? Hash
+  refine Hash do
+    def deeply_merge( hash )
+      raise  ArgumentError( "type invalid. : %s" % hash )    unless  hash.is_a? Hash
 
-    temp  =  self.deeply_dup
-    temp.deeply_merge!( hash )
-    temp
-  end
+      temp  =  self.deeply_dup
+      temp.deeply_merge!( hash )
+      temp
+    end
 
-  def deeply_merge!( hash )
-    raise  ArgumentError( "type invalid. : %s" % hash )    unless  hash.is_a? Hash
-
-    hash.each do |key, obj|
-      case  obj
-      when  NilClass
-        self[key]  =  nil
-      when  Hash
-        self[key]  =  {}    if self[key].nil?
-        self[key].deeply_merge!(obj)
-      else
-        self[key]  =  obj.dup
+    def deeply_merge!( hash )
+      raise  ArgumentError( "type invalid. : %s" % hash )    unless  hash.is_a? Hash
+
+      hash.each do |key, obj|
+        case  obj
+        when  NilClass
+          self[key]  =  nil
+        when  Hash
+          self[key]  =  {}    if self[key].nil?
+          self[key].deeply_merge!(obj)
+        else
+          self[key]  =  obj.dup
+        end
       end
     end
   end
-end
 
 
-## deeply_map
+  ## deeply_map
 
-class Hash
-  def deeply_map( &block )
-    temp  =  self.deeply_dup
-    temp.deeply_map!( &block )
-    temp
-  end
+  refine Hash do
+    def deeply_map( &block )
+      temp  =  self.deeply_dup
+      temp.deeply_map!( &block )
+      temp
+    end
 
-  def deeply_map!( &block )
-    self.each do |key, obj|
-      case  obj
-      when  NilClass
-        self[key]  =  nil
-      when  Array, Hash
-        self[key].deeply_map!( &block )
-      else
-        self[key]  =  block.call( obj )
+    def deeply_map!( &block )
+      self.each do |key, obj|
+        case  obj
+        when  NilClass
+          self[key]  =  nil
+        when  Array, Hash
+          self[key].deeply_map!( &block )
+        else
+          self[key]  =  block.call( obj )
+        end
       end
     end
   end
-end
 
-class Array
-  def deeply_map( &block )
-    temp  =  self.deeply_dup
-    temp.deeply_map!( &block )
-    temp
-  end
+  refine Array do
+    def deeply_map( &block )
+      temp  =  self.deeply_dup
+      temp.deeply_map!( &block )
+      temp
+    end
 
-  def deeply_map!( &block )
-    self.map! do |obj|
-      case  obj
-      when  NilClass
-        nil
-      when  Array, Hash
-        obj.deeply_map!( &block )
-      else
-        block.call( obj )
+    def deeply_map!( &block )
+      self.map! do |obj|
+        case  obj
+        when  NilClass
+          nil
+        when  Array, Hash
+          obj.deeply_map!( &block )
+        else
+          block.call( obj )
+        end
       end
     end
   end
-end
 
 
-## deeply_dup
+  ## deeply_dup
 
-class Hash
-  def deeply_dup
-    self.each_with_object({}) do |(key, obj), hash|
-      case  obj
-      when  NilClass
-        hash[key]  =  nil
-      when  Array, Hash
-        hash[key]  =  obj.deeply_dup
-      else
-        hash[key]  =  obj.dup
+  refine Hash do
+    def deeply_dup
+      self.each_with_object({}) do |(key, obj), hash|
+        case  obj
+        when  NilClass
+          hash[key]  =  nil
+        when  Array, Hash
+          hash[key]  =  obj.deeply_dup
+        else
+          hash[key]  =  obj.dup
+        end
       end
     end
   end
-end
 
-class Array
-  def deeply_dup
-    self.map do |obj|
-      case  obj
-      when  NilClass
-        nil
-      when  Array, Hash
-        obj.deeply_dup
-      else
-        obj.dup
+  refine Array do
+    def deeply_dup
+      self.map do |obj|
+        case  obj
+        when  NilClass
+          nil
+        when  Array, Hash
+          obj.deeply_dup
+        else
+          obj.dup
+        end
       end
     end
   end
+
 end
 

data/lib/app/config/json.rb

@@ -3,19 +3,22 @@ require  "erb"
 require  "json"
 require  "time"
 require  "date"
+require_relative "deeply"
 
 module App
   module Config
+    using Deeply
 
     class JSON < ::Hash
+      include App::Config::Base
+
       DEFAULT_MASK  =  "*.json"
       DEFAULT_SUFFIX  =  ".json"
+      DEFAULT_ENCODE  =  { allow_nan: true }
+      DEFAULT_DECODE  =  { allow_nan: true }
 
       def initialize( **opts )
-        super
-        self.default_proc  =  proc do |hash, key|
-          hash[key]  =  {}
-        end
+        super()
         reload( **opts )
       end
 
@@ -30,8 +33,8 @@ module App
         @vardir  =  @paths.last
         Dir.mkdir( @vardir )    unless ::Dir.exist?( @vardir )
 
-        @encode  =  { allow_nan: true }.merge( encode || {} )
-        @decode  =  { allow_nan: true }.merge( decode || {} )
+        @encode  =  DEFAULT_ENCODE.merge( encode || {} )
+        @decode  =  DEFAULT_DECODE.merge( decode || {} )
 
         load_overlay( DEFAULT_MASK )
       end

data/lib/app/config/ruby.rb

@@ -1,18 +1,21 @@
 require  "fileutils"
 require  "pp"
+require_relative "deeply"
 
 module App
   module Config
+    using Deeply
 
     class RUBY < ::Hash
+      include App::Config::Base
+
       DEFAULT_MASK  =  "*.rb"
       DEFAULT_SUFFIX  =  ".rb"
+      DEFAULT_ENCODE  =  {}
+      DEFAULT_DECODE  =  {}
 
       def initialize( **opts )
-        super
-        self.default_proc  =  proc do |hash, key|
-          hash[key]  =  {}
-        end
+        super()
         reload( **opts )
       end
 
@@ -27,8 +30,8 @@ module App
         @vardir  =  @paths.last
         Dir.mkdir( @vardir )    unless ::Dir.exist?( @vardir )
 
-        @encode  =  {}.merge( encode || {} )
-        @decode  =  {}.merge( decode || {} )
+        @encode  =  DEFAULT_ENCODE.merge( encode || {} )
+        @decode  =  DEFAULT_DECODE.merge( decode || {} )
 
         load_overlay( DEFAULT_MASK )
       end
@@ -65,10 +68,14 @@ module App
         pathname  =  savepathname(section)
         hash  =  { section => self[section] }.deeply_stringify_keys
         ::File.open( pathname, "w" ) do |file|
-          file.puts( hash.pretty_inspect )
+          file.puts( pretty_text( hash ) )
         end
       end
 
+      def pretty_text( hash )
+        hash.pretty_inspect
+      end
+
       # remove and load configuration.
       def reset( section )
         raise  ArgumentError, "'#{ section }' is not String."    unless  String === section

data/lib/app/config/version.rb

@@ -1,5 +1,5 @@
 module App
   module Config
-    VERSION = "0.1.4"
+    VERSION = "0.1.5"
   end
 end

data/lib/app/config/yaml.rb

@@ -1,19 +1,22 @@
 require  "fileutils"
 require  "erb"
 require  "yaml"
+require_relative "deeply"
 
 module App
   module Config
+    using Deeply
 
     class YAML < ::Hash
+      include App::Config::Base
+
       DEFAULT_MASK  =  "*.{yml,yaml}"
       DEFAULT_SUFFIX  =  ".yaml"
+      DEFAULT_ENCODE  =  {}
+      DEFAULT_DECODE  =  {}
 
       def initialize( **opts )
-        super
-        self.default_proc  =  proc do |hash, key|
-          hash[key]  =  {}
-        end
+        super()
         reload( **opts )
       end
 
@@ -28,8 +31,8 @@ module App
         @vardir  =  @paths.last
         Dir.mkdir( @vardir )    unless ::Dir.exist?( @vardir )
 
-        @encode  =  {}.merge( encode || {} )
-        @decode  =  {}.merge( decode || {} )
+        @encode  =  DEFAULT_ENCODE.merge( encode || {} )
+        @decode  =  DEFAULT_DECODE.merge( decode || {} )
 
         load_overlay( DEFAULT_MASK )
       end
@@ -67,10 +70,14 @@ module App
         pathname  =  savepathname(section)
         hash  =  { section => self[section] }.deeply_stringify_keys
         ::File.open( pathname, "w" ) do |file|
-          file.puts( ::YAML.dump( hash, **@encode ) )
+          file.puts( pretty_text( hash ) )
         end
       end
 
+      def pretty_text( hash )
+        ::YAML.dump( hash, **@encode )
+      end
+
       # remove and load configuration.
       def reset( section )
         raise  ArgumentError, "'#{ section }' is not String."    unless  String === section

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: app-configs
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - arimay
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-27 00:00:00.000000000 Z
+date: 2021-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake