api_hammer 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 389df34af6fc825bf80bd8460ec43ca7ea626d52
-  data.tar.gz: ad21026ef421554be76e50158c4fe438c9ac2f61
+  metadata.gz: e91b96d24872a1d8bed529e435ee220fedc2f90e
+  data.tar.gz: 79efc1dc82362fa52906e83314b1ce10e0a2872f
 SHA512:
-  metadata.gz: fbc5733ba3f575fce86e74b469c3996884c5a6a8f5a622d47008b4635d5f443fe61d91d24697b964138995337306d8e20777e5d834cd51f554bd41542d06ebfe
-  data.tar.gz: f29386f32c2a6d89bc78661ea05c494b25576c59a4c8e7448af6994e44287074c068b662fb2e3bf73dabd15ae2745d871e42959690d1853c02304f13b7dc2e6b
+  metadata.gz: 465349874c9e57aa860d70de8bee3386b4497bbc06adae9242e6b9ee16afd629f424a76d5b5693ac11a484ee82993ec7b619cf85cd4550be8562c1e9ada0ec64
+  data.tar.gz: ca74a38d500888996b05a558815f9d0b59217dd46dc12195467c911db9bc869e1ff9d514036a302264694d4465095cda8faabae368a9c37d9551dacbf0d79031

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.18.1
+- improve supported media types for sinatra
+- report to Rollbar on 4xx if Rollbar available
+
 # v0.18.0
 - add option to hc for basic auth
 - add option to hc to make it consider the body as text

data/gemfiles/Gemfile_rack_1

@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'byebug'
 gem 'wwtd'
 
 gem 'rack', '~> 1.0'
@@ -10,4 +9,5 @@ gem 'actionpack', '~> 4.0'
 
 if RUBY_VERSION == '2.0.0'
   gem 'nokogiri', '~> 1.6.8'
+  gem 'public_suffix', '~> 2.0'
 end

data/gemfiles/Gemfile_rack_2

@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'byebug'
 gem 'wwtd'
 
 gem 'rack', '~> 2.0'

data/lib/api_hammer/halt_methods.rb

@@ -31,6 +31,9 @@ module ApiHammer
         end
       end
       body['error_message'] = error_message if error_message
+      if Object.const_defined?(:Rollbar) and status != 404
+        Rollbar.debug "Service halted with status #{status}", status: status, body: body, halt_options: halt_options
+      end
       halt(status, body, halt_options)
     end
 

data/lib/api_hammer/rails/halt.rb

@@ -3,7 +3,7 @@ require 'api_hammer/halt_methods'
 # the contents of this file are to let you halt a controller in its processing without having to have a 
 # return in the actual action. this lets helper methods which do things like parameter validation halt.
 #
-# it is desgined to function similarly to Sinatra's handling of throw(:halt), but is based around exceptions 
+# it is designed to function similarly to Sinatra's handling of throw(:halt), but is based around exceptions 
 # because rails doesn't catch anything, just rescues. 
 
 module ApiHammer::Rails

data/lib/api_hammer/sinatra.rb

@@ -46,8 +46,11 @@ module ApiHammer
 
     include ApiHammer::Sinatra::Halt
 
+    # supported_media_types may be defined for the instance (applying to one request) or on the class
+    # (applying to the whole sinatra app)
+    attr_writer :supported_media_types
     def supported_media_types
-      self.class.supported_media_types
+      instance_variable_defined?(:@supported_media_types) ? @supported_media_types : self.class.supported_media_types
     end
 
     # finds the best match (highest q) for those supported_media_types indicated as acceptable by the Accept header. 
@@ -62,6 +65,7 @@ module ApiHammer
     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"))
+      supported_media_types = options[:supported_media_types] || self.supported_media_types
       accept = env['HTTP_ACCEPT']
       if accept =~ /\S/
         begin
@@ -92,8 +96,8 @@ module ApiHammer
       end
     end
 
-    def check_accept
-      response_media_type(:halt_if_unacceptable => true)
+    def check_accept(options = {})
+      response_media_type(options.merge(:halt_if_unacceptable => true))
     end
 
     # returns a rack response with the given object encoded in the appropriate format for the requests. 
@@ -107,6 +111,12 @@ module ApiHammer
         body = case response_media_type
         when 'application/json'
           JSON.pretty_generate(body_object)
+        when 'application/x-www-form-urlencoded'
+          URI.encode_www_form(body_object)
+        when 'application/xml'
+          body_object.to_s
+        when 'text/plain'
+          body_object
         else
           # :nocov:
           raise NotImplementedError, "unsupported response media type #{response_media_type}"

data/lib/api_hammer/version.rb

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

data/test/helper.rb

@@ -4,7 +4,6 @@ require 'bundler'
 Bundler.setup
 
 require 'simplecov'
-require 'byebug'
 
 # NO EXPECTATIONS 
 ENV["MT_NO_EXPECTATIONS"] = ''

metadata

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