yaml-sugar 0.0.9 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab3bdfaef086854e51b7365a4fd127ce3437290f
-  data.tar.gz: 597894290c837ad6c0ad9dd2633bce7d447ead17
+  metadata.gz: 6ab33f42fda682e83aecf1447da5d556a0409e1a
+  data.tar.gz: 0655b7c8102e42e0823871e9bd003afa0299b2e6
 SHA512:
-  metadata.gz: 66cac587de7d98edefd37dc81cc755fb74ccc2f299ce27879fe2a811f7b06555d6c9b0ea26773bb4fbcf4149157a9e9ee96a07877132c359ef77ee936ae8379d
-  data.tar.gz: d499cd15979a4c6c41797d910d5b7f91485e1a0a96e122b3b2ee8c4cea86e08df690d1eeb9563ed6d8826e647abbf4e7b45adf132602878b0676578ed772a0e7
+  metadata.gz: 4bd840e4daa6dbbe60887c801dfde4356ed8a0f5f566c2dab9ef4cdce7c7d971034950497d5a2b2914ea2e3284412c6e0bb372241747ee7b5a9fff544c332b77
+  data.tar.gz: 46d8455c7787ee299f29c71ed2fe0a72816a07ceab2bdceaca57c35a80566e55e7a7ebd0dd6aa208d061c86a305c81c176213b918c34f931b314b699c1ae71dc

data/lib/yaml/sugar.rb

@@ -0,0 +1,24 @@
+require 'yaml/sugar_impl'
+
+# YamlSugar module
+module YamlSugar
+  attr_reader :config
+
+  def self.new
+    SugarImpl.new
+  end
+
+  def self.clear
+    @config = nil
+  end
+
+  def self.method_missing(method_sym, *args)
+    @config ||= SugarImpl.new
+    @config.send method_sym, *args
+  end
+
+  def self.load(dir, args = {})
+    @config ||= SugarImpl.new
+    @config.load(dir, args)
+  end
+end

data/lib/{yaml-sugar/sugar.rb → yaml/sugar_impl.rb}

@@ -1,12 +1,12 @@
-require 'deep_merge'
 require 'find'
-require 'hashugar'
 require 'yaml'
 require 'ostruct'
+require 'hashugar'
+require 'deep_merge'
 
-# YamlSugar class
 module YamlSugar
-  class Sugar
+  # SugarImpl class
+  class SugarImpl
     attr_reader :config
     extend Gem::Deprecate
 
@@ -19,15 +19,16 @@ module YamlSugar
         @config.send method_sym, *args
       elsif method_sym.to_s.end_with?('=')
         @config.send method_sym, *args
+      elsif method_sym == :clear
+        @config = OpenStruct.new
       else
         nil
       end
     end
 
     def set(attr, value)
-      @config.send("#{attr.to_s}=", value)
+      @config.send("#{attr}=", value)
     end
-    deprecate :set, '.attr =', 2016, 9
 
     def load(dir, args = {})
       deep_merge = args.fetch :deep_merge, false
@@ -41,11 +42,11 @@ module YamlSugar
         attr_name = File.basename(yaml_file, File.extname(yaml_file)).to_sym
         if @config.respond_to?(attr_name)
           old_config = @config.send(attr_name).to_hash
-          if deep_merge
-            new_config = new_config.deep_merge(old_config)
-          else
-            new_config = old_config.merge(new_config)
-          end
+          new_config = if deep_merge
+                         new_config.deep_merge(old_config)
+                       else
+                         old_config.merge(new_config)
+                       end
         end
         @config.send("#{attr_name}=", new_config.to_hashugar)
       end

data/lib/{yaml-sugar → yaml}/version.rb

@@ -1,4 +1,4 @@
 # yaml-sugar gem version
 module YamlSugar
-  VERSION = '0.0.9'
+  VERSION = '1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaml-sugar
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: '1.0'
 platform: ruby
 authors:
 - Daniel Han
@@ -44,10 +44,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/yaml-sugar.rb
-- lib/yaml-sugar/sugar.rb
-- lib/yaml-sugar/version.rb
-- lib/yaml-sugar/yaml-sugar.rb
+- lib/yaml/sugar.rb
+- lib/yaml/sugar_impl.rb
+- lib/yaml/version.rb
 homepage: https://github.com/hex0cter/yaml-sugar
 licenses:
 - MIT

data/lib/yaml-sugar.rb

@@ -1 +0,0 @@
-require 'yaml-sugar/yaml-sugar'

data/lib/yaml-sugar/yaml-sugar.rb

@@ -1,25 +0,0 @@
-require 'deep_merge'
-require 'find'
-require 'hashugar'
-require 'yaml'
-require 'ostruct'
-require 'yaml-sugar/sugar'
-
-# YamlSugar module
-module YamlSugar
-  attr_reader :config
-
-  def self.new
-    Sugar.new
-  end
-
-  # Define on self, since it's a module method
-  def self.method_missing(method_sym, *args)
-      @config.send method_sym, *args
-  end
-
-  def self.load(dir, args = {})
-    @config ||= Sugar.new
-    @config.load(dir, args)
-  end
-end