yajl-ruby 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 123d047ce44bacef2d09aab8b2f51bf4a0d456d6
-  data.tar.gz: 2d8622c124a07ea78ca3678a8042baed033407ef
+  metadata.gz: 17f8ce761c82a4625e4b55c33f7047c096912762
+  data.tar.gz: 14c6fa5ed9a57dda37e8e2191f49a1fd6353d323
 SHA512:
-  metadata.gz: 3d68e9873ee4ea9173adc6d46a20c9157b64d4b613e3ea9d5bcff6becc32bc130a26637565b1a6aa3a5c98ddad824e09edae2f83995974da754ba9dfd8e0e444
-  data.tar.gz: a47eb3ca4f465e3cc931e492cb18083ce00e2f7b81d307c1232409dff5509f2138d904877e1397ef3ffd7f3f22f779f1857c0092701716bc650f983ad4e1c61b
+  metadata.gz: 37a13ef5aad63d7b2ceff3a7db250eb03556f3ef3de4d12d5eabf67698c063b89e3964a062bbc25de0c88e5b7e4d25a6f5e3ed7b44bfe6c2bc864389e433375d
+  data.tar.gz: 3038b8ca0f7a587b8ddc20e7130f078b24fad9b3066d53e1aead28ef91d883c13996e5beaca3dd8b0c52b6ae9a12e116c5be89b3fac374ba62eb4a26869344da

data/.travis.yml

@@ -3,12 +3,15 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - rbx
+  - 2.0.0
+  - 2.1.0
+  - 2.1.1
   - ree
   - ruby-head
   - rbx-18mode
   - rbx-19mode
 matrix:
   allow_failures:
+    - rvm: rbx
     - rvm: rbx-18mode
-    - rvm: rbx-19mode
+    - rvm: rbx-19mode

data/README.md

@@ -25,6 +25,12 @@ Go ahead and install it as usual:
 gem install yajl-ruby
 ```
 
+Or use your Gemfile:
+
+``` ruby
+gem 'yajl-ruby', require: 'yajl'
+```
+
 ## Example of use
 
 NOTE: I'm building up a collection of small examples in the examples (http://github.com/brianmario/yajl-ruby/tree/master/examples) folder.

data/ext/yajl/extconf.rb

@@ -2,6 +2,6 @@ require 'mkmf'
 require 'rbconfig'
 
 $CFLAGS << ' -Wall -funroll-loops'
-$CFLAGS << ' -Wextra -O0 -ggdb3' if ENV['DEBUG']
+$CFLAGS << ' -Werror-implicit-function-declaration -Wextra -O0 -ggdb3' if ENV['DEBUG']
 
 create_makefile('yajl/yajl')

data/ext/yajl/yajl_ext.c

@@ -275,7 +275,7 @@ static int yajl_found_boolean(void * ctx, int boolean) {
 }
 
 static int yajl_found_number(void * ctx, const char * numberVal, unsigned int numberLen) {
-    char buf[numberLen+1];
+    char* buf = (char*)malloc(numberLen + 1);
     buf[numberLen] = 0;
     memcpy(buf, numberVal, numberLen);
 
@@ -286,6 +286,7 @@ static int yajl_found_number(void * ctx, const char * numberVal, unsigned int nu
     } else {
         yajl_set_static_value(ctx, rb_cstr2inum(buf, 10));
     }
+    free(buf);
     return 1;
 }
 
@@ -315,15 +316,13 @@ static int yajl_found_hash_key(void * ctx, const unsigned char * stringVal, unsi
 #endif
 
     if (wrapper->symbolizeKeys) {
-        char buf[stringLen+1];
-        memcpy(buf, stringVal, stringLen);
-        buf[stringLen] = 0;
-        VALUE stringEncoded = rb_str_new2(buf);
 #ifdef HAVE_RUBY_ENCODING_H
-        rb_enc_associate(stringEncoded, rb_utf8_encoding());
+        ID id = rb_intern3((const char *)stringVal, stringLen, utf8Encoding);
+        keyStr = ID2SYM(id);
+#else
+        VALUE str = rb_str_new((const char *)stringVal, stringLen);
+        keyStr = rb_str_intern(str);
 #endif
-
-        yajl_set_static_value(ctx, ID2SYM(rb_to_id(stringEncoded)));
     } else {
         keyStr = rb_str_new((const char *)stringVal, stringLen);
 #ifdef HAVE_RUBY_ENCODING_H
@@ -332,8 +331,8 @@ static int yajl_found_hash_key(void * ctx, const unsigned char * stringVal, unsi
           keyStr = rb_str_export_to_enc(keyStr, default_internal_enc);
         }
 #endif
-        yajl_set_static_value(ctx, keyStr);
     }
+    yajl_set_static_value(ctx, keyStr);
     yajl_check_and_fire_callback(ctx);
     return 1;
 }

data/lib/yajl/version.rb

@@ -1,3 +1,3 @@
 module Yajl
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end

data/spec/json_gem_compatibility/compatibility_spec.rb

@@ -192,7 +192,7 @@ describe "JSON Gem compatability API" do
       it "should be able to parse #{File.basename(name)} as an IO" do
           lambda {
             JSON.parse(StringIO.new(source))
-          }.should_not raise_error(JSON::ParserError)
+          }.should_not raise_error
       end
     end
 
@@ -200,7 +200,7 @@ describe "JSON Gem compatability API" do
       it "should be able to parse #{File.basename(name)} as a string" do
           lambda {
             JSON.parse(source)
-          }.should_not raise_error(JSON::ParserError)
+          }.should_not raise_error
       end
     end
   end

data/spec/parsing/active_support_spec.rb

@@ -38,7 +38,7 @@ describe "ActiveSupport test cases" do
     it "should be able to parse #{json} as an IO" do
       lambda {
         Yajl::Parser.parse(StringIO.new(json)).should == expected
-      }.should_not raise_error(Yajl::ParseError)
+      }.should_not raise_error
     end
   end
 
@@ -46,7 +46,7 @@ describe "ActiveSupport test cases" do
     it "should be able to parse #{json} as a string" do
       lambda {
         Yajl::Parser.parse(json).should == expected
-      }.should_not raise_error(Yajl::ParseError)
+      }.should_not raise_error
     end
   end
 

data/spec/parsing/chunked_spec.rb

@@ -67,7 +67,7 @@ describe "Chunked parser" do
     @callback.should_receive(:call).exactly(430).times
     lambda {
       @parser.parse(json)
-    }.should_not raise_error(Yajl::ParseError)
+    }.should_not raise_error
   end
 
   it "should parse twitter_stream.json and fire callback 430 times, with a block as the callback" do
@@ -81,7 +81,7 @@ describe "Chunked parser" do
         times += 1
       end
       times.should eql(430)
-    }.should_not raise_error(Yajl::ParseError)
+    }.should_not raise_error
   end
 
   it "should raise a Yajl::ParseError error if multiple JSON strings were found when no on_parse_complete callback assigned" do
@@ -93,4 +93,4 @@ describe "Chunked parser" do
       @parser.parse(json)
     }.should raise_error(Yajl::ParseError)
   end
-end
+end

data/spec/parsing/fixtures_spec.rb

@@ -26,7 +26,7 @@ describe "Parsing JSON Fixtures" do
     it "should be able to parse #{File.basename(name)} as an IO" do
         lambda {
           Yajl::Parser.parse(StringIO.new(source))
-        }.should_not raise_error(Yajl::ParseError)
+        }.should_not raise_error
     end
   end
 
@@ -34,7 +34,7 @@ describe "Parsing JSON Fixtures" do
     it "should be able to parse #{File.basename(name)} as a string" do
         lambda {
           Yajl::Parser.parse(source)
-        }.should_not raise_error(Yajl::ParseError)
+        }.should_not raise_error
     end
   end
-end
+end

data/spec/parsing/large_number_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe 'Parsing very long text' do
+  shared_examples 'running script successfully' do |script|
+    def dup_pipe(parent_half, child_half, new_io)
+      parent_half.close
+      new_io.reopen(child_half)
+      child_half.close
+    end
+
+    def capture(cmd, stdin_data)
+      child_in, child_out, child_err = IO::pipe, IO::pipe, IO::pipe
+
+      child_pid = fork do
+        dup_pipe(child_in[1], child_in[0], STDIN)
+        dup_pipe(child_out[0], child_out[1], STDOUT)
+        dup_pipe(child_err[0], child_err[1], STDERR)
+
+        exec(cmd)
+      end
+
+      [
+        child_in[0],
+        child_out[1],
+        child_err[1],
+      ].each(&:close)
+
+      child_in[1].write(stdin_data)
+      child_in[1].close
+      _, status = Process.waitpid2(child_pid)
+
+      return child_out[0].read, child_err[0].read, status
+    ensure
+      [
+        child_in[1],
+        child_out[0],
+        child_err[0],
+      ].reject(&:closed?).each(&:close)
+    end
+
+    it 'runs successfully' do
+      out, err, status = capture('ruby', script)
+      [err, status.exitstatus].should eq(['', 0])
+    end
+  end
+
+  context 'when parseing big floats' do
+    include_examples('running script successfully', <<-EOS)
+require "yajl"
+Yajl::Parser.parse('[0.' + '1' * 2**23 + ']')
+    EOS
+  end
+
+  context 'when parseing long hash key with symbolize_keys option' do
+    include_examples('running script successfully', <<-EOS)
+require "yajl"
+Yajl::Parser.parse('{"' + 'a' * 2**23 + '": 0}', :symbolize_keys => true)
+    EOS
+  end
+end

data/spec/parsing/one_off_spec.rb

@@ -20,7 +20,7 @@ describe "One-off JSON examples" do
     json = StringIO.new('{"key": /* this is a comment */ "value"}')
     lambda {
       Yajl::Parser.parse(json, :allow_comments => true)
-    }.should_not raise_error(Yajl::ParseError)
+    }.should_not raise_error
   end
 
   it "should not parse invalid UTF8 with :check_utf8 set to true" do
@@ -67,6 +67,11 @@ describe "One-off JSON examples" do
   end
 
   if RUBY_VERSION =~ /^1.9/
+    it "should encode non-ascii symbols in utf-8" do
+      parsed = Yajl::Parser.parse('{"曦": 1234}', :symbolize_keys => true)
+      parsed.keys.fetch(0).encoding.should eq(Encoding::UTF_8)
+    end
+
     it "should return strings and hash keys in utf-8 if Encoding.default_internal is nil" do
       Encoding.default_internal = nil
       Yajl::Parser.parse('{"key": "value"}').keys.first.encoding.should eql(Encoding.find('utf-8'))

data/spec/spec_helper.rb

@@ -1,6 +1,3 @@
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
-
 require 'rspec'
 require 'yajl'
 require 'date'

data/yajl-ruby.gemspec

@@ -3,6 +3,7 @@ require './lib/yajl/version'
 Gem::Specification.new do |s|
   s.name = %q{yajl-ruby}
   s.version = Yajl::VERSION
+  s.license = "MIT"
   s.authors = ["Brian Lopez", "Lloyd Hilaiel"]
   s.date = Time.now.utc.strftime("%Y-%m-%d")
   s.email = %q{seniorlopez@gmail.com}
@@ -17,9 +18,9 @@ Gem::Specification.new do |s|
 
   # tests
   s.add_development_dependency 'rake-compiler', ">= 0.7.5"
-  s.add_development_dependency 'rspec', ">= 2.0.0"
+  s.add_development_dependency 'rspec', "~> 2.14"
   # benchmarks
-  s.add_development_dependency 'activesupport'
+  s.add_development_dependency 'activesupport', '~> 3.1.2'
   s.add_development_dependency 'json'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yajl-ruby
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Brian Lopez
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-17 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -29,30 +29,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -218,6 +218,7 @@ files:
 - spec/parsing/fixtures/pass2.json
 - spec/parsing/fixtures/pass3.json
 - spec/parsing/fixtures_spec.rb
+- spec/parsing/large_number_spec.rb
 - spec/parsing/one_off_spec.rb
 - spec/rcov.opts
 - spec/spec_helper.rb
@@ -225,7 +226,8 @@ files:
 - tasks/rspec.rake
 - yajl-ruby.gemspec
 homepage: http://github.com/brianmario/yajl-ruby
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -332,6 +334,7 @@ test_files:
 - spec/parsing/fixtures/pass2.json
 - spec/parsing/fixtures/pass3.json
 - spec/parsing/fixtures_spec.rb
+- spec/parsing/large_number_spec.rb
 - spec/parsing/one_off_spec.rb
 - spec/rcov.opts
 - spec/spec_helper.rb