figly 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65ac42decd3b9d8da0ffa6a4d00401300a0e83dc
-  data.tar.gz: d257ea30a2c4242b96d4e3213a4aab91540e213f
+  metadata.gz: ed42e2f75afa1d3e7f14e70184fd7fb2a62a0f82
+  data.tar.gz: 6a62de81f60e6137f8d054936fed6562a1b4dadc
 SHA512:
-  metadata.gz: 170370e713d00bfc38576067ce7ae0b6b4d82bea2febbebb1224c6ecf220aefeef1d88894a5130c18b4344ae96e07276d68d5640134c1cfa52946c87dd2e64b4
-  data.tar.gz: 7e04253fef6b344ad1c7a36d54c33344835f14c831033b0fabf18f24a904e69bd4b5174483bdef7ce1de1658269abe028ec17e3b0b59d28b9d0c436ad54e3380
+  metadata.gz: b78d9f57c8ceee1bb99ef86929596371bdcae81babd53ac2c664f917f5e61b67a559e347f71f9f490471f53904dac519018081e37731617c02e95bc3aa349f15
+  data.tar.gz: e79ac988669c6cba31ade4c4fef568cbdc5fb2a1e59f037036bc37037a3435577892b8dcb527989333bec0dc841546c62d17612e5495bbc0c5cf8011ef114235

data/README.md

@@ -48,6 +48,20 @@ Figly currently supports the following file extensions, and will infer the parse
 - .toml => TOML
 - .json => JSON
 
+
+## UPDATE: As of version 1.1.0
+
+You can now use your settings directly from Figly::Settings with indifferent access. So using the above config, you can access
+the value `Yay` in all of the following ways, plus the ways you were able to before.
+
+```
+Figly::Settings[:nest1][:nest2].nest3
+Figly::Settings['nest1'][:nest2]['nest3']
+
+# Or if calling a method on a module makes you uncomfortable, you can use #to_h
+Figly::Settings.to_h['nest1'][:nest2]['nest3']
+```
+
 ## Testing    
 
 If you want to contribute start by making sure the tests work:

data/lib/figly.rb

@@ -51,7 +51,7 @@ module Figly
     if _config_loaded?
       _deep_merge(@@data, data)
     else
-      @@data = data
+      @@data = data.extend(Settings::SettingsHash)
     end
   end
 

data/lib/figly/settings.rb

@@ -1,27 +1,65 @@
 module Figly
   module Settings
     module SettingsHash
-      def method_missing(meth, *args, &blk)
-        m = meth.to_s
-        if has_key? m
-          value = self[m]
-          return value.extend(SettingsHash) if value.instance_of? Hash
-          value
+      def method_missing(m, *args, &blk)
+        value = self[m]
+        return value.extend(SettingsHash) if value.instance_of? Hash
+        value
+      end
+
+      def [](key)
+        if self.key?(key.to_s)
+          self.fetch(key.to_s)
+        elsif self.key?(key.to_sym)
+          self.fetch(key.to_sym)
+        end
+      end
+
+      def symbolize_keys
+        _symbolize_keys(self)
+      end
+
+      def symbolize_keys!
+        _symbolize_keys(self, in_place: true)
+      end
+
+      private
+      def _symbolize_keys(hash, in_place: false)
+        h = in_place ? hash : hash.dup
+        h.tap do |h|
+          h.keys.each do |key|
+            if key.is_a?(String)
+              val = h.delete(key)
+              h[key.to_sym] = if val.is_a?(Hash)
+                _symbolize_keys(val, in_place: in_place)
+              else
+                val
+              end
+            end
+          end
         end
       end
     end
 
+    def self.to_h
+      Figly.data
+    end
+
     def self.method_missing(meth, *args, &block)
+      m = meth == :[] ? args[0] : meth
       data = Figly.data
-      if data.has_key? meth.to_s
-        val = data[meth.to_s]
-        if val.instance_of?(Hash)
-          val.extend(SettingsHash)
-        elsif val.instance_of? Array
-          val.each_with_index{ |item ,idx| item.extend(SettingsHash) if item.instance_of? Hash }
-        end
-        return val
+      val = if data.key?(m.to_s)
+         data[m.to_s]
+      elsif data.key?(m.to_sym)
+         data[m.to_sym]
+      end
+
+      if val.instance_of?(Hash)
+        val.extend(SettingsHash)
+      elsif val.instance_of? Array
+        val.each_with_index{ |item ,idx| item.extend(SettingsHash) if item.instance_of? Hash }
       end
+      return val
     end
   end
 end

data/lib/figly/version.rb

@@ -1,3 +1,3 @@
 module Figly
-  VERSION = "1.0.4"
+  VERSION = "1.1.0"
 end

data/spec/figly_spec.rb

@@ -28,6 +28,26 @@ describe Figly do
     it 'should return nil when accessing a key that doesnt exist' do
       expect(Figly::Settings.blah).to eq(nil)
     end
+
+    context 'indifferent access' do
+      it 'should be able to access a symbol key from a string hash', focus: true do
+        expect(Figly::Settings.to_h[:a]).to eq({'aa' => {'aaa' => 'ohai'}})
+        expect(Figly::Settings.a[:aa]).to eq({'aaa' => 'ohai'})
+        expect(Figly::Settings.a.aa[:aaa]).to eq('ohai')
+      end
+
+      it 'should be able to access a string key from a symbol hash' do
+        expect(Figly::Settings.to_h['a']).to eq({'aa' => {'aaa' => 'ohai'}})
+        expect(Figly::Settings['a']['aa']).to eq({'aaa' => 'ohai'})
+        expect(Figly::Settings['a']['aa']['aaa']).to eq('ohai')
+      end
+    end
+
+    context 'symbolize_keys' do
+      it 'should deep symbolize the keys' do
+        expect(Figly::Settings.a.symbolize_keys).to eq(({:aa => {:aaa => 'ohai'}}))
+      end
+    end
   end
 
   context 'TOML' do
@@ -55,6 +75,8 @@ describe Figly do
     it 'should have both sets of data merged' do
       expect(Figly::Settings.userId).to eq(1)
       expect(Figly::Settings.a.b.c).to eq({"d"=>"test"})
+      expect(Figly::Settings.to_h[:a][:b][:c]).to eq({"d"=>"test"})
+      expect(Figly::Settings[:a][:b][:c][:d]).to eq("test")
     end
   end
 

data/spec/support/config.yml

@@ -15,3 +15,6 @@ ary:
         'Woot'
   - 3
 
+a:
+  aa:
+    aaa: ohai

data/spec/support/test_env.rb

@@ -1,3 +1,4 @@
+require 'pry'
 module TestEnv
   def config_file(ext = 'yml')
     File.join(root, "spec/support/config.#{ext}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: figly
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Ryan Canty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toml
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: A tiny gem that allows you to access config settings from YAML, TOML, or