oj 2.18.0 → 2.18.1

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: 49295a5c6be0e45972d2cf83173fabb2db55fcc3
-  data.tar.gz: 645d5ec2b8214eeb596fd98cb5a9c0e1e2a9836e
-SHA512: 
-  metadata.gz: 0731c01c050cc7aff03be4510be0ad026ed0a320f1fee34fb6318bcdcb5888455c13e9dfb6ec2e7b4d6436e5c04cf43a6d43ff257bb076cc1ec5b8ee5c224cc4
-  data.tar.gz: ce82256a18f92155498d0ee6b74c06704eb51782cd3411a3c7c2308af252386e668c43216831b32999a349cea83ff5804515314ec1ef9dfc1df36fac388c56dc
+---
+SHA1:
+  metadata.gz: 0c4ba43d61f927e22bc0e86fcb053d0593a531f0
+  data.tar.gz: d09686c7ff45e8c6b07fd71c7c31aa5c7920a2f3
+SHA512:
+  metadata.gz: 1a8f222f85bf299d92f6ea6432d2bae1f541f5ed615e18a052a7328badb430050928a363961fde7148aa66fb56f6507608fe6e17c482f003cb13230073dc58bd
+  data.tar.gz: d65f126ff8de728d8a95048ce7f624bf51c3ea81721fb29ad27855454f8c94ba7e971676c3144330a9e93a973e443ed70698247f2c65ffb1be3fbf58863bd07f

data/README.md

@@ -170,18 +170,7 @@ Oj.default_options = {:mode => :compat }
 
 ## Releases
 
-** Release 2.18.0**
-
-- Rubinius compilation fixes.
-
-- Added a separate option for as_json instead of piggy backing on the
-  use_to_json. This changes the API slightly.
-
-- Ready for Ruby 2.4.
-
-- Thanks to faucct for fixing mimic to not redefine JSON::ParseError.
-
-[Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
+See [CHANGELOG.md](CHANGELOG.md)
 
 ## Compatibility
 

data/ext/oj/fast.c

@@ -867,6 +867,35 @@ get_doc_leaf(Doc doc, const char *path) {
     return leaf;
 }
 
+static const char*
+next_slash(const char *s) {
+    for (; '\0' != *s; s++) {
+	if ('\\' == *s) {
+	    s++;
+	    if ('\0' == *s) {
+		break;
+	    }
+	} else if ('/' == *s) {
+	    return s;
+	}
+    }
+    return NULL;
+}
+
+static bool
+key_match(const char *pat, const char *key, int plen) {
+    for (; 0 < plen; plen--, pat++, key++) {
+	if ('\\' == *pat) {
+	    plen--;
+	    pat++;
+	}
+	if (*pat != *key) {
+	    return false;
+	}
+    }
+    return '\0' == *key;
+}
+
 static Leaf
 get_leaf(Leaf *stack, Leaf *lp, const char *path) {
     Leaf	leaf = *lp;
@@ -912,7 +941,7 @@ get_leaf(Leaf *stack, Leaf *lp, const char *path) {
 		} while (e != first);
 	    } else if (T_HASH == type) {
 		const char	*key = path;
-		const char	*slash = strchr(path, '/');
+		const char	*slash = next_slash(path);
 		int		klen;
 
 		if (0 == slash) {
@@ -923,7 +952,7 @@ get_leaf(Leaf *stack, Leaf *lp, const char *path) {
 		    path += klen + 1;
 		}
 		do {
-		    if (0 == strncmp(key, e->key, klen) && '\0' == e->key[klen]) {
+		    if (key_match(key, e->key, klen)) {
 			lp++;
 			*lp = e;
 			leaf = get_leaf(stack, lp, path);
@@ -1022,7 +1051,7 @@ move_step(Doc doc, const char *path, int loc) {
 		} while (e != first);
 	    } else if (T_HASH == leaf->rtype) {
 		const char	*key = path;
-		const char	*slash = strchr(path, '/');
+		const char	*slash = next_slash(path);
 		int		klen;
 
 		if (0 == slash) {
@@ -1033,7 +1062,7 @@ move_step(Doc doc, const char *path, int loc) {
 		    path += klen + 1;
 		}
 		do {
-		    if (0 == strncmp(key, e->key, klen) && '\0' == e->key[klen]) {
+		    if (key_match(key, e->key, klen)) {
 			doc->where++;
 			*doc->where = e;
 			loc = move_step(doc, path, loc + 1);
@@ -1167,6 +1196,29 @@ doc_open_file(VALUE clas, VALUE filename) {
     return obj;
 }
 
+static int
+esc_strlen(const char *s) {
+    int	cnt = 0;
+
+    for (; '\0' != *s; s++, cnt++) {
+	if ('/' == *s) {
+	    cnt++;
+	}
+    }
+    return cnt;
+}
+
+static char*
+append_key(char *p, const char *key) {
+    for (; '\0' != *key; p++, key++) {
+	if ('/' == *key) {
+	    *p++ = '\\';
+	}
+	*p = *key;
+    }
+    return p;
+}
+
 /* Document-method: parse
  * @see Oj::Doc.open
  */
@@ -1192,7 +1244,7 @@ doc_where(VALUE self) {
 	for (lp = doc->where_path; lp <= doc->where; lp++) {
 	    leaf = *lp;
 	    if (T_HASH == leaf->parent_type) {
-		size += strlen((*lp)->key) + 1;
+		size += esc_strlen((*lp)->key) + 1;
 	    } else if (T_ARRAY == leaf->parent_type) {
 		size += ((*lp)->index < 100) ? 3 : 11;
 	    }
@@ -1202,7 +1254,7 @@ doc_where(VALUE self) {
 	for (lp = doc->where_path; lp <= doc->where; lp++) {
 	    leaf = *lp;
 	    if (T_HASH == leaf->parent_type) {
-		p = stpcpy(p, (*lp)->key);
+		p = append_key(p, (*lp)->key);
 	    } else if (T_ARRAY == leaf->parent_type) {
 		p = ulong_fill(p, (*lp)->index);
 	    }

data/ext/oj/oj.c

@@ -937,7 +937,10 @@ dump(int argc, VALUE *argv, VALUE self) {
     struct _Out		out;
     struct _Options	copts = oj_default_options;
     VALUE		rstr;
-    
+
+    if (1 > argc) {
+	rb_raise(rb_eArgError, "wrong number of arguments (0 for 1).");
+    }
     if (2 == argc) {
 	oj_parse_options(argv[1], &copts);
     }

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '2.18.0'
+  VERSION = '2.18.1'
 end

data/test/foo.rb

@@ -1,24 +1,19 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
 
-$VERBOSE = true
-
-here = File.expand_path(File.dirname(__FILE__))
-$: << File.dirname(__FILE__)
-$: << File.join(File.dirname(here), 'ext')
-$: << File.join(File.dirname(here), 'lib')
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
 
 require 'oj'
 
-Oj.mimic_JSON()
-
-class Foo
-  def as_json
-    { foo: 'bar' }
+class A < BasicObject
+  def initialize(data)
+    @data = data
   end
 end
 
-opts = {}
+a = A.new("xyz")
+
+json = Oj.dump(a, mode: :compat, use_to_json: true)
+#=> NoMethodError: undefined method `to_hash' for #<A:0x007fae03de1dc8>
 
-puts Foo.new.to_json
-puts Foo.new.to_json(opts)

data/test/test_fast.rb

@@ -174,6 +174,20 @@ class DocTest < Minitest::Test
     end
   end
 
+  def test_move_slash
+    Oj::Doc.open(%|{"top":{"a/b":3}}|) do |doc|
+      doc.move('top/a\/b')
+      assert_equal('/top/a\/b', doc.where?)
+    end
+  end
+
+  def test_fetch_slash
+    Oj::Doc.open(%|{"a/b":3}|) do |doc|
+      x = doc.fetch('a\/b')
+      assert_equal(3, x)
+    end
+  end
+
   def test_move_relative
     Oj::Doc.open($json1) do |doc|
       [['/', 'array', '/array'],

metadata

@@ -1,55 +1,65 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: oj
-version: !ruby/object:Gem::Version 
-  version: 2.18.0
+version: !ruby/object:Gem::Version
+  version: 2.18.1
 platform: ruby
-authors: 
+authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2016-11-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2017-01-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake-compiler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.9"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "5"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "4"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :development
-  version_requirements: *id003
-description: "The fastest JSON parser and object serializer. "
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
 executables: []
-
-extensions: 
+extensions:
 - ext/oj/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - LICENSE
 - README.md
 - ext/oj/buf.h
@@ -160,96 +170,95 @@ files:
 - test/test_writer.rb
 - test/write_timebars.rb
 homepage: http://www.ohler.com/oj
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
-rdoc_options: 
-- --main
+rdoc_options:
+- "--main"
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - &id004 
-    - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id004
+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: oj
-rubygems_version: 2.2.2
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A fast JSON parser and serializer.
-test_files: 
-- test/_test_active.rb
-- test/_test_active_mimic.rb
-- test/_test_mimic_rails.rb
-- test/activesupport_datetime_test.rb
-- test/bug.rb
-- test/bug2.rb
+test_files:
+- test/perf_object.rb
+- test/test_hash.rb
 - test/bug3.rb
-- test/bug_fast.rb
-- test/bug_load.rb
+- test/write_timebars.rb
+- test/test_writer.rb
+- test/russian.rb
+- test/test_gc.rb
+- test/_test_active_mimic.rb
+- test/test_serializer.rb
+- test/sample/file.rb
+- test/sample/group.rb
+- test/sample/oval.rb
+- test/sample/rect.rb
+- test/sample/hasprops.rb
+- test/sample/layer.rb
+- test/sample/text.rb
+- test/sample/doc.rb
+- test/sample/line.rb
+- test/sample/dir.rb
+- test/sample/shape.rb
+- test/sample/change.rb
 - test/crash.rb
-- test/example.rb
-- test/files.rb
-- test/foo.rb
-- test/helper.rb
 - test/io.rb
+- test/test_object.rb
+- test/struct.rb
 - test/mod.rb
-- test/perf.rb
-- test/perf_compat.rb
-- test/perf_fast.rb
-- test/perf_file.rb
-- test/perf_object.rb
-- test/perf_saj.rb
-- test/perf_scp.rb
-- test/perf_simple.rb
-- test/perf_strict.rb
-- test/rails.rb
-- test/russian.rb
 - test/sample.rb
-- test/sample_json.rb
-- test/struct.rb
-- test/test_compat.rb
-- test/test_debian.rb
-- test/test_fast.rb
-- test/test_file.rb
-- test/test_gc.rb
-- test/test_hash.rb
-- test/test_object.rb
+- test/perf_scp.rb
+- test/bug2.rb
 - test/test_saj.rb
-- test/test_scp.rb
-- test/test_serializer.rb
 - test/test_strict.rb
+- test/perf_saj.rb
+- test/perf_simple.rb
+- test/perf_fast.rb
+- test/example.rb
+- test/_test_active.rb
+- test/perf_compat.rb
 - test/test_various.rb
-- test/test_writer.rb
-- test/write_timebars.rb
+- test/activesupport_datetime_test.rb
+- test/test_scp.rb
+- test/bug_load.rb
+- test/files.rb
+- test/foo.rb
+- test/isolated/test_mimic_rails_after.rb
+- test/isolated/test_mimic_rails_datetime.rb
+- test/isolated/test_mimic_redefine.rb
+- test/isolated/test_mimic_as_json.rb
 - test/isolated/shared.rb
-- test/isolated/test_mimic_after.rb
 - test/isolated/test_mimic_alone.rb
-- test/isolated/test_mimic_as_json.rb
+- test/isolated/test_mimic_after.rb
 - test/isolated/test_mimic_before.rb
-- test/isolated/test_mimic_define.rb
-- test/isolated/test_mimic_rails_after.rb
 - test/isolated/test_mimic_rails_before.rb
-- test/isolated/test_mimic_rails_datetime.rb
-- test/isolated/test_mimic_redefine.rb
-- test/sample/change.rb
-- test/sample/dir.rb
-- test/sample/doc.rb
-- test/sample/file.rb
-- test/sample/group.rb
-- test/sample/hasprops.rb
-- test/sample/layer.rb
-- test/sample/line.rb
-- test/sample/oval.rb
-- test/sample/rect.rb
-- test/sample/shape.rb
-- test/sample/text.rb
+- test/isolated/test_mimic_define.rb
+- test/_test_mimic_rails.rb
+- test/test_file.rb
+- test/bug.rb
+- test/sample_json.rb
+- test/test_debian.rb
+- test/test_fast.rb
+- test/rails.rb
+- test/perf_file.rb
+- test/test_compat.rb
+- test/helper.rb
+- test/perf.rb
+- test/bug_fast.rb
+- test/perf_strict.rb