ffi-yajl 0.1.5 → 0.1.6

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzIyZGY5NmRiNDIxNjYyYmU5ZDBiODNkYTA1MDAyNmNhNTljOTg5Mw==
-  data.tar.gz: !binary |-
-    NGMwNTUzOGE5NTEyYWZiMTY1NjhjNTU3NTI2MmQzYTU0M2ViMzQ4Mw==
+SHA1:
+  metadata.gz: f1453e9523f1bd1469cd58b184eab27f33a80242
+  data.tar.gz: b477f818062421da4df0a059b355d48522c1e94b
 SHA512:
-  metadata.gz: !binary |-
-    Zjk3YTgxY2NmY2Y3YWRjYjAyZmUwN2YzYjhlMjYxOWI3ZTY0NTAyZmZiZmEx
-    NzNmNWFlZjM5NzQzZTNiMjE1YTdiMWFiOWZlYTM3OTAzZjcyZjdkMWUyZTg1
-    NDhkZTIwMjQwMjUzYTllZGQ1ZGJmZDMzOTAyYTAxNWM5MGMxMWI=
-  data.tar.gz: !binary |-
-    OTUwYzlmZDQ2NDMwNWUzOWYwOTNkYzMwNmM0M2IwYjRmMTk3NjAxZTk2NjUx
-    OWY4OTIxODU5ZjI0MWFkNzk1ODI2NWQxNzViMDNiZDE4ZGFmNjNiZTI1MGRl
-    MDY1NTFlZWUxODVkNGNkMjVmY2U4ZDU0NTI0NDY3ZmM3YTg5NTE=
+  metadata.gz: 6c79611e78c69e53f4db81c4b6475179c04467c7a4a73c31601878dfaddf5cdd1ac69eda51f32b7b182ffa4e8b3e277458aae0087207a026067c6cee70ff5353
+  data.tar.gz: 250b143ad9111b33b792fae5ac909c3d0c771026615af1024a61f3476ad155150160027983cfc02e133fba2c31bcfa29fe90918a59e7c964e6b3e754b50e4197

data/Rakefile

@@ -57,7 +57,9 @@ end
 desc "Run all specs against both extensions"
 task :spec do
   Rake::Task["spec:ffi"].invoke
-  Rake::Task["spec:ext"].invoke
+  if !defined?(RUBY_ENGINE) || RUBY_ENGINE !~ /jruby/
+    Rake::Task["spec:ext"].invoke
+  end
 end
 
 namespace :spec do

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

@@ -170,6 +170,8 @@ static VALUE mParser_do_yajl_parse(VALUE self, VALUE str, VALUE opts) {
   /* 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);
 
   hand = yajl_alloc(&callbacks, NULL, &ctx);
   if ((stat = yajl_parse(hand, (unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str))) != yajl_status_ok) {

data/lib/ffi_yajl/ext.rb

@@ -2,10 +2,13 @@ require 'rubygems'
 
 require 'ffi_yajl/encoder'
 require 'ffi_yajl/parser'
-require 'dl'
 require 'ffi'
 require 'libyajl2'
-
+begin
+  require 'fiddle'
+rescue LoadError
+  require 'dl'
+end
 
 module FFI_Yajl
   class Parser
@@ -13,7 +16,11 @@ module FFI_Yajl
     libname = ::FFI.map_library_name("yajl")
     libpath = File.expand_path(File.join(Libyajl2.opt_path, libname))
     libpath.gsub!(/dylib/, 'bundle')
-    ::DL.dlopen(libpath)
+    if defined?(Fiddle)
+      ::Fiddle.dlopen(libpath)
+    else
+      ::DL.dlopen(libpath)
+    end
     require 'ffi_yajl/ext/parser'
     include FFI_Yajl::Ext::Parser
   end
@@ -23,7 +30,11 @@ module FFI_Yajl
     libname = ::FFI.map_library_name("yajl")
     libpath = File.expand_path(File.join(Libyajl2.opt_path, libname))
     libpath.gsub!(/dylib/, 'bundle')
-    ::DL.dlopen(libpath)
+    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/version.rb

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

data/spec/ffi_yajl/json_gem_spec.rb

@@ -94,7 +94,7 @@ describe "JSON Gem Compat API" do
       end
 
       it "changing the default_options should change the behavior to true" do
-        pending("implement symbolize keys")
+        skip("implement symbolize keys")
         JSON.default_options[:symbolize_keys] = true
         expect(JSON.parse('{"foo": 1234}')).to eq( :foo => 1234 )
       end
@@ -109,19 +109,19 @@ describe "JSON Gem Compat API" do
       end
 
       it "changing the default_options should change the behavior to true" do
-        pending("implement symbolize keys")
+        skip("implement symbolize keys")
         JSON.default_options[:symbolize_names] = true
         expect(JSON.parse('{"foo": 1234}')).to eq( :foo => 1234 )
       end
     end
 
     it "should support passing symbolize_names to JSON.parse" do
-      pending("implement symbolize keys")
+      skip("implement symbolize keys")
       expect(JSON.parse('{"foo": 1234}', :symbolize_names => true)).to eq( :foo => 1234 )
     end
 
     it "should support passing symbolize_keys to JSON.parse" do
-      pending("implement symbolize keys")
+      skip("implement symbolize keys")
       expect(JSON.parse('{"foo": 1234}', :symbolize_keys => true)).to eq( :foo => 1234 )
     end
 

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: ffi-yajl
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Lamont Granquist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: libyajl2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby FFI wrapper around YAJL 2.x
@@ -171,12 +171,12 @@ require_paths:
 - lib
 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: []