rails_config 0.1.5 → 0.1.6

data/Gemfile

@@ -1,8 +1,3 @@
 source 'http://rubygems.org'
 
-gem "activesupport", ">= 3.0.0.rc"
-gem "rspec", ">= 2.0.0.beta.19"
-gem 'autotest'
-gem "growl-glue"
-
-gem "ruby-debug"
+gemspec

data/Gemfile.lock

@@ -1,32 +1,29 @@
+PATH
+  remote: .
+  specs:
+    rails_config (0.1.5)
+      activesupport (~> 3.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.0.0.rc)
-    autotest (4.3.2)
-    columnize (0.3.1)
+    activesupport (3.0.0)
     diff-lcs (1.1.2)
-    growl-glue (1.0.7)
-    linecache (0.43)
-    rspec (2.0.0.beta.19)
-      rspec-core (= 2.0.0.beta.19)
-      rspec-expectations (= 2.0.0.beta.19)
-      rspec-mocks (= 2.0.0.beta.19)
-    rspec-core (2.0.0.beta.19)
-    rspec-expectations (2.0.0.beta.19)
+    rspec (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
+      rspec-mocks (= 2.0.0)
+    rspec-core (2.0.0)
+    rspec-expectations (2.0.0)
       diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.19)
-    ruby-debug (0.10.3)
-      columnize (>= 0.1)
-      ruby-debug-base (~> 0.10.3.0)
-    ruby-debug-base (0.10.3)
-      linecache (>= 0.3)
+    rspec-mocks (2.0.0)
+      rspec-core (= 2.0.0)
+      rspec-expectations (= 2.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 3.0.0.rc)
-  autotest
-  growl-glue
+  activesupport (~> 3.0)
+  rails_config!
   rspec (>= 2.0.0.beta.19)
-  ruby-debug

data/README.md

@@ -58,9 +58,22 @@ Config entries are compiled from
 
 settings defined in files that are lower in the list override settings higher
 
-### Reloading config files
+### Reloading settings
 
-You can reload the Settings from file at any time by running Settings.reload!
+You can reload the Settings object at any time by running Settings.reload!
+
+### Reloading settings and config files
+
+You can also reload the Settings object from different config files at runtime.
+
+For example, in your tests if you want to test the production settings, you can:
+
+    Rails.env = "production"
+    Settings.reload_from_files(
+      Rails.root.join("config", "settings.yml").to_s,
+      Rails.root.join("config", "settings", "#{Rails.env}.yml").to_s,
+      Rails.root.join("config", "environments", "#{Rails.env}.yml").to_s
+    )
 
 ### Environment specific config files
 

data/Rakefile

@@ -11,9 +11,11 @@ begin
     s.email = ["railsjedi@gmail.com", "ifredwu@gmail.com"]
     s.files =  FileList["[A-Z]*", "{bin,generators,lib,spec}/**/*"]
 
-    s.add_dependency 'activesupport', "~>3.0"
-    s.add_development_dependency 'rspec', ">=2.0.0.beta.19"
-
+    s.add_dependency 'activesupport', "~> 3.0"
+    s.add_development_dependency 'rspec', "~> 2.0"
+    s.add_development_dependency 'autotest'
+    s.add_development_dependency 'growl-glue'
+    s.add_development_dependency 'ruby-debug' if RUBY_VERSION < "1.9"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/rails_config/options.rb

@@ -11,10 +11,6 @@ module RailsConfig
       @config_sources << source
     end
 
-    def load!
-      reload!
-    end
-
     # look through all our sources and rebuild the configuration
     def reload!
       conf = {}
@@ -36,6 +32,11 @@ module RailsConfig
 
     alias :load! :reload!
 
+    def reload_from_files(*files)
+      RailsConfig.load_and_set_settings(files)
+      reload!
+    end
+
     protected
 
     # Recursively converts Hashes to Options (including Hashes inside Arrays)

data/lib/rails_config/railtie.rb

@@ -10,13 +10,11 @@ if defined?(Rails::Railtie)
 
       # Parse the settings before any of the initializers
       ActiveSupport.on_load :before_initialize, :yield => true do
-        settings = RailsConfig.load_files(
+        RailsConfig.load_and_set_settings(
           Rails.root.join("config", "settings.yml").to_s,
           Rails.root.join("config", "settings", "#{Rails.env}.yml").to_s,
           Rails.root.join("config", "environments", "#{Rails.env}.yml").to_s
         )
-        
-        Kernel.const_set(RailsConfig.const_name, settings)
       end
 
       # Rails Dev environment should reload the Settings on every request

data/lib/rails_config.rb

@@ -17,11 +17,6 @@ module RailsConfig
     @@_ran_once = true
   end
 
-  @@load_paths = []
-  def self.load_paths
-    @@load_paths
-  end
-
   # Create a populated Options instance from a yaml file.  If a second yaml file is given, then the sections of that file will overwrite the sections
   # if the first file if they exist in the first file.
   def self.load_files(*files)
@@ -32,9 +27,14 @@ module RailsConfig
       config.add_source!(Sources::YAMLSource.new(file))
     end
     config.load!
-    return config
+    config
   end
 
+  # Loads and sets the settings constant!
+  def self.load_and_set_settings(*files)
+    Kernel.send(:remove_const, RailsConfig.const_name) if Kernel.const_defined?(RailsConfig.const_name)
+    Kernel.const_set(RailsConfig.const_name, RailsConfig.load_files(files))
+  end
 end
 
 # add railtie

data/spec/rails_config_spec.rb

@@ -44,6 +44,18 @@ describe RailsConfig do
     config.size.should == 2
   end
 
+  it "should allow full reload of the settings files" do
+    files = [setting_path("settings.yml")]
+    RailsConfig.load_and_set_settings(files)
+    Settings.server.should == "google.com"
+    Settings.size.should == 1
+
+    files = [setting_path("settings.yml"), setting_path("development.yml")]
+    Settings.reload_from_files(files)
+    Settings.server.should == "google.com"
+    Settings.size.should == 2
+  end
+
   context "Nested Settings" do
     let(:config) do
       RailsConfig.load_files(setting_path("development.yml"))

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rails_config
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Jacques Crocker
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 -07:00
+date: 2010-10-12 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +26,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 3
         - 0
@@ -40,18 +38,40 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196421
         segments: 
         - 2
         - 0
-        - 0
-        - beta
-        - 19
-        version: 2.0.0.beta.19
+        version: "2.0"
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: autotest
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: growl-glue
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
 description: Provides an easy to use Application Configuration object
 email: 
 - railsjedi@gmail.com
@@ -113,7 +133,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -122,7 +141,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"