ettin 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17fdcd8956f8975bcd9410dc6d8f1981fe456c36
-  data.tar.gz: 154504874c1efc6d60f045376b05e15962208813
+  metadata.gz: 10a5902f647b9772c30966700e003151b9bc08cb
+  data.tar.gz: 5241db1d8824dff1032a403a971b59503256cc2c
 SHA512:
-  metadata.gz: 7ce4768cef0f9cc3dae5f8babf451b5688e7298ffd8e66ef31ea87f1830400aa1c8a2155e71d7158726502c65ec85297e77035f5983543566577bdc955337206
-  data.tar.gz: 9bdcd9fe40a892fcad2c86e04090ce8e408a4236d3cc3b98f6567fe7ec3b23e9ef3feaab191558751861d0ceb1aef58f8d72771a846ed615cc6de1a71821c169
+  metadata.gz: 52d11cf101a3eee2c5a8dec8637147043232f8a61135fed7aa243a945fdd58115088967a2bf6183ec923ecbe12842725a76a91bb2135d3756405853e71affe69
+  data.tar.gz: 2932215d9352310b8e8b41efff2a6256c2aa6622aa3a2af7714b63dba27a0a70186028e9c90151c985db3577d9e2a6a27b28ae8b92e0fdd347feec5c555c1fd6

data/lib/ettin/hash_factory.rb

@@ -3,7 +3,6 @@
 require "deep_merge/rails_compat"
 require "ettin/deep_transform"
 require "ettin/source"
-require "ettin/key"
 
 module Ettin
 
@@ -15,7 +14,7 @@ module Ettin
         .flatten
         .map {|target| Source.for(target) }
         .map(&:load)
-        .map {|h| h.deep_transform_keys {|key| Key.new(key) } }
+        .map {|h| h.deep_transform_keys {|key| key.to_s.to_sym } }
         .each {|h| hash.deeper_merge!(h, overwrite_arrays: true) }
       hash
     end

data/lib/ettin/options.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "ettin/key"
 require "deep_merge/rails_compat"
 
 module Ettin
@@ -39,7 +38,7 @@ module Ettin
     end
 
     def key?(key)
-      hash.key?(Key.new(key))
+      hash.key?(convert_key(key))
     end
     alias_method :has_key?, :key?
 
@@ -48,11 +47,11 @@ module Ettin
     end
 
     def [](key)
-      convert(hash[Key.new(key)])
+      convert(hash[convert_key(key)])
     end
 
     def []=(key, value)
-      hash[Key.new(key)] = value
+      hash[convert_key(key)] = value
     end
 
     def to_h
@@ -89,6 +88,10 @@ module Ettin
       end
     end
 
+    def convert_key(key)
+      key.to_s.to_sym
+    end
+
     def convert(value)
       case value
       when Hash

data/lib/ettin/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ettin
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Bryan Hockey
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-07 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deep_merge
@@ -118,7 +118,6 @@ files:
 - lib/ettin/config_files.rb
 - lib/ettin/deep_transform.rb
 - lib/ettin/hash_factory.rb
-- lib/ettin/key.rb
 - lib/ettin/options.rb
 - lib/ettin/source.rb
 - lib/ettin/sources/hash_source.rb

data/lib/ettin/key.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-module Ettin
-
-  # Internal hash key that handles strings and symbols as
-  # the same type.
-  class Key
-    def initialize(key)
-      @key = key
-    end
-
-    def inspect
-      to_sym.inspect
-    end
-
-    def class
-      Symbol
-    end
-
-    def to_s
-      key.to_s
-    end
-
-    def to_sym
-      to_s.to_sym
-    end
-
-    def eql?(other)
-      to_sym == other.to_s.to_sym
-    end
-    alias_method :==, :eql?
-
-    def hash
-      key.to_s.to_sym.hash
-    end
-
-    private
-
-    attr_reader :key
-
-  end
-end