api_hammer 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b342d8c401e21b4f1de5a9bca122654c97029575
-  data.tar.gz: 43ebdf3104bb5f99a077b1f5a6865175be99ae0b
+  metadata.gz: ce63ff50e3e052b9baa6a9f6f6c45e9a5a7f2ed5
+  data.tar.gz: 7f0e9b25392ce4a3e8ee142fba08046c6162915b
 SHA512:
-  metadata.gz: 354e49d66f033993d760bb2e465e8166330ec28be9f2bc7cf2d1c385fb887b3c5a06e744f60be19cbb3ed52c84024c41d6603004860628b50ecc37b6f3b94b88
-  data.tar.gz: 38e03dedd7c08c876b1f91cb7fd3b68da53b3dc045e71787d753a653d0952c10d884a6f36d7ca993e9de533b2fc19cd5462daba5131c4847250b2fb2324cfb6c
+  metadata.gz: 6e34d35e48b004a332d754bf4ca95b41841ba2aba0a4071e4f583b4d311855f045d7444fc5e30a91fa751cf7aefb1e245289be6932bd283cb2bba0aba04058aa
+  data.tar.gz: e3763513e988b90137f7160a023faf59ebe03f1a84d37ae148da4aa7cb988c8716b4c14a01e4469317dcec4daa9eb0082aa1722cf836c071c0ca75c9b2c56e0a

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.6.0
+- ApiHammer::RailsOrSidekiqLogger
+
 # v0.5.0
 - rack request logger logs all request and response headers
 - fix id / uuid / guid logging in rack request logger

data/lib/api_hammer/faraday/request_logger.rb

@@ -4,13 +4,6 @@ require 'term/ansicolor'
 require 'json'
 require 'strscan'
 
-if Faraday.respond_to?(:register_middleware)
-  Faraday.register_middleware(:request, :api_hammer_request_logger => proc { ApiHammer::Faraday::RequestLogger })
-end
-if Faraday::Request.respond_to?(:register_middleware)
-  Faraday::Request.register_middleware(:api_hammer_request_logger => proc { ApiHammer::Faraday::RequestLogger })
-end
-
 module ApiHammer
   # parses attributes out of content type header
   class ContentTypeAttrs
@@ -51,7 +44,7 @@ module ApiHammer
     end
   end
 
-  class Faraday
+  module Faraday
     # Faraday middleware for logging.
     #
     # two lines:

data/lib/api_hammer/rails_or_sidekiq_logger.rb

@@ -0,0 +1,43 @@
+module ApiHammer
+  # switch a logger between Rails.logger and sidekiq's logger 
+  #
+  #     Sidekiq.configure_server do |config|
+  #       ...
+  #       
+  #       config.server_middleware do |chain|
+  #         chain.add ApiHammer::RailsOrSidekiqLoggerMiddleware
+  #       end
+  #     end
+  class RailsOrSidekiqLoggerMiddleware
+    def call(worker, msg, queue, &block)
+      ApiHammer::RailsOrSidekiqLogger.with_logger(worker.logger, &block)
+    end
+  end
+
+  # include in a class to define #logger which will switch between Sidekiq and Rails 
+  # using RailsOrSidekiqLoggerMiddleware
+  #
+  #     class Foo
+  #       include ApiHammer::RailsOrSidekiqLogger
+  #     end
+  #
+  module RailsOrSidekiqLogger
+    LOGGER_KEY = 'api_hammer_rails_or_sidekiq_logger'
+    def with_logger(logger)
+      orig_logger = Thread.current[LOGGER_KEY]
+      begin
+        Thread.current[LOGGER_KEY] = logger
+        yield
+      ensure
+        Thread.current[LOGGER_KEY] = orig_logger
+      end
+    end
+
+    def logger
+      logger = Thread.current[LOGGER_KEY] || ::Rails.logger
+      logger.respond_to?(:tagged) ? logger : ::ActiveSupport::TaggedLogging.new(logger)
+    end
+
+    extend self
+  end
+end

data/lib/api_hammer/version.rb

@@ -1,3 +1,3 @@
 module ApiHammer
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/api_hammer.rb

@@ -2,8 +2,23 @@ require 'api_hammer/version'
 
 module ApiHammer
   autoload :Rails, 'api_hammer/rails'
-  autoload :RequestLogger, 'api_hammer/request_logger.rb'
-  autoload :ShowTextExceptions, 'api_hammer/show_text_exceptions.rb'
-  autoload :TrailingNewline, 'api_hammer/trailing_newline.rb'
-  autoload :Weblink, 'api_hammer/weblink.rb'
+  autoload :RequestLogger, 'api_hammer/request_logger'
+  autoload :ShowTextExceptions, 'api_hammer/show_text_exceptions'
+  autoload :TrailingNewline, 'api_hammer/trailing_newline'
+  autoload :Weblink, 'api_hammer/weblink'
+  autoload :RailsOrSidekiqLoggerMiddleware, 'api_hammer/rails_or_sidekiq_logger'
+  autoload :RailsOrSidekiqLogger, 'api_hammer/rails_or_sidekiq_logger'
+  autoload :FaradayOutputter, 'api_hammer/faraday/outputter'
+  autoload :FaradayCurlVOutputter, 'api_hammer/faraday/outputter'
+  module Faraday
+    autoload :RequestLogger, 'api_hammer/faraday/request_logger'
+  end
+end
+
+require 'faraday'
+if Faraday.respond_to?(:register_middleware)
+  Faraday.register_middleware(:request, :api_hammer_request_logger => proc { ApiHammer::Faraday::RequestLogger })
+end
+if Faraday::Request.respond_to?(:register_middleware)
+  Faraday::Request.register_middleware(:api_hammer_request_logger => proc { ApiHammer::Faraday::RequestLogger })
 end

data/test/faraday_request_logger_test.rb

@@ -4,7 +4,6 @@ proc { |p| $:.unshift(p) unless $:.any? { |lp| File.expand_path(lp) == p } }.cal
 require 'helper'
 require 'logger'
 require 'stringio'
-require 'api_hammer/faraday/request_logger'
 
 describe ApiHammer::RequestLogger do
   let(:logio) { StringIO.new }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_hammer
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ethan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -244,6 +244,7 @@ files:
 - lib/api_hammer/halt.rb
 - lib/api_hammer/public_instance_exec.rb
 - lib/api_hammer/rails.rb
+- lib/api_hammer/rails_or_sidekiq_logger.rb
 - lib/api_hammer/rails_request_logging.rb
 - lib/api_hammer/request_logger.rb
 - lib/api_hammer/show_text_exceptions.rb