airborne_report 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 341027d5bc0c0b14f5909a55dd9ace77581024d6
-  data.tar.gz: a770921562e20a30f7872d40e83fd3e9fd61f352
+  metadata.gz: ed1c7456a4dd13090a4dae8e93b9f9a59ae4d36e
+  data.tar.gz: 9539721512253d96189ec9b90c7c77cd1d8bca4f
 SHA512:
-  metadata.gz: 8133f68adb5098ca288636bfa374a2dd477753c5e19c64e516766125e680485b39bd41733e47419cfef9de770995ed3b3540b9b51cb56627bcb7a57d4661e8cc
-  data.tar.gz: 4b9ee896cb80975d0183d6f917955188e1eb0b16671a65be2ff9c16e28a9be14543dc6c127502381e146b7746cca5a4633c0fc97d0e7eb142aa61ffe14949b3a
+  metadata.gz: 98a06ab9ea2344fa44e1d15bed80a72d7b756264b5ac1e36a1204a4dddab66fa58ac678e0e2a177388bb453fb6cf79cea89aaf1550879380ab2b893b5912c295
+  data.tar.gz: 8209349b2f1406fb7c2109e732291d4358b6d2902b5ee4c7f733abc4987d72bfb3db1e9c43465e52d80f13eadd74dc907ecfa7a96a4e1a04129c97aa50545335

data/.gitignore

@@ -11,4 +11,3 @@
 report.html
 report.json
 .byebug_history
-storage.json

data/README.md

@@ -22,7 +22,7 @@ Or install it yourself as:
     
 ## Usage
 
-```
+```ruby
 # spec/spec_helper.rb
 require 'airborne_report'
 ```

data/airborne_report.gemspec

@@ -29,4 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'byebug'
 end

data/lib/airborne_report.rb

@@ -1,5 +1,6 @@
 require 'airborne_report/version'
 require 'airborne_report/message'
+require 'airborne_report/storage/tests'
 
 module AirborneReport
 end
@@ -29,18 +30,14 @@ module Airborne
 
     def full_save(response)
       request = response.request
-      AirborneReport::JsonFile.push(
-        location,
-        AirborneReport::Message.full(request, response).to_hash
-      )
+      AirborneReport::Storage::Tests.find_or_create(location)
+        .push(AirborneReport::Message.full(request, response).to_hash)
     end
 
     def wasted_save(args, response)
       url = get_url(args[1])
-      AirborneReport::JsonFile.push(
-        location,
-        AirborneReport::Message.wasted(args, response, url).to_hash
-      )
+      AirborneReport::Storage::Tests.find_or_create(location)
+        .push(AirborneReport::Message.wasted(args, response, url).to_hash)
     end
 
     def location

data/lib/airborne_report/message.rb

@@ -1,5 +1,4 @@
 require 'multi_json'
-require 'airborne_report/json_file'
 
 module AirborneReport
   class Message
@@ -10,30 +9,36 @@ module AirborneReport
     def self.full(request, response)
       new(
         'time' => Time.now,
-        'request' => {
-          'method' => request.method,
-          'url' => request.url,
-          'headers' => request.headers,
-          'body' => request.args
-        },
         'response' => {
           'headers' => response.headers,
-          'body' => MultiJson.load(response)
+          'body' => load_response(response),
+          'request' => {
+            'method' => request.method,
+            'url' => request.url,
+            'headers' => request.headers,
+            'body' => request.args[:payload]
+          }
         }
       )
     end
 
+    def self.load_response(response)
+      MultiJson.load(response)
+    rescue MultiJson::ParseError
+      response
+    end
+
     def self.wasted(args, response, url)
       new(
         'time' => Time.now,
-        'request' => {
-          'method' => args[0],
-          'url' => url,
-          'headers' => args[2][:headers],
-          'body' => args[2][:body]
-        },
         'response' => {
-          'body' => response
+          'body' => response,
+          'request' => {
+            'method' => args[0],
+            'url' => url,
+            'headers' => args[2][:headers],
+            'body' => args[2][:body]
+          }
         }
       )
     end

data/lib/airborne_report/report.rb

@@ -11,7 +11,18 @@ module AirborneReport
 
       notification.examples.map do |example|
         location = example.metadata[:location]
-        after_json[location] = craft_example(before_json, location, example)
+
+        hash = {}
+        e = example.exception
+        if e
+          hash['exception'] =  {
+            'class' => e.class.name,
+            'message' => e.message,
+            'backtrace' => e.backtrace,
+          }
+        end
+
+        after_json[location] = craft_example(before_json, location, example).merge(hash)
         statuses = increment_statuses(statuses, example)
       end
 
@@ -35,7 +46,7 @@ module AirborneReport
 
     def craft_example(before_json, location, example)
       if before_json[location]
-        Message.extra(example).to_hash.merge(before_json[location])
+        Message.extra(example).to_hash.merge('responses' => before_json[location])
       else
         Message.extra(example).to_hash
       end

data/lib/airborne_report/rspec_html_formatter.rb

@@ -1,19 +1,14 @@
 require 'rspec/core/formatters/base_formatter'
 require 'haml'
-require 'airborne_report/json_file'
 require 'airborne_report/report'
+require 'airborne_report/storage/tests'
 
 module AirborneReport
   class RspecHtmlFormatter < RSpec::Core::Formatters::BaseFormatter
-    RSpec::Core::Formatters.register self, :start, :stop
-
-    def start(_notification)
-      AirborneReport::JsonFile.save(Report.blank)
-    end
+    RSpec::Core::Formatters.register self, :stop
 
     def stop(notification)
-      tests = AirborneReport::JsonFile.tests
-      AirborneReport::JsonFile.destroy
+      tests = AirborneReport::Storage::Tests.all
 
       report = Report.new(tests, notification).to_hash
       craft_html(report)

data/lib/airborne_report/rspec_json_formatter.rb

@@ -1,19 +1,14 @@
 require 'rspec/core/formatters/base_formatter'
 require 'multi_json'
-require 'airborne_report/json_file'
 require 'airborne_report/report'
+require 'airborne_report/storage/tests'
 
 module AirborneReport
   class RspecJsonFormatter < RSpec::Core::Formatters::BaseFormatter
-    RSpec::Core::Formatters.register self, :start, :stop
-
-    def start(_notification)
-      AirborneReport::JsonFile.save(Report.blank)
-    end
+    RSpec::Core::Formatters.register self, :stop
 
     def stop(notification)
-      tests = AirborneReport::JsonFile.tests
-      AirborneReport::JsonFile.destroy
+      tests = AirborneReport::Storage::Tests.all
 
       report = Report.new(tests, notification).to_hash
       craft_json(report)

data/lib/airborne_report/storage/tests.rb

@@ -0,0 +1,20 @@
+module AirborneReport
+  module Storage
+    module Tests
+      class << self
+        def find_or_create(location)
+          @tests ||= {}
+          unless @tests[location]
+            @tests[location] = []
+          end
+          @tests[location]
+        end
+
+        def all
+          @tests ||= {}
+          @tests
+        end
+      end
+    end
+  end
+end

data/lib/airborne_report/version.rb

@@ -1,3 +1,3 @@
 module AirborneReport
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/lib/airborne_report/view/report.html.haml

@@ -21,63 +21,56 @@
       %details
         %summary{class: "collapse #{example.last['status']}"}
           = example.last['full_description']
-        %div
+        %div{class: 'group'}
           %div{class: 'section'}
-          - if example.last['request'] && example.last['response']['body']
             %div
               %b path:
               = example.first
-            %div
-              %b time:
-              = example.last['time']
-            %div{class: 'section'}
-              %div
-                %b request.method:
-                = example.last['request']['method']
-              %div
-                %b request.url:
-                = example.last['request']['url']
-              %div
-                %b request.headers:
-                = example.last['request']['headers']
-              %div
-                %b request.body:
-                %xmp
-                  = example.last['request']['body']
-            %div{class: 'section'}
-              %div
-                %b response.headers:
-                = example.last['response']['headers']
-              %div
-                %b response.body:
-                %xmp
-                  = example.last['response']['body']
-          - elsif example.last['request']
-            %div
-              %b path:
-              = example.first
-            %div{class: 'section'}
+
+          - if example.last['responses']
+            - example.last['responses'].each do |response|
+              %div{class: 'group'}
+                - if response['response'] && response['response']['request']
+                  %div{class: 'section'}
+                    %div
+                      %b request.time:
+                      = response['time']
+                    %div
+                      %b request.method:
+                      = response['response']['request']['method']
+                    %div
+                      %b request.url:
+                      = response['response']['request']['url']
+                    %div
+                      %b request.headers:
+                      = response['response']['request']['headers']
+                    %div
+                      %b request.body:
+                      %xmp
+                        =response['response']['request']['body']
+                - if response['response']
+                  %div{class: 'section'}
+                    %div
+                      %b response.headers:
+                      = response['response']['headers']
+                    %div
+                      %b response.body:
+                      %xmp
+                        = response['response']['body']
+
+          - if example.last['exception']
+
+            %details
+              %summary{class: "collapse"}
+                = 'exception'
               %div
-                %b request.method:
-                = example.last['request']['method']
-              %div
-                %b request.url:
-                = example.last['request']['url']
-              %div
-                %b request.headers:
-                = example.last['request']['headers']
-              %div
-                %b request.body:
-                = example.last['request']['body']
-            %div{class: 'section'}
-              %div
-                Request failed
-          - elsif example.last['status'] == 'pending'
-            %div
-              %b path:
-              = example.first
-          - else
-            %div
-              %b path:
-              = example.first
-            Test failed
+                %div{class: 'group section'}
+                  %div
+                    %b exception.class:
+                    = example.last['exception']['class']
+                  %div
+                    %b exception.message:
+                    = example.last['exception']['message']
+                  %div
+                    %b exception.backtrace:
+                    = example.last['exception']['backtrace']

data/lib/airborne_report/view/style.css

@@ -39,3 +39,9 @@ summary:hover {
 .section {
     padding-top: 10px;
 }
+
+.group {
+    border: 1px solid black;
+    margin: 5px 0px;
+    padding: 0px 5px;
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: airborne_report
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Dmitry Efimov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airborne
@@ -94,6 +94,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This gem gives you RSpec formatters which let you generate HTML and JSON
   reports if you use the airborne gem for your integration tests.
 email:
@@ -112,11 +140,11 @@ files:
 - bin/console
 - bin/setup
 - lib/airborne_report.rb
-- lib/airborne_report/json_file.rb
 - lib/airborne_report/message.rb
 - lib/airborne_report/report.rb
 - lib/airborne_report/rspec_html_formatter.rb
 - lib/airborne_report/rspec_json_formatter.rb
+- lib/airborne_report/storage/tests.rb
 - lib/airborne_report/version.rb
 - lib/airborne_report/view/report.html.haml
 - lib/airborne_report/view/style.css

data/lib/airborne_report/json_file.rb

@@ -1,25 +0,0 @@
-require 'multi_json'
-
-module AirborneReport
-  class JsonFile
-    NAME = 'storage.json'.freeze
-
-    def self.save(json)
-      File.open(NAME, 'w') do |file|
-        file.write(MultiJson.dump(json))
-      end
-    end
-
-    def self.push(key, value)
-      save('tests' => tests.merge(key => value))
-    end
-
-    def self.tests
-      MultiJson.load(File.read(NAME))['tests']
-    end
-
-    def self.destroy
-      File.delete(NAME)
-    end
-  end
-end