api_hammer 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4967ef9a4193e2caca1f27035eb81f81e1ed918
-  data.tar.gz: 61f6a27ec7f13762954656f841666dddc37c9a8c
+  metadata.gz: 1e01c987bb7ede49542371cb4d6c68a0ca529f5f
+  data.tar.gz: 719112d08117e9af8c03355067bd41b9cae51350
 SHA512:
-  metadata.gz: ea757b0f6203e080b27eee87ba0094db03a71bfc517f0c33223d37049bd2972ad2db6cf48601668bb2c20625628194bc5eb2897bfeb95d9df097fd2dae345cc7
-  data.tar.gz: 141e9a7c5aae36bedd0f1293c4faddae6621f6fa0d8b956ee44309a44628fad1245d012d9d9ad6c52ba233fca74465eb3b47187f479ce0d37583ca8e5b83138c
+  metadata.gz: 786a19ca358815f579ed7755c88df46bb272f9d37ed4e48b97eb9d2641fffdc7f35fcd09724ab8275b0b6986711fb455f17aa6b02cfb362fbed42288c5426342
+  data.tar.gz: 0f810365af6dc3d0f538963b3d5d7ba05b9eecce309d7ceb3e4e83dd329886c35cf2dbf6faa028eb6937985d3dd24ef6b7399ec2ec7ed5772f068e38bb3a437a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.13.1
+- ApiHammer::Sinatra class method use_with_lint
+- set up Rack::Accept middleware in sinatra as api hammer methods rely on that
+
 # v0.13.0
 - ApiHammer::Sinatra, with some useful sinatra methods
   - #halt, #halt_error, #halt_unprocessable_entity and friends

data/lib/api_hammer/rails/halt.rb

@@ -19,11 +19,11 @@ module ApiHammer::Rails
     attr_reader :body, :render_options
   end
 
-  unless instance_variables.any? { |iv| iv.to_s == '@halt_included' }
-    @halt_included = proc do |controller_class|
+  unless @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)
     end
-    (@on_included ||= Set.new) << @halt_included
   end
 
   # handle a raised ApiHammer::Halt or subclass and render it

data/lib/api_hammer/sinatra.rb

@@ -8,6 +8,32 @@ module ApiHammer
       end
     end
 
+    unless @sinatra_included_defined
+      @sinatra_included_defined = true
+      (@on_included ||= Set.new) << proc do |klass|
+        # set up self.supported_media_types
+        klass.define_singleton_method(:supported_media_types=) do |supported_media_types|
+          @supported_media_types = supported_media_types
+        end
+        klass.define_singleton_method(:supported_media_types) do
+          @supported_media_types
+        end
+
+        # causes a Rack::Lint middleware to be inserted before and after the given middleware to be used 
+        klass.define_singleton_method(:use_with_lint) do |middleware, *args, &block|
+          if (development? || test?) && (@middleware.empty? || @middleware.last.first != Rack::Lint)
+            use Rack::Lint
+          end
+          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
+
     # override Sinatra::Base#route_missing
     def route_missing
       message = I18n.t('app.errors.request.route_404',
@@ -19,18 +45,6 @@ module ApiHammer
 
     include ApiHammer::Sinatra::Halt
 
-    unless instance_variables.any? { |iv| iv.to_s == '@supported_media_types_included' }
-      @supported_media_types_included = proc do |klass|
-        klass.define_singleton_method(:supported_media_types=) do |supported_media_types|
-          @supported_media_types = supported_media_types
-        end
-        klass.define_singleton_method(:supported_media_types) do
-          @supported_media_types
-        end
-      end
-      (@on_included ||= Set.new) << @supported_media_types_included
-    end
-
     def supported_media_types
       self.class.supported_media_types
     end

data/lib/api_hammer/version.rb

@@ -1,3 +1,3 @@
 module ApiHammer
-  VERSION = "0.13.0"
+  VERSION = "0.13.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_hammer
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Ethan