tolerate_json 0.0.3 → 0.0.4

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZDEyYzEyMzYxYTA4YjQzYmQ5NzcwOGIzYmE1M2E2MDg2ZjZkY2JkYQ==
+  data.tar.gz: !binary |-
+    MGQwYzBiNTg3MzZkZWQ2YTM4ODliYzE1NzFkOTg2OWU5OWViYjY2Mg==
+SHA512:
+  metadata.gz: !binary |-
+    NjczNzdkNjYwNTBlY2UxMTZmOGI0M2FkNzk1Yjg0Y2ZiNTYwNTIxMzMwNzQz
+    Nzg0MzU1M2RhMmY5NjczZDFiNDYzYTM3NDk4Yzc5ZTg3YzE0OWVkMDA1OWRk
+    Yjc2YjcxZDQyODM3NThmMDYzMTJhNGEyNDU4NTVmOWNkOGU0ZjA=
+  data.tar.gz: !binary |-
+    Y2NjZDJmOWI4NGJiZDFhOTE4ZGMzYjhkZWZlMWNlOWU2MDViNjVkNjljMTA4
+    ODMxNjFlMjE1N2MzNDI4MzJjNzNiZWNmZTE0YjU5OTFkNzgyNTYxZmEzZmYz
+    NTg1ZWYxNWVmMGE1NGNjM2EyODMzMWZhM2JiNjMwNjAwYjUxOWE=

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
+  - 2.1.0
   - 2.0.0
   - 1.9.3
-  - 1.9.2
   - rbx-18mode
   - rbx-19mode
   - 1.8.7

data/README.md

@@ -12,28 +12,39 @@ It is a "90%" solution: it works in 90% of use cases, but will almost certainly
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Either add `gem 'tolerate_json'` to your application's Gemfile and do `bundle install`, or install it manually with `gem install tolerate_json`
 
-    gem 'tolerate_json'
+## Usage
 
-And then execute:
+### Include the module
 
-    $ bundle
+```ruby
+  require 'rubygems' # optional on 1.9.3 and up
 
-Or install it yourself as:
+  require 'tolerate_json'
 
-    $ gem install tolerate_json
+  include TolderateJson
 
-## Usage
+  puts pretty_print_json('{"foo":{"bar":"baz"}}')
+
+  # Prints:
+  #
+  # {
+  #    "foo":{
+  #      "bar":"baz"
+  #    }
+  # }
+  #
+```
+
+### Use it directly from the class
 
 ```ruby
   require 'rubygems' # optional on 1.9.3 and up
 
   require 'tolerate_json'
 
-  include TolderateJson
-
-  puts pretty_print_json('{"foo":{"bar":"baz"}}')
+  puts TolderateJson.pretty_print_json('{"foo":{"bar":"baz"}}')
 
   # Prints:
   #

data/lib/tolerate_json.rb

@@ -1,42 +1,56 @@
 require "tolerate_json/version"
 
 module TolerateJson
-  def pretty_print_json(json, indentation_character = '  ')
-    return json if json.to_s.size < 1
-
-    json.gsub!("\r\n", '')
-    json.gsub!("\n", '')
-    json.gsub!("\r", '')
+  module Formatter
+    def self.format_json_string(json, indentation_character=nil)
+      indentation_character ||= '  '
+      return json if json.to_s.size < 1
+
+      json.gsub!("\r\n", '')
+      json.gsub!("\n", '')
+      json.gsub!("\r", '')
+
+      if json.match(/[^\n]\}$/)
+        json.gsub!(/\}$/, "\n}")
+        json.gsub!(/\}\}/, "}\n}")
+      end
 
-    if json.match(/[^\n]\}$/)
-      json.gsub!(/\}$/, "\n}")
-      json.gsub!(/\}\}/, "}\n}")
-    end
+      if json.match(/[^\n]\]$/)
+        json.gsub!(/\]$/, "\n]")
+      end
 
-    if json.match(/[^\n]\]$/)
-      json.gsub!(/\]$/, "\n]")
-    end
+      json = json.to_s.gsub(/\{[\s+]\"/, "{\"").gsub(/\{(\s+)\"/, "{\"").gsub(/\"(\s+)\}/, "\"}").gsub(/true(\s+)\}/, "true}").gsub(/false(\s+)\}/, "false}").gsub(/\",(\s+)\"/, '","')
 
-    json = json.to_s.gsub(/\{[\s+]\"/, "{\"").gsub(/\{(\s+)\"/, "{\"").gsub(/\"(\s+)\}/, "\"}").gsub(/true(\s+)\}/, "true}").gsub(/false(\s+)\}/, "false}").gsub(/\",(\s+)\"/, '","')
+      json = json.gsub("},", "},\n").gsub("],", "],\n").gsub("{[", "{\n[").gsub("}]", "}\n]").gsub("[{", "[\n{").gsub("]}", "]\n}").gsub("{\"", "{\n\"").gsub("\"}", "\"\n}").gsub("\",\"", "\",\n\"").gsub(":true,\"", ":true,\n\"").gsub(":false,\"", ":false,\n\"").gsub(":true}", ":true\n}").gsub(":false}", ":false\n}").gsub(/:(\d+)}/) { ":#{$1}\n}" }.gsub(/\:(\d+),\"/) { ":#{$1},\n\"" }.gsub(/\:(\d+),\"/,":\1,\n\"")
 
-    json = json.gsub("},", "},\n").gsub("],", "],\n").gsub("{[", "{\n[").gsub("}]", "}\n]").gsub("[{", "[\n{").gsub("]}", "]\n}").gsub("{\"", "{\n\"").gsub("\"}", "\"\n}").gsub("\",\"", "\",\n\"").gsub(":true,\"", ":true,\n\"").gsub(":false,\"", ":false,\n\"").gsub(":true}", ":true\n}").gsub(":false}", ":false\n}").gsub(/:(\d+)}/) { ":#{$1}\n}" }.gsub(/\:(\d+),\"/) { ":#{$1},\n\"" }.gsub(/\:(\d+),\"/,":\1,\n\"")
+      # don't put a CR in empty arrays
+      json = json.gsub(/\[\n\s*\]/, '[]')
 
-    output = []
+      output = []
 
-    indent_level = 0
-    json.split("\n").each do |s|
-      indent_level -= 1 if ["]", "}"].include?(s.split('').first) && indent_level > 0
-      output << (indentation_character*indent_level) + s
-      if ["{", "["].include?(s.split('').last)
-        indent_level += 1
-        next
-      end
+      indent_level = 0
+      json.split("\n").each do |s|
+        indent_level -= 1 if ["]", "}"].include?(s.split('').first) && indent_level > 0
+        output << (indentation_character*indent_level) + s
+        if ["{", "["].include?(s.split('').last)
+          indent_level += 1
+          next
+        end
 
-      if ["{", "["].include?(s.split('').first)
-        indent_level += 1
-        next
+        if ["{", "["].include?(s.split('').first)
+          indent_level += 1
+          next
+        end
       end
+      output.join("\n")+"\n"
     end
-    output.join("\n")+"\n"
+  end
+
+  def pretty_print_json(json, indentation_character=nil)
+    TolerateJson::Formatter.format_json_string(json, indentation_character)
+  end
+
+  def self.pretty_print_json(json, indentation_character=nil)
+    TolerateJson::Formatter.format_json_string(json, indentation_character)
   end
 end

data/lib/tolerate_json/version.rb

@@ -1,3 +1,3 @@
 module TolerateJson
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/lib/tolerate_json/formatter_spec.rb

@@ -0,0 +1,104 @@
+require 'spec_helper'
+require 'tolerate_json'
+
+describe TolerateJson::Formatter do
+
+  describe "pretty_print_json" do
+
+    it "should format simple json" do
+      unformatted = '{"foo":"bar"}'
+      formatted= "{\n  \"foo\":\"bar\"\n}\n"
+
+      expect(subject.format_json_string(unformatted)).to eq(formatted)
+    end
+
+    it "should format complex json" do
+      unformatted = '{"foo":"bar","boolean":true,"Numbers":12345,"baz":"quz"}'
+      formatted= "{\n  \"foo\":\"bar\",\n  \"boolean\":true,\n  \"Numbers\":12345,\n  \"baz\":\"quz\"\n}\n"
+
+      expect(subject.format_json_string(unformatted)).to eq(formatted)
+    end
+
+    describe 'arrays' do
+      context 'array is empty' do
+        it "should not add a cr between the square braces of an empty array" do
+          unformatted = "{\"foo\":[]}"
+          formatted= "{\n  \"foo\":[]\n}\n"
+
+          expect(subject.format_json_string(unformatted)).to eq(formatted)
+        end
+      end
+
+      context 'array is not empty' do
+        it "should put the last square bracket on its own line" do
+          unformatted = '["foo", "bar", "baz"]'
+          formatted= "[\"foo\",\n  \"bar\",\n  \"baz\"\n]\n"
+
+          expect(subject.format_json_string(unformatted)).to eq(formatted)
+        end
+      end
+    end
+
+    describe 'hashes' do
+      context 'hash is empty' do
+        it "should not add a cr between the curly braces of an empty hash" do
+          unformatted = "{\"foo\":{}}"
+          formatted= "{\n  \"foo\":{}\n}\n"
+
+          expect(subject.format_json_string(unformatted)).to eq(formatted)
+        end
+      end
+
+      context 'hash is not empty' do
+        it "should put the last curly brace on its own line" do
+          unformatted = '{"foo":"bar"}'
+          formatted= "{\n  \"foo\":\"bar\"\n}\n"
+
+          expect(subject.format_json_string(unformatted)).to eq(formatted)
+        end
+      end
+    end
+
+    it "should indent nested structures" do
+      unformatted = '{"foo":{"bar":"baz"}}'
+      formatted= "{\n  \"foo\":{\n    \"bar\":\"baz\"\n  }\n}\n"
+
+      expect(subject.format_json_string(unformatted)).to eq(formatted)
+    end
+
+    it "should separate concurrant curly braces with a cr" do
+      unformatted = '{"qux":{"foo":{"bar":"baz"}}, "quux":"quuux"}'
+      formatted= "{\n  \"qux\":{\n    \"foo\":{\n      \"bar\":\"baz\"\n    }\n  },\n   \"quux\":\"quuux\"\n}\n"
+
+      expect(subject.format_json_string(unformatted)).to eq(formatted)
+    end
+
+    it "should separate numbers and closing curly braces with cr" do
+      unformatted = '{"qux":{"foo":1}, "quux":"quuux"}'
+      formatted= "{\n  \"qux\":{\n    \"foo\":1\n  },\n   \"quux\":\"quuux\"\n}\n"
+
+      expect(subject.format_json_string(unformatted)).to eq(formatted)
+    end
+
+    it "should include only one cr at the end of the result" do
+      unformatted = "{}\n\n\n"
+      formatted= "{\n}\n"
+
+      expect(subject.format_json_string(unformatted)).to eq(formatted)
+    end
+
+    it "should remove any newlines in the input" do
+      unformatted = "{\n\"foo\"\n:{\"bar\":\"baz\"}\n\n\n\n\n}"
+      formatted= "{\n  \"foo\":{\n    \"bar\":\"baz\"\n  }\n}\n"
+
+      expect(subject.format_json_string(unformatted)).to eq(formatted)
+    end
+
+    it "should tolerate and format already-formatted json" do
+      unformatted = "{\n\t\"foo\":{\n\t\t\"bar\":\"baz\",\n\t\t\"qux\":true\n\t}\n}"
+      formatted= "{\n  \"foo\":{\n    \"bar\":\"baz\",\n    \"qux\":true\n  }\n}\n"
+
+      expect(subject.format_json_string(unformatted)).to eq(formatted)
+    end
+  end
+end

data/spec/lib/tolerate_json_spec.rb

@@ -1,83 +1,28 @@
 require 'spec_helper'
 require 'tolerate_json'
 
-class T
-  include TolerateJson
-end
-
 describe TolerateJson do
-  let(:t) { T.new }
-
-  describe "pretty_print_json" do
-
-    it "should format simple json" do
-      unformatted = '{"foo":"bar"}'
-      formatted= "{\n  \"foo\":\"bar\"\n}\n"
-
-      expect(t.pretty_print_json(unformatted)).to eq(formatted)
-    end
-
-    it "should format complex json" do
-      unformatted = '{"foo":"bar","boolean":true,"Numbers":12345,"baz":"quz"}'
-      formatted= "{\n  \"foo\":\"bar\",\n  \"boolean\":true,\n  \"Numbers\":12345,\n  \"baz\":\"quz\"\n}\n"
-
-      expect(t.pretty_print_json(unformatted)).to eq(formatted)
-    end
-
-    it "should put the last curly brace on its own line" do
-      unformatted = '{}'
-      formatted= "{\n}\n"
-
-      expect(t.pretty_print_json(unformatted)).to eq(formatted)
-    end
-
-    it "should put the last suqre bracket on its own line" do
-      unformatted = '[]'
-      formatted= "[\n]\n"
-
-      expect(t.pretty_print_json(unformatted)).to eq(formatted)
-    end
 
-    it "should indent nested structures" do
-      unformatted = '{"foo":{"bar":"baz"}}'
-      formatted= "{\n  \"foo\":{\n    \"bar\":\"baz\"\n  }\n}\n"
+  let(:json) { double(:json_string) }
+  let(:indentation_string) { "\t" }
 
-      expect(t.pretty_print_json(unformatted)).to eq(formatted)
-    end
-
-    it "should separate concurrant curly braces with a cr" do
-      unformatted = '{"qux":{"foo":{"bar":"baz"}}, "quux":"quuux"}'
-      formatted= "{\n  \"qux\":{\n    \"foo\":{\n      \"bar\":\"baz\"\n    }\n  },\n   \"quux\":\"quuux\"\n}\n"
-
-      expect(t.pretty_print_json(unformatted)).to eq(formatted)
-    end
-
-    it "should separate numbers and closing curly braces with cr" do
-      unformatted = '{"qux":{"foo":1}, "quux":"quuux"}'
-      formatted= "{\n  \"qux\":{\n    \"foo\":1\n  },\n   \"quux\":\"quuux\"\n}\n"
-
-      expect(t.pretty_print_json(unformatted)).to eq(formatted)
-    end
-
-    it "should include only one cr at the end of the result" do
-      unformatted = "{}\n\n\n"
-      formatted= "{\n}\n"
-
-      expect(t.pretty_print_json(unformatted)).to eq(formatted)
-    end
-
-    it "should remove any newlines in the input" do
-      unformatted = "{\n\"foo\"\n:{\"bar\":\"baz\"}\n\n\n\n\n}"
-      formatted= "{\n  \"foo\":{\n    \"bar\":\"baz\"\n  }\n}\n"
-
-      expect(t.pretty_print_json(unformatted)).to eq(formatted)
+  describe '.pretty_print_json' do
+    it 'calls TolerateJson::Formatter' do
+      expect(TolerateJson::Formatter).to receive(:format_json_string).with(json, indentation_string)
+      TolerateJson.pretty_print_json(json, indentation_string)
     end
+  end
 
-    it "should tolerate and format already-formatted json" do
-      unformatted = "{\n\t\"foo\":{\n\t\t\"bar\":\"baz\",\n\t\t\"qux\":true\n\t}\n}"
-      formatted= "{\n  \"foo\":{\n    \"bar\":\"baz\",\n    \"qux\":true\n  }\n}\n"
+  
+  describe '#pretty_print_json' do
+    it 'calls TolerateJson::Formatter' do
+      class T
+        include TolerateJson
+      end
+      t = T.new
 
-      expect(t.pretty_print_json(unformatted)).to eq(formatted)
+      expect(TolerateJson::Formatter).to receive(:format_json_string).with(json, indentation_string)
+      t.pretty_print_json(json, indentation_string)
     end
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: tolerate_json
 version: !ruby/object:Gem::Version
-  version: 0.0.3
-  prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Matthew Nielsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -77,33 +70,33 @@ files:
 - Rakefile
 - lib/tolerate_json.rb
 - lib/tolerate_json/version.rb
+- spec/lib/tolerate_json/formatter_spec.rb
 - spec/lib/tolerate_json_spec.rb
 - spec/spec_helper.rb
 - tolerate_json.gemspec
 homepage: https://github.com/xunker/tolerate_json
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Tolerate_json is a pure-ruby Json formatter that has no outside gem dependencies.
   It almost works right and is good enough so you can tolerate reading JSON from your
   screen (hence the name). It is designed to be a simple formatter for when you need
@@ -111,5 +104,6 @@ summary: Tolerate_json is a pure-ruby Json formatter that has no outside gem dep
   is mission-critical. Compatible with MRI 1.8.7, 1.9.3 and 2.0.0 as well as JRuby
   and Rubinius in those modes.
 test_files:
+- spec/lib/tolerate_json/formatter_spec.rb
 - spec/lib/tolerate_json_spec.rb
 - spec/spec_helper.rb