hyperion_http 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9d372cf4d4619f6f072bc380c17063ecb5fe855
-  data.tar.gz: 26f3f857b2e7c95172957dbaed57c63daa4528a7
+  metadata.gz: c24c3452a5f16a5347b6d0ab930e01744a27e9fc
+  data.tar.gz: 80d605302f41e1872f745cab3563657e183cdfb8
 SHA512:
-  metadata.gz: f38a45cf7bf55934c47dfd23bb1516fbd489751f32a74ed78bc3171e1e68b7ee7fa38eb0d856ee0809a816aed593538ebb1c092c79367e4251a3423e18730145
-  data.tar.gz: a80a5552f4a2419ab751806a4f6b3aeb4f26790ee2390bcbbb52906442c00019f639b86d8bcdc74505162225e91aa2edec1bb8e96651ca04817cc82364741951
+  metadata.gz: b83b365370c05091223d03c430aa2d998b629313644ece52dec7f95d0fa7e6c13e32e2299bb97b2dadf3f8499aa8cbe80d59c64225301b094a4cde5bb735922a
+  data.tar.gz: 66b8e4a08fbd601368020ecc199d7be76616316cb0b36dbc38aa7839ea5ba2be7f65ccad2673b7818c4ae06ae1856f22a103cbc13aa00abbe13927dbc3b1e0c9

data/Gemfile

@@ -2,4 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in hyperion.gemspec
 gemspec
-

data/hyperion_http.gemspec

@@ -31,4 +31,5 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'oj', '~> 2.12'
   spec.add_runtime_dependency 'typhoeus', '~> 0.7'
   spec.add_runtime_dependency 'mimic', '~> 0.4.3'
+  spec.add_runtime_dependency 'logatron'
 end

data/lib/hyperion/aux/logger.rb

@@ -1,54 +1,29 @@
+require 'logatron/logatron'
+
 class Hyperion
   module Logger
-    class << self
-      attr_accessor :level
-    end
 
     def logger
-      rails_logger_available? ? Rails.logger : default_logger
+      Logatron
     end
 
     def with_request_logging(route, uri, headers)
-      log_request_start(route, uri, headers)
-      start = Time.now
-      begin
+      Logatron.log(msg: "Hyperion #{route.method.to_s.upcase} #{uri}") do |logger|
+        log_headers(headers, logger)
         yield
-      ensure
-        stop = Time.now
-        log_request_end(((stop - start) * 1000).round)
       end
     end
 
     def log_stub(rule)
       mr = rule.mimic_route
       logger.debug "Stubbed #{mr.method.to_s.upcase} #{mr.path}"
-      log_headers(rule.headers)
+      log_headers(rule.headers, logger)
     end
 
     private
 
-    def log_request_start(route, uri, headers)
-      logger.debug "Requesting #{route.method.to_s.upcase} #{uri}"
-      log_headers(headers)
-    end
-
-    def log_request_end(ms)
-      logger.debug "Completed in #{ms}ms"
-      logger.debug ''
-    end
-
-    def rails_logger_available?
-      Kernel.const_defined?(:Rails) && !Rails.logger.nil?
-    end
-
-    def default_logger
-      logger = ::Logger.new($stdout)
-      logger.level = Hyperion::Logger.level || ::Logger::DEBUG
-      logger
-    end
-
-    def log_headers(headers)
-      headers.each_pair { |k, v| logger.debug "    #{k}: #{v}" unless k == 'Expect' }
+    def log_headers(headers, logger)
+      headers.each_pair { |k, v| logger.info "    #{k}: #{v}" unless k == 'Expect' }
     end
   end
 end

data/lib/hyperion/aux/version.rb

@@ -1,3 +1,3 @@
 class Hyperion
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/lib/hyperion/formats.rb

@@ -57,7 +57,8 @@ class Hyperion
           mode: :compat,
           time_format: :xmlschema,  # xmlschema == iso8601
           use_to_json: false,
-          second_precision: 3
+          second_precision: 3,
+          bigdecimal_load: :float
       }
     end
 

data/lib/hyperion/headers.rb

@@ -1,11 +1,12 @@
 require 'hyperion/formats'
+require 'logatron/logatron'
 
 class Hyperion
   module Headers
     # constructs and destructures HTTP headers
 
     def route_headers(route)
-      headers = {}
+      headers = Logatron.http_headers
       rd = route.response_descriptor
       pd = route.payload_descriptor
       headers['Expect'] = nil # this overrides default libcurl behavior.

data/spec/lib/hyperion/headers_spec.rb

@@ -1,9 +1,11 @@
 require 'hyperion'
 require 'hyperion/headers'
+require 'abstractivator/trees/tree_compare'
 
 class Hyperion
   describe Headers do
     include Headers
+    include Abstractivator::Trees
 
     before :each do
       Hyperion.configure do |config|
@@ -22,6 +24,10 @@ class Hyperion
         headers = route_headers(RestRoute.new(:get, uri, ResponseDescriptor.new('ttt', 999, :json), PayloadDescriptor.new(:json)))
         expect(headers['Content-Type']).to eql 'application/json'
       end
+      it 'merges the logatron headers' do
+        headers = route_headers(RestRoute.new(:get, uri, ResponseDescriptor.new('ttt', 999, :json)))
+        expect(tree_compare(headers, Logatron.http_headers)).to eql []
+      end
     end
 
     describe '#content_type_for' do

data/spec/lib/hyperion/logger_spec.rb

@@ -29,23 +29,28 @@ describe Hyperion::Logger do
   it 'respects the log level' do
     output = StringIO.new
     with_stdout(output) do
-      Hyperion::Logger.level = Logger::ERROR
+      Logatron.level = Logatron::ERROR
       logger.debug 'xyzzy'
       logger.error 'qwerty'
-      Hyperion::Logger.level = Logger::DEBUG
+      Logatron.level = Logatron::DEBUG
     end
     output_str = output.string
     expect(output_str).to include 'qwert'
     expect(output_str).to_not include 'xyzzy'
   end
 
-  def with_stdout(tmp_stdout)
-    old = $stdout
-    $stdout = tmp_stdout
+  def with_stdout(io)
+    set_log_io(io)
     begin
       yield
     ensure
-      $stdout = old
+      set_log_io($stdout)
+    end
+  end
+
+  def set_log_io(io)
+    Logatron.configure do |c|
+      c.logger = Logger.new(io)
     end
   end
 

data/spec/lib/hyperion_spec.rb

@@ -15,16 +15,16 @@ describe Hyperion do
       body = 'Ventura'
       additional_headers = {'From' => 'dev@indigobio.com'}
 
-      expected_headers = {
-          'Accept' => "application/vnd.indigobio-ascent.#{rd.type}-v#{rd.version}+#{rd.format}",
-          'Content-Type' => 'application/x-protobuf',
-          'From' => 'dev@indigobio.com',
-          'Expect' => nil
-      }
+      expected_headers = Logatron.http_headers.merge(
+        'Accept' => "application/vnd.indigobio-ascent.#{rd.type}-v#{rd.version}+#{rd.format}",
+        'Content-Type' => 'application/x-protobuf',
+        'From' => 'dev@indigobio.com',
+        'Expect' => nil
+      )
 
       expect(Hyperion::Typho).to receive(:request).
-                                     with(uri, {method: method, headers: expected_headers, body: 'Ventura'}).
-                                     and_return(make_typho_response(200, write({'foo' => 'bar'}, :json)))
+                                   with(uri, {method: method, headers: expected_headers, body: 'Ventura'}).
+                                   and_return(make_typho_response(200, write({'foo' => 'bar'}, :json)))
 
       result = Hyperion.request(route, body, additional_headers)
       expect(result).to be_a HyperionResult
@@ -40,11 +40,12 @@ describe Hyperion do
       let!(:rd){ResponseDescriptor.new('data_type', 1, :json)}
       let!(:pd){PayloadDescriptor.new(:json)}
       let!(:route){RestRoute.new(method, uri, rd, pd)}
-      let!(:expected_headers){{
+      let!(:expected_headers) do
+        Logatron.http_headers.merge(
           'Accept' => "application/vnd.indigobio-ascent.#{rd.type}-v#{rd.version}+#{rd.format}",
           'Content-Type' => 'application/json',
-          'Expect' => nil
-      }}
+          'Expect' => nil)
+      end
       it 'deserializes the response' do
         allow(Hyperion::Typho).to receive(:request).and_return(make_typho_response(200, '{"a":"b"}'))
         result = Hyperion.request(route)
@@ -52,15 +53,15 @@ describe Hyperion do
       end
       it 'serializes the payload' do
         expect(Hyperion::Typho).to receive(:request).
-                                       with(uri, {method: method, headers: expected_headers, body: '{"c":"d"}'}).
-                                       and_return(make_typho_response(200, write({}, :json)))
+                                     with(uri, {method: method, headers: expected_headers, body: '{"c":"d"}'}).
+                                     and_return(make_typho_response(200, write({}, :json)))
         Hyperion.request(route, {'c' => 'd'})
       end
       it 'deserializes 400-level errors to ClientErrorResponse' do
         client_error = ClientErrorResponse.new('oops', [], ClientErrorCode::MISSING)
         allow(Hyperion::Typho).to receive(:request).
-                                      with(uri, {method: method, headers: expected_headers, body: '{"c":"d"}'}).
-                                      and_return(make_typho_response(400, write(client_error.as_json, :json)))
+                                    with(uri, {method: method, headers: expected_headers, body: '{"c":"d"}'}).
+                                    and_return(make_typho_response(400, write(client_error.as_json, :json)))
         result = Hyperion.request(route, {'c' => 'd'})
         expect(result.body).to be_a ClientErrorResponse
         expect(result.body.message).to eql 'oops'

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
 require 'rspec'
 require 'json_spec'
 require 'hyperion'
+require 'logatron/logatron'

data/spec/support/core_helpers.rb

@@ -1,5 +1,13 @@
+require 'logatron/logatron'
+
 RSpec.configure do |config|
   config.mock_with :rspec do |mocks|
     mocks.verify_partial_doubles = true
   end
 end
+
+Logatron.configure do |c|
+  c.logger = Logger.new($stdout)
+  c.level = Logatron::DEBUG
+  c.transformer = proc {|x| x[:body]}
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyperion_http
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Indigo BioAutomation, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -178,6 +178,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.3
+- !ruby/object:Gem::Dependency
+  name: logatron
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby REST client for internal service architecture
 email:
 - pwinton@indigobio.com
@@ -230,12 +244,12 @@ files:
 - spec/lib/hyperion/formats_spec.rb
 - spec/lib/hyperion/headers_spec.rb
 - spec/lib/hyperion/logger_spec.rb
+- spec/lib/hyperion/requestor_spec.rb
 - spec/lib/hyperion/test_spec.rb
 - spec/lib/hyperion/types/client_error_response_spec.rb
 - spec/lib/hyperion/types/hyperion_result_spec.rb
 - spec/lib/hyperion/types/hyperion_uri_spec.rb
 - spec/lib/hyperion_spec.rb
-- spec/lib/superion_spec.rb
 - spec/lib/types_spec.rb
 - spec/spec_helper.rb
 - spec/support/core_helpers.rb
@@ -268,12 +282,12 @@ test_files:
 - spec/lib/hyperion/formats_spec.rb
 - spec/lib/hyperion/headers_spec.rb
 - spec/lib/hyperion/logger_spec.rb
+- spec/lib/hyperion/requestor_spec.rb
 - spec/lib/hyperion/test_spec.rb
 - spec/lib/hyperion/types/client_error_response_spec.rb
 - spec/lib/hyperion/types/hyperion_result_spec.rb
 - spec/lib/hyperion/types/hyperion_uri_spec.rb
 - spec/lib/hyperion_spec.rb
-- spec/lib/superion_spec.rb
 - spec/lib/types_spec.rb
 - spec/spec_helper.rb
 - spec/support/core_helpers.rb