ffi-yajl 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1453e9523f1bd1469cd58b184eab27f33a80242
-  data.tar.gz: b477f818062421da4df0a059b355d48522c1e94b
+  metadata.gz: a73785d92badd552df56ecd0fd14f53537bc5c5b
+  data.tar.gz: 6c7f329234428cd07ec9fbf73b1040c27d82fab3
 SHA512:
-  metadata.gz: 6c79611e78c69e53f4db81c4b6475179c04467c7a4a73c31601878dfaddf5cdd1ac69eda51f32b7b182ffa4e8b3e277458aae0087207a026067c6cee70ff5353
-  data.tar.gz: 250b143ad9111b33b792fae5ac909c3d0c771026615af1024a61f3476ad155150160027983cfc02e133fba2c31bcfa29fe90918a59e7c964e6b3e754b50e4197
+  metadata.gz: 2938f35493a720cfcf72ee73dfcccd88e56ef2cc2b58bcd5859a6ec7dde34100891a69c3b1139edf7a75c0f7c181ade595a0de6cf3d37fb73336c76ee5be631e
+  data.tar.gz: a40243af1ddc3095562a3af781bcf73c2cb04691ce4cb2a090ca85e4987508b0673e8e89f0176364dbed765e0369ba3d4185b3eafcba52f8e4056d41e37da487

data/ext/ffi_yajl/ext/parser/parser.c

@@ -9,21 +9,20 @@ static rb_encoding *utf8Encoding;
 static VALUE mFFI_Yajl, mExt, mParser, cParseError;
 
 typedef struct {
-  VALUE finished;
-  VALUE stack;
-  VALUE key_stack;
-  VALUE key;
+  VALUE self;
 } CTX;
 
 void set_value(CTX *ctx, VALUE val) {
-  long len = RARRAY_LEN(ctx->stack);
-  VALUE last = rb_ary_entry(ctx->stack, len-1);
+  VALUE stack = rb_ivar_get(ctx->self, rb_intern("stack"));
+  VALUE key = rb_ivar_get(ctx->self, rb_intern("key"));
+  long len = RARRAY_LEN(stack);
+  VALUE last = rb_ary_entry(stack, len-1);
   switch (TYPE(last)) {
     case T_ARRAY:
       rb_ary_push(last, val);
       break;
     case T_HASH:
-      rb_hash_aset(last, ctx->key, val);
+      rb_hash_aset(last, key, val);
       break;
     default:
       break;
@@ -31,20 +30,26 @@ void set_value(CTX *ctx, VALUE val) {
 }
 
 void set_key(CTX *ctx, VALUE key) {
-  ctx->key = key;
+  rb_ivar_set(ctx->self, rb_intern("key"), key);
 }
 
 void start_object(CTX *ctx, VALUE obj) {
-  rb_ary_push(ctx->key_stack, ctx->key);
-  rb_ary_push(ctx->stack, obj);
+  VALUE key_stack = rb_ivar_get(ctx->self, rb_intern("key_stack"));
+  VALUE key       = rb_ivar_get(ctx->self, rb_intern("key"));
+  VALUE stack     = rb_ivar_get(ctx->self, rb_intern("stack"));
+
+  rb_ary_push(key_stack, key);
+  rb_ary_push(stack, obj);
 }
 
 void end_object(CTX *ctx) {
-  ctx->key = rb_ary_pop(ctx->key_stack);
-  if ( RARRAY_LEN(ctx->stack) > 1 ) {
-    set_value(ctx, rb_ary_pop(ctx->stack));
+  VALUE key_stack = rb_ivar_get(ctx->self, rb_intern("key_stack"));
+  VALUE stack = rb_ivar_get(ctx->self, rb_intern("stack"));
+  rb_ivar_set(ctx->self, rb_intern("key"), rb_ary_pop(key_stack));
+  if ( RARRAY_LEN(stack) > 1 ) {
+    set_value(ctx, rb_ary_pop(stack));
   } else {
-    ctx->finished = rb_ary_pop(ctx->stack);
+    rb_ivar_set(ctx->self, rb_intern("finished"), rb_ary_pop(stack));
   }
 }
 
@@ -162,18 +167,14 @@ static VALUE mParser_do_yajl_parse(VALUE self, VALUE str, VALUE opts) {
   yajl_handle hand;
   yajl_status stat;
   unsigned char *err;
-  CTX ctx;
+  volatile CTX ctx;
 
-  ctx.stack = rb_ary_new();
-  ctx.key_stack = rb_ary_new();
+  rb_ivar_set(self, rb_intern("stack"), rb_ary_new());
+  rb_ivar_set(self, rb_intern("key_stack"), rb_ary_new());
 
-  /* hack to avoid garbage collection */
-  rb_ivar_set(self, rb_intern("stack"), ctx.stack);
-  rb_ivar_set(self, rb_intern("key_stack"), ctx.key_stack);
-  rb_ivar_set(self, rb_intern("finished"), ctx.stack);
-  rb_ivar_set(self, rb_intern("key"), ctx.stack);
+  ctx.self = self;
 
-  hand = yajl_alloc(&callbacks, NULL, &ctx);
+  hand = yajl_alloc(&callbacks, NULL, (void *)&ctx);
   if ((stat = yajl_parse(hand, (unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str))) != yajl_status_ok) {
     err = yajl_get_error(hand, 1, (unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str));
     goto raise;
@@ -183,7 +184,7 @@ static VALUE mParser_do_yajl_parse(VALUE self, VALUE str, VALUE opts) {
     goto raise;
   }
   yajl_free(hand);
-  return ctx.finished;
+  return rb_ivar_get(self, rb_intern("finished"));
 
 raise:
   if (hand) {

data/lib/ffi_yajl/ext.rb

@@ -7,34 +7,32 @@ require 'libyajl2'
 begin
   require 'fiddle'
 rescue LoadError
+end
+begin
   require 'dl'
+rescue LoadError
 end
 
 module FFI_Yajl
+  # FIXME: DRY with ffi_yajl/ffi.rb
+  libname = ::FFI.map_library_name("yajl")
+  libpath = File.expand_path(File.join(Libyajl2.opt_path, libname))
+  libpath.gsub!(/dylib/, 'bundle')
+  libpath = ::FFI.map_library_name("yajl") unless File.exist?(libpath)
+  if defined?(Fiddle) && Fiddle.respond_to?(:dlopen)
+    ::Fiddle.dlopen(libpath)
+  elsif defined?(DL) && DL.respond_to?(:dlopen)
+    ::DL.dlopen(libpath)
+  else
+    ffi_lib libpath
+  end
+
   class Parser
-    # FIXME: DRY with ffi_yajl/ffi.rb
-    libname = ::FFI.map_library_name("yajl")
-    libpath = File.expand_path(File.join(Libyajl2.opt_path, libname))
-    libpath.gsub!(/dylib/, 'bundle')
-    if defined?(Fiddle)
-      ::Fiddle.dlopen(libpath)
-    else
-      ::DL.dlopen(libpath)
-    end
     require 'ffi_yajl/ext/parser'
     include FFI_Yajl::Ext::Parser
   end
 
   class Encoder
-    # FIXME: DRY with ffi_yajl/ffi.rb
-    libname = ::FFI.map_library_name("yajl")
-    libpath = File.expand_path(File.join(Libyajl2.opt_path, libname))
-    libpath.gsub!(/dylib/, 'bundle')
-    if defined?(Fiddle)
-      ::Fiddle.dlopen(libpath)
-    else
-      ::DL.dlopen(libpath)
-    end
     require 'ffi_yajl/ext/encoder'
     include FFI_Yajl::Ext::Encoder
   end

data/lib/ffi_yajl/ffi/parser.rb

@@ -4,14 +4,6 @@ require 'ffi_yajl/ffi'
 module FFI_Yajl
   module FFI
     module Parser
-        attr_accessor :stack, :key_stack, :key, :finished
-
-        #
-        # stack used to build up our complex object
-        #
-        def stack
-          @stack ||= Array.new
-        end
 
         def set_value(val)
           case stack.last
@@ -33,13 +25,6 @@ module FFI_Yajl
           end
         end
 
-        #
-        # stack to keep track of keys as we create nested hashes
-        #
-        def key_stack
-          @key_stack ||= Array.new
-        end
-
         def key_push
           key_stack.push(key)
         end

data/lib/ffi_yajl/json_gem.rb

@@ -20,7 +20,8 @@ module JSON
     raise JSON::GeneratorError, e.message
   end
 
-  def self.pretty_generate(obj, opts={})
+  def self.pretty_generate(obj, opts=nil)
+    opts ||= {}
     options_map = {}
     options_map[:pretty] = true
     options_map[:indent] = opts[:indent] if opts.has_key?(:indent)

data/lib/ffi_yajl/parser.rb

@@ -2,8 +2,24 @@
 module FFI_Yajl
   class ParseError < StandardError; end
   class Parser
+    attr_accessor :stack, :key_stack, :key, :finished
+
     attr_accessor :opts
 
+    #
+    # stack used to build up our complex object
+    #
+    def stack
+      @stack ||= Array.new
+    end
+
+    #
+    # stack to keep track of keys as we create nested hashes
+    #
+    def key_stack
+      @key_stack ||= Array.new
+    end
+
     def self.parse(obj, *args)
       new(*args).parse(obj)
     end

data/lib/ffi_yajl/version.rb

@@ -1,3 +1,3 @@
 module FFI_Yajl
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-yajl
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Lamont Granquist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-05 00:00:00.000000000 Z
+date: 2014-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake