rails_config 0.4.2 → 0.5.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 398fad247176f6f529a62ac80b96358113f6e613
-  data.tar.gz: a53c3e50550df2479cd9b5e176919e6da84f4c08
+  metadata.gz: e61cf6197d3a2803156500248660b7e93fb724ff
+  data.tar.gz: d6163325528368ca7ea2f31c7a5f1e4609faa2c5
 SHA512:
-  metadata.gz: 9d5274236ebaf6b9ea22dd86ea157a66b8922ad868d455d6b98a08b54d5360271f0010dca3f97ee04daaf4516512a1c11f93db6f0a778c23d311c75034807178
-  data.tar.gz: b04b85474cd08a0d73aa14e5a4a37791d0523e5a75494684cf663456877fe942d8e63a3e1d73a1c8a57ccdc3d922f110a114b2665e3331cdebda243f042698b5
+  metadata.gz: 39685ffecfdd708a5aa825a1a1ea323eeee36610b37bc95c471bc9033f722038d45039313003b77ec2934e941ba95e431d71dc9b2f9e62520eca5e2158bf5020
+  data.tar.gz: 539b6ef9a90acacba394d3c6d8fd6e3c62f7b330cdc2b52af5eb995597b9eeb37928b65344d3826eb3c3cf0e6f22390adb5d395bfa2ab6f6ed8e18d99362866d

data/README.md

@@ -1,3 +1,4 @@
+[![Build Status](https://api.travis-ci.org/railsconfig/rails_config.png?branch=master)](http://travis-ci.org/railsconfig/rails_config)
 [![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)
 
@@ -110,10 +111,10 @@ Config entries are compiled from:
     config/settings.yml
     config/settings/#{environment}.yml
     config/environments/#{environment}.yml
-    
+
     config/settings.local.yml
     config/settings/#{environment}.local.yml
-    config/environments/#{environment}.local.yml    
+    config/environments/#{environment}.local.yml
 
 Settings defined in files that are lower in the list override settings higher.
 
@@ -154,7 +155,7 @@ Example production environment config file:
 
 ### Developer specific config files
 
-If you want to have local settings, specific to your machine or development environment, 
+If you want to have local settings, specific to your machine or development environment,
 you can use the following files, which are automatically `.gitignored` :
 
     Rails.root.join("config", "settings.local.yml").to_s,
@@ -180,7 +181,7 @@ Settings.add_source!("#{Rails.root}/config/settings/local.yml")
 Settings.reload!
 ```
 
-> Note: this is an example usage, it is easier to just use the default local files `settings.local.yml, settings/#{Rails.env}.local.yml and environments/#{Rails.env}.local.yml` 
+> Note: this is an example usage, it is easier to just use the default local files `settings.local.yml, settings/#{Rails.env}.local.yml and environments/#{Rails.env}.local.yml`
 >       for your developer specific settings.
 
 ## Embedded Ruby (ERB)

data/lib/generators/rails_config/install_generator.rb

@@ -18,6 +18,8 @@ module RailsConfig
       end
 
       def modify_gitignore
+        create_file '.gitignore' unless File.exists? '.gitignore'
+
         append_to_file '.gitignore' do
           "\n"                                +
           "config/settings.local.yml\n"       +
@@ -27,4 +29,4 @@ module RailsConfig
       end
     end
   end
-end
+end

data/lib/rails_config/integration/rails.rb

@@ -15,13 +15,7 @@ module RailsConfig
 
             # 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.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
+              RailsConfig.setting_files(::Rails.root.join("config"), ::Rails.env)
             )
           end
 
@@ -37,4 +31,4 @@ module RailsConfig
       end
     end
   end
-end
+end

data/lib/rails_config/integration/sinatra.rb

@@ -18,18 +18,9 @@ module RailsConfig
         root = Padrino.root
       end
 
-      RailsConfig.load_and_set_settings(
-        File.join(root.to_s, "config", "settings.yml").to_s,
-        File.join(root.to_s, "config", "settings", "#{env}.yml").to_s,
-        File.join(root.to_s, "config", "environments", "#{env}.yml").to_s,
-
-        File.join(root.to_s, "config", "settings.local.yml").to_s,
-        File.join(root.to_s, "config", "settings", "#{env}.local.yml").to_s,
-        File.join(root.to_s, "config", "environments", "#{env}.local.yml").to_s
-      )
+      RailsConfig.load_and_set_settings(RailsConfig.setting_files(File.join(root, 'config'), env))
 
       inner_app.use(::RailsConfig::Rack::Reloader) if inner_app.development?
     end
   end
-
-end
+end

data/lib/rails_config/options.rb

@@ -1,12 +1,10 @@
 require 'ostruct'
 module RailsConfig
   class Options < OpenStruct
-
     include Enumerable
 
-    def empty?
-      marshal_dump.empty?
-    end
+    def keys()   marshal_dump.keys;   end
+    def empty?() marshal_dump.empty?; end
 
     def add_source!(source)
       # handle yaml file paths
@@ -94,7 +92,7 @@ module RailsConfig
     def []=(param, value)
       send("#{param}=", value)
     end
-    
+
     protected
 
     # Recursively converts Hashes to Options (including Hashes inside Arrays)

data/lib/rails_config/sources/yaml_source.rb

@@ -4,7 +4,6 @@ require 'erb'
 module RailsConfig
   module Sources
     class YAMLSource
-
       attr_accessor :path
 
       def initialize(path)
@@ -13,12 +12,15 @@ module RailsConfig
 
       # returns a config hash from the YML file
       def load
-        if @path and File.exists?(@path.to_s)
+        if @path and File.exist?(@path.to_s)
           result = YAML.load(ERB.new(IO.read(@path.to_s)).result)
         end
         result || {}
+      rescue Psych::SyntaxError => e
+        raise "YAML syntax error occurred while parsing #{@path}. " \
+              "Please note that YAML must be consistently indented using spaces. Tabs are not allowed. " \
+              "Error: #{e.message}"
       end
-
     end
   end
-end
+end

data/lib/rails_config/version.rb

@@ -1,3 +1,3 @@
 module RailsConfig
-  VERSION = '0.4.2'
+  VERSION = '0.5.0.beta1'
 end

data/lib/rails_config.rb

@@ -2,7 +2,7 @@ require 'active_support/core_ext/module/attribute_accessors'
 
 require 'rails_config/options'
 require 'rails_config/version'
-require 'rails_config/engine'
+require 'rails_config/engine' if defined?(::Rails)
 require 'rails_config/sources/yaml_source'
 require 'rails_config/vendor/deep_merge' unless defined?(DeepMerge)
 
@@ -40,6 +40,18 @@ module RailsConfig
     Kernel.const_set(RailsConfig.const_name, RailsConfig.load_files(files))
   end
 
+  def self.setting_files(config_root, env)
+    [
+      File.join(config_root, "settings.yml").to_s,
+      File.join(config_root, "settings", "#{env}.yml").to_s,
+      File.join(config_root, "environments", "#{env}.yml").to_s,
+
+      File.join(config_root, "settings.local.yml").to_s,
+      File.join(config_root, "settings", "#{env}.local.yml").to_s,
+      File.join(config_root, "environments", "#{env}.local.yml").to_s
+    ].freeze
+  end
+
   def self.reload!
     Kernel.const_get(RailsConfig.const_name).reload!
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_config
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0.beta1
 platform: ruby
 authors:
 - Jacques Crocker
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -215,12 +215,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Provides a Settings helper for Rails that reads from config/settings.yml