yaml-sugar 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 360282871d8d48b8b93618a84438caa0417be95d
-  data.tar.gz: 05e22a50b040c9e225cf722670f03523c8219a4f
+  metadata.gz: 21569db1e1ced65164e350b7ee9d8c841bda8be5
+  data.tar.gz: 90271943eedb38a75a02b52374236b09c77ee3d9
 SHA512:
-  metadata.gz: b89f00a1ff34064adb9364f8141a2e2ee85408d95c7baac13d5e24c617caa09b63b54708dff9a735b187376e23db4353f6322b53926d8136dad4ed571822572c
-  data.tar.gz: 54d9d328af1cee03b7197bd26eb735e8353a204f2e76412522edecb4e2e729d5c0d7732c1c26d3cda65ace7b0738e9c4ac6dbfa3710df55100804ff2d45585c9
+  metadata.gz: 31bea7de73aa69d2676b23aacb684e6a1241d71da606a887117ef676337b3ca8788bac6159151a8733d161d5590729ae1732a10ca38658ee3002ccab200d6933
+  data.tar.gz: 4970077c75b512fd152eb85870720f9bfa42792739e0e5de70d4697e32dfc5e213d94dcf53f25fc639e40253c2b02c18a88b0cf3ba2d8a22cb239602cb670b1a

data/lib/yaml-sugar/version.rb

@@ -1,4 +1,4 @@
 # hash-config bundle version
 module YamlSugar
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

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

@@ -2,24 +2,22 @@ require 'deep_merge'
 require 'find'
 require 'hashugar'
 require 'yaml'
+require 'ostruct'
 
 # YamlSugar class
 module YamlSugar
+  attr_reader :config
+  class << self
+    attr_reader :class_instance_variable
+  end
+
   # Define on self, since it's a module method
   def self.method_missing(method_sym, *_args)
-    config = {}
-    @yaml_files.each do |yaml|
-      if File.basename(yaml, File.extname(yaml)) == method_sym.to_s
-        config.deep_merge! YAML.load_file(yaml)
-      end
+    if @config.respond_to? method_sym
+      @config.send method_sym
+    else
+      super
     end
-
-    config = config.to_hashugar
-    self.class.instance_eval do
-        define_method(method_sym) { config }
-    end
-
-    config
   end
 
   def self.set(attr, value)
@@ -28,12 +26,25 @@ module YamlSugar
     end
   end
 
-  def self.load(dir)
+  def self.load(dir, deep_merge: false)
     fail "Parameter #{File.join(Dir.pwd, dir)} is not a valid directory" unless File.directory? dir
 
     @yaml_files ||= []
-    Find.find(dir) do |path|
-      @yaml_files << File.join(Dir.pwd, path) if path =~ /.*\.yml$/ or path =~ /.*\.yaml$/
+    @config ||= OpenStruct.new
+    Find.find(dir) do |yaml_file|
+      next unless yaml_file =~ /.*\.yml$/ or yaml_file =~ /.*\.yaml$/
+      new_config = YAML.load_file(yaml_file)
+
+      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
+      end
+      @config.send("#{attr_name}=", new_config.to_hashugar)
     end
   end
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: yaml-sugar
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Daniel Han
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-02 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashugar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '5.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 description: Read yaml files recursively from a given directory and return an OpenStruct
@@ -72,9 +72,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/yaml-sugar.rb
 - lib/yaml-sugar/version.rb
 - lib/yaml-sugar/yaml-sugar.rb
+- lib/yaml-sugar.rb
 homepage: https://github.com/hex0cter/yaml-sugar
 licenses:
 - MIT
@@ -85,17 +85,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Read yaml into an OpenStruct