choices 0.2.4 → 0.3.0

data/README.md

@@ -1,49 +1,65 @@
-The choice is yours
-===================
+Choices for Rails
+=================
 
 Easy-peasy external settings for your Rails app.
 
-    # Gemfile
-    gem 'choices'
+~~~ rb
+# Gemfile
+gem 'choices'
+~~~
 
 In your app initializer block:
 
-    config.from_file 'settings.yml'
+~~~ rb
+config.from_file 'settings.yml'
+~~~
 
-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.
+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.
 
-    # .gitignore
-    config/settings.local.yml
+~~~
+# .gitignore
+config/settings.local.yml
+~~~
 
-Configuration files can contain ERB; this is useful for reading in Heroku configuration. For example:
+Configuration files can contain ERB; this is useful for reading in dynamic
+config such as from environment variables:
 
-    # settings.yml
-    defaults: &defaults
-      secret_token: <%= ENV['COOKIE_SECRET'] %>
-      heroku: <%= !!ENV['HEROKU_TYPE'] %>
-      mongodb:
-        uri: <%= ENV['MONGOHQ_URL'] %>
+~~~ yaml
+# settings.yml
+defaults: &defaults
+  secret_token: <%= ENV['COOKIE_SECRET'] %>
+  heroku: <%= !!ENV['HEROKU_TYPE'] %>
+  mongodb:
+    uri: <%= ENV['MONGOHQ_URL'] %>
 
-    development:
-      <<: *defaults
+development:
+  <<: *defaults
 
-    test: &testing
-      <<: *defaults
-      secret_token: <%= "banana" * 5 %>
-      mongodb:
-        database: myapp_test
+test: &testing
+  <<: *defaults
+  secret_token: <%= "banana" * 5 %>
+  mongodb:
+    database: myapp_test
 
-    cucumber:
-      <<: *testing
+cucumber:
+  <<: *testing
+~~~
 
 The ".local" file can contain overrides for your development environment:
 
-    # settings.local.yml
-    development:
-      mongodb:
-        database: myapp_dev
+~~~ yaml
+# settings.local.yml
+development:
+  mongodb:
+    database: myapp_dev
+~~~
 
 Finally, the config keys can be read in your app as such:
 
-    Rails.configuration.heroku              #=> false
-    Rails.configuration.mongodb.database    #=> "myapp_dev"
+~~~ rb
+Rails.configuration.heroku              #=> false
+Rails.configuration.mongodb.database    #=> "myapp_dev"
+~~~

data/lib/choices/rails.rb

@@ -1,3 +1,4 @@
+require 'hashie/mash'
 require 'choices'
 
 module Choices::Rails
@@ -21,6 +22,18 @@ module Choices::Rails
     @choices.update settings
     
     settings.each do |key, value|
+      old_value = self.respond_to?(key) ? self.send(key) : nil
+
+      if "Rails::OrderedOptions" == old_value.class.name
+        # convert from Array to a real Hash
+        old_value = old_value.inject({}) {|h,(k,v)| h[k]=v; h }
+      end
+
+      if Hash === value and Hash === old_value
+        # don't overwrite existing Hash values; deep update them
+        value = Hashie::Mash.new(old_value).update value
+      end
+
       self.send("#{key}=", value)
     end
   end

metadata

@@ -1,85 +1,65 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: choices
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 4
-  version: 0.2.4
 platform: ruby
-authors: 
-- "Mislav Marohni\xC4\x87"
+authors:
+- Mislav Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-18 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: hashie
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 description: 
 email: mislav.marohnic@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - lib/choices/rails.rb
 - lib/choices.rb
 - README.md
-has_rdoc: false
-homepage: http://github.com/mislav/choices
+homepage: https://github.com/mislav/choices
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Easy settings for your app
 test_files: []
-
+has_rdoc: