api_hammer 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa33b65d40e0ebef568c1a0da19a598da4a8e21b
-  data.tar.gz: 37aed9c6adcbc5aeaedd3776f503047e57095caa
+  metadata.gz: d812135b67bb320c645f0adaa2a50384f7c4e81b
+  data.tar.gz: 3f8c644149a7ad7878d50af7dd1fb2fbd4ce1166
 SHA512:
-  metadata.gz: 6d34d68f09541878f3ab910a975bb43633d00b490e10ea2febb4cae42af8a1c27489d656eb8e0aa77e7191fecccb15d24e4afb466e688faaf92f5e9443fae59f
-  data.tar.gz: 7e2cb70f0271b4f4bebd43c7e4e6f8c8ed73ca321b07fc4b6361279b0136d7b3df6dab06505443f0404b66b720101bb78b477428633c8de0d3cbde3218ae2080
+  metadata.gz: f06fc026f7cc0383eed1ac89974dab0e1d3d9d6067a0d4c95d09c8397f7cbfd825e201c5a4720fc097d3099091d232a7e80e29fce20d2c45ca07eb6fdfa23fc1
+  data.tar.gz: 3400cc586418fc47faffd6462f78626229d84361f703c9675f6af44978633629aa3104665f1618f11fd33f7480d5a22cc71a2035e463e4e3716946463e9f433c

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 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
+- improve hc User-Agent
+
 # v0.16.0
 - fix dependency on json pure parser, which moved from the json gem to json_pure gem
 

data/Gemfile

@@ -5,3 +5,6 @@ gemspec
 
 gem 'byebug'
 gem 'wwtd'
+if RUBY_VERSION == '2.0.0'
+  gem 'nokogiri', '~> 1.6.8'
+end

data/bin/hc

@@ -123,7 +123,7 @@ if body && !headers['Content-Type'.downcase]
 end
 
 unless headers.keys.any? { |key| key.downcase == 'user-agent' }
-  headers['User-Agent'] = "ApiHammer #{ApiHammer::VERSION} hc"
+  headers['User-Agent'] = "ApiHammer-hc/#{ApiHammer::VERSION} (#{RUBY_ENGINE} #{RUBY_VERSION}; #{RUBY_PLATFORM})"
 end
 
 # OH LOOK IT'S FINALLY ACTUALLY CONNECTING TO SOMETHING

data/gemfiles/Gemfile_rack_1

@@ -7,3 +7,7 @@ gem 'wwtd'
 
 gem 'rack', '~> 1.0'
 gem 'actionpack', '~> 4.0'
+
+if RUBY_VERSION == '2.0.0'
+  gem 'nokogiri', '~> 1.6.8'
+end

data/gemfiles/Gemfile_rack_2

@@ -7,3 +7,7 @@ gem 'wwtd'
 
 gem 'rack', '~> 2.0'
 gem 'actionpack', '~> 5.0'
+
+if RUBY_VERSION == '2.0.0'
+  gem 'nokogiri', '~> 1.6.8'
+end

data/lib/api_hammer/show_text_exceptions.rb

@@ -9,6 +9,19 @@ module ApiHammer
   # those middlewares have a #prefers_plain_text? method which makes them behave like this, but 
   # it's simpler and more reliable to roll our own than monkey-patch those) 
   class ShowTextExceptions
+    # this module blatantly stolen from
+    # https://github.com/rspec/rspec-support/blob/v3.5.0/lib/rspec/support.rb#L121-L130
+    # under MIT license https://github.com/rspec/rspec-support/blob/v3.5.0/LICENSE.md
+    module AllExceptionsExceptOnesWeMustNotRescue
+      # These exceptions are dangerous to rescue as rescuing them
+      # would interfere with things we should not interfere with.
+      AVOID_RESCUING = [NoMemoryError, SignalException, Interrupt, SystemExit]
+
+      def self.===(exception)
+        AVOID_RESCUING.none? { |ar| ar === exception }
+      end
+    end
+
     def initialize(app, options)
       @app=app
       @options = options
@@ -16,7 +29,7 @@ module ApiHammer
     def call(env)
       begin
         @app.call(env)
-      rescue Exception => e
+      rescue AllExceptionsExceptOnesWeMustNotRescue => e
         full_error_message = (["#{e.class}: #{e.message}"] + e.backtrace.map{|l| "  #{l}" }).join("\n")
         if @options[:logger]
           @options[:logger].error(full_error_message)

data/lib/api_hammer/sinatra.rb

@@ -1,4 +1,9 @@
 require 'api_hammer/sinatra/halt'
+begin
+  require 'rack/accept'
+rescue LoadError => e
+  raise e.class, e.message + "\nPlease `gem install rack_accept` or add rack_accept to your Gemfile", e.backtrace
+end
 
 module ApiHammer
   module Sinatra
@@ -27,10 +32,6 @@ module ApiHammer
           use middleware, *args, &block
           use Rack::Lint if development? || test?
         end
-
-        # ApiHammer::Sinatra's methods use Rack::Accept so we will go ahead and put this middleware
-        # in the stack
-        klass.use_with_lint Rack::Accept
       end
     end
 
@@ -60,10 +61,11 @@ module ApiHammer
     # returns the first supported media type. 
     def response_media_type(options={})
       options = {:halt_if_unacceptable => false}.merge(options)
+      env = options[:env] || (respond_to?(:env) ? self.env : raise(ArgumentError, "must pass env"))
       accept = env['HTTP_ACCEPT']
       if accept =~ /\S/
         begin
-          best_media_type = env['rack-accept.request'].best_media_type(supported_media_types)
+          best_media_type = Rack::Accept::Request.new(env).best_media_type(supported_media_types)
         rescue RuntimeError => e
           # TODO: this is a crappy way to recognize this exception 
           raise unless e.message =~ /Invalid header value/
@@ -83,8 +85,10 @@ module ApiHammer
             supported_media_types.first
           end
         end
-      else
+      elsif supported_media_types && supported_media_types.any?
         supported_media_types.first
+      else
+        raise "No media types are defined. Please set supported_media_types."
       end
     end
 

data/lib/api_hammer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_hammer
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Ethan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2017-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -305,7 +305,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: an API tool