rails_config 0.3.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdfe7d4c355ef3a597de7a74ecce0b5b0884c3aa
-  data.tar.gz: 51f7b615597fe525b31cdfdd80bf9dd95b6bf5a1
+  metadata.gz: 83dec17f82e00cff05d9177c29a6c8d8d96abdbf
+  data.tar.gz: 95d36c359a9c8562ed5a41c91e2994902fb0adf5
 SHA512:
-  metadata.gz: fb605e92f8f97565e9aade53bd8e871f72bb5cbca6e77e47e658ef0374aa5707096eb5306e9872d18d8d57f7e4cf733cbc076ed9d9a508999a88414acc9f8c22
-  data.tar.gz: b22b49167706e2d8ac227e75ac331a4e0cd872756abdb851e16c5c4b193fe15852df9771b10a97530ba1fe1f1131b85a57d3d0ee51d09d5321bafd92edc1ce5a
+  metadata.gz: b4e44bc4cdb6845342c36e4a0da4aaa14983e2f4902bdecf82a92e4b5022c88b87baf592cd95bf30a80b2363499b11f1c55fbf7141bee963a7b8348ea173e5da
+  data.tar.gz: 949e524f41cef5212bfdecb6eb16e6cc940e2072f8c2940d07bccc9c31d23f5886ebfb05261e589baca70d3053601a935afaeba2f25308f97fd2b81075ca1d5a

data/CHANGELOG.md

@@ -1,4 +1,13 @@
+# 0.4.1
+
+* fixed compatibility with Rails 4.1 ([#72](https://github.com/railsjedi/rails_config/issues/72))
+* testing suite verifies compatibility with Rails 3.2, 4.0 and 4.1
+
+# 0.4.0
+
+* compatibility with Heroku ([#64](https://github.com/railsjedi/rails_config/issues/64))
+
 # 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
+* adding support for Rails 4.1.0.rc ([#70](https://github.com/railsjedi/rails_config/issues/70))

data/LICENSE.md

@@ -0,0 +1,27 @@
+The MIT License (MIT)
+
+Copyright (c) 2010-2014 Jacques Crocker, Fred Wu, Piotr Kuczynski
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+Third-party materials and licenses:
+
+* RailsConfig contains Deep Merge (deep_merge.rb) which is governed by the MIT license
+  Copyright (C) 2008 Steve Midgley

data/README.md

@@ -1,3 +1,6 @@
+[![Gem Version](https://badge.fury.io/rb/rails_config.svg)](http://badge.fury.io/rb/rails_config)
+[![Dependency Status](https://gemnasium.com/railsjedi/rails_config.svg)](https://gemnasium.com/railsjedi/rails_config)
+
 # RailsConfig
 
 ## Summary
@@ -13,13 +16,13 @@ RailsConfig helps you easily manage environment specific Rails settings in an ea
 
 ## Compatibility
 
-* Rails 3.x
+* Rails 3.x and 4.x
 * Padrino
 * Sinatra
 
 For older versions of Rails and other Ruby apps, use [AppConfig](http://github.com/fredwu/app_config).
 
-## Installing on Rails 3
+## Installing on Rails 3 or 4
 
 Add this to your `Gemfile`:
 
@@ -231,6 +234,46 @@ Settings.section.servers[0].name # => yahoo.com
 Settings.section.servers[1].name # => amazon.com
 ```
 
+## Working with Heroku
+
+Heroku uses ENV object to store sensitive settings which are like the local files described above. You cannot upload such files to Heroku because it's ephemeral filesystem gets recreated from the git sources on each instance refresh.
+
+To use rails_config with Heroku just set the `use_env` var to `true` in your `config/initializers/rails_config.rb` file. Eg:
+
+```ruby
+RailsConfig.setup do |config|
+  config.const_name = 'AppSettings'
+  config.use_env = true
+end
+```
+
+Now rails_config would read values from the ENV object to the settings. For the example above it would look for keys starting with 'AppSettings'. Eg:
+
+```ruby
+ENV['AppSettings.section.size'] = 1
+ENV['AppSettings.section.server'] = 'google.com'
+```
+
+It won't work with arrays, though.
+
+To upload your local values to Heroku you could ran `bundle exec rake rails_config:heroku`.
+
+
+## Contributing
+
+Bootstrap
+
+```bash
+$ appraisal install
+```
+
+Running the test suite
+
+```bash
+$ appraisal rspec
+```
+
+
 ## Authors
 
 * [Jacques Crocker](http://github.com/railsjedi)

data/lib/rails_config.rb

@@ -1,16 +1,18 @@
 require 'active_support/core_ext/module/attribute_accessors'
-require 'rails_config/options'
-
-require "rails_config/sources/yaml_source"
 
+require 'rails_config/options'
+require 'rails_config/version'
+require 'rails_config/engine'
+require 'rails_config/sources/yaml_source'
 require 'rails_config/vendor/deep_merge' unless defined?(DeepMerge)
 
 module RailsConfig
   # ensures the setup only gets run once
   @@_ran_once = false
 
-  mattr_accessor :const_name
+  mattr_accessor :const_name, :use_env
   @@const_name = "Settings"
+  @@use_env = false
 
   def self.setup
     yield self if @@_ran_once == false
@@ -28,6 +30,7 @@ module RailsConfig
     end
 
     config.load!
+    config.load_env! if @@use_env
     config
   end
 

data/lib/rails_config/engine.rb

@@ -0,0 +1,5 @@
+module RailsConfig
+  class Engine < ::Rails::Engine
+    isolate_namespace RailsConfig
+  end
+end

data/lib/rails_config/integration/rails.rb

@@ -3,16 +3,13 @@ module RailsConfig
     module Rails
       if defined?(::Rails::Railtie)
         class Railtie < ::Rails::Railtie
-
-          # 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
+          # Load rake tasks (eg. Heroku)
+          rake_tasks do
+            Dir[File.join(File.dirname(__FILE__),'../tasks/*.rake')].each { |f| load f }
           end
 
-          ActiveSupport.on_load init_callback, :yield => true do
-            # manually load the custom initializer before everything else
+          ActiveSupport.on_load :before_configuration, :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)
 

data/lib/rails_config/options.rb

@@ -16,6 +16,23 @@ module RailsConfig
       @config_sources << source
     end
 
+    def reload_env!
+      return self if ENV.nil? || ENV.empty?
+      conf = Hash.new
+      ENV.each do |key, value|
+        next unless key.to_s.index(RailsConfig.const_name) == 0
+        hash = value
+        key.to_s.split('.').reverse.each do |element|
+          hash = {element => hash}
+        end
+        DeepMerge.deep_merge!(hash, conf, :preserve_unmergeables => false)
+      end
+
+      merge!(conf[RailsConfig.const_name] || {})
+    end
+
+    alias :load_env! :reload_env!
+
     # look through all our sources and rebuild the configuration
     def reload!
       conf = {}
@@ -32,6 +49,8 @@ module RailsConfig
       # swap out the contents of the OStruct with a hash (need to recursively convert)
       marshal_load(__convert(conf).marshal_dump)
 
+      reload_env! if RailsConfig.use_env
+
       return self
     end
 

data/lib/rails_config/railtie.rb

@@ -0,0 +1,9 @@
+require 'rails'
+
+module RailsConfig
+  class Railtie < Rails::Railtie
+    rake_tasks do
+      Dir[File.join(File.dirname(__FILE__),'tasks/*.rake')].each { |f| load f }
+    end
+  end
+end

data/lib/rails_config/tasks/heroku.rake

@@ -0,0 +1,7 @@
+require 'rails_config'
+require 'tasks.rb'
+namespace 'rails_config' do
+  task :heroku => :environment do |_, args|
+    RailsConfig::Tasks::Heroku.new(args[:app]).invoke
+  end
+end

data/lib/rails_config/tasks/rails_config_tasks.rake

@@ -0,0 +1,4 @@
+# desc "Explaining what the task does"
+# task :rails_config do
+#   # Task goes here
+# end

data/lib/rails_config/version.rb

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

data/lib/tasks.rb

@@ -0,0 +1,59 @@
+require "bundler"
+
+module RailsConfig
+  module Tasks
+    class Heroku < Struct.new(:app)
+      def invoke
+        puts 'Setting vars...'
+        heroku_command = "config:set #{vars}"
+        heroku(heroku_command)
+        puts 'Vars set:'
+        puts heroku_command
+      end
+
+      def vars
+        # Load only local options to Heroku
+        RailsConfig.load_and_set_settings(
+            Rails.root.join("config", "settings.local.yml").to_s,
+            Rails.root.join("config", "settings", "#{environment}.local.yml").to_s,
+            Rails.root.join("config", "environments", "#{environment}.local.yml").to_s
+        )
+
+        out = ''
+        dotted_hash = to_dotted_hash Kernel.const_get(RailsConfig.const_name).to_hash, {}, RailsConfig.const_name
+        dotted_hash.each {|key, value| out += " #{key}=#{value} "}
+        out
+      end
+
+      def environment
+        heroku("run 'echo $RAILS_ENV'").chomp[/(\w+)\z/]
+      end
+
+      def heroku(command)
+        with_app = app ? " --app #{app}" : ""
+        `heroku #{command}#{with_app}`
+      end
+
+      def `(command)
+        Bundler.with_clean_env { super }
+      end
+
+      def to_dotted_hash(source, target = {}, namespace = nil)
+        prefix = "#{namespace}." if namespace
+        case source
+          when Hash
+            source.each do |key, value|
+              to_dotted_hash(value, target, "#{prefix}#{key}")
+            end
+          when Array
+            source.each_with_index do |value, index|
+              to_dotted_hash(value, target, "#{prefix}#{index}")
+            end
+          else
+            target[namespace] = source
+        end
+        target
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_config
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.1
 platform: ruby
 authors:
 - Jacques Crocker
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -26,6 +26,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -42,6 +56,62 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.17
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.2.17
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -55,7 +125,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -69,19 +139,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Easy to use Settings helper that loads its data in from config/settings.yml.
   Handles adding multiple sources, and easy reloading.
 email:
@@ -93,16 +177,9 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .bundle/config
-- .gitignore
-- .ruby-gemset
 - CHANGELOG.md
-- Gemfile
-- LICENSE
+- LICENSE.md
 - README.md
-- Rakefile
-- autotest/discover.rb
-- init.rb
 - lib/generators/rails_config/install_generator.rb
 - lib/generators/rails_config/templates/rails_config.rb
 - lib/generators/rails_config/templates/settings.local.yml
@@ -111,30 +188,18 @@ files:
 - lib/generators/rails_config/templates/settings/production.yml
 - lib/generators/rails_config/templates/settings/test.yml
 - lib/rails_config.rb
+- lib/rails_config/engine.rb
 - lib/rails_config/integration/rails.rb
 - lib/rails_config/integration/sinatra.rb
 - lib/rails_config/options.rb
 - lib/rails_config/rack/reloader.rb
+- lib/rails_config/railtie.rb
 - lib/rails_config/sources/yaml_source.rb
+- lib/rails_config/tasks/heroku.rake
+- lib/rails_config/tasks/rails_config_tasks.rake
 - lib/rails_config/vendor/deep_merge.rb
 - lib/rails_config/version.rb
-- rails_config.gemspec
-- spec/fixtures/bool_override/config1.yml
-- spec/fixtures/bool_override/config2.yml
-- spec/fixtures/custom_types/hash.yml
-- spec/fixtures/deep_merge/config1.yml
-- spec/fixtures/deep_merge/config2.yml
-- spec/fixtures/deep_merge2/config1.yml
-- spec/fixtures/deep_merge2/config2.yml
-- spec/fixtures/development.yml
-- spec/fixtures/empty1.yml
-- spec/fixtures/empty2.yml
-- spec/fixtures/settings.yml
-- spec/fixtures/settings2.yml
-- spec/fixtures/with_erb.yml
-- spec/rails_config_spec.rb
-- spec/sources/yaml_source_spec.rb
-- spec/spec_helper.rb
+- lib/tasks.rb
 homepage: http://github.com/railsjedi/rails_config
 licenses:
 - MIT
@@ -160,20 +225,4 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 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
-- spec/fixtures/custom_types/hash.yml
-- spec/fixtures/deep_merge/config1.yml
-- spec/fixtures/deep_merge/config2.yml
-- spec/fixtures/deep_merge2/config1.yml
-- spec/fixtures/deep_merge2/config2.yml
-- spec/fixtures/development.yml
-- spec/fixtures/empty1.yml
-- spec/fixtures/empty2.yml
-- spec/fixtures/settings.yml
-- spec/fixtures/settings2.yml
-- spec/fixtures/with_erb.yml
-- spec/rails_config_spec.rb
-- spec/sources/yaml_source_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.bundle/config

@@ -1,2 +0,0 @@
---- {}
-

data/.gitignore

@@ -1,5 +0,0 @@
-.DS_Store
-pkg/*.gem
-.rvmrc
-Gemfile.lock
-.idea

data/.ruby-gemset

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

data/Gemfile

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

data/LICENSE

@@ -1,23 +0,0 @@
-Copyright (c) 2010 Jacques Crocker
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-Deep Merge (deep_merge.rb) code Copyright (c) 2008 Steve Midgley, released under the MIT license

data/Rakefile

@@ -1,28 +0,0 @@
-begin
-  require "bundler"
-  Bundler::GemHelper.install_tasks
-rescue Exception => e
-end
-
-require "rake"
-require "rspec"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = "spec/**/*_spec.rb"
-end
-
-RSpec::Core::RakeTask.new('spec:progress') do |spec|
-  spec.rspec_opts = %w(--format progress)
-  spec.pattern = "spec/**/*_spec.rb"
-end
-
-require "rdoc/task"
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = "rdoc"
-  rdoc.title = "Rails Config #{RailsConfig::VERSION}"
-  rdoc.rdoc_files.include("README*")
-  rdoc.rdoc_files.include("lib/**/*.rb")
-end
-
-task :default => :spec

data/autotest/discover.rb

@@ -1,2 +0,0 @@
-Autotest.add_discovery { "rspec2" }
-

data/init.rb

@@ -1 +0,0 @@
-require File.dirname(__FILE__) + '/lib/rails_config'

data/rails_config.gemspec

@@ -1,25 +0,0 @@
-require File.dirname(__FILE__) + "/lib/rails_config/version"
-
-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", "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"]
-  s.files            = `git ls-files`.split("\n")
-  s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-
-  s.add_dependency "activesupport", ">= 3.0"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rdoc"
-  s.add_development_dependency "pry"
-  s.add_development_dependency "rspec", "~> 2.0"
-end

data/spec/fixtures/bool_override/config1.yml

@@ -1,2 +0,0 @@
-override_bool: true
-override_bool_opposite: false

data/spec/fixtures/bool_override/config2.yml

@@ -1,2 +0,0 @@
-override_bool: false
-override_bool_opposite: true

data/spec/fixtures/custom_types/hash.yml

@@ -1,7 +0,0 @@
-prices:
-  type: hash
-  contents:
-    1: 2.99
-    5: 9.99
-    15: 19.99
-    30: 29.99

data/spec/fixtures/deep_merge/config1.yml

@@ -1,28 +0,0 @@
-size: 1
-server: google.com
-inner:
-  something1: "blah1"
-  something2: "blah2"
-
-inner2:
-  inner2_inner:
-    foo1: "blah1"
-
-
-arraylist1:
-  - 1
-  - 2
-  - 3
-  
-arraylist2:
-  inner:
-    - 1
-    - 2
-    - 3
-
-hash_array:
-  - 1
-  - inner:
-    - 1
-    - 2
-    - 3

data/spec/fixtures/deep_merge/config2.yml

@@ -1,28 +0,0 @@
-server: google.com
-
-inner:
-  something3: "blah3"
-
-inner2:
-  inner2_inner:
-    foo2: "blah2"
-    foo3: "blah3"
-    
-arraylist1:
-  - 4
-  - 5
-  - 6
-
-
-arraylist2:
-  inner:
-    - 4
-    - 5
-    - 6
-
-hash_array:
-  - 2
-  - inner:
-    - 4
-    - 5
-    - 6

data/spec/fixtures/deep_merge2/config1.yml

@@ -1,3 +0,0 @@
-tvrage:
-  service_url: 'http://services.tvrage.com'
-  cache: 500

data/spec/fixtures/deep_merge2/config2.yml

@@ -1,2 +0,0 @@
-tvrage:
-  service_url: "http://url2"

data/spec/fixtures/development.yml

@@ -1,4 +0,0 @@
-size: 2
-section:
-  size: 3
-  servers: [ {name: yahoo.com}, {name: amazon.com} ]

data/spec/fixtures/settings.yml

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

data/spec/fixtures/settings2.yml

@@ -1 +0,0 @@
-another: "something"

data/spec/fixtures/with_erb.yml

@@ -1,4 +0,0 @@
-computed: <%= 1 + 2 + 3 %>
-section:
-  computed1: <%= "1" %>
-  computed2: <%= "2" %>

data/spec/rails_config_spec.rb

@@ -1,245 +0,0 @@
-require 'spec_helper'
-
-describe RailsConfig do
-
-  it "should load a basic config file" 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
-    config = RailsConfig.load_files(setting_path("settings.yml"), setting_path("settings2.yml"))
-    config.size.should eq 1
-    config.server.should eq "google.com"
-    config.another.should eq "something"
-  end
-
-  it "should load empty config for a missing file path" do
-    config = RailsConfig.load_files(setting_path("some_file_that_doesnt_exist.yml"))
-    config.should be_empty
-  end
-
-  it "should load an empty config for multiple missing file paths" do
-    files = [setting_path("doesnt_exist1.yml"), setting_path("doesnt_exist2.yml")]
-    config = RailsConfig.load_files(files)
-    config.should be_empty
-  end
-
-  it "should load empty config for an empty setting file" do
-    config = RailsConfig.load_files(setting_path("empty1.yml"))
-    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)
-    config.should be_empty
-  end
-
-  it "should allow overrides" do
-    files = [setting_path("settings.yml"), setting_path("development.yml")]
-    config = RailsConfig.load_files(files)
-    config.server.should eq "google.com"
-    config.size.should eq 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 eq "google.com"
-    Settings.size.should eq 1
-
-    files = [setting_path("settings.yml"), setting_path("development.yml")]
-    Settings.reload_from_files(files)
-    Settings.server.should eq "google.com"
-    Settings.size.should eq 2
-  end
-
-  context "Nested Settings" do
-    let(:config) do
-      RailsConfig.load_files(setting_path("development.yml"))
-    end
-
-    it "should allow nested sections" do
-      config.section.size.should eq 3
-    end
-
-    it "should allow configuration collections (arrays)" do
-      config.section.servers[0].name.should eq "yahoo.com"
-      config.section.servers[1].name.should eq "amazon.com"
-    end
-  end
-
-  context "Settings with ERB tags" do
-    let(:config) do
-      RailsConfig.load_files(setting_path("with_erb.yml"))
-    end
-
-    it "should evaluate ERB tags" do
-      config.computed.should eq 6
-    end
-
-    it "should evaluated nested ERB tags" do
-      config.section.computed1.should eq 1
-      config.section.computed2.should eq 2
-    end
-  end
-
-  context "Deep Merging" do
-    let(:config) do
-      files = [setting_path("deep_merge/config1.yml"), setting_path("deep_merge/config2.yml")]
-      RailsConfig.load_files(files)
-    end
-
-    it "should merge hashes from multiple configs" do
-      config.inner.marshal_dump.keys.size.should eq 3
-      config.inner2.inner2_inner.marshal_dump.keys.size.should eq 3
-    end
-
-    it "should merge arrays from multiple configs" do
-      config.arraylist1.size.should eq 6
-      config.arraylist2.inner.size.should eq 6
-    end
-  end
-
-  context "Boolean Overrides" do
-    let(:config) do
-      files = [setting_path("bool_override/config1.yml"), setting_path("bool_override/config2.yml")]
-      RailsConfig.load_files(files)
-    end
-
-    it "should allow overriding of bool settings" do
-      config.override_bool.should eq false
-      config.override_bool_opposite.should eq true
-    end
-  end
-
-  context "Custom Configuration" do
-    it "should have the default settings constant as 'Settings'" do
-      RailsConfig.const_name.should eq "Settings"
-    end
-
-    it "should be able to assign a different settings constant" do
-      RailsConfig.setup{ |config| config.const_name = "Settings2" }
-      RailsConfig.const_name.should eq "Settings2"
-    end
-  end
-
-  context "Settings with a type value of 'hash'" do
-    let(:config) do
-      files = [setting_path("custom_types/hash.yml")]
-      RailsConfig.load_files(files)
-    end
-
-    it "should turn that setting into a Real Hash" do
-      config.prices.should be_a(Hash)
-    end
-
-    it "should map the hash values correctly" do
-      config.prices[1].should eq 2.99
-      config.prices[5].should eq 9.99
-      config.prices[15].should eq 19.99
-      config.prices[30].should eq 29.99
-    end
-  end
-
-  context "Merging hash at runtime" do
-    let(:config) { RailsConfig.load_files(setting_path("settings.yml")) }
-    let(:hash) { {:options => {:suboption => 'value'}, :server => 'amazon.com'} }
-    
-    it 'should be chainable' do
-      config.merge!({}).should eq config
-    end
-    
-    it 'should preserve existing keys' do
-      expect { config.merge!({}) }.to_not change{ config.keys }
-    end
-    
-    it 'should recursively merge keys' do
-      config.merge!(hash)
-      config.options.suboption.should eq 'value'
-    end
-    
-    it 'should rewrite a merged value' do
-      expect { config.merge!(hash) }.to change{ config.server }.from('google.com').to('amazon.com')
-    end
-  end
-  
-  context "Merging nested hash at runtime" do
-    let(:config) { RailsConfig.load_files(setting_path("deep_merge/config1.yml")) }
-    let(:hash) { {:inner => {:something1 => 'changed1', :something3 => 'changed3'} } }
-    
-    it 'should preserve first level keys' do
-      expect { config.merge!(hash) }.to_not change{ config.keys }
-    end
-    
-    it 'should preserve nested key' do
-      config.merge!(hash)
-      config.inner.something2.should eq 'blah2'
-    end
-    
-    it 'should add new nested key' do
-      expect { config.merge!(hash) }.to change { config.inner.something3 }.from(nil).to("changed3")
-    end
-    
-    it 'should rewrite a merged value' do
-      expect { config.merge!(hash) }.to change{ config.inner.something1 }.from('blah1').to('changed1')
-    end
-  end
-
-  context "[] accessors" do
-    let(:config) do
-      files = [setting_path("development.yml")]
-      RailsConfig.load_files(files)
-    end
-
-    it "should access attributes using []" do
-      config.section['size'].should eq 3
-      config.section[:size].should eq 3
-      config[:section][:size].should eq 3
-    end
-
-    it "should set values using []=" do
-      config.section[:foo] = 'bar'
-      config.section.foo.should eq 'bar'
-    end
-  end
-
-  context "enumerable" do
-    let(:config) do
-      files = [setting_path("development.yml")]
-      RailsConfig.load_files(files)
-    end
-
-    it "should enumerate top level parameters" do
-      keys = []
-      config.each { |key, value| keys << key }
-      keys.should eq [:size, :section]
-    end
-
-    it "should enumerate inner parameters" do
-      keys = []
-      config.section.each { |key, value| keys << key }
-      keys.should eq [:size, :servers]
-    end
-
-    it "should have methods defined by Enumerable" do
-      config.map { |key, value| key }.should eq [:size, :section]
-    end
-  end
-end

data/spec/sources/yaml_source_spec.rb

@@ -1,69 +0,0 @@
-require 'spec_helper'
-
-module RailsConfig::Sources
-  describe YAMLSource do
-
-    it "should take a path as initializer" do
-      source = YAMLSource.new "somepath"
-      source.path.should == "somepath"
-    end
-
-    context "basic yml file" do
-      let(:source) do
-        YAMLSource.new setting_path("development.yml")
-      end
-
-      it "should properly read the settings" do
-        results = source.load
-        results["size"].should == 2
-      end
-
-      it "should properly read nested settings" do
-        results = source.load
-        results["section"]["size"].should == 3
-        results["section"]["servers"].should be_an(Array)
-        results["section"]["servers"].size.should == 2
-      end
-    end
-
-    context "yml file with erb tags" do
-      let(:source) do
-        YAMLSource.new setting_path("with_erb.yml")
-      end
-
-      it "should properly evaluate the erb" do
-        results = source.load
-        results["computed"].should == 6
-      end
-
-      it "should properly evaluate the nested erb settings" do
-        results = source.load
-        results["section"]["computed1"].should == 1
-        results["section"]["computed2"].should == 2
-      end
-    end
-
-    context "missing yml file" do
-      let(:source) do
-        YAMLSource.new "somewhere_that_doesnt_exist.yml"
-      end
-
-      it "should return an empty hash" do
-        results = source.load
-        results.should == {}
-      end
-    end
-
-    context "blank yml file" do
-      let(:source) do
-        YAMLSource.new setting_path("empty1.yml")
-      end
-
-      it "should return an empty hash" do
-        results = source.load
-        results.should == {}
-      end
-    end
-
-  end
-end

data/spec/spec_helper.rb

@@ -1,25 +0,0 @@
-require 'rails_config'
-require 'pathname'
-require 'bundler/setup'
-
-def in_editor?
-  ENV.has_key?('TM_MODE') || ENV.has_key?('EMACS') || ENV.has_key?('VIM')
-end
-
-RSpec.configure do |c|
-  c.color_enabled = !in_editor?
-  c.run_all_when_everything_filtered = true
-
-  # setup fixtures path
-  c.before(:all) do
-    @fixture_path = Pathname.new(File.join(File.dirname(__FILE__), "/fixtures"))
-    raise "Fixture folder not found: #{@fixture_path}" unless @fixture_path.directory?
-  end
-
-  # returns the file path of a fixture setting file
-  def setting_path(filename)
-    @fixture_path.join(filename)
-  end
-
-end
-