autoconfig 1.1.0 → 2.0

data/README.markdown

@@ -1,5 +1,5 @@
 	  !!!plain
-
+                 _                           ____
                 | |                         / __/
       __ _ _   _| |_  ___   ___  ___  _ __ | |_ _  __ _
      / _` | | | | __|/ _ \ / __|/ _ \| '_ \|  _| |/ _` |
@@ -10,9 +10,11 @@
 
 ## What is it
 
-Autoconfig in an automated way to create flexible configuration structures representing your YAML configuration
+`autoconfig` in an automated way to create flexible configuration structures. 
+
+Since version 2.0.0 `autoconfig` relies on [heirarchical_config](https://rubygems.org/gems/hierarchical_config) for the strategy for configuring an application in a static, declarative, robust, and intuitive way.
 
-## How does it work
+## Usage
 
 1. require 'autoconfig'
 2. profit!
@@ -30,8 +32,8 @@ Lets say you have application.yml in your config folder:
        web:
          hostname: "the.production.com"
 
-After requiring 'autoconfig' you should expect ApplicationConfig structure that will contain all the information. In production environment
-ApplicationConfig.web.hostname call will return "the.production.com".
+After requiring 'autoconfig' you should expect `ApplicationConfig` structure that will contain all the information. 
+In production environment `ApplicationConfig.web.hostname` call will return `the.production.com`.
 
 ## Advance Example
 
@@ -66,6 +68,7 @@ Check it out under test/config/one
       three: five
 
 Autoconfig can support:
+
  * specifying which keys are required via !REQUIRED yaml type
  * environment specific defaults shared across some environments
  * deep nested structures

data/lib/autoconfig.rb

@@ -1,13 +1,6 @@
-require 'ostruct'
-require 'yaml'
-require 'erb'
-require 'set'
-
+require 'hierarchical_config'
 
 module AutoConfig
-  REQUIRED = :REQUIRED
-  YAML.add_builtin_type( 'REQUIRED' ){ REQUIRED }
-
   module StringCamelize
     # Taken straight from active support inflector.rb, line 161
     def camelize(first_letter_in_uppercase = true)
@@ -20,23 +13,6 @@ module AutoConfig
   end
   String.send(:include, StringCamelize) unless String.instance_methods.include?("camelize")
 
-  class OpenStruct < ::OpenStruct
-    def method_missing(mid, *args) # :nodoc:
-      mname = mid.id2name
-      len = args.length
-      if mname.chomp!('=')
-        if len != 1
-          raise ArgumentError, "wrong number of arguments (#{len} for 1)", caller(1)
-        end
-        modifiable[new_ostruct_member(mname)] = args[0]
-      elsif len == 0 && @table.key?( mid )
-        @table[mid]
-      else
-        raise NoMethodError, "undefined method `#{mname}' for #{self}", caller(1)
-      end
-    end
-  end
-
   class Base
     class << self
       def root
@@ -45,11 +21,11 @@ module AutoConfig
       end
 
       def pattern
-        ENV['AUTOCONFIG_PATTERN'] || 'config/*.yml'
+        ENV['AUTOCONFIG_PATTERN'] || '*.yml'
       end
 
       def path
-        ENV['AUTOCONFIG_PATH'] || File.expand_path(pattern, root)
+        ENV['AUTOCONFIG_PATH'] || File.expand_path('config',root)
       end
 
       def environment
@@ -65,32 +41,26 @@ module AutoConfig
         Regexp.new(names)
       end
 
-      def reload
+      def load(name)
+        HierarchicalConfig.load_config( name, path, environment )
+      end
+
+
+      def autoload
         wipe
-        files = Dir.glob(path)
+        files = Dir.glob(File.join(path,pattern))
         begin
           old_verbose, $VERBOSE = $VERBOSE, nil
 
           files.each do |file|
-            name = File.basename(file, '.yml')
-            next if name.match(ignored_filenames)
+            name = File.basename(file, pattern.gsub('*',''))
+            next if name.match(ignored_filenames) || name.match(/-overrides/)
 
-            constant_name = "#{name}Config".gsub('-','_').camelize
+            constant_name = "#{name}Config".gsub('-','_').camelize.intern
             begin
-              yaml_config   = YAML::load(ERB.new(IO.read(file)).result)
-
-              @ordered_stanza_labels[constant_name] = []
-              @ordered_stanza_labels[constant_name] << 'defaults' if yaml_config.key? 'defaults'
-              @ordered_stanza_labels[constant_name] += yaml_config.keys.grep(/^defaults\[.*#{environment}/).sort_by{ |a| a.count(',') }
-              @ordered_stanza_labels[constant_name] << environment if yaml_config.key? environment
-
-              config = @ordered_stanza_labels[constant_name].inject({}) do |acc, label|
-                deep_merge(acc,yaml_config[label])
-              end
-
-              ensure_requirements_met_and_ostructify!(config, constant_name )
-
-              Object::const_set(constant_name.intern, OpenStruct.new(config))
+              Object::const_set(constant_name, load(name))
+              @autoset_constants ||= Set.new
+              @autoset_constants << constant_name
             rescue StandardError => e
               @errors << <<-ERROR
                 Error reading file #{file} into #{constant_name}.
@@ -108,46 +78,18 @@ module AutoConfig
         end
       end
 
+      alias :reload :autoload
+
       private
+
       # unsets created constants
       def wipe
-        unless @ordered_stanza_labels.nil?
-          @ordered_stanza_labels.keys.each{|const| Object::const_set(const.intern, nil) }
+        unless @autoset_constants.nil?
+          @autoset_constants.each{|const| Object::const_set(const, nil) }
         end
-        @ordered_stanza_labels = {}
         @errors = Set.new
       end
 
-      # merges two hashes with nested hashes if present
-      def deep_merge( hash1, hash2 )
-        hash1 = hash1.dup
-        ( hash1.keys + hash2.keys ).each do | key |
-          if hash1.key?( key ) && hash2.key?( key ) &&
-             hash1[key].is_a?( Hash ) && hash2[key].is_a?( Hash )
-             hash1[key] = deep_merge( hash1[key], hash2[key] )
-          elsif hash2.key?( key )
-            hash1[key] = hash2[key]
-          end
-        end
-        hash1
-      end
-      # Mutator method that does two things:
-      # * checks if any of the keys were required and not set. Upon finding
-      # it adds key to the error set
-      # * recursively sets open structs for deep hashes
-      def ensure_requirements_met_and_ostructify!( hash, path )
-        hash.each do | key, value |
-          case
-          when value.respond_to?( :keys ) && value.respond_to?( :values )
-            ensure_requirements_met_and_ostructify!( value, path + '.' + key )
-          when value == REQUIRED
-            @errors << "#{path}.#{key} is REQUIRED"
-          end
-          hash[key] = OpenStruct.new(value) if value.is_a?( Hash )
-        end
-      end
     end
   end
 end
-
-AutoConfig::Base.reload

metadata

@@ -1,69 +1,59 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: autoconfig
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: '2.0'
   prerelease: 
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
 platform: ruby
-authors: 
+authors:
 - tjbladez
 - timgaleckas
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-12 00:00:00 -05:00
-default_executable: 
-dependencies: []
-
-description: Automated way to create flexible configuration structures representing your YAML configuration
+date: 2011-10-12 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: hierarchical_config
+  requirement: &70155900128960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70155900128960
+description: Automated way to create flexible configuration structures representing
+  your YAML configuration
 email: nick@tjbladez.com, tim@galeckas.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/autoconfig.rb
 - README.markdown
-has_rdoc: false
 homepage: http://github.com/tjbladez/autoconfig
 licenses: []
-
 post_install_message: Forget about loading your yaml configuration
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Automagically creates Config structures from your config/*.yml files
 test_files: []
-