tms_client 0.4.0 → 0.4.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWFkYWUyYTcyMmRkN2M0MDFjYTE2YzI3ZDBiNWY4NGVjZGI3MDZjNw==
+  data.tar.gz: !binary |-
+    MmVjM2Y4ODVkNDYyZjAwYzUxMDc3N2VkNmU1OTgwNmI1MTIwZGYyMw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZTZhMDI0MjA4MjhmNjM2YzRhOGYxMGQ4NGE2Y2JhNWM5ZGM4OWUwMjE0MjMx
+    MDdjZTRmZDQ0OGNkNTNjMjAzNDdmNzhhMTBkMjcyMGY3YTNiMmViODdkY2U5
+    OGNkNGFiMWY4ZjkwZTIwOWQxODdlNTVmYzFmODA5N2YyOWZjODM=
+  data.tar.gz: !binary |-
+    NGZmNTJkYjFlMTllNjk2YjE5N2M1ZjU1OTU5MDVlMDBjNGMyZWM2ZThiM2M3
+    OTU0OWRiN2Y3ZjhiYzdkMGQwN2FiYjE0ZThjZjQyOTRiN2M3OGQ4MmRkNGM2
+    ZjNjNDViYmI1MmMwMmUxYzVkMjQ1MTZiZDYwNDAzZjdiYzJkZDk=

data/lib/tms_client/client.rb

@@ -21,9 +21,9 @@ class TMS::Client
   #                               :logger => Logger.new(STDOUT)})
   #
   def initialize(auth_token, options = DEFAULTS)
-    @api_root = options.delete(:api_root)
-    @logger = options.delete(:logger) || setup_logging(options.delete(:debug))
-    connect!(auth_token, options)
+    @api_root = options[:api_root]
+    @logger = options[:logger] || setup_logging(options[:debug])
+    connect!(auth_token, options.except(:api_root, :logger, :debug))
     discover!
   end
 

data/lib/tms_client/connection.rb

@@ -1,5 +1,5 @@
 class TMS::Connection
-  attr_accessor :auth_token, :api_root, :connection, :logger, :debug
+  attr_accessor :auth_token, :api_root, :connection, :logger
 
   def get(href)
     resp = connection.get("#{href}.json")
@@ -14,7 +14,6 @@ class TMS::Connection
     self.auth_token = opts[:auth_token]
     self.api_root = opts[:api_root]
     self.logger = opts[:logger]
-    self.debug = opts[:debug]
     setup_connection
   end
 
@@ -22,7 +21,6 @@ class TMS::Connection
     self.connection = Faraday.new(:url => self.api_root) do |faraday|
       faraday.use TMS::Logger, self.logger if self.logger
       faraday.request :json
-      setup_logging(faraday)
       faraday.headers['X-AUTH-TOKEN'] = auth_token
       faraday.headers[:user_agent] = "GovDelivery Ruby TMS::Client #{TMS::VERSION}"
       faraday.response :json, :content_type => /\bjson$/
@@ -30,16 +28,6 @@ class TMS::Connection
     end
   end
 
-  def setup_logging(faraday)
-    faraday.use FaradayMiddleware::Instrumentation, {:name => 'tms_client'}
-    ActiveSupport::Notifications.subscribe('tms_client') do |name, starts, ends, _, env|
-      duration = ends - starts
-      logger.info "#{env[:method].to_s.upcase.ljust(7)}#{env[:status].to_s.ljust(4)}#{env[:url]} (#{duration} seconds)"
-      logger.debug('response headers') { JSON.pretty_generate env[:response_headers] }
-      logger.debug('response body') { env[:body] }
-    end
-  end
-
   def dump_headers(headers)
     headers.map { |k, v| "#{k}: #{v.inspect}" }.join("\n")
   end

data/lib/tms_client/logger.rb

@@ -14,9 +14,23 @@ module TMS #:nodoc:
 
     def call(env)
       debug "performing #{env[:method].to_s.upcase.ljust(7)} #{env[:url]}"
-      super
+
+      start = Time.now
+
+      # In order to log request duration in a threadsafe way, `start` must be a local variable instead of instance variable.
+      @app.call(env).on_complete do |environment|
+        on_complete(environment)
+        log_stuff(start, environment)
+      end
     end
 
+    private
 
+    def log_stuff(start, environment)
+      duration = Time.now - start
+      info "#{environment[:method].to_s.upcase.ljust(7)}#{environment[:status].to_s.ljust(4)}#{environment[:url]} (#{duration} seconds)"
+      debug('response headers') { JSON.pretty_generate environment[:response_headers] }
+      debug('response body') { environment[:body] }
+    end
   end
-end
+end

data/lib/tms_client/version.rb

@@ -1,3 +1,3 @@
 module TMS #:nodoc:
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: tms_client
 version: !ruby/object:Gem::Version
-  version: 0.4.0
-  prerelease: 
+  version: 0.4.1
 platform: ruby
 authors:
 - GovDelivery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -112,33 +105,26 @@ files:
 - spec/tms_client_spec.rb
 homepage: http://govdelivery.com
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 825628313063111602
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 825628313063111602
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.7
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A ruby client to interact with the GovDelivery TMS REST API.
 test_files:
 - spec/client_spec.rb
@@ -153,3 +139,4 @@ test_files:
 - spec/sms_messages_spec.rb
 - spec/spec_helper.rb
 - spec/tms_client_spec.rb
+has_rdoc: