confstruct 0.2.4 → 0.2.5

data/README.md

@@ -193,6 +193,7 @@ The pattern `add_$key!` can be used to add to or create an array.
 - <b>v0.2.2</b> - Fix ArgumentError on #respond_to?(sym, true)
 - <b>v0.2.3</b> - Don't evaluate Deferreds during #inspect
 - <b>v0.2.4</b> - Fix deferreds under Ruby 1.9.x
+- <b>v0.2.5</b> - #14 #configure loses nested hashes somehow
 
 ## Contributing to confstruct
 

data/lib/confstruct.rb

@@ -4,5 +4,5 @@ module Confstruct
   autoload :HashWithStructAccess, 'confstruct/hash_with_struct_access'
   autoload :Configuration, 'confstruct/configuration'
   
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

data/lib/confstruct/configuration.rb

@@ -6,7 +6,7 @@ module Confstruct
   
     def initialize hash=@@hash_class.new, &block
       super({})
-      @default_values = hash.is_a?(HashWithStructAccess) ? hash : HashWithStructAccess.from_hash(hash)
+      @default_values = HashWithStructAccess.from_hash(hash)
       eval_or_yield @default_values, &block
       reset_defaults!
     end
@@ -16,7 +16,7 @@ module Confstruct
     
     def configure *args, &block
       if args[0].respond_to?(:each_pair)
-        self.deep_merge!(args[0])
+        self.deep_merge!(HashWithStructAccess.from_hash(args[0]))
       end
       eval_or_yield self, &block
       after_config! self

data/lib/confstruct/hash_with_struct_access.rb

@@ -46,6 +46,7 @@ module Confstruct
     
     class << self
       def from_hash hash
+        return hash if hash.is_a?(self)
         symbolized_hash = symbolize_hash hash
         self.new(symbolized_hash)
       end

data/spec/confstruct/configuration_spec.rb

@@ -127,6 +127,12 @@ describe Confstruct::Configuration do
         mock postconfigurator
       end
     end
+
+    it "should be initializable with a string-keyed hash" do
+      conf = Confstruct::Configuration.new
+      conf.configure(:top=>{:middle=>{"one"=>"two"}})
+      conf.top.middle.one.should == 'two'
+    end
   end
 
 end

metadata

@@ -1,128 +1,128 @@
 --- !ruby/object:Gem::Specification
 name: confstruct
 version: !ruby/object:Gem::Version
-  version: 0.2.4
   prerelease: 
+  version: 0.2.5
 platform: ruby
 authors:
 - Michael Klein
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-23 00:00:00.000000000 Z
+date: 2012-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: active_support
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: active_support
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
+    none: false
+  name: rake
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.8.7
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: simplecov
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdiscount
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: rdiscount
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: rdoc
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: rspec
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
     none: false
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  name: yard
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
 description: A simple, hash/struct-based configuration object
 email:
 - mbklein@gmail.com
@@ -153,26 +153,20 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1650864101667936832
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1650864101667936832
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A simple, hash/struct-based configuration object