ecology 0.0.11 → 0.0.12

data/Gemfile.lock

@@ -1,12 +1,14 @@
 PATH
   remote: .
   specs:
-    ecology (0.0.11)
+    ecology (0.0.12)
+      erubis
       multi_json
 
 GEM
   remote: http://rubygems.org/
   specs:
+    erubis (2.7.0)
     minitest (2.3.0)
     mocha (0.9.12)
     multi_json (1.0.3)

data/README.md

@@ -176,6 +176,25 @@ on_initialize hook, then the hook will run immediately.
 There is also an on_reset hook.  Read "Testing with an Ecology" to
 find out why you'd ever care about that.
 
+Ecology.read Etiquette
+======================
+
+If you're writing an application, try to call Ecology.read early.
+Libraries depending on it can then initialize themselves, now that
+they know where your Ecology data is.
+
+If you're writing a library, call Ecology.on_initialize early to make
+sure you get initialized as soon as possible.  You'll probably need
+your own Ecology.read call since your containing application may not
+use Ecology, or have an Ecology file.  Try to make Ecology.read happen
+as late as you can - the first time you genuinely need the data, for
+instance.
+
+For test purposes, if you set a bunch of data with
+Ecology.on_initialize, try to register Ecology.on_reset to clear that
+same data.  Then a test using Ecology.reset can test your library with
+different settings.
+
 Testing with an Ecology
 =======================
 

data/TODO

@@ -1,5 +1,7 @@
-* Use Erubis before evaluating
-
 * On Ecology.read calls, make sure ecology filename hasn't changed (and warn if it has)
 
 * Have Ecology.read try to do a read relative to the executable's directory first rather than relative to cwd.
+
+* Register properties by top-level tag
+
+* Allow setting environment variables based on Ecology

data/ecology.gemspec

@@ -28,6 +28,7 @@ EOS
   s.require_paths = ["lib"]
 
   s.add_dependency "multi_json"
+  s.add_dependency "erubis"
 
   s.add_development_dependency "bundler", "~> 1.0.10"
   s.add_development_dependency "scope", "~> 0.2.1"

data/lib/ecology/version.rb

@@ -1,3 +1,3 @@
 module Ecology
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/lib/ecology/version.rb~

@@ -1,3 +1,3 @@
 module Ecology
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/ecology.rb

@@ -39,10 +39,15 @@ module Ecology
       mutex.synchronize do
         return if @ecology_initialized
 
-        file_path = ENV['ECOLOGY_SPEC'] || ecology_pathname || default_ecology_name
-        if File.exist?(file_path)
-          @data = {}
-          contents = merge_with_overrides(file_path)
+        filelist = [ENV["ECOLOGY_SPEC"], ecology_pathname, default_ecology_name]
+        filelist.detect do |file_path|
+          if file_path && (File.exist?(file_path) || File.exist?(file_path + ".erb"))
+            @data = {}
+            contents = merge_with_overrides(file_path)
+            true
+          else
+            false
+          end
         end
 
         @application ||= File.basename($0)
@@ -103,7 +108,18 @@ module Ecology
     end
 
     def merge_with_overrides(file_path)
-      contents = File.read(file_path)
+      if File.exist?(file_path + ".erb")
+        contents = File.read(file_path + ".erb")
+
+        require "erubis"
+        var_hash = {
+          :ecology_version => Ecology::VERSION,
+          :filename => "#{file_path}.erb",
+        }
+        contents = Erubis::Eruby.new(contents).result(var_hash)
+      else
+        contents = File.read(file_path)
+      end
       file_data = MultiJson.decode(contents);
 
       return unless file_data

data/test/ecology_test.rb

@@ -16,6 +16,7 @@ class EcologyTest < Scope::TestCase
 
     should "respect the ECOLOGY_SPEC environment variable" do
       ENV['ECOLOGY_SPEC'] = '/tmp/bobo.txt'
+      File.expects(:exist?).with('/tmp/bobo.txt.erb').returns(false).at_least_once
       File.expects(:exist?).with('/tmp/bobo.txt').returns(true)
       File.expects(:read).with('/tmp/bobo.txt').returns('{ "application": "foo_app" }')
       Ecology.read
@@ -31,6 +32,7 @@ class EcologyTest < Scope::TestCase
       $0 = "whatever_app.rb"
 
       ENV['ECOLOGY_SPEC'] = nil
+      File.expects(:exist?).with("whatever_app.ecology.erb").returns(false).at_least_once
       File.expects(:exist?).with("whatever_app.ecology").returns(false)
 
       Ecology.read

data/test/erubis_test.rb

@@ -0,0 +1,46 @@
+require File.join(File.dirname(__FILE__), "test_helper.rb")
+require "multi_json"
+
+class ErubisTest < Scope::TestCase
+  setup do
+    Ecology.reset
+  end
+
+  context "with a .erb ecology" do
+    setup do
+      set_up_ecology(<<ECOLOGY_CONTENTS, "some_app.ecology.erb")
+{
+  "application": "SomeApp",
+  "domain": {
+    "property1" :
+      <% if ENV["BOBO"] %>
+        37
+      <% else %>
+        42
+      <% end %>
+  },
+  "bobo": <%= MultiJson.encode(ENV["BOBO"]) %>
+}
+ECOLOGY_CONTENTS
+
+      ENV["BOBO"] = nil
+    end
+
+    should "Parse conditionally with Erubis" do
+      ENV["BOBO"] = "true"
+      Ecology.read
+      assert_equal 37, Ecology.property("domain::property1")
+    end
+
+    should "Parse conditionally with Erubis when a variable is unset" do
+      Ecology.read
+      assert_equal 42, Ecology.property("domain::property1")
+    end
+
+#    should "Return values from Erubis" do
+#      ENV["BOBO"] = { "a" => "b", "c" => "d" }
+#      Ecology.read
+#      assert_equal { "a" => "b", "c" => "d" }, Ecology.property("bobo")
+#    end
+  end
+end

data/test/test_helper.rb

@@ -10,7 +10,15 @@ require "ecology"
 
 class Scope::TestCase
   def set_up_ecology(file_contents, filename = "some.ecology")
-    ENV["ECOLOGY_SPEC"] = filename
+    match = filename.match(/^(.*)\.erb$/)
+    if match
+      ENV["ECOLOGY_SPEC"] = match[1]
+      File.stubs(:exist?).with(match[1]).returns(false)
+    else
+      ENV["ECOLOGY_SPEC"] = filename
+    end
+
+    File.stubs(:exist?).with(filename + ".erb").returns(false)
     File.stubs(:exist?).with(filename).returns(true)
     File.expects(:read).with(filename).returns(file_contents).at_least_once
   end

data/test/trigger_test.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), "test_helper.rb")
 
-class EnvironmentTest < Scope::TestCase
+class TriggerTest < Scope::TestCase
   setup do
     Ecology.reset
   end

metadata

@@ -2,7 +2,7 @@
 name: ecology
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors: 
 - Noah Gibbs
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-06 00:00:00 Z
+date: 2011-10-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: multi_json
@@ -24,49 +24,60 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: erubis
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 1.0.10
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: scope
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 0.2.1
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 description: |
   Ecology sets configuration data for an application based
   on environment variables and other factors.  It is meant
@@ -95,6 +106,7 @@ files:
 - test/ecology_test.rb
 - test/environment_test.rb
 - test/environment_var_test.rb
+- test/erubis_test.rb
 - test/override_properties_test.rb
 - test/path_test.rb
 - test/property_test.rb
@@ -133,6 +145,7 @@ test_files:
 - test/ecology_test.rb
 - test/environment_test.rb
 - test/environment_var_test.rb
+- test/erubis_test.rb
 - test/override_properties_test.rb
 - test/path_test.rb
 - test/property_test.rb