rails_config 0.2.0 → 0.2.1

data/lib/generators/rails_config/install_generator.rb

@@ -1,6 +1,6 @@
 module RailsConfig
   module Generators
-    class InstallGenerator < Rails::Generators::Base
+    class InstallGenerator < ::Rails::Generators::Base
       desc "Generates a custom Rails Config initializer file."
 
       def self.source_root

data/lib/rails_config/options.rb

@@ -40,6 +40,19 @@ module RailsConfig
       reload!
     end
 
+    def to_hash
+      result = {}
+      marshal_dump.each do |k, v|
+        result[k] = v.instance_of?(RailsConfig::Options) ? v.to_hash : v
+      end
+      result
+    end
+
+    def to_json(*args)
+      require "json" unless defined?(JSON)
+      to_hash.to_json(*args)
+    end
+
     protected
 
     # Recursively converts Hashes to Options (including Hashes inside Arrays)
@@ -48,19 +61,14 @@ module RailsConfig
 
       h.each do |k, v|
         s.new_ostruct_member(k)
+
         if v.is_a?(Hash)
-          if(v["type"] == "hash")
-            val = v["contents"]
-          else
-            val = __convert(v)
-          end
-          s.send( (k+'=').to_sym, val)
+          v = v["type"] == "hash" ? v["contents"] : __convert(v)
         elsif v.is_a?(Array)
-          converted_array = v.collect { |e| e.instance_of?(Hash) ? __convert(e) : e }
-          s.send("#{k}=".to_sym, converted_array)
-        else
-          s.send("#{k}=".to_sym, v)
+          v = v.collect { |e| e.instance_of?(Hash) ? __convert(e) : e }
         end
+
+        s.send("#{k}=".to_sym, v)
       end
       s
     end

data/lib/rails_config/railtie.rb

@@ -9,7 +9,7 @@ if defined?(Rails::Railtie)
       end
 
       # Parse the settings before any of the initializers
-      ActiveSupport.on_load :before_initialize, :yield => true do
+      ActiveSupport.on_load :before_configuration, :yield => true do
         RailsConfig.load_and_set_settings(
           Rails.root.join("config", "settings.yml").to_s,
           Rails.root.join("config", "settings", "#{Rails.env}.yml").to_s,

data/lib/rails_config/version.rb

@@ -1,3 +1,3 @@
 module RailsConfig
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/rails_config_spec.rb

@@ -31,6 +31,16 @@ describe RailsConfig do
     config.should be_empty
   end
 
+  it "should convert to a hash" do
+    config = RailsConfig.load_files(setting_path("development.yml")).to_hash
+    config[:section][:servers].should be_a_kind_of(Array)
+  end
+
+  it "should convert to a json" do
+    config = RailsConfig.load_files(setting_path("development.yml")).to_json
+    JSON.parse(config)["section"]["servers"].should be_a_kind_of(Array)
+  end
+
   it "should load an empty config for multiple missing file paths" do
     files = [setting_path("empty1.yml"), setting_path("empty2.yml")]
     config = RailsConfig.load_files(files)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rails_config
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jacques Crocker
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 +11:00
+date: 2010-11-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,6 +27,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
@@ -40,6 +42,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 2
         - 0
@@ -54,6 +57,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -67,6 +71,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -134,6 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -142,6 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"