ffi-yajl 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e660d3d15b0a0f9af4ad908c4fbc45242782c101
-  data.tar.gz: 9cfc7d0d71890a8a8d99074164dc5a012b45b009
+  metadata.gz: 1b3576aa3b630817425565c2e7f18e03a6bf3144
+  data.tar.gz: 0ba4867aafcbd1b5ed11e5aac09fb949d7fc28e2
 SHA512:
-  metadata.gz: 9c4115b6df991bfd96123074691c591c1821a1234940b34ee0f554eb8e3087a9c1fe5bb69da32fd550e32298f8061f4d9da6125911bb217f52e7e5a9b756ab8c
-  data.tar.gz: a2881d97c1aac2ba7546fd47aa2497f7a0efc16d46b854561a112cfc1cc36f02e51cf0447bd7e6d92ce0eb15f9a2c51de44cda0b9bfb949b86c4cf61a0901251
+  metadata.gz: 0437fb83e17971e61d8b07cc539de3184a7a5718471deeb91ffa57eac960519ab4429de20b944b9cb087ffee6138346c7e1cb2652ed62d8c794d7ca01f5e688f
+  data.tar.gz: ddf01b4b3eeac328bdd8226acbc40648615f09ad6ab8662192e3774ee02c97203b65a61e78f69e8356e9c619fc5f6cac7191ed8b2ac5bd946618e3a10696cabb

data/README.md

@@ -1,5 +1,5 @@
 
-[![Build Status](https://travis-ci.org/lamont-granquist/ffi-yajl.png)](https://travis-ci.org/lamont-granquist/ffi-yajl)  [![Code Climate](https://codeclimate.com/github/lamont-granquist/ffi-yajl.png)](https://codeclimate.com/github/lamont-granquist/ffi-yajl)
+[![Build Status](https://travis-ci.org/opscode/ffi-yajl.png)](https://travis-ci.org/opscode/ffi-yajl)  [![Code Climate](https://codeclimate.com/github/opscode/ffi-yajl.png)](https://codeclimate.com/github/opscode/ffi-yajl)
 
 ## TODO
 

data/ext/ffi_yajl/ext/encoder/encoder.c

@@ -9,7 +9,7 @@ static VALUE cYajl_Gen;
 #define CHECK_STATUS(call) \
       if ((status = (call)) != yajl_gen_status_ok) { rb_funcall(mEncoder2, rb_intern("raise_error_for_status"), 1, INT2FIX(status)); }
 
-static VALUE mEncoder_do_yajl_encode(VALUE self, VALUE obj, VALUE yajl_gen_opts) {
+static VALUE mEncoder_do_yajl_encode(VALUE self, VALUE obj, VALUE yajl_gen_opts, VALUE json_opts) {
   ID sym_ffi_yajl = rb_intern("ffi_yajl");
   VALUE sym_yajl_gen_beautify = ID2SYM(rb_intern("yajl_gen_beautify"));
   VALUE sym_yajl_gen_validate_utf8 = ID2SYM(rb_intern("yajl_gen_validate_utf8"));
@@ -42,6 +42,8 @@ static VALUE mEncoder_do_yajl_encode(VALUE self, VALUE obj, VALUE yajl_gen_opts)
 
   rb_hash_aset(state, rb_str_new2("processing_key"), Qfalse);
 
+  rb_hash_aset(state, rb_str_new2("json_opts"), json_opts);
+
   rb_yajl_gen = Data_Wrap_Struct(cYajl_Gen, NULL, NULL, yajl_gen);
 
   rb_funcall(obj, sym_ffi_yajl, 2, rb_yajl_gen, state);
@@ -261,7 +263,7 @@ void Init_encoder() {
   mExt = rb_define_module_under(mFFI_Yajl, "Ext");
   mEncoder = rb_define_module_under(mExt, "Encoder");
   cYajl_Gen = rb_define_class_under(mEncoder, "YajlGen", rb_cObject);
-  rb_define_method(mEncoder, "do_yajl_encode", mEncoder_do_yajl_encode, 2);
+  rb_define_method(mEncoder, "do_yajl_encode", mEncoder_do_yajl_encode, 3);
 
   rb_define_method(rb_cHash, "ffi_yajl", rb_cHash_ffi_yajl, 2);
   rb_define_method(rb_cArray, "ffi_yajl", rb_cArray_ffi_yajl, 2);

data/lib/ffi_yajl/encoder.rb

@@ -18,7 +18,7 @@ module FFI_Yajl
       end
 
       # call either the ext or ffi hook
-      str = do_yajl_encode(obj, yajl_gen_opts)
+      str = do_yajl_encode(obj, yajl_gen_opts, opts)
       str.force_encoding('UTF-8') if defined? Encoding
       str
     end
@@ -29,6 +29,7 @@ module FFI_Yajl
 
     def initialize(opts = {})
       @opts = opts
+      @opts ||= {}
     end
 
     def self.raise_error_for_status(status)

data/lib/ffi_yajl/ffi/encoder.rb

@@ -4,8 +4,7 @@ require 'ffi_yajl/ffi'
 module FFI_Yajl
   module FFI
     module Encoder
-      def do_yajl_encode(obj, yajl_gen_opts = {})
-
+      def do_yajl_encode(obj, yajl_gen_opts, opts)
         yajl_gen = FFI_Yajl.yajl_gen_alloc(nil);
 
         # configure the yajl encoder

data/lib/ffi_yajl/json_gem.rb

@@ -55,49 +55,49 @@ end
 
 class Array
   def to_json(*opts, &block)
-    FFI_Yajl::Encoder.encode(self)
+    FFI_Yajl::Encoder.encode(self, *opts)
   end
 end
 
 class Hash
   def to_json(*opts, &block)
-    FFI_Yajl::Encoder.encode(self)
+    FFI_Yajl::Encoder.encode(self, *opts)
   end
 end
 
 class Fixnum
   def to_json(*opts, &block)
-    FFI_Yajl::Encoder.encode(self)
+    FFI_Yajl::Encoder.encode(self, *opts)
   end
 end
 
 class Float
   def to_json(*opts, &block)
-    FFI_Yajl::Encoder.encode(self)
+    FFI_Yajl::Encoder.encode(self, *opts)
   end
 end
 
 class String
   def to_json(*opts, &block)
-    FFI_Yajl::Encoder.encode(self)
+    FFI_Yajl::Encoder.encode(self, *opts)
   end
 end
 
 class TrueClass
   def to_json(*opts, &block)
-    FFI_Yajl::Encoder.encode(self)
+    FFI_Yajl::Encoder.encode(self, *opts)
   end
 end
 
 class FalseClass
   def to_json(*opts, &block)
-    FFI_Yajl::Encoder.encode(self)
+    FFI_Yajl::Encoder.encode(self, *opts)
   end
 end
 
 class NilClass
   def to_json(*opts, &block)
-    FFI_Yajl::Encoder.encode(self)
+    FFI_Yajl::Encoder.encode(self, *opts)
   end
 end
 

data/lib/ffi_yajl/parser.rb

@@ -41,7 +41,12 @@ module FFI_Yajl
         raise ArgumentError, "options check_utf8 and dont_validate_strings are both true which conflict"
       end
 
-      yajl_opts[:yajl_allow_comments]         = @opts[:allow_comments]
+      yajl_opts[:yajl_allow_comments]         = true
+
+      if @opts.key?(:allow_comments)
+        yajl_opts[:yajl_allow_comments]       = @opts[:allow_comments]
+      end
+
       yajl_opts[:yajl_dont_validate_strings]  = (@opts[:check_utf8] == false || @opts[:dont_validate_strings])
       yajl_opts[:yajl_allow_trailing_garbage] = @opts[:allow_trailing_garbage]
       yajl_opts[:yajl_allow_multiple_values]  = @opts[:allow_multiple_values]

data/lib/ffi_yajl/version.rb

@@ -1,3 +1,3 @@
 module FFI_Yajl
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/ffi_yajl/encoder_spec.rb

@@ -51,5 +51,13 @@ describe "FFI_Yajl::Encoder" do
     expect(encoder.encode(ruby)).to eq('{"gid":4294967294}')
   end
 
-end
+  context "when the encoder has nil passed in for options" do
+    let(:encoder) { FFI_Yajl::Encoder.new(nil) }
+
+    it "does not throw an exception" do
+      ruby = { "foo" => "bar" }
+      expect(encoder.encode(ruby)).to eq("{\"foo\":\"bar\"}")
+    end
+  end
 
+end

data/spec/ffi_yajl/json_gem_spec.rb

@@ -97,6 +97,17 @@ describe "JSON Gem Compat API" do
       expect(JSON.pretty_generate({'foo' => 1234}, {})).to eql("{\n  \"foo\": 1234\n}")
     end
 
+    class Foo
+      def to_json(*a)
+        {'foo' => 1234}.to_json(*a)
+      end
+    end
+
+    it "JSON#pretty_generate should work with an Object that implements #to_json" do
+      f = Foo.new
+      expect(JSON.pretty_generate(f)).to eql("{\n  \"foo\": 1234\n}\n")
+    end
+
     context "when setting symbolize_keys via JSON.default_options" do
       after(:each) { JSON.default_options[:symbolize_keys] = false }
 

data/spec/ffi_yajl/parser_spec.rb

@@ -32,6 +32,14 @@ describe "FFI_Yajl::Parser" do
           expect(parser).to eq({"key"=>"value"})
         end
       end
+
+      context "by default" do
+        let(:options) { }
+
+        it "should parse" do
+          expect(parser).to eq({"key"=>"value"})
+        end
+      end
     end
 
     context "when json has multiline comments" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-yajl
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Lamont Granquist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2014-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 description: Ruby FFI wrapper around YAJL 2.x
-email: lamont@scriptkiddie.org
+email: lamont@getchef.com
 executables:
 - ffi-yajl-bench
 extensions:
@@ -161,7 +161,7 @@ files:
 - spec/ffi_yajl/json_gem_spec.rb
 - spec/ffi_yajl/parser_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/lamont-granquist/ffi-yajl
+homepage: http://github.com/opscode/ffi-yajl
 licenses:
 - Apache-2.0
 metadata: {}