simplecov-oj 0.18.2 → 0.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb418a561162036e2741a76baef6dba8ab9339c915970f32428232127e0dce86
-  data.tar.gz: 798f34594159560b6f64fd0f69b799c2a428add53275e88d292622244ccf3433
+  metadata.gz: c79725e77c65ffc720f386f1fc92a5bb131c3ed85253f5020b211397cf51c864
+  data.tar.gz: 41c1cf717b408c4b6e8e7abf1504178d2d020b662d6a256cd55b7477d301ab4c
 SHA512:
-  metadata.gz: 13a883c1bc3c5e070262350b838a6ba9ef777b6e4b67b6549a1b63d1c2a8e6b1ea7c507391e9150f5b86a1863f8fed31b2444e0bae5c09a8ba591d3b980feec1
-  data.tar.gz: 3c028c0280f7eba299e0ffc2d3143c4fb415d00ea7e09a1bb223684d2bcbd4b3a9e4f23d7a6aaed331f3207b3312cf20b9f4316069629bef4140f7ffd956fb29
+  metadata.gz: ea9788ab04d7a288938cfd83298991d94b24801acfe9397809345a0c200ad5e2c05ffde92e6079477bdbe2806cdac203f59c9f9767998c94ec6a5d1f91a92f1f
+  data.tar.gz: 1a5cc01c0056abada359228d2681fb50d67c2a17f75597241908e33b4004d06c5b3804ed60b353489105cad1ff81dd98cc3108c4fe1d1ae412433e5406deec9a

data/lib/simple_cov/formatter/oj_formatter.rb

@@ -42,14 +42,9 @@ module SimpleCov
         json
       end
 
-      # @private
-      def output_filename
-        FILE_NAME
-      end
-
       # @private
       def output_filepath
-        File.join(SimpleCov.coverage_path, output_filename)
+        File.join(SimpleCov.coverage_path, FILE_NAME)
       end
     end
   end

data/lib/simple_cov/oj/source_file_wrapper.rb

@@ -39,11 +39,18 @@ module SimpleCov
 
       # @private
       def coverage_data
-        if SimpleCov::SourceFile.instance_methods.include?(:coverage_data)
-          source_file.coverage_data
-        else
-          source_file.coverage
-        end
+        return coverage if coverage.is_a?(Array)
+
+        coverage['lines']
+      end
+
+      def coverage
+        @coverage ||=
+          if SimpleCov::SourceFile.instance_methods.include?(:coverage_data)
+            source_file.coverage_data
+          else
+            source_file.coverage
+          end
       end
 
       # @private

data/lib/simple_cov/oj/version.rb

@@ -9,6 +9,6 @@ module SimpleCov
   module Oj
     #
     # @return [String] the current version of the gem
-    VERSION = '0.18.2'
+    VERSION = '0.18.3'
   end
 end

data/spec/simple_cov/formatter/oj_formatter_spec.rb

@@ -1,19 +1,21 @@
 # frozen_string_literal: true
 
 RSpec.describe SimpleCov::Formatter::OjFormatter do
-  let(:formatter)     { described_class.new }
-  let(:result)        { instance_double(SimpleCov::Result) }
-  let(:command_name)  { 'RSpec' }
-  let(:created_at)    { Time.now.to_s }
-  let(:foo)           { instance_double(SimpleCov::SourceFile) }
-  let(:foo_line_list) { instance_double(Array) }
-  let(:bar)           { instance_double(SimpleCov::SourceFile) }
-  let(:bar_line_list) { instance_double(Array) }
+  let(:formatter)         { described_class.new }
+  let(:result)            { instance_double(SimpleCov::Result) }
+  let(:command_name)      { 'RSpec' }
+  let(:created_at)        { Time.now.to_s }
+  let(:foo)               { instance_double(SimpleCov::SourceFile) }
+  let(:foo_line_list)     { instance_double(Array) }
+  let(:foo_coverage_data) { [1, nil, 0, 0, nil, 1, nil] }
+  let(:bar)               { instance_double(SimpleCov::SourceFile) }
+  let(:bar_line_list)     { instance_double(Array) }
+  let(:bar_coverage_data) { [nil, 1, nil, 1, 1, 1, 0, 0, nil, 1, nil] }
 
   describe '#format' do
     subject(:format) { formatter.format(result) }
 
-    let(:formatted_hash) do
+    let(:expected_hash) do
       {
         'timestamp' => created_at.to_i,
         'command_name' => 'RSpec',
@@ -53,9 +55,9 @@ RSpec.describe SimpleCov::Formatter::OjFormatter do
       allow(foo).to receive(:filename).twice.and_return('/lib/foo.rb')
       allow(foo).to receive(:covered_percent).and_return(50.0)
       if SimpleCov::SourceFile.instance_methods.include?(:coverage_data)
-        allow(foo).to receive(:coverage_data).and_return([1, nil, 0, 0, nil, 1, nil])
+        allow(foo).to receive(:coverage_data).and_return(foo_coverage_data)
       else
-        allow(foo).to receive(:coverage).and_return([1, nil, 0, 0, nil, 1, nil])
+        allow(foo).to receive(:coverage).and_return(foo_coverage_data)
       end
       allow(foo).to receive(:covered_strength).twice.and_return(0.50)
       allow(foo).to receive(:covered_lines).and_return(foo_line_list)
@@ -66,9 +68,9 @@ RSpec.describe SimpleCov::Formatter::OjFormatter do
       allow(bar).to receive(:filename).twice.and_return('/lib/bar.rb')
       allow(bar).to receive(:covered_percent).and_return(71.42)
       if SimpleCov::SourceFile.instance_methods.include?(:coverage_data)
-        allow(bar).to receive(:coverage_data).and_return([nil, 1, nil, 1, 1, 1, 0, 0, nil, 1, nil])
+        allow(bar).to receive(:coverage_data).and_return(bar_coverage_data)
       else
-        allow(bar).to receive(:coverage).and_return([nil, 1, nil, 1, 1, 1, 0, 0, nil, 1, nil])
+        allow(bar).to receive(:coverage).and_return(bar_coverage_data)
       end
       allow(bar).to receive(:covered_strength).twice.and_return(0.71)
       allow(bar).to receive(:covered_lines).and_return(bar_line_list)
@@ -77,6 +79,13 @@ RSpec.describe SimpleCov::Formatter::OjFormatter do
       allow(bar_line_list).to receive(:count).and_return(5)
     end
 
-    it { is_expected.to eq(formatted_hash) }
+    it { is_expected.to be_json_eql(expected_hash) }
+
+    context 'when coverage_data is a hash with the key `lines:`' do
+      let(:foo_coverage_data) { { lines: [1, nil, 0, 0, nil, 1, nil] } }
+      let(:bar_coverage_data) { { lines: [nil, 1, nil, 1, 1, 1, 0, 0, nil, 1, nil] } }
+
+      it { is_expected.to be_json_eql(expected_hash) }
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,17 @@
 # frozen_string_literal: true
 
-require 'simplecov-oj'
+require 'bundler/setup'
+require 'simplecov'
+
 require 'pry'
+require 'rspec'
+require 'json_spec'
+
+require 'simplecov-oj'
+
+RSpec.configure do |config|
+  config.include JsonSpec::Helpers
+end
 
 RSpec.configure do |config|
   config.define_derived_metadata do |meta|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simplecov-oj
 version: !ruby/object:Gem::Version
-  version: 0.18.2
+  version: 0.18.3
 platform: ruby
 authors:
 - Mikael Henriksson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-02 00:00:00.000000000 Z
+date: 2020-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -92,6 +92,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: json_spec
+  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: rake
   requirement: !ruby/object:Gem::Requirement
@@ -120,6 +134,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: simplecov-json
+  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: github-markup
   requirement: !ruby/object:Gem::Requirement