minitest-match_json 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c4027d485fb16d15e957b930a8da529ab72cbe1
-  data.tar.gz: 23bbd0c28f7c4ca0428f880641b51fb3c34d8abc
+  metadata.gz: 27009176eb3e76417efbe93b3347432a98ef73f5
+  data.tar.gz: fdd7af554496ea29734494456fce808273054c39
 SHA512:
-  metadata.gz: b353ade92cb392f4f73611b6220b461c1ead810545a55ca44eef92b532d5fbd56f13709b41f0f7fb8c7ef694f30ce05226447d184b028b81727f84f7406a237b
-  data.tar.gz: 129aa8951a8953e668ef81c2d9943aa7fc9043d46bebd4ed8f1cb25c7c04dd676be336c2a02a49b2becd9e8b6806f564035ee7114cd9ecea01c1761c76da0cf4
+  metadata.gz: 7e0896d6f40a3790297fe882591c1696dcf505b508c8b5be2a477aed36a6700588f5920c477186b30d63b663f2e7b6569d7dd0eecc8e13a72af7329475dff5a8
+  data.tar.gz: 7d92f63a92b995f4c91d5b21f6cd233a0e5da9e603d3fea71b6d013d3819f1c94220054ab4a2fbdd6f33643ee978766c72766b98f157426f671ea2c014bce3d1

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in minitest-match_json.gemspec
 gemspec
+
+group :test do
+  gem 'codeclimate-test-reporter', require: nil
+end

data/README.md

@@ -1,6 +1,8 @@
 # Minitest::MatchJson
 
-Compare two JSON objects. If a String is passed in, it is expected to be valid JSON, any other type will be converted to json if possible.
+[![Build Status](https://travis-ci.org/ggordon/minitest-match_json.svg?branch=master)](https://travis-ci.org/ggordon/minitest-match_json) [![Gem Version](https://badge.fury.io/rb/minitest-match_json.svg)](http://badge.fury.io/rb/minitest-match_json) [![Code Climate](https://codeclimate.com/github/ggordon/minitest-match_json/badges/gpa.svg)](https://codeclimate.com/github/ggordon/minitest-match_json) [![Test Coverage](https://codeclimate.com/github/ggordon/minitest-match_json/badges/coverage.svg)](https://codeclimate.com/github/ggordon/minitest-match_json)
+
+Compare a JSON string to another JSON object. If a String is passed in, it is expected to be valid JSON, any other type will be converted to json if possible.
 
 ## Installation
 
@@ -24,7 +26,7 @@ Or install it yourself as:
 require 'minitest-match_json'
 ```
 
-[Diffy](https://github.com/samg/diffy) is used to compared the two JSON objects. Options to control the output format and number of context lines to be displayed can be passed through to Diffy.
+[Diffy](https://github.com/samg/diffy) is used to compare the two JSON objects. Options to control the output format and number of context lines to be displayed can be passed through to Diffy.
 
 ```ruby
 Minitest::MatchJson.configure do |config|

data/Rakefile

@@ -1,10 +1,16 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 
+namespace :coverage do
+  desc 'Delete previous coverage results'
+  task :clean do
+    rm_rf 'coverage'
+  end
+end
+
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
   t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
+  t.libs.push 'test'
 end
-
+task test: 'coverage:clean'
 task default: :test

data/lib/minitest/match_json.rb

@@ -9,27 +9,27 @@ module Minitest
   module MatchJson
     class << self
       attr_writer :configuration
-    end
 
-    def self.configuration
-      @configuration ||= Configuration.new
-    end
+      def configuration
+        @configuration ||= Configuration.new
+      end
 
-    def self.configure
-      yield configuration
-    end
+      def configure
+        yield configuration
+      end
 
-    def self.compare_json(actual_json, expected_json)
-      Diffy::Diff.new(
-        expected_json,
-        actual_json,
-        context: configuration.context
-      ).to_s(configuration.format)
-    end
+      def compare_json(actual_json, expected_json)
+        Diffy::Diff.new(
+          expected_json,
+          actual_json,
+          context: configuration.context
+        ).to_s(configuration.format)
+      end
 
-    def self.pretty_json(param)
-      json = (param.is_a?(String)) ? param : param.to_json
-      JSON.pretty_generate(JSON.parse(json))
+      def pretty_json(param)
+        json = (param.is_a?(String)) ? param : param.to_json
+        JSON.pretty_generate(JSON.parse(json))
+      end
     end
   end
 
@@ -73,6 +73,6 @@ module Minitest
     #
     #  Fails unless the subject and parameter are equivalent JSON
     #
-    infect_an_assertion :assert_match_json, :must_match_json
+    String.infect_an_assertion :assert_match_json, :must_match_json, true
   end
 end

data/lib/minitest/match_json/version.rb

@@ -1,6 +1,6 @@
 module Minitest
   # JSON matchers
   module MatchJson
-    VERSION = '0.1.0'
+    VERSION = '0.2.0'
   end
 end

data/minitest-match_json.gemspec

@@ -25,5 +25,4 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'simplecov'
 end

data/test/minitest/match_json_test.rb

@@ -1,9 +1,4 @@
-require 'simplecov'
-SimpleCov.start
-
-gem 'minitest'
-require 'minitest/autorun'
-require 'minitest/match_json'
+require 'test_helper'
 
 describe Minitest do
   describe 'Configuration' do
@@ -28,12 +23,40 @@ describe Minitest do
       json = '{"a": 2, "b": 4}'
       begin
         json.must_match_json 2
-      rescue MiniTest::Assertion
-        pass
+      rescue MiniTest::Assertion => expected_failure
+        expected_failure.message.must_match /Parameter cannot be converted to JSON/
       end
     end
 
-    it 'returns a default result when failing' do
+    it 'returns a default result when failing with assert' do
+      Minitest::MatchJson.configure do |config|
+        config.format = :text
+      end
+
+      json = '{"b": 5}'
+      hash = { b: 4 }
+
+      out, _ = capture_io do
+        begin
+          assert_match_json json, hash
+        rescue MiniTest::Assertion
+          pass
+        end
+      end
+      out.must_equal(<<STR
+
+ {
+-  \"b\": 5
++  \"b\": 4
+ }
+\
+
+STR
+      )
+    end
+
+
+    it 'returns a default result when failing with spec' do
       Minitest::MatchJson.configure do |config|
         config.format = :text
       end
@@ -51,8 +74,8 @@ describe Minitest do
       out.must_equal(<<STR
 
  {
--  \"b\": 4
-+  \"b\": 5
+-  \"b\": 5
++  \"b\": 4
  }
 \
 
@@ -79,8 +102,8 @@ STR
       out.must_equal(<<STR
 
    \"a\": 3,
--  \"b\": 4,
-+  \"b\": 5,
+-  \"b\": 5,
++  \"b\": 4,
    \"c\": 5
 
 STR
@@ -105,8 +128,8 @@ STR
       out.must_equal(<<STR
 
  {
-\e[31m-  \"b\": 4\e[0m
-\e[32m+  \"b\": 5\e[0m
+\e[31m-  \"b\": 5\e[0m
+\e[32m+  \"b\": 4\e[0m
  }
 \
 

data/test/test_helper.rb

@@ -0,0 +1,10 @@
+require 'codeclimate-test-reporter'
+CodeClimate::TestReporter.configuration.git_dir = '.'
+CodeClimate::TestReporter.start
+
+require 'simplecov'
+SimpleCov.start
+
+gem 'minitest'
+require 'minitest/autorun'
+require 'minitest/match_json'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: minitest-match_json
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Gary Gordon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-19 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.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'
 description: Compare two JSON objects with pretty diffs
 email:
 - gfgordon@gmail.com
@@ -113,6 +99,7 @@ files:
 - lib/minitest/match_json/version.rb
 - minitest-match_json.gemspec
 - test/minitest/match_json_test.rb
+- test/test_helper.rb
 homepage: http://ggordon.github.io/minitest-match_json
 licenses:
 - MIT
@@ -139,3 +126,4 @@ specification_version: 4
 summary: Compare two JSON objects
 test_files:
 - test/minitest/match_json_test.rb
+- test/test_helper.rb