config_default 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7e18b5eb5ba11e06e39b8ecc08aa74d98a32dc0bfe36caa787978224f1aca90
-  data.tar.gz: fee80751ea9a44bda3acbbb29d9714f287c6055f6c52c241251d7d8b42440df0
+  metadata.gz: 0f4cf3d6077b01b84dd411087f261e2bbd05d60e94c44dbb56533c67a28cbf44
+  data.tar.gz: ca3206dbcc7f82a9f1d37049f7106a51cba979ef735ad2b28393c3452152488f
 SHA512:
-  metadata.gz: d6da506d9904ebaf20ffd47fb3d9e0aeef689fa3bb0e39950670f7ecc2fc24f22baf064ab38b23ab7f1ed5a88a6286a6d2aba0abd22291e84229a2f905d92f28
-  data.tar.gz: 444e8ddfdcee3d3ba48bbe8e3b19b83fde496cc9429b68d8df973de971f6994106d6b2dde311f795f02da2a8d0ef7a743a0ae07ccc25e651ccdf1cf5b4334df8
+  metadata.gz: 7891a43cdf5152d15524e240a0d89ef33333073d4e8514310d49f58b134b14f34f18306882d653f11a4032b968977f73081657ae806dcead0876e19f6c1d09e7
+  data.tar.gz: 6ca0ce6cd318011478cffda1ac799d93587b0fc341ed06443fac793f3f756e207f0d72679ec76725c0b845a28a3e6bc021d6696759ee2018cdc32f512627425f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    config_default (0.1.2)
+    config_default (0.2.0)
       activesupport (~> 6)
 
 GEM

data/README.md

@@ -9,7 +9,7 @@ Maybe in future I'll remove Rails dependency (cause it's never cool) and leave o
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'config_default'
+gem "config_default"
 ```
 
 And then execute:
@@ -104,7 +104,7 @@ config = ConfigDefault.load(:app, key: nil) # Will not use key at all and result
 config = ConfigDefault.load(:app, key: "preprod") # Will search preprod key in file
 ```
 
-### Struct using
+### `#load_struct` method
 
 If you want to use configuration as a struct object you can use `#load_struct` method.
 Let's see an example with `database.yaml` config above:
@@ -156,6 +156,24 @@ config.first.second.to_hash
 # => { "third" => "option" }
 ```
 
+### Using `ConfigDefault::Struct` without configuration load
+
+You can use `ConfigDefault::Struct` to achive ability to create config object from Hash objects.
+Here an example of creation struct object on the fly:
+
+```ruby
+config_on_the_fly = { first: { second: { third: "option" } } }
+config = ConfigDefault::Struct.new(attributes: config_on_the_fly, recursive: true)
+config.first.to_hash
+# => { "second" => { "third" => "option" } }
+config.first.second.third
+# => "option"
+config.first.lolkek
+# => StandardError: There is no option :lolkek in configuration.
+```
+
+`ConfigDefault::Struct` supports `recursive` and `allow_nil` options.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/skirushkin/config_default.

data/lib/config_default/struct.rb

@@ -3,22 +3,13 @@
 class ConfigDefault::Struct
   RESERVED_METHODS = %i[method_missing respond_to_missing? to_hash].freeze
 
-  def initialize(attributes = {}, recursive: false, allow_nil: false)
+  def initialize(attributes:, recursive: false, allow_nil: false)
     @attributes = ActiveSupport::HashWithIndifferentAccess.new(attributes)
     @allow_nil = allow_nil
     @recursive = recursive
 
-    if @recursive
-      @attributes.each do |key, value|
-        next unless value.is_a?(Hash)
-        @attributes[key] = self.class.new(value, recursive: @recursive, allow_nil: @allow_nil)
-      end
-    end
-
-    @attributes.each do |key, value|
-      next if RESERVED_METHODS.include?(key.to_sym)
-      define_singleton_method(key) { value }
-    end
+    make_recursive!
+    define_methods!
 
     @attributes.freeze
   end
@@ -28,7 +19,8 @@ class ConfigDefault::Struct
   end
 
   def method_missing(method, *_args)
-    raise StandardError.new("There is no option :#{method} in configuration.") unless @allow_nil
+    return if @allow_nil
+    raise StandardError.new("There is no option :#{method} in configuration.")
   end
 
   def respond_to_missing?(*_args)
@@ -47,4 +39,26 @@ class ConfigDefault::Struct
 
     dup
   end
+
+  private
+
+  def make_recursive!
+    return unless @recursive
+
+    @attributes.each do |key, value|
+      next unless value.is_a?(Hash)
+      @attributes[key] = self.class.new(
+        attributes: value,
+        recursive: @recursive,
+        allow_nil: @allow_nil,
+      )
+    end
+  end
+
+  def define_methods!
+    @attributes.each do |key, value|
+      next if RESERVED_METHODS.include?(key.to_sym)
+      define_singleton_method(key) { value }
+    end
+  end
 end

data/lib/config_default/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ConfigDefault
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/config_default.rb

@@ -19,10 +19,10 @@ module ConfigDefault
   end
 
   def load(name, key: Rails.env, symbolize_keys: false, deep_symbolize_keys: false)
-    base_config = load_file("#{name}.#{config.postfix}")
+    default_config = load_file("#{name}.#{config.postfix}")
     config = load_file(name)
 
-    data = base_config.deep_merge(config)
+    data = default_config.deep_merge(config)
     data = key ? data[key] : data
 
     if deep_symbolize_keys
@@ -42,8 +42,11 @@ module ConfigDefault
   end
 
   def load_struct(name, key: Rails.env, recursive: false, allow_nil: false)
-    attributes = load(name, key: key)
-    ConfigDefault::Struct.new(attributes, recursive: recursive, allow_nil: allow_nil)
+    ConfigDefault::Struct.new(
+      attributes: load(name, key: key),
+      recursive: recursive,
+      allow_nil: allow_nil,
+    )
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: config_default
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Stepan Kirushkin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-20 00:00:00.000000000 Z
+date: 2021-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,13 +44,6 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- config/database.default.yml
-- config/database.yml
-- config/example1.default.yml
-- config/example1.yml
-- config/example2.default.yml
-- config/example3.yml
-- config/nested.yml
 - lib/config_default.rb
 - lib/config_default/config.rb
 - lib/config_default/rails/application/configuration_extension.rb

data/config/database.default.yml

@@ -1,2 +0,0 @@
-development:
-  host: localhost

data/config/database.yml

@@ -1,2 +0,0 @@
-development:
-  database: example

data/config/example1.default.yml

@@ -1,3 +0,0 @@
-development:
-  first: one
-  second: two

data/config/example1.yml

@@ -1,2 +0,0 @@
-development:
-  second: example

data/config/example2.default.yml

@@ -1,2 +0,0 @@
-development:
-  first: one

data/config/example3.yml

@@ -1,2 +0,0 @@
-development:
-  second: two

data/config/nested.yml

@@ -1,4 +0,0 @@
-development:
-  first:
-    second:
-      third: "three"