konfa 0.3.2 → 0.4.0

data/lib/konfa.rb

@@ -1,29 +1,31 @@
-# -*- coding: utf-8 -*-
-require 'yaml'
+require_relative File.join(File.dirname(__FILE__), 'konfa', 'initializer')
 
 module Konfa
   class Base
+    include Konfa::Initializer
+
     class << self
       protected
 
       #
-      # The following methods are not a part of the public API. You may sublcass
+      # The following methods are not a part of the public API. You may subclass
       # them, but remember that unless you scope them as protected or private,
       # they will then be public
       #
 
-      attr_writer :configuration, :deferred, :initialized_deferred
+      attr_writer :configuration, :initializer, :initialized
 
-      def initialized_deferred
-        @initialized_deferred ||= false
+      def initialized
+        @initialized ||= false
       end
 
       def configuration
+        self.init
         @configuration ||= self.allowed_variables
       end
 
-      def deferred
-        @deferred ||= nil
+      def initializer
+        @initializer ||= nil
       end
 
       def truthy?(value)
@@ -39,11 +41,6 @@ module Konfa
         end
       end
 
-      def do_deferred_initialization
-        self.send(self.deferred.first, *self.deferred[1..-1])
-        self.initialized_deferred = true
-      end
-
       public
 
       #
@@ -63,16 +60,11 @@ module Konfa
         raise UnsupportedVariableError.new(key)
       end
 
-      def do_deferred_initialization?
-        !self.initialized_deferred && !self.deferred.nil?
-      end
-
       #
       # The following methods provides the interface to this class
       #
 
       def get(variable)
-        self.do_deferred_initialization if self.do_deferred_initialization?
         raise UnsupportedVariableError.new(variable) unless self.configuration.has_key? variable
         self.configuration[variable]
       end
@@ -93,8 +85,26 @@ module Konfa
         self.configuration.dup
       end
 
-      def initialize_deferred(method, *args)
-        self.deferred = [method, *args]
+      def init?
+        !self.initialized && !self.initializer.nil?
+      end
+
+      def init
+        return unless self.init?
+        # Set to true before calling to prevent recursion if
+        # an initializer is accessing the configuration
+        self.initialized = true
+        self.send(self.initializer.first, *self.initializer[1..-1])
+        self.after_initialize
+      end
+
+      def init_with(suffix, *args)
+        self.initializer = [:"init_with_#{suffix}", *args]
+        self
+      end
+
+      def reinit
+        self.initialized = false
       end
 
       def after_initialize
@@ -113,46 +123,9 @@ module Konfa
         result
       end
 
-      # FIXME: Move out to external package
-      def initialize_from_yaml(path)
-        # FIXME: It would be a lot cleaner if the YAML library would raise an
-        # exception if it fails to read the file. We'll handle it like this for now
-        # load_file just returns "false" if it fails
-        yaml_data = YAML.load_file(path)
-
-        unless yaml_data.nil?
-          raise InitializationError.new("Bad YAML format, key/value pairs expected") unless yaml_data.kind_of?(Hash)
-
-          yaml_data.each do |variable, value|
-            self.store(variable, value)
-          end
-        end
-
-        after_initialize
-        dump
-      end
-
-      # FIXME: Move out to external package
-      def initialize_from_env
-        conf_prefix = self.env_variable_prefix.upcase
-
-        ENV.keys.reject { |key|
-          key !~ /^#{conf_prefix}/ # Ignore everything that doesn't match the prefix
-        }.each { |key|
-          variable = key[conf_prefix.size..-1].downcase
-
-          self.store(variable, ENV[key])
-        }
-
-        after_initialize
-        dump
-      end
     end
   end
 
-  class InitializationError < StandardError
-  end
-
   class UnsupportedVariableError < StandardError
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: konfa
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -40,7 +40,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Application configuration