librato-rails 0.6.0 → 0.7.0

data/test/fixtures/config/simple.yml

@@ -0,0 +1,5 @@
+test:
+  user: 'test@bar.com'
+  token: <%= 'test api key' %>
+
+

data/test/unit/configuration_test.rb

@@ -1,6 +1,10 @@
 require 'test_helper'
 
-class LibratoRailsAggregatorTest < MiniTest::Unit::TestCase
+class LibratoRailsConfigTest < MiniTest::Unit::TestCase
+
+  def setup
+    Librato::Rails.explicit_source = nil
+  end
 
   def teardown
     ENV.delete('LIBRATO_METRICS_USER')
@@ -8,6 +12,7 @@ class LibratoRailsAggregatorTest < MiniTest::Unit::TestCase
     ENV.delete('LIBRATO_METRICS_SOURCE')
     Librato::Rails.check_config
     Librato::Rails.prefix = nil
+    Librato::Rails.explicit_source = nil
   end
 
   def test_environmental_variable_config
@@ -18,6 +23,7 @@ class LibratoRailsAggregatorTest < MiniTest::Unit::TestCase
     assert_equal 'foo@bar.com', Librato::Rails.user
     assert_equal 'api_key', Librato::Rails.token
     assert_equal 'source', Librato::Rails.source
+    assert Librato::Rails.explicit_source, 'source is explicit'
   end
 
   def test_config_file_config
@@ -28,6 +34,15 @@ class LibratoRailsAggregatorTest < MiniTest::Unit::TestCase
       assert_equal 30, Librato::Rails.flush_interval
       assert_equal 'custom-1', Librato::Rails.source
       assert_equal false, Librato::Rails.source_pids
+      assert Librato::Rails.explicit_source, 'source is explicit'
+    end
+  end
+
+  def test_implicit_source
+    with_fixture_config('simple') do
+      assert_equal 'test@bar.com', Librato::Rails.user
+      assert_equal 'test api key', Librato::Rails.token
+      assert !Librato::Rails.explicit_source, 'source is not explicit'
     end
   end
 
@@ -43,8 +58,8 @@ class LibratoRailsAggregatorTest < MiniTest::Unit::TestCase
     end
   end
 
-  def with_fixture_config
-    fixture_config = File.join(File.dirname(__FILE__), '../fixtures/config/librato.yml')
+  def with_fixture_config(file='librato')
+    fixture_config = File.join(File.dirname(__FILE__), "../fixtures/config/#{file}.yml")
     previous, Librato::Rails.config_file = Librato::Rails.config_file, fixture_config
     Librato::Rails.check_config
     yield

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librato-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -149,26 +149,26 @@ files:
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
 - test/dummy/script/rails
-- test/dummy/test_env.sh
+- test/dummy/tmp/cache/assets/CBF/9D0/sprockets%2F541895701c40c7d7fd678356b18cb59d
 - test/dummy/tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
 - test/dummy/tmp/cache/assets/CDF/870/sprockets%2Fb878faf942403e313a5b103e5d80488e
 - test/dummy/tmp/cache/assets/CE8/7E0/sprockets%2F178e2a1f9aa891d473009c7f3095df28
 - test/dummy/tmp/cache/assets/CF9/7C0/sprockets%2F40fc2f3d2a468a00e463f1d313cb1683
+- test/dummy/tmp/cache/assets/D02/220/sprockets%2F1410fa948b990522bdfeca7841d31b13
 - test/dummy/tmp/cache/assets/D04/890/sprockets%2F587335c079eef8d5a63784fc8f99905a
 - test/dummy/tmp/cache/assets/D05/D40/sprockets%2F1c9faaf28d05409b88ad3113374d613c
-- test/dummy/tmp/cache/assets/D11/D90/sprockets%2Ff688bee5b15ad322749fd06432065df2
+- test/dummy/tmp/cache/assets/D19/710/sprockets%2F5b878936d488c1f601c231fda1d678ea
 - test/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
-- test/dummy/tmp/cache/assets/D48/6E0/sprockets%2F3d5dd928c45756c99bb1018cdbba7485
 - test/dummy/tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
 - test/dummy/tmp/cache/assets/D4F/000/sprockets%2F25e44896aac12384727e9dab827ebef9
 - test/dummy/tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
-- test/dummy/tmp/cache/assets/D66/890/sprockets%2F789354d3ec91e1ba6c8e92878d8f6ff8
-- test/dummy/tmp/cache/assets/D84/000/sprockets%2F2ed60caa8412eb8334fe327cab12cb32
+- test/dummy/tmp/cache/assets/D69/610/sprockets%2F3902e4b1ffbdb61222bf5fc45a44799a
 - test/dummy/tmp/cache/assets/D8B/F90/sprockets%2Ffe6ce696e9141eb755d8eed79128e17c
 - test/dummy/tmp/cache/assets/D98/8B0/sprockets%2Fedbef6e0d0a4742346cf479f2c522eb0
 - test/dummy/tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
 - test/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
 - test/fixtures/config/librato.yml
+- test/fixtures/config/simple.yml
 - test/integration/custom_test.rb
 - test/integration/mail_test.rb
 - test/integration/request_test.rb
@@ -197,7 +197,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2251758174729954387
+      hash: 716215214105827455
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -206,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2251758174729954387
+      hash: 716215214105827455
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -264,26 +264,26 @@ test_files:
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
 - test/dummy/script/rails
-- test/dummy/test_env.sh
+- test/dummy/tmp/cache/assets/CBF/9D0/sprockets%2F541895701c40c7d7fd678356b18cb59d
 - test/dummy/tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
 - test/dummy/tmp/cache/assets/CDF/870/sprockets%2Fb878faf942403e313a5b103e5d80488e
 - test/dummy/tmp/cache/assets/CE8/7E0/sprockets%2F178e2a1f9aa891d473009c7f3095df28
 - test/dummy/tmp/cache/assets/CF9/7C0/sprockets%2F40fc2f3d2a468a00e463f1d313cb1683
+- test/dummy/tmp/cache/assets/D02/220/sprockets%2F1410fa948b990522bdfeca7841d31b13
 - test/dummy/tmp/cache/assets/D04/890/sprockets%2F587335c079eef8d5a63784fc8f99905a
 - test/dummy/tmp/cache/assets/D05/D40/sprockets%2F1c9faaf28d05409b88ad3113374d613c
-- test/dummy/tmp/cache/assets/D11/D90/sprockets%2Ff688bee5b15ad322749fd06432065df2
+- test/dummy/tmp/cache/assets/D19/710/sprockets%2F5b878936d488c1f601c231fda1d678ea
 - test/dummy/tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
-- test/dummy/tmp/cache/assets/D48/6E0/sprockets%2F3d5dd928c45756c99bb1018cdbba7485
 - test/dummy/tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
 - test/dummy/tmp/cache/assets/D4F/000/sprockets%2F25e44896aac12384727e9dab827ebef9
 - test/dummy/tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
-- test/dummy/tmp/cache/assets/D66/890/sprockets%2F789354d3ec91e1ba6c8e92878d8f6ff8
-- test/dummy/tmp/cache/assets/D84/000/sprockets%2F2ed60caa8412eb8334fe327cab12cb32
+- test/dummy/tmp/cache/assets/D69/610/sprockets%2F3902e4b1ffbdb61222bf5fc45a44799a
 - test/dummy/tmp/cache/assets/D8B/F90/sprockets%2Ffe6ce696e9141eb755d8eed79128e17c
 - test/dummy/tmp/cache/assets/D98/8B0/sprockets%2Fedbef6e0d0a4742346cf479f2c522eb0
 - test/dummy/tmp/cache/assets/DDC/400/sprockets%2Fcffd775d018f68ce5dba1ee0d951a994
 - test/dummy/tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
 - test/fixtures/config/librato.yml
+- test/fixtures/config/simple.yml
 - test/integration/custom_test.rb
 - test/integration/mail_test.rb
 - test/integration/request_test.rb

data/test/dummy/test_env.sh

@@ -1,2 +0,0 @@
-export LIBRATO_METRICS_USER='matt@librato.com'
-export LIBRATO_METRICS_TOKEN='02673bee476e872a5c40d4529d98c2cfd2d741882c302c1b7f10ccb1ee9eb45e'