kungfuig 0.7.2 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc430df3b6cfe95416a9954f8a70af80cb28192a
-  data.tar.gz: ca05a19e089810361ed88492c3d65ca256365a42
+  metadata.gz: f916d00ad175d459be94cde9664bd5ef813983f5
+  data.tar.gz: 6d2e2630943cbb354eb2ebd11e3b3d0f307fa839
 SHA512:
-  metadata.gz: 4c91b9e77ef5988557eb0f2a3cde047eeec3d83448d42d02a8b65e31885582918512a13e31bebf7c2807578dce855fc29b31ae43131e8c6919fdce057717b582
-  data.tar.gz: d3a55b372986ee6128b29aa33ac7ad2c8bdb6a4322384ea0bdd586efebeaa3da60a5a42272232706d89c098570cbe92f234474c09e202fddda51bb4327372859
+  metadata.gz: 3afbfeb420ef1a7d9f44cdd203e87bef98193ca2c01ec8221169203d76266f9dd8acad29cfc73e4d60f04ff42f4c283f824bad31db694dac3985da36e0ddd9fc
+  data.tar.gz: 6e34a2c86f900be9326583e0f0621bcc8d360a66361dce17a6bb2c89f63e61491b70c06544366fc8e0c80e5d6ada180015c227363f5c58fa6a4fd7d3e7de6930

data/lib/kungfuig.rb

@@ -29,11 +29,11 @@ module Kungfuig
       begin
         File.exist?(hos) ? Hashie::Mash.load(hos) : Hashie::Mash.new(YAML.load(hos))
       rescue ArgumentError
-        fail ArgumentError, "#{__callee__} expects valid YAML configuration file. “#{hos.inspect}” contains invalid syntax."
+        raise ArgumentError, "#{__callee__} expects valid YAML configuration file. “#{hos.inspect}” contains invalid syntax."
       rescue Psych::SyntaxError
-        fail ArgumentError, "#{__callee__} expects valid YAML configuration string. Got:\n#{hos.inspect}"
+        raise ArgumentError, "#{__callee__} expects valid YAML configuration string. Got:\n#{hos.inspect}"
       rescue
-        fail ArgumentError, "#{__callee__} expects valid YAML configuration string (misspelled file name?). Got:\n#{hos.inspect}"
+        raise ArgumentError, "#{__callee__} expects valid YAML configuration string (misspelled file name?). Got:\n#{hos.inspect}"
       end
     when ->(h) { h.respond_to?(:to_hash) } then Hashie::Mash.new(h.to_hash)
     else
@@ -56,10 +56,14 @@ module Kungfuig
 
     # Options getter
     # @return [Hashie::Mash] options
-    def options
+    def __options__
       @options ||= Hashie::Mash.new
     end
-    private :options
+    private :__options__
+
+    def options
+      __options__.dup
+    end
 
     # Accepts:
     #     option :foo, :bar, 'baz'
@@ -67,15 +71,15 @@ module Kungfuig
     #     option 'foo.bar.baz'
     #     option 'foo::bar::baz'
     def option *keys
-      key = keys.join('.').gsub(/::/, '.').split('.')
+      key = keys.map(&:to_s).join('.').gsub(/::/, '.').split('.')
 
       MX.synchronize {
         # options.foo!.bar!.baz!
         [key, key[1..-1]].map do |candidate|
-          candidate.inject(options.dup) do |memo, k|
+          candidate && candidate.inject(options) do |memo, k|
             memo.public_send(k.to_s) unless memo.nil?
           end
-        end.detect { |e| e }
+        end.compact.first
       }
     end
 
@@ -84,12 +88,12 @@ module Kungfuig
     #     option! 'foo.bar.baz', value
     #     option! 'foo::bar::baz', value
     def option! keys, value
-      key = (keys.is_a?(Array) ? keys.join('.') : keys).gsub(/::/, '.').split('.')
+      key = (keys.is_a?(Array) ? keys.join('.') : keys.to_s).gsub(/::/, '.').split('.')
       last = key.pop
 
       MX.synchronize {
         # options.foo!.bar!.baz! = value
-        build = key.inject(options) do |memo, k|
+        build = key.inject(__options__) do |memo, k|
           memo.public_send("#{k}!")
         end
         build[last] = value
@@ -104,7 +108,7 @@ module Kungfuig
     #   mash or string (when string, should be either valid YAML file name or
     #   string with valid YAML)
     def merge_hash_or_string! hos
-      options.deep_merge! Kungfuig.load_stuff hos
+      __options__.deep_merge! Kungfuig.load_stuff hos
     end
     private :merge_hash_or_string!
   end

data/lib/kungfuig/version.rb

@@ -1,3 +1,3 @@
 module Kungfuig
-  VERSION = "0.7.2"
+  VERSION = "0.7.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kungfuig
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.5
 platform: ruby
 authors:
 - Kantox LTD
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie