tronprint 1.2.1 → 1.2.2

data/lib/tronprint.rb

@@ -100,7 +100,7 @@ module Tronprint
 
   # The Tronprint::TrafficMonitor instance
   def traffic_monitor
-    @traffic_monitor ||= TrafficMonitor.new aggregator, application_name
+    @traffic_monitor ||= TrafficMonitor.new application_name
   end
 
   # The Tronprint::Statistics interface

data/lib/tronprint/app.rb

@@ -1,6 +1,8 @@
 require 'tronprint'
 
 module Tronprint
+  
+  # App is a middleware that counts app requests
   class App
     def initialize(app)
       @app = app

data/lib/tronprint/rails.rb

@@ -12,7 +12,7 @@ module Tronprint
     end
 
     config.after_initialize do
-      if Tronprint.aggregator.adapter == 'active_record' && !Moneta::Adapters::ActiveRecord::Store.table_exists?
+      if Tronprint.aggregator && Tronprint.aggregator.adapter == 'active_record' && !Moneta::Adapters::ActiveRecord::Store.table_exists?
         Tronprint.aggregator.migrate
       end
       Tronprint.run

data/lib/tronprint/traffic_monitor.rb

@@ -1,17 +1,19 @@
 module Tronprint
 
-  # Tronprint::CPUMonitor is a thread that monitors aggregate CPU usage.
+  # Tronprint::TrafficMonitor counts app requests
   class TrafficMonitor
     attr_accessor :aggregator, :application_name
 
     # Parameters:
-    # +aggregator+:: A Tronprint::Aggregator instance.
     # +application_name+:: A unique application name.
-    def initialize(aggregator, application_name)
-      self.aggregator = aggregator
+    def initialize(application_name)
       self.application_name = application_name
     end
 
+    def aggregator
+      Tronprint.aggregator
+    end
+
     # The key used to store number of requests in the Aggregator.
     def key
       [application_name, 'requests'].join('/')
@@ -19,7 +21,7 @@ module Tronprint
 
     # Increment the total number of requests
     def increment
-      aggregator.update key, 1
+      aggregator.update key, 1 if aggregator
     end
 
     def requests

data/lib/tronprint/version.rb

@@ -1,3 +1,3 @@
 module Tronprint
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/spec/tronprint/traffic_monitor_spec.rb

@@ -3,7 +3,11 @@ require 'timecop'
 
 describe Tronprint::TrafficMonitor do
   let(:aggregator) { Tronprint::Aggregator.new :adapter => :memory }
-  let(:traffic_monitor) { Tronprint::TrafficMonitor.new aggregator, 'my_app' }
+  let(:traffic_monitor) { Tronprint::TrafficMonitor.new 'my_app' }
+
+  before :each do
+    traffic_monitor.stub!(:aggregator).and_return(aggregator)
+  end
 
   describe '#increment' do
     it 'increments the user count for each time slice' do
@@ -23,6 +27,12 @@ describe Tronprint::TrafficMonitor do
       traffic_monitor.increment
       traffic_monitor.requests.should == 2
     end
+    it 'does nothing if no aggregator is available' do
+      traffic_monitor.stub!(:aggregator)
+      expect do
+        traffic_monitor.increment
+      end.should_not raise_error
+    end
   end
 
   describe '#requests' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tronprint
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-07-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &2164332000 !ruby/object:Gem::Requirement
+  requirement: &2164404220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *2164332000
+  version_requirements: *2164404220
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2164331500 !ruby/object:Gem::Requirement
+  requirement: &2164403720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *2164331500
+  version_requirements: *2164403720
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2164331120 !ruby/object:Gem::Requirement
+  requirement: &2164403340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164331120
+  version_requirements: *2164403340
 - !ruby/object:Gem::Dependency
   name: bueller
-  requirement: &2164330580 !ruby/object:Gem::Requirement
+  requirement: &2164402780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.0.2
   type: :development
   prerelease: false
-  version_requirements: *2164330580
+  version_requirements: *2164402780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164330160 !ruby/object:Gem::Requirement
+  requirement: &2164402360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164330160
+  version_requirements: *2164402360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2164329620 !ruby/object:Gem::Requirement
+  requirement: &2164401820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2164329620
+  version_requirements: *2164401820
 - !ruby/object:Gem::Dependency
   name: sandbox
-  requirement: &2164329200 !ruby/object:Gem::Requirement
+  requirement: &2164401400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164329200
+  version_requirements: *2164401400
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2164328740 !ruby/object:Gem::Requirement
+  requirement: &2164400940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164328740
+  version_requirements: *2164400940
 - !ruby/object:Gem::Dependency
   name: carbon
-  requirement: &2164328240 !ruby/object:Gem::Requirement
+  requirement: &2164400440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2164328240
+  version_requirements: *2164400440
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2164327820 !ruby/object:Gem::Requirement
+  requirement: &2164400000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164327820
+  version_requirements: *2164400000
 - !ruby/object:Gem::Dependency
   name: dkastner-moneta
-  requirement: &2164327280 !ruby/object:Gem::Requirement
+  requirement: &2164399460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,7 +131,7 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2164327280
+  version_requirements: *2164399460
 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: -3333556664513962669
+      hash: -2483952378864654912
 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: -3333556664513962669
+      hash: -2483952378864654912
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.5