snappy 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ODU1ZGZjMzdjNTA3ZGQyYTA1NWVkMWU4MTUxZGE2ZWFhMmQxZDM5Mw==
-  data.tar.gz: !binary |-
-    ODhjYTAwNzc4ZGY4OGM5NmJkOWUzZTdkOWI5NWQ1NGY4NDU4ZTJlZg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MWViMjZmOWIxNTFjMDk0MjQyZTE0MWJmM2EwMzc2NTEzYWNhM2Q4M2Y5NzI0
-    NWU5YzFiZmM0ZTA4ZWVhNDRhMTBkZmJmNjQwZjQ3MWE2MTBhYTJlYWY4ZDhh
-    NzM1OGU2MDQxZDQwZmE1YjZjZDY0NzJkNTExNzAwOTU3YzMzMzQ=
-  data.tar.gz: !binary |-
-    ZThjMmIwYzBhNTM3YjU0ZDNiMWE0N2I4YzYzNThkNmRhYzk1ZWEwZmRmODRk
-    NzI0OTZjODMwYjMzYTM2YjYyNmFmOGU0NGRlMGFmY2ZkMzNiYzRlMjhhMDU1
-    N2YxNGNmMmY3ODAyZWYxNzJmODQyNWYyYTAwZmZlMmJmZmI4MDU=
+SHA1:
+  metadata.gz: 990c047e2344f52eae8e3ba76bb893a77faa986b
+  data.tar.gz: ec20ae0e67ba95f05f9a0747461a77fee9db34b8
+SHA512:
+  metadata.gz: 4093ccce5bab5fd572922c3d6062b5fe72158e449111414bbd3cfbe056e8bd51c21435f94a24b4665a1f04da84ea72e03922d6290284f96b980eed4043faa7c7
+  data.tar.gz: afe38b265e257d36158a653286a689568c86a8229b623693b9c8165beec89b784dfd1d043f4525f8d4d8de4c853e17099c125e768e5c9480528b9eb7c41a3cb9

data/.gitignore

@@ -15,3 +15,10 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+lib/snappy_ext.*
+ext/Makefile
+ext/config.h
+ext/*.o
+ext/*.log
+ext/snappy*
+ext/java/build

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in snappy.gemspec
-gemspec
+gemspec

data/Rakefile

@@ -1,23 +1,68 @@
+require "bundler/setup"
 require "bundler/gem_tasks"
 require "rake/testtask"
 require "rbconfig"
 
-DLEXT = RbConfig::CONFIG["DLEXT"]
+Rake::TestTask.new do |t|
+  t.warning = true
+  t.verbose = true
+end
+
+if defined?(JRUBY_VERSION)
+  require 'ant'
+
+  directory 'ext/java/build'
 
-file "ext/snappy.#{DLEXT}" => Dir.glob("ext/*{.rb,.c}") do
-  Dir.chdir("ext") do
-     ruby "extconf.rb"
-     sh "make"
+  task :setup => 'ext/java/build' do
+    ant.property name: 'src.dir', value: 'ext/java/src'
+    ant.property name: 'build.dir', value: 'ext/java/build'
+
+    ant.path id: 'compile.class.path' do
+      pathelement location: File.join(RbConfig::CONFIG['prefix'], 'lib', 'jruby.jar')
+      $LOAD_PATH.flat_map { |path| Dir[File.join(path, '**', '*.jar')] }.each do |jar|
+        pathelement location: jar
+      end
+    end
   end
-  cp "ext/snappy.#{DLEXT}", "lib"
-end
 
-task :clean do
-  rm_rf(["ext/snappy.#{DLEXT}", "lib/snappy.#{DLEXT}", "ext/mkmf.log", "ext/config.h", "ext/api.o", "ext/Makefile", "ext/snappy.cc", "ext/snappy.h", "ext/snappy.o"] + Dir["ext/snappy-*"])
-end
+  desc 'Compile the extension'
+  task :compile => :setup do
+    ant.javac destdir: '${build.dir}', includeantruntime: 'no', target: '1.6', source: '1.6', debug: 'on' do
+      classpath refid: 'compile.class.path'
+      src { pathelement location: '${src.dir}' }
+    end
+  end
 
-Rake::TestTask.new do |t|
-  t.warning = true
-  t.verbose = true
+  desc 'Clean up build artifacts'
+  task :clean do
+    rm_rf 'ext/java/build'
+    rm_rf 'lib/snappy_ext.jar'
+  end
+
+  desc 'Package the jar'
+  file 'lib/snappy_ext.jar' => :compile do |t|
+    ant.jar destfile: 'lib/snappy_ext.jar', basedir: '${build.dir}' do
+      ant.fileset dir: '${build.dir}', includes: 'snappy/*.class'
+      ant.fileset dir: '${build.dir}', includes: 'SnappyExtLibraryService.class'
+    end
+  end
+
+  task :test => 'lib/snappy_ext.jar'
+  task :build => [:clean, 'lib/snappy_ext.jar']
+else
+  DLEXT = RbConfig::CONFIG["DLEXT"]
+
+  file "ext/snappy_ext.#{DLEXT}" => Dir.glob("ext/*{.rb,.c}") do
+    Dir.chdir("ext") do
+       ruby "extconf.rb"
+       sh "make"
+    end
+    cp "ext/snappy_ext.#{DLEXT}", "lib/snappy_ext.#{DLEXT}"
+  end
+
+  task :clean do
+    rm_rf(["ext/snappy_ext.#{DLEXT}", "lib/snappy_ext.#{DLEXT}", "ext/mkmf.log", "ext/config.h", "ext/api.o", "ext/Makefile", "ext/snappy.cc", "ext/snappy.h", "ext/snappy.o"] + Dir["ext/snappy-*"])
+  end
+
+  task :test => "ext/snappy_ext.#{DLEXT}"
 end
-task :test => "ext/snappy.#{DLEXT}"

data/ext/api.c

@@ -78,7 +78,7 @@ snappy_inflate(int argc, VALUE *argv, VALUE self)
     return dst;
 }
 
-void Init_snappy()
+void Init_snappy_ext()
 {
     rb_mSnappy = rb_define_module("Snappy");
     rb_eSnappy = rb_define_class_under(rb_mSnappy, "Error", rb_eStandardError);
@@ -92,7 +92,4 @@ void Init_snappy()
 
     rb_define_alias(rb_mSnappy_singleton, "uncompress", "inflate");
     rb_define_alias(rb_mSnappy_singleton, "load", "inflate");
-
-    rb_require("snappy/writer");
-    rb_require("snappy/reader");
-}
+  }

data/ext/extconf.rb

@@ -1,7 +1,7 @@
 require 'mkmf'
 require 'fileutils'
 
-unless have_library 'snappy'
+unless have_library 'snappy_ext'
   dst = File.dirname File.expand_path __FILE__
 
   tar = 'tar'
@@ -36,4 +36,4 @@ snappy.h
   end
 end
 
-create_makefile 'snappy'
+create_makefile 'snappy_ext'

data/ext/java/src/SnappyExtService.java

@@ -0,0 +1,18 @@
+import org.jruby.Ruby;
+import org.jruby.RubyModule;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.runtime.load.Library;
+import org.jruby.runtime.load.BasicLibraryService;
+
+import snappy.SnappyModule;
+
+
+public class SnappyExtService implements BasicLibraryService {
+  public boolean basicLoad(final Ruby runtime) {
+    RubyModule snappyModule = runtime.defineModule("Snappy");
+    snappyModule.defineAnnotatedMethods(SnappyModule.class);
+    return true;
+  }
+}

data/ext/java/src/snappy/SnappyModule.java

@@ -0,0 +1,32 @@
+package snappy;
+
+import java.io.IOException;
+
+import org.jruby.RubyString;
+import org.jruby.anno.JRubyModule;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.util.ByteList;
+
+import org.xerial.snappy.Snappy;
+
+
+@JRubyModule(name = "Snappy")
+public class SnappyModule {
+  @JRubyMethod(module = true, name = {"deflate", "compress", "dump"})
+  public static IRubyObject deflate(ThreadContext context, IRubyObject self, IRubyObject str) throws IOException {
+    ByteList input = str.convertToString().getByteList();
+    byte[] compressed = new byte[Snappy.maxCompressedLength(input.length())];
+    int compressedLength = Snappy.compress(input.unsafeBytes(), input.begin(), input.length(), compressed, 0);
+    return RubyString.newStringNoCopy(context.runtime, compressed, 0, compressedLength);
+  }
+
+  @JRubyMethod(module = true, name = {"inflate", "uncompress", "load"})
+  public static IRubyObject inflate(ThreadContext context, IRubyObject self, IRubyObject str) throws IOException {
+    ByteList input = str.convertToString().getByteList();
+    byte[] uncompressed = new byte[Snappy.uncompressedLength(input.unsafeBytes(), input.begin(), input.length())];
+    int uncompressedLength = Snappy.uncompress(input.unsafeBytes(), input.begin(), input.length(), uncompressed, 0);
+    return RubyString.newStringNoCopy(context.runtime, uncompressed, 0, uncompressedLength);
+  }
+}

data/lib/snappy.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+
+require 'snappy-jars' if defined?(JRUBY_VERSION)
+require 'snappy_ext'
+require 'snappy/reader'
+require 'snappy/writer'

data/lib/snappy/version.rb

@@ -1,3 +1,3 @@
 module Snappy
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/snappy.gemspec

@@ -17,7 +17,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
-  spec.extensions    = ["ext/extconf.rb"]
+
+  if defined?(JRUBY_VERSION)
+    spec.files += %w[lib/snappy_ext.jar]
+    spec.platform = 'java'
+    spec.add_dependency 'snappy-jars', '~> 1.1.0'
+  else
+    spec.extensions = ["ext/extconf.rb"]
+  end
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snappy
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - miyucy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-24 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,28 +28,28 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: libsnappy binding for Ruby
@@ -67,6 +67,9 @@ files:
 - Rakefile
 - ext/api.c
 - ext/extconf.rb
+- ext/java/src/SnappyExtService.java
+- ext/java/src/snappy/SnappyModule.java
+- lib/snappy.rb
 - lib/snappy/reader.rb
 - lib/snappy/version.rb
 - lib/snappy/writer.rb
@@ -84,17 +87,17 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: libsnappy binding for Ruby