ettin 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9db7c8f66861b7c4756aea114ea744df55fee3e9b535d5cd80a3eac24854e504
-  data.tar.gz: 6bb9e6b54f6781f9ad786e5b17f01203bd87a1f6b565df8f8c70e4a7e6c7472f
+  metadata.gz: 9dd6d9b69ef0b573b75f582f7c6c9f2f1afb8e16b127999f144a7fd65f61a9ad
+  data.tar.gz: dc56de18c062471f558fc88790660f2a3c118e3313a998a41a394c374130ef19
 SHA512:
-  metadata.gz: c1cec2a48117c50f34e341c13db556d9f82928a8232e34be007a4fcee7417ee77f9081333b542ac522ce68d3280d192ff870b6d3e601d130eea6d7c3de996f42
-  data.tar.gz: f7a8d90857c525581d6f767574c1ecee93881464d7ccebac40ed3a4e204b077d5fe9bacc596498dfad95c0b6ef9cae2b262a247f0ca854598e8b36c948c76f37
+  metadata.gz: 5796dcf7cd7ff06b6ab16ee87bf4b4098348054ba39e8f1ad763d94c24df48a361ac5157d52da6200239cb9662bf9748b9f254e1ef6b2af3ccbb658d05ec94ad
+  data.tar.gz: 32dfd88f01e37b6033db91ceed9b94f8f9663ab9e933d8adf87a3c4eb73900a09cb25918bdc19298317068871ae9b14a3d624a24f06a8bfd6d799d16396e1ddf

data/README.md

@@ -3,7 +3,6 @@
 [![Build Status](https://travis-ci.org/mlibrary/ettin.svg?branch=master)](https://travis-ci.org/mlibrary/ettin)
 [![Maintainability](https://api.codeclimate.com/v1/badges/efd34b151bad7dacb994/maintainability)](https://codeclimate.com/github/mlibrary/ettin/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/efd34b151bad7dacb994/test_coverage)](https://codeclimate.com/github/mlibrary/ettin/test_coverage)
-[![Dependency Status](https://gemnasium.com/badges/github.com/mlibrary/ettin.svg)](https://gemnasium.com/github.com/mlibrary/ettin)
 
 ## Summary
 
@@ -23,8 +22,9 @@ ruby nor does it pollute the global namespace.
 
 ## Compatibility
 
-* ruby 2.3.x
+* ruby 2.5.x
 * ruby 2.4.x
+* ruby 2.3.x
 
 As Ettin does not rely on any specific runtime environment other than
 the ruby core and standard library, it is compatible with every
@@ -71,7 +71,25 @@ module MyApp
 end
 ```
 
-In a Rails initializer:
+Use one of the above variants in a Rails app's `application.rb`, making
+settings available to your `environment.rb`, `development.rb`, and initializers:
+
+```ruby
+module MyApp
+  class << self
+    def config
+      @config ||= Ettin.for(Ettin.settings_files("config", Rails.env))
+    end
+  end
+
+  class Application < Rails::Application
+    # ...
+  end
+end
+```
+
+Add a section to the Rails configuration in an initializer (noting that load
+order is alphanumeric):
 
 ```ruby
 Rails.application.configure do |config|

data/lib/ettin/options.rb

@@ -20,8 +20,22 @@ module Ettin
 
     def method_missing(method, *args, &block)
       if handles?(method)
-        if bang?(method) && !key?(debang(method))
-          raise KeyError, "key #{debang(method)} not found"
+        if !key?(debang(method))
+          if bang?(method)
+            raise KeyError, "key #{debang(method)} not found"
+          else
+            self[debang(method)]
+          end
+        else
+          self[debang(method)]
+        end
+      else
+        super(method, *args, &block)
+      end
+
+      if handles?(method)
+        if bang?(method)
+          handle_bang_method(method)
         else
           self[debang(method)]
         end
@@ -30,6 +44,14 @@ module Ettin
       end
     end
 
+    def handle_bang_method(method)
+      if key?(debang(method))
+        self[debang(method)]
+      else
+        raise KeyError, "key #{debang(method)} not found"
+      end
+    end
+
     # We respond to:
     # * all methods our parents respond to
     # * all methods that are mostly alpha-numeric: /^[a-zA-Z_0-9]*$/
@@ -43,6 +65,11 @@ module Ettin
     end
     alias_method :has_key?, :key?
 
+    def merge(other)
+      new_hash = {}.deeper_merge(hash).deeper_merge!(other.to_h, overwrite_arrays: true)
+      self.class.new(new_hash)
+    end
+
     def merge!(other)
       hash.deeper_merge!(other.to_h, overwrite_arrays: true)
     end

data/lib/ettin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ettin
-  VERSION = "1.1.5"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ettin
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Bryan Hockey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-13 00:00:00.000000000 Z
+date: 2019-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -144,8 +144,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.2
 signing_key: 
 specification_version: 4
 summary: The best way to add settings in any ruby project.