right_support 2.8.17 → 2.8.20

data/VERSION

@@ -1 +1 @@
-2.8.17
+2.8.20

data/lib/right_support/log/mixin.rb

@@ -85,7 +85,7 @@ module RightSupport::Log
     # Instance methods that become available to classes that include Mixin.
     module InstanceMethods
       def logger
-        @logger || self.class.logger
+        @logger || (self.class.respond_to?(:logger) && self.class.logger) || RightSupport::Log::Mixin.default_logger
       end
 
       def logger=(logger)

data/lib/right_support/rack/request_logger.rb

@@ -47,12 +47,20 @@ module RightSupport::Rack
     end
 
     # Add a logger to the Rack environment and call the next middleware.
-    # Set "rack.logging.enabled" in Rack environment to indicate whether logging
-    # is enabled for this request for use by other middleware in the call chain.
     #
     # @param [Hash] env Rack environment
+    # @option env [TrueClass|FalseClass] 'rack.logging.enabled' in Rack
+    #  environment to indicate whether logging is enabled for this request for
+    #  use by other middleware in the call chain.
+    # @option env [TrueClass|FalseClass] 'sinatra.error' is set by Sinatra to
+    #  pass error info (exception object) to handlers.
+    # @option env [TrueClass|FalseClass] 'sinatra.error.handled' is true to
+    #  prevent any additional error handlers in the call chain from processing
+    #  an error that has already handled been handled (i.e. log and response)
+    #  (default = false).
     #
-    # @return [Object] always returns whatever value is returned by the next layer of middleware
+    # @return [Object] always returns whatever value is returned by the next
+    #  layer of middleware
     def call(env)
       logger = env["rack.logger"]
       env["rack.logging.enabled"] = enabled = logging_enabled?(logger, env)
@@ -61,7 +69,9 @@ module RightSupport::Rack
 
       log_request_begin(logger, env) if enabled
       status, header, body = @app.call(env)
-      log_exception(logger, env['sinatra.error']) if env['sinatra.error']
+      if env['sinatra.error'] && !env['sinatra.error.handled']
+        log_exception(logger, env['sinatra.error'])
+      end
       log_request_end(logger, status, header, began_at) if enabled
 
       return [status, header, body]

data/lib/right_support/stats/activity.rb

@@ -31,7 +31,7 @@ module RightSupport::Stats
     # at value V for average A to reach 90% of the original difference between A and V
     # For example, for A = 0, V = 1, RECENT_SIZE = 3 the progression for A is
     # 0, 0.3, 0.5, 0.7, 0.8, 0.86, 0.91, 0.94, 0.96, 0.97, 0.98, 0.99, ...
-    RECENT_SIZE = 3
+    RECENT_SIZE = 3.0
 
     # Maximum string length for activity type
     MAX_TYPE_SIZE = 60
@@ -130,8 +130,10 @@ module RightSupport::Stats
     #
     # @return [Float, NilClass] Recent average rate, or nil if total is 0
     def avg_rate
-      if @total > 0
-        if @interval == 0.0 then 0.0 else 1.0 / @interval end
+      if @total > 1
+        @interval == 0.0 ? 0.0 : 1.0 / @interval
+      elsif @total == 1
+        0.0
       end
     end
 
@@ -204,7 +206,7 @@ module RightSupport::Stats
     #
     # @return [Float] New average
     def average(current, value)
-      ((current * (RECENT_SIZE - 1)) + value) / RECENT_SIZE.to_f
+      ((current * (RECENT_SIZE - 1)) + value) / RECENT_SIZE
     end
 
     public

data/right_support.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "right_support"
-  s.version = "2.8.17"
+  s.version = "2.8.20"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tony Spataro", "Sergey Sergyenko", "Ryan Williamson", "Lee Kirchhoff", "Alexey Karpik", "Scott Messier"]
-  s.date = "2014-03-01"
+  s.date = "2014-03-21"
   s.description = "A toolkit of useful, reusable foundation code created by RightScale."
   s.email = "support@rightscale.com"
   s.extra_rdoc_files = [
@@ -137,7 +137,7 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/rightscale/right_support"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.15"
+  s.rubygems_version = "1.8.26"
   s.summary = "Reusable foundation code."
 
   if s.respond_to? :specification_version then

data/spec/log/mixin_spec.rb

@@ -7,7 +7,33 @@ end
 class Bystander < InnocentVictim
 end
 
+module Parasite
+  include RightSupport::Log::Mixin
+end
+
+class Host
+  include Parasite
+end
+
 describe RightSupport::Log::Mixin do
+  context 'when mixed into a module' do
+    before(:each) do
+      @victim = Host.new
+    end
+
+    it 'provides instance-level accesssor to hosts' do
+      @victim.should respond_to(:logger)
+      @victim.should respond_to(:logger=)
+      @victim.logger.info 'haha'
+    end
+
+    it 'provides a module-method-level accessor' do
+      Parasite.should respond_to(:logger)
+      Parasite.should respond_to(:logger=)
+      Parasite.logger.info 'haha'
+    end
+  end
+
   context 'when mixed into a base class' do
     before(:each) do
       @victim = InnocentVictim.new
@@ -16,10 +42,13 @@ describe RightSupport::Log::Mixin do
     it 'provides a class-level accessor' do
       @victim.class.should respond_to(:logger)
       @victim.class.should respond_to(:logger=)
+      @victim.class.logger.info 'haha'
     end
 
     it 'provides an instance-level accessor' do
       @victim.should respond_to(:logger)
+      @victim.should respond_to(:logger=)
+      @victim.logger.info 'haha'
     end
 
     context :logger do
@@ -88,4 +117,4 @@ describe RightSupport::Log::Mixin do
       Bystander.logger.error('foo')
     end
   end
-end
+end

data/spec/rack/request_logger_spec.rb

@@ -45,6 +45,13 @@ describe RightSupport::Rack::RequestLogger do
         @logger.should_receive(:error)
         @middleware.call(@env)
       end
+
+      it 'skips logging the exception when already handled' do
+        @logger.should_receive(:info)
+        @logger.should_receive(:error).never
+        @env['sinatra.error.handled'] = true
+        @middleware.call(@env)
+      end
     end
 
     context 'when limit logging extent' do

data/spec/stats/activity_spec.rb

@@ -181,11 +181,20 @@ describe RightSupport::Stats::Activity do
 
   context :avg_rate do
     it "converts interval to rate" do
+      flexmock(Time).should_receive(:now).and_return(1000020, 1000042)
+      @stats.avg_rate.should be_nil
+      @stats.update
+      @stats.update
+      @stats.instance_variable_get(:@interval).should == 4.0
+      @stats.avg_rate.should == 0.25
+    end
+
+    it "does not convert interval to rate if there is only one event" do
       flexmock(Time).should_receive(:now).and_return(1000020)
       @stats.avg_rate.should be_nil
       @stats.update
       @stats.instance_variable_get(:@interval).should == 2.0
-      @stats.avg_rate.should == 0.5
+      @stats.avg_rate.should == 0.0
     end
   end
 
@@ -236,7 +245,7 @@ describe RightSupport::Stats::Activity do
     it "returns all activity aspects that were measured except duration" do
       flexmock(Time).should_receive(:now).and_return(1000010)
       @stats.update
-      @stats.all.should == {"last" => {"elapsed" => 0}, "total" => 1, "rate" => 1.0}
+      @stats.all.should == {"last" => {"elapsed" => 0}, "total" => 1, "rate" => 0.0}
     end
 
     it "excludes rate if it is not being measured" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: right_support
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 7
   prerelease: 
   segments: 
   - 2
   - 8
-  - 17
-  version: 2.8.17
+  - 20
+  version: 2.8.20
 platform: ruby
 authors: 
 - Tony Spataro
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-03-01 00:00:00 Z
+date: 2014-03-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :development