dot_hash 0.3.2 → 0.3.4

data/lib/dot_hash/hash_loader.rb

@@ -0,0 +1,51 @@
+module DotHash
+  class HashLoader
+    attr_reader :hashes
+
+    def initialize *hashes
+      @hashes = hashes
+    end
+
+    def load
+      hashes.inject({}) do |hash, arg|
+        merge_hashes hash, get_hash_from(arg)
+      end
+    end
+
+    def merge_hashes(h1, h2)
+      return h1 unless h2
+      return h2 unless h1
+
+      h2.each do |key, value|
+        h1[key] = value.is_a?(Hash) ?
+          merge_hashes(h1[key], value) : value
+      end
+
+      h1
+    end
+
+    private
+
+    def get_hash_from arg
+      if arg.is_a? Hash
+        arg
+      elsif File.file? arg
+        get_hash_from_file arg
+      elsif File.directory? arg
+        get_hash_from_directory arg
+      end
+    end
+
+    def get_hash_from_file(file)
+      return {} unless file =~ /\.(yaml|yml)$/
+      YAML.load_file(file)
+    end
+
+    def get_hash_from_directory(directory)
+      Dir["#{directory}/**/*"].inject({}) do |hash, file|
+        merge_hashes hash, get_hash_from_file(file)
+      end
+    end
+  end
+end
+

data/lib/dot_hash/properties.rb

@@ -8,15 +8,21 @@ module DotHash
     end
 
     def method_missing(key, *args, &block)
-      has_key?(key) ?
-        execute(key, *args, &block) :
+      if has_key?(key)
+        execute(key, *args, &block)
+      else
         super(key, *args, &block)
+      end
     end
 
     def respond_to?(key)
       has_key?(key) or super(key)
     end
 
+    def to_s
+      hash.to_s
+    end
+
     def [](key)
       get_value(key)
     end

data/lib/dot_hash/settings.rb

@@ -22,52 +22,11 @@ module DotHash
       end
 
       def respond_to?(key)
-        instance.respond_to?(key)
+        super(key) || instance.respond_to?(key)
       end
 
       def load(*args)
-        @instance = new hash_from(*args)
-      end
-
-      private
-
-      def hash_from *args
-        args.inject({}) do |hash, arg|
-          merge_hashes hash, get_hash_from(arg)
-        end
-      end
-
-      def get_hash_from arg
-        if arg.is_a? Hash
-          arg
-        elsif File.file? arg
-          get_hash_from_file arg
-        elsif File.directory? arg
-          get_hash_from_directory arg
-        end
-      end
-
-      def get_hash_from_file(file)
-        return {} unless file =~ /\.(yaml|yml)$/
-        YAML.load_file(file)
-      end
-
-      def get_hash_from_directory(directory)
-        Dir["#{directory}/**/*"].inject({}) do |hash, file|
-          merge_hashes hash, get_hash_from_file(file)
-        end
-      end
-
-      def merge_hashes(h1, h2)
-        return h1 unless h2
-        return h2 unless h1
-
-        h2.each do |key, value|
-          h1[key] = value.is_a?(Hash) ?
-            merge_hashes(h1[key], value) : value
-        end
-
-        h1
+        @instance = new HashLoader.new(*args).load
       end
     end
   end

data/lib/dot_hash/version.rb

@@ -1,3 +1,3 @@
 module DotHash
-  VERSION = "0.3.2"
+  VERSION = "0.3.4"
 end

data/lib/dot_hash.rb

@@ -3,5 +3,6 @@ $:.push File.expand_path('../', __FILE__)
 require 'yaml'
 require 'dot_hash/properties'
 require 'dot_hash/hash_to_properties'
+require 'dot_hash/hash_loader'
 require 'dot_hash/settings'
 require 'dot_hash/version'

data/test/dot_hash/hash_loader_test.rb

@@ -0,0 +1,53 @@
+require_relative "../test_helper"
+
+module DotHash
+  describe HashLoader do
+
+    describe "#load" do
+      it "merges the given hashes" do
+        loader = HashLoader.new(
+          {a: 1, b: {c: 2}},
+          {b: {x: {z: 10}}}
+        )
+        loader.load.must_equal({a: 1, b: {c: 2, x: {z: 10}}})
+      end
+
+      it "loads from a file" do
+        loader = HashLoader.new fixtures_path("configs1.yaml")
+
+        loader.load.must_equal({
+          "default" => {"attr" => {"speed"=>10, "power"=>11}},
+          "rogue" => {"attr" => {"speed"=>20, "power"=>11}}
+        })
+      end
+
+      it "loads from two files" do
+        loader = HashLoader.new(
+          fixtures_path("configs1.yaml"),
+          fixtures_path("configs2.yaml")
+        )
+
+        loader.load.must_equal({
+          "default"=>{"attr"=>{"speed"=>10, "power"=>11}},
+          "rogue"=>{"attr"=>{"speed"=>25, "power"=>11}}
+        })
+      end
+
+      it "does not load files without the yaml extension" do
+        loader = HashLoader.new fixtures_path("config.yaml.example")
+
+        loader.load.must_equal({})
+      end
+
+      it "loads from a directory" do
+        loader = HashLoader.new fixtures_path
+
+        loader.load.must_equal({
+          "default"=>{"attr"=>{"speed"=>10, "power"=>11}},
+          "rogue"=>{"attr"=>{"speed"=>25, "power"=>11}}
+        })
+      end
+    end
+  end
+end
+

data/test/dot_hash/hash_to_properties_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../../test_helper", __FILE__)
+require_relative "../test_helper"
 
 describe Hash do
   attr_reader :properties

data/test/dot_hash/properties_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../../test_helper", __FILE__)
+require_relative "../test_helper"
 
 module DotHash
   describe Properties do
@@ -15,7 +15,9 @@ module DotHash
         end
 
         it "raises an error if the method is not on the hash" do
-          -> {properties.name}.must_raise NoMethodError
+          -> {
+            properties.name
+          }.must_raise NoMethodError, "undefined method `name' for {:speed=>\"15\", \"power\"=>100}:DotHash::Properties"
         end
 
         it "gets a property from a stringed key" do
@@ -75,6 +77,19 @@ module DotHash
       end
     end
 
+    describe "#to_s" do
+      attr_reader :hash
+
+      before do
+        @hash = { user: {name: "dude"} }
+        @properties = Properties.new @hash
+      end
+
+      it "returns the hash as a string" do
+        properties.to_s.must_equal hash.to_s
+      end
+    end
+
     describe "#respond_to?" do
       before do
         @properties = Properties.new speed: "15",

data/test/dot_hash/settings_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../../test_helper", __FILE__)
+require_relative "../test_helper"
 
 module DotHash
   describe Settings do

data/test/test_helper.rb

@@ -1,5 +1,6 @@
 require "minitest/autorun"
-require File.expand_path("../../lib/dot_hash", __FILE__)
+require_relative "../lib/dot_hash"
+
 TESTS_PATH= File.dirname(__FILE__)
 
 def fixtures_path file=nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dot_hash
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -42,10 +42,12 @@ files:
 - Rakefile
 - dot_hash.gemspec
 - lib/dot_hash.rb
+- lib/dot_hash/hash_loader.rb
 - lib/dot_hash/hash_to_properties.rb
 - lib/dot_hash/properties.rb
 - lib/dot_hash/settings.rb
 - lib/dot_hash/version.rb
+- test/dot_hash/hash_loader_test.rb
 - test/dot_hash/hash_to_properties_test.rb
 - test/dot_hash/properties_test.rb
 - test/dot_hash/settings_test.rb
@@ -67,7 +69,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2180397336244030562
+      hash: -817138279000566861
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -76,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2180397336244030562
+      hash: -817138279000566861
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -84,6 +86,7 @@ signing_key:
 specification_version: 3
 summary: Converts hash.to_properties so you can access values using properties.some_key
 test_files:
+- test/dot_hash/hash_loader_test.rb
 - test/dot_hash/hash_to_properties_test.rb
 - test/dot_hash/properties_test.rb
 - test/dot_hash/settings_test.rb