log_spy 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87ce664150f376cd71aca737ccb28dc70dad3990
-  data.tar.gz: b4f87234b6561e55e4ee6afbb3ee0faa53920d0c
+  metadata.gz: 34268e22c164c45eca6f47b0b0c36f884fafa44e
+  data.tar.gz: 60f7eb5ad9eecbf8aa043cccaf29fbd50704756b
 SHA512:
-  metadata.gz: d8564baac75a081c8d39b01cf58c3118947543e4a348885916cafc4e3fb0b171e397e1df07e48095cfbf72768bdd21405e9661ec73efdf0d7bb0f1fbc8c7758a
-  data.tar.gz: 70401bafdc79eb89cfb7f6590c12e06fa041be34e64b24e3334748b6cdb19c37c3b5515415b2f99ea9c6862009dc34ecec3769411f012d53c9d15bfd4ce76968
+  metadata.gz: a02c0a56797fb22b04571a651f5947f02f94daecb9c63569e0ee34b42b3449825c16db65c9f0b32f4b41989336cdfc9dd889d6179ee77d05238c44be5e98a163
+  data.tar.gz: 382af23783237d1962b0b54b0bd810694457ea956f55c7ea4e037bb02359c9864c7ad384170afb4a08bd7ccbd145ae2a5a8814fabac161c385eee9f9bfc55715

data/History.md

@@ -0,0 +1,5 @@
+
+0.0.3 / 2014-09-04
+==================
+
+ * accomondate the case when `Rack::Request#body` not readable, fallback to env['RAW_POST_BODY'] if any

data/lib/log_spy/payload.rb

@@ -8,8 +8,6 @@ class LogSpy::Payload
   end
 
   def to_json
-    req_body = @req.content_type =~ /multipart/ ? '' : @req.body.read
-
     hash = {
       :path => @req.path,
       :status => @res.status,
@@ -20,7 +18,7 @@ class LogSpy::Payload
         :request_method => @req.request_method,
         :ip => @req.ip,
         :query_string => @req.query_string,
-        :body => req_body
+        :body => request_body
       }
     }
 
@@ -30,4 +28,11 @@ class LogSpy::Payload
 
     hash.to_json
   end
+
+  def request_body
+    return '' if @req.content_type =~ /multipart/
+    @req.body.read
+  rescue Exception => e
+    @req.env['RAW_POST_BODY']
+  end
 end

data/lib/log_spy/version.rb

@@ -1,3 +1,3 @@
 module LogSpy
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/payload_spec.rb

@@ -8,7 +8,7 @@ describe LogSpy::Payload do
   let(:query_string) { 'query-key=query-val' }
   let(:status) { 200 }
   let(:duration) { 335 }
-  let(:body) { double(:body, :read => 'the-raw-body') }
+  let(:body) { double(:body) }
   let(:content_type) { 'application/json' }
 
   let(:request) do 
@@ -48,14 +48,12 @@ describe LogSpy::Payload do
           :content_type => content_type,
           :request_method => request_method,
           :ip => ip,
-          :query_string => query_string,
-          :body => body.read
+          :query_string => query_string
         }
       }
     end
 
-    context "if no error" do
-      let(:payload) { LogSpy::Payload.new request, response, begin_at }
+    shared_examples 'ensure_payload_formats' do
       it 'returns correct format' do
         expect(payload.to_json).to eq(expected_hash.to_json)
       end
@@ -68,17 +66,54 @@ describe LogSpy::Payload do
       end
     end
 
-    context "if with error" do
+    shared_context "if_body_readable" do
+      before(:each) do
+        allow(body).to receive_messages(:read => 'the-raw-body') 
+        expected_hash[:request][:body] = 'the-raw-body'
+      end
+    end
+
+    shared_context 'if_body_unreadable' do
+      before(:each) do
+        allow(body).to receive(:read).and_raise(Exception, 'closed stream')
+        allow(request).to receive_messages(:env => { 'RAW_POST_BODY' => 'raw-post-body' })
+        expected_hash[:request][:body] = 'raw-post-body'
+      end
+    end
+
+    context "if request ends without error" do
+      let(:payload) { LogSpy::Payload.new request, response, begin_at }
+
+      context "if body can be read" do
+        include_context "if_body_readable"
+        include_examples 'ensure_payload_formats'
+      end
+
+      context "if body can not be read" do
+        include_context "if_body_unreadable"
+        include_examples 'ensure_payload_formats'
+      end
+
+    end
+
+    context "if request ends with error" do
       let(:payload) { LogSpy::Payload.new request, response, begin_at, error }
-      it 'returns error with message and backtrace' do
+      before :each do
         expected_hash[:error] = {
           :message => error.message,
           :backtrace => error.backtrace
         }
+      end
 
-        expect(payload.to_json).to eq(expected_hash.to_json) 
+      context "if request body can be read" do
+        include_context 'if_body_readable'
+        include_examples 'ensure_payload_formats'
+      end
+
+      context "if request body can not be read" do
+        include_context 'if_body_unreadable'
+        include_examples 'ensure_payload_formats'
       end
-      
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: log_spy
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Yang-Hsing Lin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -90,6 +90,7 @@ files:
 - .gitignore
 - .rspec
 - Gemfile
+- History.md
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -121,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: send rack application log to Amazon SQS