config_default 0.1.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8986cd898691eacd74aec36524a3eacd38433629b6ba8e71638619b33dd9f817
-  data.tar.gz: 87e0031a77052c3f9e42b87a2c670874cca926a6e1d0803c0c9c113d717f441f
+  metadata.gz: 22a68604e91e09d6852ff82a00591cd121667b0fa0c5ed55a89e2c9c583c6684
+  data.tar.gz: 4e927c83a5531bf50132ade3d27a11a5c8dea03ab8373a7082797c6748c5ef15
 SHA512:
-  metadata.gz: f86e0e505bea0492833852ef4957c73ed8b3ab1b1f43e81e114cce90923fe737fb457ddf0259c5234a079b5458e6b1a6325c4dd560d2ad9c64526c63894bb432
-  data.tar.gz: 68a825fe3fd12616f413d28a20b712b9d8783d18bbc3b88615999502581fcbb58a3f74b714149c7d07ea627a8f721f9f8ff4ade4026a7fe7cf8eed7a7ef1800f
+  metadata.gz: 4e0ea59583d2bdebfce8d140ee9299b1b6a2039f952fae3fc11bfd5a2b8cda16a7166df8b0d47398be05be69dbc9181f3bb5dcd791f251e19a88db45061bc59a
+  data.tar.gz: 7e00d91352e0b2763748388ef8da77f2776d4df23de4f885c41b22aea2c3885a6e3e57dc3c6fb00d2a397d2a328717ce39cb01f44c4b08e89eb2433b77854bfd

data/.github/workflows/main.yml

@@ -24,7 +24,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: [2.5, 2.6, 2.7, 3.0]
+        ruby: [2.7, 3.0, 3.1]
 
     steps:
     - uses: actions/checkout@v2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.2
+
+- Move config struct option definition from `#method_missing` to `#define_singleton_method`
+
 ## 0.1.1
 
 - Remove Rails dependency.

data/Gemfile.lock

@@ -1,83 +1,91 @@
 PATH
   remote: .
   specs:
-    config_default (0.1.1)
-      activesupport (~> 6)
+    config_default (0.2.2)
+      activesupport (>= 6)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actioncable (7.0.1)
+      actionpack (= 7.0.1)
+      activesupport (= 7.0.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionmailbox (7.0.1)
+      actionpack (= 7.0.1)
+      activejob (= 7.0.1)
+      activerecord (= 7.0.1)
+      activestorage (= 7.0.1)
+      activesupport (= 7.0.1)
       mail (>= 2.7.1)
-    actionmailer (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      actionview (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.1)
+      actionpack (= 7.0.1)
+      actionview (= 7.0.1)
+      activejob (= 7.0.1)
+      activesupport (= 7.0.1)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.4.1)
-      actionview (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.1)
+      actionview (= 7.0.1)
+      activesupport (= 7.0.1)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actiontext (7.0.1)
+      actionpack (= 7.0.1)
+      activerecord (= 7.0.1)
+      activestorage (= 7.0.1)
+      activesupport (= 7.0.1)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionview (7.0.1)
+      activesupport (= 7.0.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.4.1)
-      activesupport (= 6.1.4.1)
+    activejob (7.0.1)
+      activesupport (= 7.0.1)
       globalid (>= 0.3.6)
-    activemodel (6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activerecord (6.1.4.1)
-      activemodel (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activestorage (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-      marcel (~> 1.0.0)
+    activemodel (7.0.1)
+      activesupport (= 7.0.1)
+    activerecord (7.0.1)
+      activemodel (= 7.0.1)
+      activesupport (= 7.0.1)
+    activestorage (7.0.1)
+      actionpack (= 7.0.1)
+      activejob (= 7.0.1)
+      activerecord (= 7.0.1)
+      activesupport (= 7.0.1)
+      marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.4.1)
+    activesupport (7.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     ast (2.4.2)
     builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
     crass (1.0.6)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
+    digest (3.1.0)
     erubi (1.10.0)
-    globalid (0.5.2)
+    globalid (1.0.0)
       activesupport (>= 5.0)
     i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    loofah (2.12.0)
+    io-wait (0.2.1)
+    loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -85,14 +93,29 @@ GEM
     marcel (1.0.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    minitest (5.14.4)
+    minitest (5.15.0)
+    net-imap (0.2.3)
+      digest
+      net-protocol
+      strscan
+    net-pop (0.1.1)
+      digest
+      net-protocol
+      timeout
+    net-protocol (0.1.2)
+      io-wait
+      timeout
+    net-smtp (0.3.1)
+      digest
+      net-protocol
+      timeout
     nio4r (2.5.8)
-    nokogiri (1.12.5-x86_64-darwin)
+    nokogiri (1.13.1-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.12.5-x86_64-linux)
+    nokogiri (1.13.1-x86_64-linux)
       racc (~> 1.4)
     parallel (1.21.0)
-    parser (3.0.2.0)
+    parser (3.1.0.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
@@ -101,35 +124,35 @@ GEM
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.1.4.1)
-      actioncable (= 6.1.4.1)
-      actionmailbox (= 6.1.4.1)
-      actionmailer (= 6.1.4.1)
-      actionpack (= 6.1.4.1)
-      actiontext (= 6.1.4.1)
-      actionview (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activemodel (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    rails (7.0.1)
+      actioncable (= 7.0.1)
+      actionmailbox (= 7.0.1)
+      actionmailer (= 7.0.1)
+      actionpack (= 7.0.1)
+      actiontext (= 7.0.1)
+      actionview (= 7.0.1)
+      activejob (= 7.0.1)
+      activemodel (= 7.0.1)
+      activerecord (= 7.0.1)
+      activestorage (= 7.0.1)
+      activesupport (= 7.0.1)
       bundler (>= 1.15.0)
-      railties (= 6.1.4.1)
-      sprockets-rails (>= 2.0.0)
+      railties (= 7.0.1)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    railties (7.0.1)
+      actionpack (= 7.0.1)
+      activesupport (= 7.0.1)
       method_source
-      rake (>= 0.13)
+      rake (>= 12.2)
       thor (~> 1.0)
-    rainbow (3.0.0)
+      zeitwerk (~> 2.5)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.2.0)
     rexml (3.2.5)
     rspec (3.10.0)
       rspec-core (~> 3.10.0)
@@ -137,61 +160,55 @@ GEM
       rspec-mocks (~> 3.10.0)
     rspec-core (3.10.1)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.3)
-    rubocop (1.17.0)
+    rubocop (1.25.0)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 1.15.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.13.0)
+    rubocop-ast (1.15.1)
       parser (>= 3.0.1.1)
-    rubocop-config-umbrellio (1.17.0.53)
-      rubocop (= 1.17.0)
-      rubocop-performance (= 1.10.0)
-      rubocop-rails (= 2.9.1)
-      rubocop-rake (= 0.5.1)
-      rubocop-rspec (= 2.2.0)
-      rubocop-sequel (= 0.2.0)
-    rubocop-performance (1.10.0)
-      rubocop (>= 0.90.0, < 2.0)
+    rubocop-config-umbrellio (1.25.0.61)
+      rubocop (~> 1.25.0)
+      rubocop-performance (~> 1.13.0)
+      rubocop-rails (~> 2.13.0)
+      rubocop-rake (~> 0.6.0)
+      rubocop-rspec (~> 2.7.0)
+      rubocop-sequel (~> 0.3.3)
+    rubocop-performance (1.13.2)
+      rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
-    rubocop-rails (2.9.1)
+    rubocop-rails (2.13.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.90.0, < 2.0)
-    rubocop-rake (0.5.1)
-      rubocop
-    rubocop-rspec (2.2.0)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
-    rubocop-sequel (0.2.0)
+    rubocop-rspec (2.7.0)
+      rubocop (~> 1.19)
+    rubocop-sequel (0.3.3)
       rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
-    sprockets (4.0.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.4.0)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      sprockets (>= 3.0.0)
-    thor (1.1.0)
+    strscan (3.0.1)
+    thor (1.2.1)
+    timeout (0.2.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.5.1)
+    zeitwerk (2.5.3)
 
 PLATFORMS
   x86_64-darwin-20

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:
@@ -33,6 +33,14 @@ ConfigDefault.configure do |config|
 end
 ```
 
+If you want to implement Rails monkey patches for `Rails.application.config_for` and ability to
+separate `database.yml` file you need to apply `#init_rails_monkey_patch!` method in your
+`application.yml` file before application initialization.
+
+```ruby
+  ConfigDefault.init_rails_monkey_patch!
+```
+
 ## Usage
 
 ### Default behaviour
@@ -104,7 +112,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 +164,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/init.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module ConfigDefault::Init
+  extend self
+
+  def init_rails_monkey_patch!
+    return unless Object.const_defined?(:Rails)
+
+    Rails::Application.prepend(ConfigDefault::RailsApplicationExtension)
+    Rails::Application::Configuration.prepend(ConfigDefault::RailsApplicationConfigurationExtension)
+  end
+end

data/lib/config_default/{rails/application/configuration_extension.rb → rails_application_configuration_extension.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-module Rails::Application::ConfigurationExtension
+module ConfigDefault::RailsApplicationConfigurationExtension
   def load_database_yaml
     ConfigDefault.load(:database, key: nil)
   end
@@ -9,5 +9,3 @@ module Rails::Application::ConfigurationExtension
     load_database_yaml
   end
 end
-
-Rails::Application::Configuration.prepend(Rails::Application::ConfigurationExtension)

data/lib/config_default/{rails/application_extension.rb → rails_application_extension.rb}

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
-module Rails::ApplicationExtension
+module ConfigDefault::RailsApplicationExtension
   def config_for(name, env: Rails.env)
     data = ConfigDefault.load(name, key: env, deep_symbolize_keys: true)
     ActiveSupport::OrderedOptions.new.merge(data)
   end
 end
-
-Rails::Application.prepend(Rails::ApplicationExtension)

data/lib/config_default/struct.rb

@@ -1,17 +1,15 @@
 # frozen_string_literal: true
 
 class ConfigDefault::Struct
-  def initialize(attributes = {}, recursive: false, allow_nil: false)
+  RESERVED_METHODS = %i[method_missing respond_to_missing? to_hash].freeze
+
+  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
+    make_recursive!
+    define_methods!
 
     @attributes.freeze
   end
@@ -21,8 +19,8 @@ class ConfigDefault::Struct
   end
 
   def method_missing(method, *_args)
-    return @attributes[method] if @attributes.key?(method)
-    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)
@@ -41,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.1"
+  VERSION = "0.2.2"
 end

data/lib/config_default.rb

@@ -4,8 +4,10 @@ require "active_support/core_ext/hash"
 
 require "config_default/version"
 require "config_default/config"
+require "config_default/init"
 require "config_default/struct"
-require "config_default/rails_monkey_patch"
+require "config_default/rails_application_extension"
+require "config_default/rails_application_configuration_extension"
 
 module ConfigDefault
   extend self
@@ -18,11 +20,15 @@ module ConfigDefault
     yield(config) if block_given?
   end
 
+  def init_rails_monkey_patch!
+    ConfigDefault::Init.init_rails_monkey_patch!
+  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,9 +48,10 @@ 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
-
-ConfigDefault::RailsMonkeyPatch.call

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: config_default
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Stepan Kirushkin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-20 00:00:00.000000000 Z
+date: 2022-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6'
 description: |2
@@ -44,18 +44,11 @@ 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
-- lib/config_default/rails/application_extension.rb
-- lib/config_default/rails_monkey_patch.rb
+- lib/config_default/init.rb
+- lib/config_default/rails_application_configuration_extension.rb
+- lib/config_default/rails_application_extension.rb
 - lib/config_default/struct.rb
 - lib/config_default/version.rb
 homepage: https://github.com/skirushkin/config_default

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"

data/lib/config_default/rails_monkey_patch.rb

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-module ConfigDefault::RailsMonkeyPatch
-  extend self
-
-  def call
-    return unless Object.const_defined?("Rails")
-    return unless Object.const_defined?("Rails::Application")
-    return unless Object.const_defined?("Rails::Application::Configuration")
-
-    require "config_default/rails/application_extension"
-    require "config_default/rails/application/configuration_extension"
-  end
-end