ffi-yajl 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 106e9a1f39150e1ba6d8c9e8cc89494619cada58
-  data.tar.gz: 2d13687a1f4eb651f4fd18078d2662afd6d9d0d9
+  metadata.gz: b3ce1385d8ff7b48416b9ae7b57157be1b0211c4
+  data.tar.gz: 461f634749b19eafbbc770e869e79e85a4d7a73b
 SHA512:
-  metadata.gz: 26a0c758139e7cfe1d36abec9457baef1ddc886a90c054bb637d52d5df51650cb1c633e9e8dacf702761fdc2c804fda5f11c00398a900b0b4e4a0bc46a4b822e
-  data.tar.gz: 7b86b9d4b257be76b21cf1f3c3c59ca3b2dc7ed7f7502be2012961e45b5324d8551ee6368e7d2c2f4d1887dc4dfd4a3380acf8359c28c19b9fd02edeb4195f1c
+  metadata.gz: 3268713c039518262d00724a1d50a828359463a279494ca50b797472bc754c0181ad867051743ca778e65d2b9ef609d4deed10f24308183263633910bcb7afe9
+  data.tar.gz: 7b7655a1cb1d46b4ab13202ad33f9b08dcae4b14eb9d6b52319e685daf753d9ebe9efb18144b34535b031016389993f9d7e4e02301ebaa33c2550719cb12cd47

data/Rakefile

@@ -1,3 +1,5 @@
+$: << File.expand_path(File.join(File.dirname( __FILE__ ), "lib"))
+
 require 'rspec/core/rake_task'
 require 'rubygems/package_task'
 require 'rake/extensiontask'

data/ext/ffi_yajl/ext/encoder/extconf.rb

@@ -9,7 +9,7 @@ RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 
 # pick up the vendored libyajl2 out of the libyajl2 gem
 $CFLAGS = "-I#{Libyajl2.include_path} -L#{Libyajl2.opt_path} #{$CFLAGS}"
-$LDFLAGS = "-L#{Libyajl2.opt_path} #{$CFLAGS}"
+$LDFLAGS = "-L#{Libyajl2.opt_path} #{$LDFLAGS}"
 
 puts $CFLAGS
 puts $LDFLAGS
@@ -22,7 +22,7 @@ if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc|clang/
   $CFLAGS << " -Wall"
 end
 
-$LDFLAGS << " -lyajl"
+#$LDFLAGS << " -lyajl"
 
 dir_config 'encoder'
 

data/ext/ffi_yajl/ext/parser/extconf.rb

@@ -9,7 +9,7 @@ RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 
 # pick up the vendored libyajl2 out of the libyajl2 gem
 $CFLAGS = "-I#{Libyajl2.include_path} -L#{Libyajl2.opt_path} #{$CFLAGS}"
-$LDFLAGS = "-L#{Libyajl2.opt_path} #{$CFLAGS}"
+$LDFLAGS = "-L#{Libyajl2.opt_path} #{$LDFLAGS}"
 
 puts $CFLAGS
 puts $LDFLAGS
@@ -22,7 +22,7 @@ if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc|clang/
   $CFLAGS << " -Wall"
 end
 
-$LDFLAGS << " -lyajl"
+#$LDFLAGS << " -lyajl"
 
 dir_config 'parser'
 

data/lib/ffi_yajl/ext.rb

@@ -2,19 +2,26 @@ require 'rubygems'
 
 require 'ffi_yajl/encoder'
 require 'ffi_yajl/parser'
+require 'dl'
+require 'ffi'
+require 'libyajl2'
 
-#unless RUBY_VERSION.to_f >= 1.9
-#  # segfaults on ruby 1.8 and this is an exceedingly low priority to fix, use ffi instead
-#  raise NotImplementedError, "The C-extension is disabled on Ruby 1.8"
-#end
 
 module FFI_Yajl
   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))
+    ::DL.dlopen(libpath)
     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))
+    ::DL.dlopen(libpath)
     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.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-yajl
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Lamont Granquist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby FFI wrapper around YAJL 2.x