api_hammer 0.17.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d812135b67bb320c645f0adaa2a50384f7c4e81b
-  data.tar.gz: 3f8c644149a7ad7878d50af7dd1fb2fbd4ce1166
+  metadata.gz: 389df34af6fc825bf80bd8460ec43ca7ea626d52
+  data.tar.gz: ad21026ef421554be76e50158c4fe438c9ac2f61
 SHA512:
-  metadata.gz: f06fc026f7cc0383eed1ac89974dab0e1d3d9d6067a0d4c95d09c8397f7cbfd825e201c5a4720fc097d3099091d232a7e80e29fce20d2c45ca07eb6fdfa23fc1
-  data.tar.gz: 3400cc586418fc47faffd6462f78626229d84361f703c9675f6af44978633629aa3104665f1618f11fd33f7480d5a22cc71a2035e463e4e3716946463e9f433c
+  metadata.gz: fbc5733ba3f575fce86e74b469c3996884c5a6a8f5a622d47008b4635d5f443fe61d91d24697b964138995337306d8e20777e5d834cd51f554bd41542d06ebfe
+  data.tar.gz: f29386f32c2a6d89bc78661ea05c494b25576c59a4c8e7448af6994e44287074c068b662fb2e3bf73dabd15ae2745d871e42959690d1853c02304f13b7dc2e6b

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.18.0
+- add option to hc for basic auth
+- add option to hc to make it consider the body as text
+- faraday logger compatibility with old faraday 0.8
+- fix ruby warnings
+
 # v0.17.0
 - fix ApiHammer::ShowTextExceptions middleware to not rescue certain exceptions
 - don't insert or rely on Rack::Accept middleware for sinatra; use Rack::Accept more directly

data/bin/hc

@@ -23,9 +23,11 @@ $options = {
   :pretty => nil,
   :no_ssl_verify => false,
   :headers => {},
+  :text => nil,
 }
 
 $oauth = {}
+$basicauth = {}
 
 opt_parser = OptionParser.new do |opts|
   opts.banner = "Usage: #{$0} [options] <verb> <url> [body]"
@@ -33,6 +35,9 @@ opt_parser = OptionParser.new do |opts|
   opts.on("-v", "--[no-]verbose", "Run verbosely - output is like curl -v (this is the default)") do |v|
     $options[:verbose] = v
   end
+  opts.on("--[no-]text", "consider the response body to be text (default relies on Content-Type)") do |v|
+    $options[:text] = v
+  end
   opts.on("-q", "Run quietly - only outputs the response body (same as --no-verbose)") do |v|
     $options[:verbose] = !v
   end
@@ -66,6 +71,12 @@ opt_parser = OptionParser.new do |opts|
   opts.on("--oauth-signature-method SIGNATURE_METHOD", "OAuth 1.0 signature method - defaults to HMAC-SHA1") do |signature_method|
     $oauth[:signature_method] = signature_method
   end
+  opts.on("--basic-user USER", "basic auth user") do |user|
+    $basicauth[:user] = user
+  end
+  opts.on("--basic-password PASSWORD", "basic auth password") do |password|
+    $basicauth[:password] = password
+  end
 
   opts.on("--no-ssl-verify", "Disables SSL verification - use cautiously!") do
     $options[:no_ssl_verify] = true
@@ -95,6 +106,9 @@ connection = Faraday.new(faraday_options) do |builder|
     OAuthenticator::FaradaySigner
     builder.use OAuthenticator::FaradaySigner, $oauth
   end
+  if $basicauth.any?
+    builder.basic_auth($basicauth[:user], $basicauth[:password])
+  end
   builder.use($options[:verbose] ? ApiHammer::FaradayCurlVOutputter : ApiHammer::FaradayOutputter, $options)
   builder.adapter Faraday.default_adapter
 end

data/lib/api_hammer/faraday/outputter.rb

@@ -129,7 +129,7 @@ module ApiHammer
     def alter_body_by_content_type(body, content_type)
       return body unless body.is_a?(String)
       content_type_attrs = ApiHammer::ContentTypeAttrs.new(content_type)
-      if content_type_attrs.text?
+      if @options[:text].nil? ? content_type_attrs.text? : @options[:text]
         if pretty?
           case content_type_attrs.media_type
           when 'application/json'

data/lib/api_hammer/faraday/request_logger.rb

@@ -37,12 +37,12 @@ module ApiHammer
 
         @app.call(request_env).on_complete do |response_env|
           now = Time.now
-          status = response_env.status
+          status = response_env[:status]
 
           if log_bodies(status)
             bodies = [
-              ['request', request_body, request_env.request_headers],
-              ['response', response_env.body, response_env.response_headers]
+              ['request', request_body, request_env[:request_headers]],
+              ['response', response_env[:body], response_env[:response_headers]]
             ].map do |(role, body_s, headers)|
               body = Body.new(body_s, headers['Content-Type'])
               if body.content_type_attrs.text?
@@ -62,12 +62,12 @@ module ApiHammer
             'request' => {
               'method' => request_env[:method],
               'uri' => request_env[:url].normalize.to_s,
-              'headers' => request_env.request_headers,
+              'headers' => request_env[:request_headers],
               'body' => bodies['request'],
             }.reject{|k,v| v.nil? },
             'response' => {
               'status' => status.to_s,
-              'headers' => response_env.response_headers,
+              'headers' => response_env[:response_headers],
               'body' => bodies['response'],
             }.reject{|k,v| v.nil? },
             'processing' => {

data/lib/api_hammer/rails/halt.rb

@@ -19,7 +19,7 @@ module ApiHammer::Rails
     attr_reader :body, :render_options
   end
 
-  unless @rails_halt_included_defined
+  unless instance_variable_defined?(:@rails_halt_included_defined)
     @rails_halt_included_defined = true
     (@on_included ||= Set.new) << proc do |controller_class|
       controller_class.send(:rescue_from, ApiHammer::Rails::Halt, :with => :handle_halt)

data/lib/api_hammer/sinatra.rb

@@ -13,7 +13,7 @@ module ApiHammer
       end
     end
 
-    unless @sinatra_included_defined
+    unless instance_variable_defined?(:@sinatra_included_defined)
       @sinatra_included_defined = true
       (@on_included ||= Set.new) << proc do |klass|
         # set up self.supported_media_types

data/lib/api_hammer/version.rb

@@ -1,3 +1,3 @@
 module ApiHammer
-  VERSION = "0.17.0"
+  VERSION = "0.18.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_hammer
 version: !ruby/object:Gem::Version
-  version: 0.17.0
+  version: 0.18.0
 platform: ruby
 authors:
 - Ethan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-23 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack