yaml-ostruct 0.1.1 → 0.2.0

data/lib/yaml/ostruct.rb

@@ -17,8 +17,8 @@ module YamlOstruct
     @config.send method_sym, *args
   end
 
-  def self.load(dir)
+  def self.load(dir, args = {})
     @config ||= YamlOstructImpl.new
-    @config.load(dir)
+    @config.load(dir, args)
   end
 end

data/lib/yaml/version.rb

@@ -1,4 +1,4 @@
 # yaml-ostruct gem version
 module YamlOstruct
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/lib/yaml/yaml_ostruct_impl.rb

@@ -2,6 +2,7 @@ require 'find'
 require 'yaml'
 require 'ostruct'
 require 'hashugar'
+require 'deep_merge'
 
 module YamlOstruct
   # YamlOstructImpl class
@@ -25,9 +26,35 @@ module YamlOstruct
       end
     end
 
-    def load(dir)
+    def load(dir, args = {})
       fail "Parameter #{File.join(Dir.pwd, dir)} is not a valid directory" unless File.directory? dir
-      load_recursively(dir, @config)
+
+      if args[:omit_path]
+        load_omit_path(dir, @config, args)
+      else
+        load_recursively(dir, @config)
+      end
+    end
+
+    def load_omit_path(dir, config, args)
+      deep_merge = args.fetch :deep_merge, false
+      fail "Parameter #{File.join(Dir.pwd, dir)} is not a valid directory" unless File.directory? dir
+
+      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
+          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
     end
 
     def load_recursively(dir, config)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaml-ostruct
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashugar
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Read yaml files recursively from a given directory and return an OpenStruct
   retaining the path
 email: hex0cter@gmail.com