data_reader 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8f2497b2d64abf0036c3a8e7a91d276b00b6328
-  data.tar.gz: aa6ed30aa2fbb6d7a98521ab78bb863970038060
+  metadata.gz: f73829d7eaf46a4dba02827cbe1c13255e6316bc
+  data.tar.gz: 3f21945b2bd955f00a6ca318930c9d6e28f0300f
 SHA512:
-  metadata.gz: bc142680fa2d7da4ebbdd28182d88ca593b1280b06b9fdccad2411d4eba1fd8708edde7663351ce780b5d17fbf89929ff01afe7faaff2d66d3ecd95b70a338ea
-  data.tar.gz: 6b214e2cd16ae778b0d87c67eaa826432b512eccd9234807b2c6d96c9c675d3480f00cfc52e68ad18000e1ec1b9f7d7bd80048e4759ee3589f4a7a434bb25658
+  metadata.gz: f73e7f233816684826fb5d22f5c1138b2e9ea4733f4f69c0852b3a653433a776ec508636cef0b1e05ec572fa7227dfe4298601488fca1bbf925eed4d07f0e71e
+  data.tar.gz: 69d0030724241ad7fcd2489d1604e872d18a0841470a24d3f8e5b4c36b49063725a5cc17493a2ca0a5814c5afeae1d4286ce8334e3642bd95b83d597a1d755e2

data/.hound.yml

@@ -55,7 +55,7 @@ Metrics/BlockNesting:
 
 # Encourage short methods.
 Metrics/MethodLength:
-  Max: 10
+  Max: 12
 
 # Encourage fewer parameters.
 Metrics/ParameterLists:

data/lib/data_reader/version.rb

@@ -1,3 +1,3 @@
 module DataReader
-  VERSION = "1.0.2".freeze
+  VERSION = "1.1.0".freeze
 end

data/lib/data_reader.rb

@@ -1,4 +1,5 @@
 require "data_reader/version"
+require "pathname"
 require "yaml"
 require "erb"
 
@@ -10,25 +11,49 @@ module DataReader
   def data_path
     return @data_path if @data_path
     return default_data_path if respond_to? :default_data_path
+
     nil
   end
 
   def data_source
     return @data_source if @data_source
+
     nil
   end
 
   def load(file_list)
     files = file_list.include?(',') ? file_list.split(',') : [file_list]
     files = files.collect(&:strip)
-    @data_source = files.inject({}) do |data, file|
-      data.merge!(YAML.safe_load(
-                    ERB.new(File.read("#{data_path}/#{file}")).result(binding)
-      ))
+
+    @data_source = files.inject({}) do |all_data, file|
+      data = include_key(::YAML.safe_load(include_data(file)))
+      all_data.merge!(data) if data
     end
   end
 
-  def include_data(filename)
-    ERB.new(IO.read("#{data_path}/#{filename}")).result
+  def include_data(file)
+    filename = Pathname.new(file).absolute? ? file : "#{@data_path}/#{file}"
+    ERB.new(IO.read(filename)).result(binding) if File.exist?(filename)
+  end
+
+  private
+
+  def include_key(data)
+    include_data = {}
+
+    if data.key?('_include_')
+      [data['_include_']].flatten.each do |file_path|
+        include_data.merge!(load(file_path))
+      end
+    end
+
+    data.delete('_include_')
+    data.merge!(include_data)
+
+    data.each do |key, value|
+      data[key] = include_key(value) if value.is_a?(Hash)
+    end
+
+    data
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_reader
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Jeff Nyman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-05 00:00:00.000000000 Z
+date: 2018-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,7 +107,7 @@ licenses:
 - MIT
 metadata: {}
 post_install_message: "\n(::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::) (::)\n
-  \ DataReader 1.0.2 has been installed.\n(::) (::) (::) (::) (::) (::) (::) (::)
+  \ DataReader 1.1.0 has been installed.\n(::) (::) (::) (::) (::) (::) (::) (::)
   (::) (::) (::) (::)\n  "
 rdoc_options: []
 require_paths:
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.5.2.2
 signing_key: 
 specification_version: 4
 summary: Provides a standard method for reading YAML data files