mighty_json 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15d2f5dff6d3f941811d37ee84d8e789e3aa0160
-  data.tar.gz: 18d8272bff2142be7f5842be8c32af429280ad5a
+  metadata.gz: 2b62f3eccb0904d6e26ae69676532a8017db82bc
+  data.tar.gz: cc524ae494417ecffe397a9ca9a21d6d8c3cfa61
 SHA512:
-  metadata.gz: 6bb832dac8163b344f5be5eda23f24ff0f901242af6886b5cffcbceabd1938248867adb4c75539ab8eb666348a5f97cfc94451f4ffb6350cefad86c1d9a319a0
-  data.tar.gz: c4b59eeeedab80b5964c544e05e566fec55e21269b0d68c2c68efab95c42e2bb162b2d8073b2fbeac7339fd0e52034cf315834cec33d9ec7baa53aff667a63b3
+  metadata.gz: 85572a67362b8993c255bbe2770636e36b22a15e05bfe3d2388d57b6c9a89020c55b5857ec2c82a9cfe75cd88d5f9a8c3c742b1e7a4a71790caa11597163f00f
+  data.tar.gz: cbf687da01e93d70ab53e7dd4a6c8972f342184d32feeccd867e896f6837fca2e2c66850cbf385d92371b8a8de63cf393e64935c27be6e7bce959ac6605c228e

data/.rubocop.yml

@@ -0,0 +1,13 @@
+inherit_gem:
+  meowcop:
+    - config/rubocop.yml
+
+AllCops:
+  TargetRubyVersion: 2.3
+
+Style/FrozenStringLiteralComment:
+  Enabled: true
+  style: always
+
+Style/EmptyLineAfterMagicComment:
+  Enabled: true

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in mighty_json.gemspec

data/README.md

@@ -2,8 +2,14 @@
 
 A faster implementation of [soutaro/strong_json](https://github.com/soutaro/strong_json).
 
+[![Gem Version](https://badge.fury.io/rb/mighty_json.svg)](https://badge.fury.io/rb/mighty_json)
+[![Build Status](https://travis-ci.org/pocke/mighty_json.svg?branch=master)](https://travis-ci.org/pocke/mighty_json)
+
 ## Benchmarking
 
+
+![graph](https://cloud.githubusercontent.com/assets/4361134/26479369/9b5848c2-420d-11e7-9ada-83d5f16840df.png)
+
 - In complex case, MightyJSON is faster 2.8x than StrongJSON ([code](https://github.com/pocke/mighty_json/blob/master/benchmarks/large.rb)).
 - In simple case, MightyJSON is faster around 2x ~ 10x than StrongJSON ([code](https://github.com/pocke/mighty_json/blob/master/benchmarks/small.rb)).
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require 'rake/testtask'
 task :default => :test

data/benchmarks/large.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 # Usage:
 #   # The json is result of RuboCop in Readmine project
+#   # https://drive.google.com/file/d/0B0yU5j3W2zM9WW53b01jaWhFZHc/view?usp=sharing
 #   $ ruby large.rb json
 #
 # Result:

data/benchmarks/realtime.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+# Usage:
+#   # The json is result of RuboCop in Readmine project
+#   # https://drive.google.com/file/d/0B0yU5j3W2zM9WW53b01jaWhFZHc/view?usp=sharing
+#   $ ruby realtime.rb json
+
+require 'json'
+require 'mighty_json'
+require 'benchmark'
+
+m = MightyJSON.new do
+  let :metadata, object(rubocop_version: string, ruby_engine: string, ruby_version: string, ruby_patchlevel: string, ruby_platform: string)
+  let :offense, object(severity: string, message: string, cop_name: string, corrected: boolean, location: object(line: number, column: number, length: number))
+  let :file, object(path: string, offenses: array(offense))
+  let :summary, object(offense_count: number, target_file_count: number, inspected_file_count: number)
+
+  let :o, object(metadata: metadata, files: array(file), summary: summary)
+end
+
+data = JSON.parse ARGF.read, symbolize_names: true
+
+time = Benchmark.realtime do
+  20.times{m.o.coerce(data)}
+end
+p time

data/benchmarks/small.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Usage:
 #   $ ruby small.rb
 #

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "bundler/setup"
 require "mighty_json"

data/lib/mighty_json.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "mighty_json/version"
 require 'mighty_json/errors'
 require 'mighty_json/type'

data/lib/mighty_json/builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "mighty_json/version"
 
 module MightyJSON
@@ -16,6 +18,7 @@ module MightyJSON
             v = var.cur
             eval <<~END
               def this.coerce(#{v})
+                none = NONE
                 #{type.compile(var: var, path: [])}
               end
 

data/lib/mighty_json/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MightyJSON
   class Error < StandardError
     attr_reader :path, :type, :value

data/lib/mighty_json/type.rb

@@ -1,8 +1,22 @@
+# frozen_string_literal: true
+
 module MightyJSON
   module Type
     NONE = Object.new
 
+    class Eval
+      def initialize(code)
+        @code = code
+      end
+
+      def inspect
+        @code
+      end
+    end
+
     class Base
+      attr_reader :type
+
       def initialize(type)
         @type = type
       end
@@ -15,7 +29,7 @@ module MightyJSON
           if path == []
             'raise IllegalTypeError.new(type: :ignored)'
           else
-            'NONE'
+            'none'
           end
         when :any
           v
@@ -67,7 +81,7 @@ module MightyJSON
       def compile(var:, path:)
         v = var.cur
         <<~END
-          if #{v}.nil? || NONE.equal?(#{v})
+          if #{v}.nil? || none.equal?(#{v})
             nil
           else
             #{@type.compile(var: var, path: path)}
@@ -105,12 +119,13 @@ module MightyJSON
 
       def compile(var:, path:)
         v = var.cur
+        idx = var.next
         child = var.next
         <<~END
           begin
             raise Error.new(path: #{path.inspect}, type: #{self.to_s.inspect}, value: #{v}) unless #{v}.is_a?(::Array)
-            #{v}.map.with_index do |#{child}, i|
-              #{@type.compile(var: var, path: path + [:array_index])} # TODO: optimize path
+            #{v}.map.with_index do |#{child}, #{idx}|
+              #{@type.compile(var: var, path: path + [Eval.new(idx)])}
             end
           end
         END
@@ -131,25 +146,29 @@ module MightyJSON
         keys = @fields.keys.map(&:inspect)
 
         result = var.next
+        is_fixed = @fields.values.none?{|type| type.is_a?(Optional) || (type.is_a?(Base) && type.type == :ignored)}
+
         <<~END
           begin
             raise Error.new(path: #{path}, type: #{self.to_s.inspect}, value: object) unless #{v}.is_a?(Hash)
 
-            {}.tap do |#{result}|
+            if #{!is_fixed} || #{@fields.size} != #{v}.size
               #{v}.each do |key, value|
                 next if #{keys.map{|key| "#{key} == key"}.join('||')}
                 raise UnexpectedFieldError.new(path: #{path.inspect} + [key], value: #{v}) # TOOD: optimize path
               end
+            end
 
+            {}.tap do |#{result}|
               #{
                 @fields.map do |key, type|
                   new_var = var.next
                   <<~END2
-                    #{new_var} = #{v}.key?(#{key.inspect}) ? #{v}[#{key.inspect}] : NONE
+                    #{new_var} = #{v}.fetch(#{key.inspect}, none)
                     v = #{type.compile(var: var, path: path + [key])}
-                    if !NONE.equal?(v) &&
+                    if !none.equal?(v) &&
                        #{!NONE.equal?(type)} &&
-                       !(#{type.is_a?(Optional)} && NONE.equal?(#{new_var}))
+                       !(#{type.is_a?(Optional)} && none.equal?(#{new_var}))
                       #{result}[#{key.inspect}] = v
                     end
                   END2
@@ -196,46 +215,5 @@ module MightyJSON
         "enum(#{types.map(&:to_s).join(", ")})"
       end
     end
-
-    class UnexpectedFieldError < StandardError
-      attr_reader :path, :value
-
-      def initialize(path: , value:)
-        @path = path
-        @value = value
-      end
-
-      def to_s
-        position = "#{path.join('.')}"
-        "Unexpected field of #{position} (#{value})"
-      end
-    end
-
-    class IllegalTypeError < StandardError
-      attr_reader :type
-
-      def initialize(type:)
-        @type = type
-      end
-
-      def to_s
-        "#{type} can not be put on toplevel"
-      end
-    end
-
-    class Error < StandardError
-      attr_reader :path, :type, :value
-
-      def initialize(path:, type:, value:)
-        @path = path
-        @type = type
-        @value = value
-      end
-
-      def to_s
-        position = path.empty? ? "" : " at .#{path.join('.')}"
-        "Expected type of value #{value}#{position} is #{type}"
-      end
-    end
   end
 end

data/lib/mighty_json/types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MightyJSON
   module Types
     def object(fields = {})

data/lib/mighty_json/variable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Variable
   def initialize
     @count = 0

data/lib/mighty_json/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module MightyJSON
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/mighty_json.gemspec

@@ -1,4 +1,6 @@
 # coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "mighty_json/version"
@@ -28,4 +30,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'minitest-power_assert'
+
+  spec.add_development_dependency 'rubocop', '0.48.1'
+  spec.add_development_dependency 'meowcop', '1.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mighty_json
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Masataka Kuwabara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-25 00:00:00.000000000 Z
+date: 2017-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.48.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.48.1
+- !ruby/object:Gem::Dependency
+  name: meowcop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.10.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.10.0
 description: A faster implementation of soutaro/strong_json
 email:
 - kuwabara@pocke.me
@@ -74,6 +102,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -81,6 +110,7 @@ files:
 - README.md
 - Rakefile
 - benchmarks/large.rb
+- benchmarks/realtime.rb
 - benchmarks/small.rb
 - bin/console
 - bin/setup