tronprint 1.1.2 → 1.1.3

data/lib/tronprint/version.rb

@@ -1,3 +1,3 @@
 module Tronprint
-  VERSION = "1.1.2"
+  VERSION = "1.1.3"
 end

data/lib/tronprint.rb

@@ -35,7 +35,9 @@ module Tronprint
     if @aggregator_options.nil?
       @aggregator_options = config[:aggregator_options]
       if env
-        @aggregator_options = @aggregator_options[env] || default_config[:aggregator_options]
+        @aggregator_options = @aggregator_options[env]
+        @aggregator_options ||= config[:aggregator_options] if config[:aggregator_options].keys.include?(:adapter)
+        @aggregator_options ||= default_config[:aggregator_options]
       end
     end
     @aggregator_options

data/spec/tronprint_spec.rb

@@ -127,5 +127,14 @@ describe Tronprint do
       }
       Tronprint.aggregator_options.should == Tronprint.default_config[:aggregator_options]
     end
+    it 'loads regular options if an environment is given but not configured' do
+      Tronprint.config = {
+        :aggregator_options => { 
+          :adapter => :memory
+        }
+      }
+      Tronprint.stub!(:env).and_return('development')
+      Tronprint.aggregator_options[:adapter].should == :memory
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tronprint
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-06-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &2154899500 !ruby/object:Gem::Requirement
+  requirement: &2159708260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *2154899500
+  version_requirements: *2159708260
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2154899000 !ruby/object:Gem::Requirement
+  requirement: &2159774040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *2154899000
+  version_requirements: *2159774040
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2154898620 !ruby/object:Gem::Requirement
+  requirement: &2159773660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154898620
+  version_requirements: *2159773660
 - !ruby/object:Gem::Dependency
   name: bueller
-  requirement: &2154898080 !ruby/object:Gem::Requirement
+  requirement: &2159773120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.0.2
   type: :development
   prerelease: false
-  version_requirements: *2154898080
+  version_requirements: *2159773120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2154897660 !ruby/object:Gem::Requirement
+  requirement: &2159772700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154897660
+  version_requirements: *2159772700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154897120 !ruby/object:Gem::Requirement
+  requirement: &2159772160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2154897120
+  version_requirements: *2159772160
 - !ruby/object:Gem::Dependency
   name: sandbox
-  requirement: &2154896700 !ruby/object:Gem::Requirement
+  requirement: &2159771740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154896700
+  version_requirements: *2159771740
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2154896240 !ruby/object:Gem::Requirement
+  requirement: &2159771280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154896240
+  version_requirements: *2159771280
 - !ruby/object:Gem::Dependency
   name: carbon
-  requirement: &2154895740 !ruby/object:Gem::Requirement
+  requirement: &2159770780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2154895740
+  version_requirements: *2159770780
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2154943180 !ruby/object:Gem::Requirement
+  requirement: &2159770360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154943180
+  version_requirements: *2159770360
 - !ruby/object:Gem::Dependency
   name: dkastner-moneta
-  requirement: &2154942640 !ruby/object:Gem::Requirement
+  requirement: &2159769820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2154942640
+  version_requirements: *2159769820
 description: A gem for monitoring the carbon footprint of your ruby app
 email: dkastner@gmail.com
 executables: []
@@ -188,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3719771868977979478
+      hash: 1377517098180526085
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3719771868977979478
+      hash: 1377517098180526085
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.5