application_configuration 1.1.10 → 1.2.0

data/lib/application_configuration.rb

@@ -6,44 +6,7 @@ module Application
   
   class Configuration
     
-    # this class is used to namespace configurations
-    class Namespace
-      
-      attr_accessor :namespace_name
-      
-      def initialize(name)
-        self.namespace_name = name
-      end
-      
-      def to_s
-        self.namespace_name
-      end
-      
-      def method_missing(sym, *args)
-        Application::Configuration.send("#{self}__#{sym}", *args)
-      end
-      
-    end
-    
-    class Location
-      
-      attr_accessor :type
-      attr_accessor :file_location
-      
-      def initialize(loc, type = Application::Configuration::Location::FILE)
-        self.type = type
-        self.file_location = loc
-      end
-      
-      def self.supported_types
-        [Application::Configuration::Location::FILE, Application::Configuration::Location::URL]
-      end
-      
-      FILE = :file
-      URL = :url
-      
-    end
-    
+    DEFAULT_RELOAD_SETTINGS_EVERY = 1200
     
     include Singleton
     
@@ -52,7 +15,7 @@ module Application
       def method_missing(sym, *args)
         inst = Application::Configuration.instance
         # check to see if the configuration needs to be reloaded.
-        if (Time.now - (inst.reload_settings_every || 0)) > inst.last_reload_time
+        if (Time.now - (inst.reload_settings_every || DEFAULT_RELOAD_SETTINGS_EVERY)) > inst.last_reload_time
           inst.reload
         end
         inst.send(sym, *args)
@@ -60,18 +23,18 @@ module Application
       
     end
 
-    attr_reader :final_configuration_settings #stores the final configuration settings
-    attr_reader :last_reload_time #stores the last time settings were reloaded
-    attr_reader :is_rails #stores whether or not we're in a rails app
-    attr_reader :loaded_files
-    attr_reader :rails_root
-    attr_reader :rails_env
+    attr_reader   :final_configuration_settings #stores the final configuration settings
+    attr_reader   :last_reload_time #stores the last time settings were reloaded
+    attr_reader   :is_rails #stores whether or not we're in a rails app
+    attr_reader   :loaded_files
+    attr_reader   :rails_root
+    attr_reader   :rails_env
     attr_accessor :whiny_config_missing
     
     def initialize
       self.whiny_config_missing = false
       @loaded_files = []
-      @final_configuration_settings = {}
+      @final_configuration_settings = {:reload_settings_every => DEFAULT_RELOAD_SETTINGS_EVERY}
       @last_reload_time = Time.now # set the first load time
       @is_rails = Object.const_defined?("RAILS_ENV") # set whether it's rails
       if self.is_rails
@@ -89,7 +52,7 @@ module Application
       unless path_to_file.nil?
         begin
           path_to_file = Application::Configuration::Location.new(path_to_file) if path_to_file.is_a? String
-          settings = load_from_file(path_to_file.file_location)
+          settings = load_from_file(path_to_file.name)
           handle_settings(settings, path_to_file)
           return self
         rescue Exception => e
@@ -103,7 +66,7 @@ module Application
       unless path_to_file.nil?
         begin
           path_to_file = Application::Configuration::Location.new(path_to_file, Application::Configuration::Location::URL) if path_to_file.is_a? String
-          settings = load_from_url(path_to_file.file_location)
+          settings = load_from_url(path_to_file.name)
           handle_settings(settings, path_to_file)
           return self
         rescue Exception => e
@@ -113,17 +76,28 @@ module Application
       end
     end
     
+    def load_hash(settings, name)
+      loc = Application::Configuration::Location.new(name, Application::Configuration::Location::HASH)
+      loc.options = settings
+      handle_settings(settings, loc)
+      return self
+    end
+    
     def reload
       puts "Loading Configuration Settings!"
-      @final_configuration_settings = {:reload_settings_every => 1200} # reset the configuration
+      @final_configuration_settings = {:reload_settings_every => DEFAULT_RELOAD_SETTINGS_EVERY} # reset the configuration
 
       self.loaded_files.each do |lf|
-        puts "Loading Configuration Settings from file: #{lf.file_location}"
         case lf.type
         when Application::Configuration::Location::FILE
+          puts "Loading Configuration Settings from file: #{lf.name}"
           load_file(lf)
         when Application::Configuration::Location::URL
+          puts "Loading Configuration Settings from url: #{lf.name}"
           load_url(lf)
+        when Application::Configuration::Location::HASH
+          puts "Loading Configuration Settings from hash: #{lf.name}"
+          load_hash(lf.options, lf.name)
         else
           raise TypeError.new("The Application::Configuration::Location type '#{lf.type}' is not supported!")
         end
@@ -162,9 +136,9 @@ WARNING: Tried to access configuration parameter: #{sym}, but there is no config
       YAML.load(template.result)
     end
     
-    def handle_settings(settings, path_to_file)
+    def handle_settings(settings, location)
       @final_configuration_settings.merge!(settings || {})
-
+      # puts "@final_configuration_settings: #{@final_configuration_settings.inspect}"
       self.final_configuration_settings.each_pair do |k,v|
         k = k.to_s.downcase
         # start a list of methods that need to be generated
@@ -189,10 +163,62 @@ WARNING: Tried to access configuration parameter: #{sym}, but there is no config
         end
       end
       
-      @loaded_files << path_to_file
+      @loaded_files << location
       @loaded_files.uniq!
     end
     
+    # this class is used to namespace configurations
+    class Namespace
+      
+      attr_accessor :namespace_name
+      
+      def initialize(name)
+        self.namespace_name = name
+      end
+      
+      def to_s
+        self.namespace_name
+      end
+      
+      def method_missing(sym, *args)
+        Application::Configuration.send("#{self}__#{sym}", *args)
+      end
+      
+    end
+    
+    class Location
+      
+      attr_accessor :type
+      attr_accessor :name
+      attr_accessor :options
+      
+      def initialize(loc, type = Application::Configuration::Location::FILE)
+        self.type = type
+        self.name = loc
+      end
+      
+      def self.supported_types
+        [Application::Configuration::Location::FILE, Application::Configuration::Location::URL, Application::Configuration::Location::HASH]
+      end
+      
+      FILE = :file
+      URL  = :url
+      HASH = :hash
+      
+      def ==(other)
+        self.name.to_s == other.name.to_s
+      end
+      
+      def eql?(other)
+        self.name.to_s == other.name.to_s
+      end
+      
+      def hash
+        self.name.to_s.hash
+      end
+      
+    end
+    
   end
   
 end

data/lib/tasks/rubyforge_config.yml

@@ -2,4 +2,4 @@
 gem_name: application_configuration
 package: application_configuration
 project: magrathea
-version: 1.1.10
+version: 1.2.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: application_configuration
 version: !ruby/object:Gem::Version 
-  version: 1.1.10
+  version: 1.2.0
 platform: ruby
 authors: 
 - markbates
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-31 00:00:00 -05:00
+date: 2008-02-18 00:00:00 -05:00
 default_executable: 
 dependencies: []