conflate 0.0.1 → 0.0.2

data/README.markdown

@@ -6,23 +6,45 @@ Conflate
 
 Load YAML files in your config directory into the Rails.application.config.
 
-Example
--------
+If you're using Rails, you probably want to use [conflate-rails], which automatically loads YAML files from config/ into Rails.application.config.
 
-Let's suppose you have a file 'config/foo.yml', with the following contents:
+Usage
+-----
+
+Let's suppose you have a file 'config/statsd.yml', with the following contents:
 
 ```yml
-thing1: "qwerty"
-thing2: "asdf
+# statsd.yml
+host: "localhost"
+port: 8125
 ```
 
-With Conflate, this information gets loaded into the `Rails.application.config` object like so:
+With Conflate, load this information (and any other YAML file in your config directory) like so.
 
 ```ruby
-Rails.application.config.foo.thing1
-# => "qwerty"
-Rails.application.config.foo.thing2
-# => "asdf"
+settings = OpenStruct.new
+Conflate::Conflator.new("config", settings).perform
+settings.stats
+# => {"host" => "localhost", "port" => 8125}
 ```
 
-Use this information in your application or other initializers.
+The [conflate-rails] gem does the following for you in a Rails app.
+
+```ruby
+Conflate::Conflator.new(Rails.root.join("config"), Rails.application.config).perform
+Rails.application.config.statsd
+# => {"host" => "localhost", "port" => 8125}
+```
+
+Around the Web
+--------------
+
+* [conflate on GitHub][conflate]
+* [conflate on RubyGems][conflate-gem]
+* [conflate-rails on GitHub][conflate-rails]
+* [conflate-rails on RubyGems][conflate-rails-gem]
+
+[conflate-rails]:https://github.com/sportngin/conflate-rails
+[conflate-rails-gem]:https://rubygems.org/gems/conflate-rails
+[conflate]:https://github.com/sportngin/conflate
+[conflate-gem]:https://rubygems.org/gems/conflate

data/lib/conflate/conflation.rb

@@ -17,6 +17,14 @@ module Conflate
 
     # Public: Add the contents of the YAML file to the config object
     def apply
+      if config_object.respond_to?(name) && !config_object.public_send(name).nil?
+        # doing this to properly handle the slightly different behaviors of
+        # OpenStruct (which does respond to unassigned attributes) or the
+        # Rails.application.config object (which doesn't)
+        warn "#{name} already contains some information, so skipping conflating it with the contents of #{yaml_path}"
+        return # so don't set it
+      end
+
       config_object.public_send "#{name}=", data
     end
 

data/lib/conflate/version.rb

@@ -1,3 +1,3 @@
 module Conflate
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/conflate/conflation_spec.rb

@@ -27,11 +27,25 @@ module Conflate
         })
       end
 
-      it "applies the values in the YAML file to the config object" do
+      it "applies the values in the YAML file if the config object does not have an attribute of that name" do
+        # bare stub object, so has no attributes, certainly not `subject.name`
         config_object.should_receive("#{subject.name}=").with(subject.send(:data))
         subject.apply
       end
 
+      it "applies the values in the YAML file to the config object if it has the attribute but the value is nil" do
+        config_object.stub(subject.name) { nil }
+        config_object.should_receive("#{subject.name}=").with(subject.send(:data))
+        subject.apply
+      end
+
+      it "does not apply the value if the config object already has a value at that key" do
+        config_object.stub(subject.name) { stub(:existing_data) }
+        config_object.should_not_receive("#{subject.name}=")
+        subject.should_receive(:warn)
+        subject.apply
+      end
+
     end
 
     context "#name" do
@@ -69,6 +83,7 @@ module Conflate
         subject.yaml_path = erb
         expect(subject.send(:data)).to eq({"foo" => "BAR"})
       end
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conflate
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1687607675183126005
+      hash: 1307108633160320951
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1687607675183126005
+      hash: 1307108633160320951
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25