dot_hash 0.2.0 → 0.2.1

data/lib/dot_hash/settings.rb

@@ -0,0 +1,74 @@
+module DotHash
+  class Settings
+    attr_reader :configs
+
+    def initialize(configs, wrapper=Properties)
+      @configs = Properties.new(configs)
+    end
+
+    def method_missing(key)
+      configs[key]
+    end
+
+    def respond_to?(key)
+      configs.respond_to?(key)
+    end
+
+    class << self
+      attr_reader :instance
+
+      def method_missing(key)
+        instance.public_send key
+      end
+
+      def respond_to?(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
+      end
+    end
+  end
+end

data/lib/dot_hash/version.rb

@@ -1,3 +1,3 @@
 module DotHash
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/dot_hash.rb

@@ -2,4 +2,5 @@ $:.push File.expand_path('../', __FILE__)
 
 require 'dot_hash/properties'
 require 'dot_hash/hash_to_properties'
+require 'dot_hash/settings'
 require 'dot_hash/version'

data/test/dot_hash/properties_test.rb

@@ -2,80 +2,80 @@ require File.expand_path("../../test_helper", __FILE__)
 
 module DotHash
   describe Properties do
-    attr_reader :settings
+    attr_reader :properties
 
     describe "#method_missing" do
       describe "with a simple hash" do
         before do
-          @settings = Properties.new speed: "15", "power" => 100
+          @properties = Properties.new speed: "15", "power" => 100
         end
 
         it "gets a hash property using the dot notation" do
-          settings.speed.must_equal "15"
+          properties.speed.must_equal "15"
         end
 
         it "raises an error if the method is not on the hash" do
-          -> {settings.name}.must_raise NoMethodError
+          -> {properties.name}.must_raise NoMethodError
         end
 
         it "gets a property from a stringed key" do
-          settings.power.must_equal 100
+          properties.power.must_equal 100
         end
       end
 
       describe "with a nested hash" do
         before do
-          @settings = Properties.new user: {
+          @properties = Properties.new user: {
             "info" => {name: "dude", is_admin: false}
           }
         end
 
         it "returns a DotHash instence for property with a nested hash" do
-          settings.user.must_be_instance_of DotHash::Properties
+          properties.user.must_be_instance_of DotHash::Properties
         end
 
         it "gets chained properties" do
-          settings.user.info.name.must_equal "dude"
-          settings.user.info.is_admin.must_equal false
+          properties.user.info.name.must_equal "dude"
+          properties.user.info.is_admin.must_equal false
         end
       end
 
       describe "#[]" do
         before do
-          @settings = Properties.new user: { name: "dude" }
+          @properties = Properties.new user: { name: "dude" }
         end
 
         it "accesses properties like a symbol hash" do
-          settings[:user][:name].must_equal "dude"
+          properties[:user][:name].must_equal "dude"
         end
 
         it "accesses properties like a string hash" do
-          settings["user"]["name"].must_equal "dude"
+          properties["user"]["name"].must_equal "dude"
         end
       end
     end
 
     describe "#respond_to?" do
       before do
-        @settings = Properties.new speed: "15",
+        @properties = Properties.new speed: "15",
           info: {name: "Eden"},
           "color" => "#00FFBB"
       end
 
       it "responds to a simple property" do
-        settings.must_respond_to :speed
+        properties.must_respond_to :speed
       end
 
       it "responds to a nested property" do
-        settings.info.must_respond_to :name
+        properties.info.must_respond_to :name
       end
 
       it "respond to a string property" do
-        settings.must_respond_to :color
+        properties.must_respond_to :color
       end
 
       it "doesn't respond to a missing property" do
-        settings.wont_respond_to :size
+        properties.wont_respond_to :size
       end
     end
 

data/test/dot_hash/settings_test.rb

@@ -0,0 +1,110 @@
+require File.expand_path("../../test_helper", __FILE__)
+
+module DotHash
+  describe Settings do
+    attr_reader :settings
+
+    describe "#method_missing" do
+      before do
+        configs = {site: "skyo.com", facebook: {api: "123"}}
+        @settings = Settings.new configs
+      end
+
+      it "gets hash properties" do
+        settings.site.must_equal "skyo.com"
+      end
+
+      it "gets a nested hash property" do
+        settings.facebook.api.must_equal "123"
+      end
+    end
+
+    describe "#respond_to?" do
+      before do
+        configs = {site: "skyo.com"}
+        @settings = Settings.new configs
+      end
+
+      it "responds to a property on the configs" do
+        settings.must_respond_to :site
+      end
+    end
+
+    describe ".instance" do
+      before do
+        configs = {site: "skyo.com"}
+        Settings.load configs
+      end
+
+      it "returns a singleton instance of the settings" do
+        Settings.instance.must_be_instance_of Settings
+      end
+    end
+
+    describe ".method_missing" do
+      before do
+        configs = {site: "skyo.com"}
+        Settings.load configs
+      end
+
+      it "gets hash properties" do
+        Settings.site.must_equal "skyo.com"
+      end
+    end
+
+    describe ".respond_to?" do
+      before do
+        configs = {site: "skyo.com"}
+        Settings.load configs
+      end
+
+      it "responds to a property on the configs" do
+        Settings.must_respond_to :site
+      end
+    end
+
+    describe ".load" do
+      describe "loading from hashes" do
+        before do
+          Settings.load({a: 1, b: {c: 2}}, {b: {x: {z: 10}}})
+        end
+
+        it "adds new properties to the previous hash" do
+          Settings.b.x.z.must_equal 10
+        end
+
+        it "keeps non-changed properties untouched" do
+          Settings.a.must_equal 1
+        end
+
+        it "merges nested hashes correctly" do
+          Settings.b.c.must_equal 2
+        end
+      end
+
+      describe "loading from files" do
+        it "loads from a file" do
+          Settings.load fixtures_path("configs1.yaml")
+          Settings.rogue.speed.must_equal 20
+          Settings.rogue.power.must_equal 11
+        end
+
+        it "loads from two files" do
+          Settings.load(
+            fixtures_path("configs1.yaml"),
+            fixtures_path("configs2.yaml")
+          )
+
+          Settings.rogue.speed.must_equal 25
+          Settings.rogue.power.must_equal 11
+        end
+
+        it "loads from a directory" do
+          Settings.load fixtures_path
+          Settings.rogue.speed.must_equal 25
+          Settings.rogue.power.must_equal 11
+        end
+      end
+    end
+  end
+end

data/test/fixtures/configs1.yaml

@@ -0,0 +1,7 @@
+default: &default
+  speed: 10
+  power: 11
+
+rogue:
+  <<: *default
+  speed: 20

data/test/fixtures/configs2.yaml

@@ -0,0 +1,2 @@
+rogue:
+  speed: 25

data/test/test_helper.rb

@@ -1,2 +1,7 @@
 require "minitest/autorun"
 require File.expand_path("../../lib/dot_hash", __FILE__)
+TESTS_PATH= File.dirname(__FILE__)
+
+def fixtures_path file=nil
+  "#{TESTS_PATH}/fixtures/#{file}"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dot_hash
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -44,9 +44,13 @@ files:
 - lib/dot_hash.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_to_properties_test.rb
 - test/dot_hash/properties_test.rb
+- test/dot_hash/settings_test.rb
+- test/fixtures/configs1.yaml
+- test/fixtures/configs2.yaml
 - test/test_helper.rb
 homepage: https://github.com/3den/dot_hash
 licenses: []
@@ -62,7 +66,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -937726017345117898
+      hash: -4301238719098485564
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -71,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -937726017345117898
+      hash: -4301238719098485564
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -81,4 +85,7 @@ summary: Converts hash.to_properties so you can access values using properties.s
 test_files:
 - test/dot_hash/hash_to_properties_test.rb
 - test/dot_hash/properties_test.rb
+- test/dot_hash/settings_test.rb
+- test/fixtures/configs1.yaml
+- test/fixtures/configs2.yaml
 - test/test_helper.rb