yaml_pack 0.0.2.alpha → 0.0.3.alpha

data/lib/yaml_pack.rb

@@ -1,91 +1,4 @@
-require 'core_ext/hash'
+require 'yaml_pack/yaml_pack'
+require 'yaml_pack/util'
+require 'yaml_pack/version'
 
-class YamlPack
-  VERSION = "0.0.2.alpha"
-
-  KEY_CONVERTERS = {
-    :symbolize => Proc.new{|key, previous_keys| key.respond_to?(:to_sym) ? key.to_sym : key }
-  }.freeze
-  
-  attr_reader :files, :base_dir
-
-  def initialize(files, opts = {})
-    @files = [files].flatten
-
-    @base_dir      = opts.fetch(:base_dir,      nil)
-    @with_erb      = opts.fetch(:erb,           true)
-    @key_converter = opts.fetch(:key_converter, nil)
-    @header_file   = opts.fetch(:header_file,   nil)
-
-    if KEY_CONVERTERS.has_key?(@key_converter)
-      @key_converter = KEY_CONVERTERS[@key_converter]
-    end
-  end
-
-  def load_deep_merged
-    hsh = {}
-    
-    files.select{|f| File.exists?(f) }.each do |f|
-      content = self.content(f)
-      content = ERB.new(content).result(binding) if @with_erb
-      
-      result = YAML::load(content) || {}
-      result = prepend_subfolders(f, result) if @base_dir
-      result = convert_keys_recursive(result) if @key_converter
-      
-      hsh.yaml_pack_deep_merge!(result)
-    end
-
-    hsh
-  end
-
-  # Include the contents of given file into yaml template.
-  # Use this inside your yaml-file.
-  #
-  #    <%= include_file('/path/to/file.yml') %>
-  #
-  # DEBT: extract into own module/class
-  #
-  def include_file(file_path)
-    File.read(file_path)
-  end
-
-  def content(file_path)
-    body   = File.read(file_path) || ""
-    [header, body].join("\n")
-  end
-
-  def header
-    (@header_file && File.exists?(@header_file)) ? File.read(@header_file) : ""
-  end
-
-  def self.subfolders(base_dir, file_path)
-    base_dir = "#{base_dir}/".gsub("//", '/') # hack to always have a trailing /
-    file_path.gsub(/^#{base_dir}/, '').split('/')[0...-1]
-  end
-
-protected
-
-  def convert_keys_recursive(result, previous_keys = [])
-    if result.is_a?(Hash)
-      hsh = {}
-      result.each do |key, value|
-        converted_key = @key_converter.call(key, previous_keys)
-        hsh[converted_key] = convert_keys_recursive(value, [*previous_keys, key])
-      end
-      hsh
-    else # If it's not a hash, return the object itself (end of recursion)
-      result
-    end
-  end
-
-  def prepend_subfolders(file_path, object)
-    subfolders(file_path).inject(object) do |object, subfolder|
-      {subfolder => object}
-    end
-  end
-
-  def subfolders(file_path)
-    self.class.subfolders(base_dir, file_path)
-  end
-end

data/lib/yaml_pack/util.rb

@@ -0,0 +1,22 @@
+class YamlPack::Util
+
+  def self.subfolders(base_dir, file_path)
+    base_dir = "#{base_dir}/".gsub("//", '/') # hack to always have a trailing /
+    file_path.gsub(/^#{base_dir}/, '').split('/')[0...-1]
+  end
+
+  # Deep merge method. 
+  #
+  # Inspired from:
+  # http://www.gemtacular.com/gemdocs/cerberus-0.2.2/doc/classes/Hash.html
+  # File lib/cerberus/utils.rb, line 42
+  def self.deep_merge!(first, second)
+    second.each_pair do |k,v|
+      if first[k].is_a?(Hash) and second[k].is_a?(Hash)
+        deep_merge!(first[k], second[k])
+      else
+        first[k] = second[k]
+      end
+    end
+  end
+end

data/lib/yaml_pack/version.rb

@@ -0,0 +1,3 @@
+class YamlPack::Version
+  VERSION = "0.0.3.alpha"
+end

data/lib/yaml_pack/yaml_pack.rb

@@ -0,0 +1,83 @@
+class YamlPack
+
+  KEY_CONVERTERS = {
+    :symbolize => Proc.new{|key, previous_keys| key.respond_to?(:to_sym) ? key.to_sym : key }
+  }.freeze
+  
+  attr_reader :files, :base_dir
+
+  def initialize(files, opts = {})
+    @files = [files].flatten
+
+    @base_dir      = opts.fetch(:base_dir,      nil)
+    @with_erb      = opts.fetch(:erb,           true)
+    @key_converter = opts.fetch(:key_converter, nil)
+    @header_file   = opts.fetch(:header_file,   nil)
+
+    if KEY_CONVERTERS.has_key?(@key_converter)
+      @key_converter = KEY_CONVERTERS[@key_converter]
+    end
+  end
+
+  def load_deep_merged
+    hsh = {}
+    
+    files.select{|f| File.exists?(f) }.each do |f|
+      content = self.content(f)
+      begin
+        content = ERB.new(content).result(binding) if @with_erb
+      rescue => e 
+        raise "Error in #{f}: #{e.message}"
+      end
+      
+      result = YAML::load(content) || {}
+      result = add_subfolders_as_namespaces(f, result) if @base_dir
+      result = convert_keys_recursive(result) if @key_converter
+      
+      Util.deep_merge!(hsh, result)
+    end
+
+    hsh
+  end
+
+  # Include the contents of given file into yaml template.
+  # Use this inside your yaml-file.
+  #
+  #    <%= include_file('/path/to/file.yml') %>
+  #
+  # DEBT: extract into own module/class
+  #
+  def include_file(file_path)
+    File.read(file_path)
+  end
+
+  def content(file_path)
+    body   = File.read(file_path) || ""
+    [header, body].join("\n")
+  end
+
+  def header
+    (@header_file && File.exists?(@header_file)) ? File.read(@header_file) : ""
+  end
+
+protected
+
+  def convert_keys_recursive(result, previous_keys = [])
+    if result.is_a?(Hash)
+      hsh = {}
+      result.each do |key, value|
+        converted_key = @key_converter.call(key, previous_keys)
+        hsh[converted_key] = convert_keys_recursive(value, [*previous_keys, key])
+      end
+      hsh
+    else # If it's not a hash, return the object itself (end of recursion)
+      result
+    end
+  end
+
+  def add_subfolders_as_namespaces(file_path, object)
+    Util.subfolders(base_dir, file_path).inject(object) do |object, subfolder|
+      {subfolder => object}
+    end
+  end
+end

data/spec/yaml_pack/util_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe YamlPack::Util do
+  it "#subfolders" do
+    YamlPack::Util.subfolders("/foo/", "/foo/baz.yml").should == []
+    YamlPack::Util.subfolders("/foo/", "/foo/bar/baz.yml").should == ['bar']
+    YamlPack::Util.subfolders("/foo/", "/foo/bar/baz/lorem.yml").should == ['bar', 'baz']
+    YamlPack::Util.subfolders("foo/", "foo/bar/baz.yml").should == ['bar']
+    YamlPack::Util.subfolders("/foo", "/foo/baz.yml").should == []
+    YamlPack::Util.subfolders("", "/foo/baz.yml").should == ['foo']
+    YamlPack::Util.subfolders(nil, "/foo/baz.yml").should == ['foo']
+  end
+end

data/spec/yaml_pack/yaml_pack_spec.rb

@@ -77,15 +77,4 @@ describe YamlPack do
     result['countries']['se']['name'].should == 'Sweden'
   end
 
-
-  it "#subfolders" do
-    YamlPack.subfolders("/foo/", "/foo/baz.yml").should == []
-    YamlPack.subfolders("/foo/", "/foo/bar/baz.yml").should == ['bar']
-    YamlPack.subfolders("/foo/", "/foo/bar/baz/lorem.yml").should == ['bar', 'baz']
-
-    YamlPack.subfolders("foo/", "foo/bar/baz.yml").should == ['bar']
-    YamlPack.subfolders("/foo", "/foo/baz.yml").should == []
-    YamlPack.subfolders("", "/foo/baz.yml").should == ['foo']
-    YamlPack.subfolders(nil, "/foo/baz.yml").should == ['foo']
-  end
 end

data/yaml_pack.gemspec

@@ -4,7 +4,7 @@ require "yaml_pack"
 
 Gem::Specification.new do |s|
   s.name        = "yaml_pack"
-  s.version     = YamlPack::VERSION
+  s.version     = YamlPack::Version::VERSION
   s.authors     = ["sebastian"]
   s.email       = ["sebastian.burkhard@gmail.com"]
   s.homepage    = ""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaml_pack
 version: !ruby/object:Gem::Version
-  version: 0.0.2.alpha
+  version: 0.0.3.alpha
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-27 00:00:00.000000000 Z
+date: 2012-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70343591986120 !ruby/object:Gem::Requirement
+  requirement: &70213350229160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70343591986120
+  version_requirements: *70213350229160
 description: ! "\n    YamlPack is a small framework for writing large and complex
   configuration files in yml.\n    It supports nesting and merging merging yaml files.\n
   \ "
@@ -35,8 +35,10 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- lib/core_ext/hash.rb
 - lib/yaml_pack.rb
+- lib/yaml_pack/util.rb
+- lib/yaml_pack/version.rb
+- lib/yaml_pack/yaml_pack.rb
 - spec/.DS_Store
 - spec/fixtures/.DS_Store
 - spec/fixtures/yaml_pack/countries/sweden.yml
@@ -46,6 +48,7 @@ files:
 - spec/fixtures/yaml_pack/names_german.yml
 - spec/fixtures/yaml_pack/population.yml
 - spec/spec_helper.rb
+- spec/yaml_pack/util_spec.rb
 - spec/yaml_pack/yaml_pack_spec.rb
 - yaml_pack.gemspec
 homepage: ''
@@ -81,5 +84,6 @@ test_files:
 - spec/fixtures/yaml_pack/names_german.yml
 - spec/fixtures/yaml_pack/population.yml
 - spec/spec_helper.rb
+- spec/yaml_pack/util_spec.rb
 - spec/yaml_pack/yaml_pack_spec.rb
 has_rdoc: 

data/lib/core_ext/hash.rb

@@ -1,17 +0,0 @@
-# Extend Hash with recursive merging abilities
-class Hash
-  # Deep merge method. Silly name prevents overwriting other implementations.
-  #
-  # Inspired from:
-  # http://www.gemtacular.com/gemdocs/cerberus-0.2.2/doc/classes/Hash.html
-  # File lib/cerberus/utils.rb, line 42
-  def yaml_pack_deep_merge!(second)
-    second.each_pair do |k,v|
-      if self[k].is_a?(Hash) and second[k].is_a?(Hash)
-        self[k].yaml_pack_deep_merge!(second[k])
-      else
-        self[k] = second[k]
-      end
-    end
-  end
-end