api_hammer 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdd05fc523d6412474d2f8e7e9391ae957eeb322
-  data.tar.gz: 5cd309f7d6e4b0df81dfb601bcec2ff6e228afe9
+  metadata.gz: 32321326726e5c0d8d195dfb62c59fbaeb6837ec
+  data.tar.gz: f770e32fc9bd8ee16d1f17d6c30b4dceeca03131
 SHA512:
-  metadata.gz: 3c0a8f2cb93d538ae70d6061abd1021d8c0b3b95c6f1e340e2e28e7f321e28d91f1affee9ef990c6eae2923402cb30cb8c66883707cfdfce8ce2edc08e1b12db
-  data.tar.gz: 7011a6bc4b70966eeddad76af884e2c821e1b77be9aeacaee76222fed61818aaa545f3e5e43382173576f5a6851b904af45c5ae18f076ae15417db23e6cf6dcb
+  metadata.gz: 843b147c0c7d60776834ffe0ea3d2c9e8c25e42558ea398df825478217969309af8700a2cbafe3ffc1f885a61adcbb183d80a495881a664b508850aa94a00cc5
+  data.tar.gz: 2202a0ebb1fbf519a37ecd5ab223418a3e38254616c7367d1dbb0da8b1c72fd1d860db831fa5031012949bc49a81284b224dfb22500f98d93bece4c010c84216

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.12.0
+- hc --input option
+- rails 4 support for unmunged_request_params
+
 # v0.11.1
 - bugfix trailingnewline
 

data/bin/hc

@@ -7,6 +7,7 @@ require 'rubygems'
 require 'faraday'
 require 'logger'
 require 'yaml'
+require 'pathname'
 
 require 'api_hammer/faraday/outputter'
 require 'api_hammer/version'
@@ -47,6 +48,9 @@ opt_parser = OptionParser.new do |opts|
   opts.on("-o", "--output OUTPUT", "write response to file") do |v|
     $options[:output] = v
   end
+  opts.on("--input INPUT", "read request body from file") do |v|
+    $options[:input] = v
+  end
   opts.on("--oauth-token TOKEN", "OAuth 1.0 token") do |token|
     $oauth[:token] = token
   end
@@ -97,6 +101,12 @@ end
 
 httpmethod, url, body = *ARGV
 
+if $options[:input] == '-'
+  body = STDIN.read
+elsif $options[:input]
+  body = Pathname.new($options[:input]).read
+end
+
 unless url['://']
   url = 'http://' + url
 end

data/lib/api_hammer/unmunged_request_params.rb

@@ -7,10 +7,19 @@ module ApiHammer::Rails
     # TODO when we are on a rails which has ActionDispatch::Request::Utils.perform_deep_munge, use that instead
     # of clobbering methods
     @unmunged_params ||= Thread.exclusive do
-      unless ActionDispatch::Request.method_defined?(:real_deep_munge)
-        ActionDispatch::Request.send(:alias_method, :real_deep_munge, :deep_munge)
+      if ActionDispatch::Request.const_defined?(:Utils) && ActionDispatch::Request::Utils.respond_to?(:deep_munge)
+        # rails 4
+        deep_munge_owner = (class << ActionDispatch::Request::Utils; self; end)
+      else
+        # rails 3
+        deep_munge_owner = ActionDispatch::Request
       end
-      ActionDispatch::Request.send(:define_method, :deep_munge) { |hash| hash }
+
+      unless deep_munge_owner.method_defined?(:real_deep_munge)
+        deep_munge_owner.send(:alias_method, :real_deep_munge, :deep_munge)
+      end
+      deep_munge_owner.send(:define_method, :deep_munge) { |hash| hash }
+
       begin
         unmunged_params = nil
         newenv = request.env.merge('action_dispatch.request.request_parameters' => nil)
@@ -19,7 +28,7 @@ module ApiHammer::Rails
         end).call(newenv)
         unmunged_params || ActionDispatch::Request.new(newenv).request_parameters
       ensure
-        ActionDispatch::Request.send(:alias_method, :deep_munge, :real_deep_munge)
+        deep_munge_owner.send(:alias_method, :deep_munge, :real_deep_munge)
       end
     end
   end

data/lib/api_hammer/version.rb

@@ -1,3 +1,3 @@
 module ApiHammer
-  VERSION = "0.11.1"
+  VERSION = "0.12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: api_hammer
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Ethan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-27 00:00:00.000000000 Z
+date: 2016-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack