config-me 0.0.4 → 0.0.6

data/lib/config-me.rb

@@ -1,36 +1,29 @@
 require 'active_support/dependencies/autoload'
+require 'active_support/core_ext/class/attribute_accessors'
 
 module ConfigMe
-
-  @current = nil
-  @configurations = {}
-
-  autoload :VERSION,           'config-me/version'
-  autoload :Node,              'config-me/node'
-  autoload :Configuration,     'config-me/configuration'
+  autoload :Base,              'config-me/base'
+  autoload :Defaults,          'config-me/defaults'
   autoload :DefinitionsParser, 'config-me/definitions_parser'
-  autoload :UndefinedSetting,  'config-me/errors'
-  autoload :UndefinedScope,    'config-me/errors'
-  autoload :ConfigurationsNotDefined, 'config-me/errors'
+  autoload :Importer,          'config-me/importer'
+  autoload :Node,              'config-me/node'
+  autoload :Runner,            'config-me/runner'
+  autoload :VERSION,           'config-me/version'
+
+  # Errors
+  autoload :UnrecognizedError,       'config-me/errors'
+  autoload :UndefinedSetting,        'config-me/errors'
+  autoload :ConfigurationNotDefined, 'config-me/errors'
+  autoload :WrongFormat,             'config-me/errors'
 
   private
 
     def self.method_missing method, *args, &block
-      raise ConfigMe::ConfigurationsNotDefined if @current.nil?
-      @current.send method, *args, &block
+      ConfigMe::Base.delegate_to_current_configuration method, *args, &block
     end
-end
 
-def ConfigMe scope = :production, &definitions
-  configurations = ConfigMe.instance_variable_get :@configurations
+end
 
-  if block_given?
-    configurations[scope] = ConfigMe::Configuration.new(&definitions)
-    ConfigMe.instance_variable_set :@configurations, configurations
-    ConfigMe.instance_variable_set :@current, configurations[scope]
-  else
-    raise ConfigMe::UndefinedScope.new(scope) unless configurations.has_key?(scope)
-    ConfigMe.instance_variable_set :@current, configurations[scope]
-    ConfigMe
-  end
+def ConfigMe namespace_or_options = ConfigMe::Defaults.namespace, &definitions
+  ConfigMe.tap { ConfigMe::Runner.parse namespace_or_options, &definitions }
 end

data/lib/config-me/base.rb

@@ -0,0 +1,34 @@
+class ConfigMe::Base
+
+  cattr_accessor :configurations
+  cattr_accessor :current_namespace
+
+  attr_accessor :node
+
+  class << self
+    def current_configuration
+      find_configuration current_namespace || ConfigMe::Defaults.namespace
+    end
+
+    def find_configuration namespace
+      raise ConfigMe::ConfigurationNotDefined.new(namespace) if !configurations.has_key?(namespace) || namespace.nil?
+      configurations[ namespace ]
+    end
+
+    def clear!
+      self.configurations = {}
+      reset_current_namespace!
+    end
+
+    def delegate_to_current_configuration method, *args, &block
+      current_configuration.node.send(method, *args, &block).tap do
+        reset_current_namespace!
+      end
+    end
+
+    def reset_current_namespace!
+      self.current_namespace = nil
+    end
+  end
+
+end

data/lib/config-me/defaults.rb

@@ -0,0 +1,8 @@
+module ConfigMe::Defaults
+  class << self
+    attr_accessor :namespace, :proc_auto_calling
+  end
+
+  self.namespace         = :production
+  self.proc_auto_calling = true
+end

data/lib/config-me/errors.rb

@@ -1,19 +1,26 @@
 module ConfigMe
-  class ConfigurationsNotDefined < Exception
+
+  class UnrecognizedError < RuntimeError
     def initialize
-      super "No configurations were defined"
+      super "Really something wrong"
     end
   end
 
-  class UndefinedScope < Exception
-    def initialize scope
-      super %(Undefined scope "#{scope}")
+  class ConfigurationNotDefined < StandardError
+    def initialize name
+      super "Configuration :#{name} not defined"
     end
   end
 
-  class UndefinedSetting < Exception
+  class UndefinedSetting < ArgumentError
     def initialize breadcrumbs
       super %(Undefined setting "#{breadcrumbs.join('.')}")
     end
   end
+
+  class WrongFormat < ArgumentError
+    def initialize expected, received
+      super %(Expected #{expected} format, but received #{received})
+    end
+  end
 end

data/lib/config-me/importer.rb

@@ -0,0 +1,41 @@
+module ConfigMe::Importer
+
+  def self.from_definitions namespace, definitions
+    with_configuration(namespace) do |configuration|
+      configuration.node = ConfigMe::DefinitionsParser.parse! %w(ConfigMe), &definitions
+    end
+  end
+
+  def self.from_hash namespace, hash
+    raise ConfigMe::WrongFormat.new('hash', hash.class) unless hash.is_a?(Hash)
+    with_configuration(namespace) do |configuration|
+      configuration.node = convert_hash hash, %w(ConfigMe)
+    end
+  end
+
+  def self.from_yaml namespace, yaml
+    require 'yaml'
+    from_hash namespace, YAML::load(File.open(yaml))
+  end
+
+  def self.with_configuration namespace
+    ConfigMe::Base.new.tap do |configuration|
+      yield configuration
+      ConfigMe::Base.configurations ||= {}
+      ConfigMe::Base.configurations[ namespace ] = configuration
+    end
+  end
+
+  def self.convert_hash hash, breadcrumbs
+    ConfigMe::Node.new(breadcrumbs).tap do |node|
+      hash.each do |key, value|
+        node[ key.to_sym ] = if value.is_a?(Hash)
+          convert_hash value, (breadcrumbs + [ key.to_sym ])
+        else
+          value
+        end
+      end
+    end
+  end
+
+end

data/lib/config-me/node.rb

@@ -25,13 +25,24 @@ class ConfigMe::Node
     case
       when block_given?     then self[ method ] = ConfigMe::DefinitionsParser.parse!(@breadcrumbs, &definitions)
       when setter?(method)  then self[ setter_method(method) ] = args.first
-      when has_key?(method) then self[ method ]
+      when has_key?(method) then read_setting(method, *args)
       else raise ConfigMe::UndefinedSetting.new(@breadcrumbs + [method])
     end
   end
 
   private
 
+    def read_setting name, *args
+      value = self[ name ]
+
+      case
+        when value.is_a?(Proc) && ConfigMe::Defaults.proc_auto_calling
+          value.call(*args)
+        else
+          value
+      end
+    end
+
     def setter? key
       key.to_s =~ /^[a-zA-Z0-9_]+=$/
     end

data/lib/config-me/runner.rb

@@ -0,0 +1,65 @@
+module ConfigMe::Runner
+  class << self
+
+    attr_accessor :namespace, :options, :definitions
+
+    def parse namespace_or_options, &definitions
+      parse_execution_params! namespace_or_options, &definitions
+      case_and_apply_action!
+    end
+
+    def case_and_apply_action!
+      case
+        when reading? then set_current_namespace
+        when writing?
+          ConfigMe::Importer.from_definitions namespace, definitions
+        when importing_from_hash?
+          ConfigMe::Importer.from_hash namespace, options[:hash]
+        when importing_from_yaml?
+          ConfigMe::Importer.from_yaml namespace, options[:yaml]
+        else
+          raise ConfigMe::UnrecognizedError.new
+      end
+    end
+
+    def set_current_namespace
+      ConfigMe::Base.current_namespace = namespace
+    end
+
+    def parse_execution_params! namespace_or_options, &definitions
+      self.definitions = definitions
+
+      case
+        # ConfigMe.foo
+        # ConfigMe(:development).foo
+        when namespace_or_options.is_a?(Symbol) || namespace_or_options.is_a?(String)
+          self.namespace = namespace_or_options.to_sym
+          self.options   = {}
+
+        # ConfigMe(:from_hash => { :foo => :bar })
+        # ConfigMe(:namespace => :development)
+        when namespace_or_options.is_a?(Hash)
+          self.namespace = namespace_or_options.delete(:namespace) || ConfigMe::Defaults.namespace
+          self.options   = namespace_or_options
+        else
+          raise ConfigMe::UnrecognizedError.new
+      end
+    end
+
+    def reading?
+      options.empty? && definitions.nil?
+    end
+
+    def writing?
+      options.empty? && !definitions.nil?
+    end
+
+    def importing_from_hash?
+      options.has_key?(:hash)
+    end
+
+    def importing_from_yaml?
+      options.has_key?(:yaml)
+    end
+  end
+end

data/lib/config-me/version.rb

@@ -1,3 +1,3 @@
 module ConfigMe
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,84 +1,119 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: config-me
-version: !ruby/object:Gem::Version
-  version: 0.0.4
+version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 6
+  version: 0.0.6
 platform: ruby
-authors:
+authors: 
 - Ivan Garmatenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-22 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-03-24 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: cucumber
-  requirement: &73904440 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.1'
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
   type: :development
-  prerelease: false
-  version_requirements: *73904440
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &73904110 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.9'
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 2
+        - 9
+        version: "2.9"
   type: :development
-  prerelease: false
-  version_requirements: *73904110
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: activesupport
-  requirement: &73903820 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
   type: :runtime
-  prerelease: false
-  version_requirements: *73903820
+  version_requirements: *id003
 description: Provides convenient tool for storing configuration
-email:
+email: 
 - cheef.che@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - lib/config-me/version.rb
+- lib/config-me/importer.rb
 - lib/config-me/errors.rb
 - lib/config-me/definitions_parser.rb
-- lib/config-me/configuration.rb
+- lib/config-me/defaults.rb
+- lib/config-me/base.rb
 - lib/config-me/node.rb
+- lib/config-me/runner.rb
 - lib/config-me.rb
 homepage: http://github.com/cheef/config-me
 licenses: []
+
 post_install_message: 
 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
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: config-me
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Provides convenient tool for storing configuration
 test_files: []
+
+has_rdoc: 

data/lib/config-me/configuration.rb

@@ -1,17 +0,0 @@
-class ConfigMe::Configuration
-
-  def initialize &definitions
-    @tree = ConfigMe::DefinitionsParser.parse! %w(ConfigMe), &definitions
-  end
-
-  def self.clear!
-    ConfigMe.instance_variable_set :@current, nil
-    ConfigMe.instance_variable_set :@configurations, {}
-  end
-
-  private
-
-    def method_missing method, *args, &block
-      @tree.send method, *args, &block
-    end
-end