rails_config 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4efd1a612a114b168e9ddeb109fac76186b65dbf
-  data.tar.gz: 4f2f6db5b1137726cd050426d43b7f5ee1b8a831
+  metadata.gz: bdfe7d4c355ef3a597de7a74ecce0b5b0884c3aa
+  data.tar.gz: 51f7b615597fe525b31cdfdd80bf9dd95b6bf5a1
 SHA512:
-  metadata.gz: 62ef2ac4f378dc31128fc018a369ddc44c714d54ad3937f73a184136828fe63b3bdbc765bc7abed6e1785e1a72f6ab901e3432a369b686265842c1a174119385
-  data.tar.gz: bb2119a46660de9e8507044911ad05bd9d6c9394f988db2433d5f40c13b27c27d51214b79219d7721cc1e34af2b80ba02a6b2ea3ae4082fd5b351fdc8ea371ce
+  metadata.gz: fb605e92f8f97565e9aade53bd8e871f72bb5cbca6e77e47e658ef0374aa5707096eb5306e9872d18d8d57f7e4cf733cbc076ed9d9a508999a88414acc9f8c22
+  data.tar.gz: b22b49167706e2d8ac227e75ac331a4e0cd872756abdb851e16c5c4b193fe15852df9771b10a97530ba1fe1f1131b85a57d3d0ee51d09d5321bafd92edc1ce5a

data/.gitignore

@@ -2,3 +2,4 @@
 pkg/*.gem
 .rvmrc
 Gemfile.lock
+.idea

data/.ruby-gemset

@@ -0,0 +1 @@
+rails_config

data/CHANGELOG.md

@@ -0,0 +1,4 @@
+# 0.3.4
+
+* expose Settings in application.rb, so you don't have to duplicate configuration for each environment file ([#59](https://github.com/railsjedi/rails_config/issues/59))
+* change the on_load init callback to support Rails 4.1.0.rc

data/Gemfile

@@ -1,3 +1,5 @@
 source 'http://rubygems.org'
 
 gemspec
+
+gem 'rubocop', require: false

data/README.md

@@ -235,4 +235,9 @@ Settings.section.servers[1].name # => amazon.com
 
 * [Jacques Crocker](http://github.com/railsjedi)
 * [Fred Wu](http://github.com/fredwu)
-* Inherited from [AppConfig](http://github.com/cjbottaro/app_config) by [Christopher J. Bottaro](http://github.com/cjbottaro)
+* [Piotr Kuczynski](http://github.com/pkuczynski)
+* Inherited from [AppConfig](http://github.com/cjbottaro/app_config) by [Christopher J. Bottaro](http://github.com/cjbottaro)
+
+## License
+
+RailsConfig is released under the [MIT License](http://www.opensource.org/licenses/MIT).

data/lib/rails_config/integration/rails.rb

@@ -1,30 +1,35 @@
 module RailsConfig
   module Integration
-    module Rails3
-      if defined?(Rails::Railtie)
-        class Railtie < Rails::Railtie
+    module Rails
+      if defined?(::Rails::Railtie)
+        class Railtie < ::Rails::Railtie
 
-          # manually load the custom initializer before everything else
-          initializer :load_custom_rails_config, :before => :load_environment_config, :group => :all do
-            initializer = Rails.root.join("config", "initializers", "rails_config.rb")
-            require initializer if File.exist?(initializer)
+          # TODO: allo them to override init_callback via ENV or something?
+          if ::Rails::VERSION::MAJOR >= 4 and ::Rails::VERSION::MINOR >= 1
+            init_callback = :before_initialize
+          else
+            init_callback = :before_configuration
           end
 
-          # Parse the settings before any of the initializers
-          initializer :load_rails_config_settings, :after => :load_custom_rails_config, :before => :load_environment_config, :group => :all do
+          ActiveSupport.on_load init_callback, :yield => true do
+            # manually load the custom initializer before everything else
+            initializer = ::Rails.root.join("config", "initializers", "rails_config.rb")
+            require initializer if File.exist?(initializer)
+
+            # Parse the settings before any of the initializers
             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,
+              ::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,
 
-              Rails.root.join("config", "settings.local.yml").to_s,
-              Rails.root.join("config", "settings", "#{Rails.env}.local.yml").to_s,
-              Rails.root.join("config", "environments", "#{Rails.env}.local.yml").to_s
+              ::Rails.root.join("config", "settings.local.yml").to_s,
+              ::Rails.root.join("config", "settings", "#{::Rails.env}.local.yml").to_s,
+              ::Rails.root.join("config", "environments", "#{::Rails.env}.local.yml").to_s
             )
           end
 
           # Rails Dev environment should reload the Settings on every request
-          if Rails.env.development?
+          if ::Rails.env.development?
             initializer :rails_config_reload_on_development do
               ActionController::Base.class_eval do
                 prepend_before_filter { ::RailsConfig.reload! }
@@ -35,4 +40,4 @@ module RailsConfig
       end
     end
   end
-end
+end

data/lib/rails_config/version.rb

@@ -1,3 +1,3 @@
 module RailsConfig
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

data/rails_config.gemspec

@@ -4,11 +4,12 @@ Gem::Specification.new do |s|
   s.name             = "rails_config"
   s.version          = RailsConfig::VERSION
   s.date             = Time.now.strftime '%F'
-  s.authors          = ["Jacques Crocker", "Fred Wu"]
-  s.email            = ["railsjedi@gmail.com", "ifredwu@gmail.com"]
-  s.summary          = "Provides a Settings helper for rails3 that reads from config/settings.yml"
+  s.authors          = ["Jacques Crocker", "Fred Wu", "Piotr Kuczynski"]
+  s.email            = ["railsjedi@gmail.com", "ifredwu@gmail.com", "piotr.kuczynski@gmail.com"]
+  s.summary          = "Provides a Settings helper for Rails that reads from config/settings.yml"
   s.description      = "Easy to use Settings helper that loads its data in from config/settings.yml. Handles adding multiple sources, and easy reloading."
   s.homepage         = "http://github.com/railsjedi/rails_config"
+  s.license          = "MIT"
   s.extra_rdoc_files = ["README.md"]
   s.rdoc_options     = ["--charset=UTF-8"]
   s.require_paths    = ["lib"]

data/spec/fixtures/settings.yml

@@ -1,3 +1,8 @@
 size: 1
 server: google.com
-1: "one" 
+1: "one"
+photo_sizes:
+  avatar: [60, 60]
+root:
+  yahoo.com: 2
+  'google.com': 3

data/spec/rails_config_spec.rb

@@ -6,6 +6,10 @@ describe RailsConfig do
     config = RailsConfig.load_files(setting_path("settings.yml"))
     config.size.should eq 1
     config.server.should eq "google.com"
+    config['1'].should eq 'one'
+    config.photo_sizes.avatar.should eq [60, 60]
+    config.root['yahoo.com'].should eq 2
+    config.root['google.com'].should eq 3
   end
 
   it "should load 2 basic config files" do

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: rails_config
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Jacques Crocker
 - Fred Wu
+- Piotr Kuczynski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-18 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -86,6 +87,7 @@ description: Easy to use Settings helper that loads its data in from config/sett
 email:
 - railsjedi@gmail.com
 - ifredwu@gmail.com
+- piotr.kuczynski@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -93,6 +95,8 @@ extra_rdoc_files:
 files:
 - .bundle/config
 - .gitignore
+- .ruby-gemset
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -132,7 +136,8 @@ files:
 - spec/sources/yaml_source_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/railsjedi/rails_config
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -151,10 +156,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Provides a Settings helper for rails3 that reads from config/settings.yml
+summary: Provides a Settings helper for Rails that reads from config/settings.yml
 test_files:
 - spec/fixtures/bool_override/config1.yml
 - spec/fixtures/bool_override/config2.yml