mashape-analytics 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 250f90de0c62a79b8bb236f960e08d2bc8561901
-  data.tar.gz: a1cfe8f56a5aad8f5d37d31b92889547e5039acd
+  metadata.gz: 749a81257d08ac6fd003fea80ae9d24b7f2669da
+  data.tar.gz: 4dec0963179b2df21204485a642a632d26e1b31c
 SHA512:
-  metadata.gz: 750577b3c2cc0ffa9ca40e6c7a460bce92482fe120003f0bc40312d4fbbd2411bb8d4c48a658d2d3fcbdddb2ac16ed0e89c0a4fb04dfc5718eddd00eb7edf22d
-  data.tar.gz: 84f6dd47a13cdd9d169ac406958ec7bc0363df2a764d7f6b419ee404331d249fc7cc3e50531629000fdfe70998b30ec28a8348a50e4f43ac476b4ac193570cc7
+  metadata.gz: 2009bfccf93d9f9cf95295990ef275cb4deea653b76c517e5f6b90c31401e7e47bd9704966c5028708a9c4e22def41a85e573b84c27beb30e884f01a2a5295db
+  data.tar.gz: 93cae7d08cfcecbb7a57e881ee5e2b434ee4a97a0d6bf4226934103a9294520af2fd43d3a667149cc5b4aff034941c2a531f27411692a50520f8069fe920f810

data/README.md

@@ -19,6 +19,8 @@ bundle install
 
 ### Ruby on Rails
 
+Make sure to add `mashape-analytics` to your Gemfile.
+
 Open your `config/environment.rb` file, and within the `Rails::Initializer.run` block, add the middleware as below:
 
 ```ruby
@@ -31,6 +33,13 @@ end
 
 *In rails 4, put the `config.middleware.use` line in the `config/application.rb` file.*
 
+```ruby
+module MyApp
+  class Application < Rails::Application
+    config.middleware.use 'MashapeAnalytics::Frameworks::Rails', service_token: 'SERVICE_TOKEN', environment: 'production'
+  end
+end
+```
 
 ### Sinatra
 

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/lib/mashape-analytics/frameworks/rack.rb

@@ -29,11 +29,11 @@ module MashapeAnalytics::Frameworks
       status, headers, body = @app.call(env)
 
       if body.respond_to? :to_str
-        body = [body.to_str]
+        response_body = [body.to_str]
       elsif body.respond_to?(:body)
-        body = [body.body]
+        response_body = [body.body]
       elsif body.respond_to?(:each)
-        # do nothing
+        response_body = body
       else
         raise TypeError, "stringable or iterable required"
       end
@@ -41,7 +41,7 @@ module MashapeAnalytics::Frameworks
       record_alf startedDateTime, env, {
         :status => status,
         :headers => header_hash(headers),
-        :body => body
+        :body => response_body
       }
 
       [status, headers, body]
@@ -98,12 +98,27 @@ module MashapeAnalytics::Frameworks
         end
     end
 
+    def stream_size(stream)
+      size = nil
+      io = StringIO.new
+      begin
+        stream.write io
+        io.flush
+        size = io.size
+      ensure
+        io.close
+      end
+      size
+    end
+
     def request_content_size(request)
       if request['HTTP_CONTENT_LENGTH']
         request['HTTP_CONTENT_LENGTH'].to_i
       else
         if request['rack.input'].respond_to? :size
           request['rack.input'].size
+        elsif request['rack.input'].respond_to? :write
+          stream_size(request['rack.input'])
         else
           -1 # Not available
         end
@@ -126,10 +141,17 @@ module MashapeAnalytics::Frameworks
     end
 
     def response_content_size(response)
+      # puts 'BODY: ' << response[:body]
       if response[:headers]['Content-Length']
         response[:headers]['Content-Length'].to_i
       else
-        response[:body].inject(0) { |sum, b| sum + b.bytesize }
+        if response[:body].respond_to? :inject
+          response[:body].inject(0) { |sum, b| sum + b.bytesize }
+        elsif response[:body].respond_to? :write
+          stream_size(response[:body])
+        else
+          -1 # Not available
+        end
       end
     end
 
@@ -193,8 +215,12 @@ module MashapeAnalytics::Frameworks
         request['rack.input'].rewind
         entry[:request][:content][:text] = Base64.strict_encode64(request['rack.input'].read)
 
-        entry[:response][:content][:encoding] = 'base64'
-        entry[:response][:content][:text] = Base64.strict_encode64(response[:body].join())
+
+        # TODO Handle streams as well
+        if response[:body].respond_to? :join
+          entry[:response][:content][:encoding] = 'base64'
+          entry[:response][:content][:text] = Base64.strict_encode64(response[:body].join())
+        end
       end
 
       alf.add_entry entry

data/mashape-analytics.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: mashape-analytics 1.0.2 ruby lib
+# stub: mashape-analytics 1.0.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "mashape-analytics"
-  s.version = "1.0.2"
+  s.version = "1.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Kenneth Lee"]
-  s.date = "2015-06-25"
+  s.date = "2015-06-29"
   s.description = "The ruby agent reports API traffic to http://apianalytics.com"
   s.email = "kennethkl@gmail.com"
   s.extra_rdoc_files = [

data/test/test_rack.rb

@@ -13,6 +13,16 @@ class TestRack < MiniTest::Test
     Rack::MockRequest.new(stack)
   end
 
+  def compressed_app
+    app = proc do
+      sleep 0.05
+      [200, {'CONTENT-TYPE' => 'application/json'}, ['{"messages": "Test Response"}']]
+    end
+    stack = Rack::Deflater.new app
+    stack = MashapeAnalytics::Frameworks::Rack.new stack, service_token: 'SERVICE-TOKEN', host: @@host, send_body: @send_body
+    Rack::MockRequest.new(stack)
+  end
+
   def setup
     # Create our socket server
     @zmq_pull = zmq_pull_socket(@@host)
@@ -67,5 +77,18 @@ class TestRack < MiniTest::Test
     assert_entry_response_content entry, 'base64', 'eyJtZXNzYWdlcyI6ICJUZXN0IFJlc3BvbnNlIn0='
   end
 
+  should 'send ALF with compressed body' do
+    response = compressed_app.get('/get?foo=bar&empty', {'HTTP_ACCEPT' => 'application/json'})
+
+    version, message = @zmq_pull.recv.split(' ', 2)
+    alf = JSON.parse(message)
+
+    assert_ruby_agent alf
+
+    entry = alf['har']['log']['entries'].first
+    assert_entry_request entry, 'GET', 'http://example.org/get?foo=bar&empty'
+    assert_entry_response entry, 200, 99
+  end
+
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mashape-analytics
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Kenneth Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbczmq