scoped_choices 0.0.3 → 0.0.4

data/README.md

@@ -8,11 +8,8 @@ Easy-peasy external settings for your Rails app.
 
 In your app initializer block:
 
-    config.from_file 'settings.yml'
-    
-    #to scope out your settings
     # Rails.configuration.my_engine...
-    config.from_file_with_scope 'settings.yml', "my_engine"
+    config.from_file_with_scope 'settings.yml', "my_scope"
 
 This will read configuration from "config/settings.yml" and, additionally, "settings.local.yml" if it exists. You should check the main file into version control, but not the ".local" file which is to be used for per-machine configuration: tweaks in development or private keys in production, for example.
 
@@ -49,5 +46,5 @@ The ".local" file can contain overrides for your development environment:
 
 Finally, the config keys can be read in your app as such:
 
-    Rails.configuration.heroku              #=> false
-    Rails.configuration.mongodb.database    #=> "myapp_dev"
+    Rails.configuration.my_scope.heroku              #=> false
+    Rails.configuration.my_scope.mongodb.database    #=> "myapp_dev"

data/lib/scoped_choices.rb

@@ -28,7 +28,8 @@ module ScopedChoices
   end
   
   def yaml_load(content)
-    if defined? YAML::ENGINE
+    ruby_major_version = RUBY_VERSION.split('.').first.to_i
+    if ruby_major_version < 2 && defined? YAML::ENGINE
       # avoid using broken Psych in 1.9.2
       old_yamler = YAML::ENGINE.yamler
       YAML::ENGINE.yamler = 'syck'
@@ -36,7 +37,9 @@ module ScopedChoices
     begin
       YAML::load(content)
     ensure
-      YAML::ENGINE.yamler = old_yamler if defined? YAML::ENGINE
+      if ruby_major_version < 2 && defined? YAML::ENGINE
+        YAML::ENGINE.yamler = old_yamler
+      end
     end
   end
 end

data/lib/scoped_choices/rails.rb

@@ -18,9 +18,11 @@ module ScopedChoices::Rails
     file = root + 'config' + name
     
     settings = ScopedChoices.load_settings(file, Rails.respond_to?(:env) ? Rails.env : RAILS_ENV)
-    scoped_settings = Hashie::Mash.new
-    scoped_settings.send("#{scope}=", settings)
-    settings = scoped_settings
+    if scope
+      scoped_settings = Hashie::Mash.new
+      scoped_settings.send("#{scope}=", settings)
+      settings = scoped_settings
+    end
     @scoped_choices.update settings
 
     settings.each do |key, value|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scoped_choices
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70248575343200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,7 +22,12 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70248575343200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 description: Based off Mislav's choices gem allows for scoping your configuration
 email: samer@onekingslane.com
 executables: []
@@ -54,7 +59,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Easy settings for your app