json-minify 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aeb41b79a66fbd6809e151954d72c477f243ddc8
-  data.tar.gz: 485ae54778599198f619d9900c5a340eb877fb96
+  metadata.gz: f59536b9ca22b0f66e6d56ddddf3ad4463b00306
+  data.tar.gz: 457e5b20f346292efbb79673dad976cd66758e0b
 SHA512:
-  metadata.gz: 94daa535c56dd78b04aed9fe637bbe3c8faa44dc450970930b082a05c92a89e713277d822fa708674645a1321123b9968f8980f7f0078422881ca92273e0bbeb
-  data.tar.gz: 8c5da8da575610179c06955fa2cc9dad8119d3954b007c836b8524e03b34326aef2d118004b790d34412af8afc6798f787f46c9047762cb2f97fbe27bab3b707
+  metadata.gz: 6e7d87ff3d41f7cc9955605b6b8bdd8a18510fea314f536101664a98d7ce7530e031cf877d938b7db6db980c1505584c64245db5fa8fe44d63149eab5af75cf7
+  data.tar.gz: 9017ab6ea18c659dc348fbd88759a2943186ed7e4e01567df951dd834bc67572f2e1a0ded6b09a10ecf3c8652f0a6dc4b94872162a19997353ec48d37462442f

data/Rakefile

@@ -1,4 +1,4 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
 require 'rspec/core/rake_task'
 

data/json-minify.gemspec

@@ -4,22 +4,22 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'json/minify/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "json-minify"
+  spec.name          = 'json-minify'
   spec.version       = JSON::Minify::VERSION
   spec.authors       = ["Geoff Youngs\n\n\n"]
-  spec.email         = ["git@intersect-uk.co.uk"]
-  spec.summary       = %q{JSON.minify implementation}
-  spec.description   = %q{Pre-parser for JSON that removes C/C++ style comments and whitespace from formatted JSON, similar to https://github.com/getify/JSON.minify.}
-  spec.homepage      = "http://github.com/geoffyoungs/json-minify-rb"
-  spec.license       = "MIT"
+  spec.email         = ['git@intersect-uk.co.uk']
+  spec.summary       = 'JSON.minify implementation'
+  spec.description   = 'Pre-parser for JSON that removes C/C++ style comments and whitespace from formatted JSON, similar to https://github.com/getify/JSON.minify.'
+  spec.homepage      = 'http://github.com/geoffyoungs/json-minify-rb'
+  spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake", '~> 10.1'
-  spec.add_development_dependency "rspec", "~> 2.14"
-  spec.add_dependency "json", "> 0"
+  spec.add_development_dependency 'bundler', '~> 1.5'
+  spec.add_development_dependency 'rake', '~> 10.1'
+  spec.add_development_dependency 'rspec', '~> 3.2'
+  spec.add_dependency 'json', '> 0'
 end

data/lib/json/minify.rb

@@ -1,19 +1,21 @@
 require 'strscan'
 require 'json'
-require "json/minify/version"
+require 'json/minify/version'
 
 module JSON
   module Minify
     def self.included(mod)
       mod.send(:extend, self)
     end
+
     def minify(str)
-      ss, buf = StringScanner.new(str), ''
+      ss = StringScanner.new(str)
+      buf = ''
 
       until ss.eos?
         # Remove whitespace
         if s = ss.scan(/\s+/)
-          
+
         # Scan punctuation
         elsif s = ss.scan(/[{},:\]\[]/)
           buf << s
@@ -31,12 +33,12 @@ module JSON
           buf << s
 
         # Remove C++ style comments
-        elsif s = ss.scan(%r<//>)
+        elsif s = ss.scan(%r{//})
           ss.scan_until(/(\r?\n|$)/)
 
         # Remove C style comments
-        elsif s = ss.scan(%r'/[*]')
-          ss.scan_until(%r'[*]/') or raise SyntaxError, "Unterminated /*...*/ comment - #{ss.rest}"
+        elsif s = ss.scan(%r{/[*]})
+          ss.scan_until(%r{[*]/}) || raise(SyntaxError, "Unterminated /*...*/ comment - #{ss.rest}")
 
         # Anything else is invalid JSON
         else

data/lib/json/minify/repairer.rb

@@ -0,0 +1,83 @@
+require 'strscan'
+require 'json'
+require 'json/minify'
+require 'json/minify/version'
+
+module JSON
+  module Minify
+    #
+    class Repairer
+      TOKENS = {
+        /\s+/ => [:whitespace, :skip],
+        /[{},:\]\[]/ => [:punctuation, :keep],
+        /""|(".*?[^\\])?"/ => [:string, :keep],
+        /(true|false|null)/ => [:reserved, :keep],
+        /-?\d+([.]\d+)?([eE][-+]?[0-9]+)?/ => [:number, :keep],
+        %r{//.*?(\r?\n|$)} => [:comment, :skip],
+        %r{/[*].*?[*]/} => [:comment, :skip]
+      }.freeze
+
+      def self.combine(tokens, type)
+        regexes = tokens.map do |key, bits|
+          key if bits[1] == type
+        end.compact
+        Regexp.new(regexes.join('|'))
+      end
+
+      KEEP = combine(TOKENS, :keep)
+      SKIP = combine(TOKENS, :skip)
+      ALL  = Regexp.new(TOKENS.keys.join('|'))
+
+      def initialize(str)
+        @str = str
+      end
+
+      def tokens
+        scanner, buf = StringScanner.new(@str), []
+
+        until scanner.eos?
+          token = scanner.scan(KEEP)
+          buf << token if token
+          skip = scanner.skip(SKIP)
+
+          # Anything else is invalid JSON
+          next if skip || token || scanner.eos?
+
+          cur = scanner.pos
+          extra = scanner.scan_until(ALL)
+          if extra
+            invalid_string = scanner.pre_match[cur..-1]
+            next_token = scanner.matched
+            buf << next_token if KEEP.match(next_token)
+          else
+            invalid_string = scanner.rest
+          end
+
+          alternate_token = transform(invalid_string)
+          if alternate_token
+            buf << alternate_token
+          else
+            raise SyntaxError, "Unable to pre-scan string: #{invalid_string}"
+          end
+        end
+
+        buf
+      end
+
+      def parse
+        JSON.parse(tokens.join)
+      end
+
+      def transform(token)
+        case token
+        when 'NaN'
+          '0'
+        end
+      end
+
+      def minify_parse(buf)
+        JSON.parse(minify(buf))
+      end
+    end
+  end
+end

data/lib/json/minify/version.rb

@@ -1,5 +1,5 @@
 module JSON
   module Minify
-    VERSION = "0.0.2"
+    VERSION = '0.0.3'.freeze
   end
 end

data/spec/minify_repairer_spec.rb

@@ -0,0 +1,24 @@
+$LOAD_PATH << File.dirname(__FILE__) + '../lib'
+
+require 'json/minify/repairer'
+
+describe JSON::Minify::Repairer do
+  subject { described_class.new(sample) }
+
+  context 'with a NaN' do
+    let(:sample) { '{ "hello": NaN }' }
+    let(:tokens) { ['{', '"hello"', ':', '0', '}'] }
+
+    it 'should remove whitespace from JSON' do
+      expect(subject.tokens).to eql(tokens)
+    end
+  end
+
+  context 'when parsing data' do
+    let(:sample) { '{ "hello": NaN }' }
+
+    it 'should remove whitespace from JSON' do
+      expect(subject.parse).to include('hello' => 0)
+    end
+  end
+end

data/spec/minify_spec.rb

@@ -1,33 +1,33 @@
-$: << File.dirname(__FILE__)+"../lib"
+$LOAD_PATH << File.dirname(__FILE__) + '../lib'
 
 require 'json/minify'
 
 describe JSON::Minify do
-  it "should remove whitespace from JSON" do
-    expect(JSON.minify("{ }")).to eql("{}")
-    expect(JSON.minify(%Q<{"foo": "bar"\n}\n>)).to eql(%Q<{"foo":"bar"}>)
+  it 'should remove whitespace from JSON' do
+    expect(JSON.minify('{ }')).to eql('{}')
+    expect(JSON.minify(%({"foo": "bar"\n}\n))).to eql(%({"foo":"bar"}))
   end
 
-  it "should remove comments from JSON" do
-    expect(JSON.minify("{ /* foo */ } /* bar */")).to eql("{}")
-    expect(JSON.minify(%Q<{"foo": "bar"\n}\n // this is a comment>)).to eql(%Q<{"foo":"bar"}>)
+  it 'should remove comments from JSON' do
+    expect(JSON.minify('{ /* foo */ } /* bar */')).to eql('{}')
+    expect(JSON.minify(%({"foo": "bar"\n}\n // this is a comment))).to eql(%({"foo":"bar"}))
   end
 
-  it "should throw a SyntaxError on invalid JSON" do
-    expect { JSON.minify("{ /* foo */ } /* bar ") }.to raise_error(SyntaxError)
-    expect { JSON.minify(%Q<{ "foo": new Date(1023) }>) }.to raise_error(SyntaxError)
+  it 'should throw a SyntaxError on invalid JSON' do
+    expect { JSON.minify('{ /* foo */ } /* bar ') }.to raise_error(SyntaxError)
+    expect { JSON.minify(%<{ "foo": new Date(1023) }>) }.to raise_error(SyntaxError)
   end
 
-  it "should cope with the example from https://github.com/getify/JSON.minify" do
-    expect(JSON.minify( %Q'{ /* comment */ "foo": 42 \n }' )).to eql('{"foo":42}')
+  it 'should cope with the example from https://github.com/getify/JSON.minify' do
+    expect(JSON.minify(%({ /* comment */ "foo": 42 \n }))).to eql('{"foo":42}')
   end
 
-  it "should cope with the https://gist.github.com/mattheworiordan/72db0dfc933f743622eb" do
+  it 'should cope with the https://gist.github.com/mattheworiordan/72db0dfc933f743622eb' do
     expect(JSON.minify('{ "PolicyName": { "Fn::Join" : [ "", [ "AblySnsPublish-", { "Ref" : "AWS::Region" }, "-", { "Ref" : "DataCenterID" } ] ] } }')).to \
       eql('{"PolicyName":{"Fn::Join":["",["AblySnsPublish-",{"Ref":"AWS::Region"},"-",{"Ref":"DataCenterID"}]]}}')
   end
 
-  it "should cope with escaped double quoted strings" do
+  it 'should cope with escaped double quoted strings' do
     expect(JSON.minify('{ "Statement1": "he said \"no way\" to the dog", "Statement2": "she said \"really?\"" }')).to \
       eql('{"Statement1":"he said \"no way\" to the dog","Statement2":"she said \"really?\""}')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-minify
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - |+
@@ -11,62 +11,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2016-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>'
+    - - ">"
       - !ruby/object:Gem::Version
         version: '0'
 description: Pre-parser for JSON that removes C/C++ style comments and whitespace
@@ -77,14 +77,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - json-minify.gemspec
 - lib/json/minify.rb
+- lib/json/minify/repairer.rb
 - lib/json/minify/version.rb
+- spec/minify_repairer_spec.rb
 - spec/minify_spec.rb
 homepage: http://github.com/geoffyoungs/json-minify-rb
 licenses:
@@ -96,19 +98,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: JSON.minify implementation
 test_files:
+- spec/minify_repairer_spec.rb
 - spec/minify_spec.rb