xorcist 1.0.0-java → 1.0.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04bd83615c3ecb37774b18b88e159f458585658c
-  data.tar.gz: 074ce686948c516e4c3fddda714de029ae6d612e
+  metadata.gz: e3ec97ff082d6a11f9f91c2b890dc1b702a7e554
+  data.tar.gz: 4c4b5dc875918295ac25fff1e8b5dbc5918470c0
 SHA512:
-  metadata.gz: 655eab50ca30c1e09f21c990bb096fc5b6301c6f67fa1f829e5a8478cd7e9f386fb533ede86f191fa14ad80bd18382070e6f95af2834e078aa1d1dc455152647
-  data.tar.gz: da4117f1799fc026ebe325d06d16053b9955a7432cf5e3fc95d443797e12bc536423b67e08ce85c4ce12be24571141e8e5fcb0ec04cb03da4274f8ef5bd2bda3
+  metadata.gz: bfe6eb7464fad71d6eba8e8937384ff9638221fecd7971eff3e77904740111faf5a27d7ee28f976209a3a2bd1fd23583dfcd087ffa70916d642e9da06868b1ac
+  data.tar.gz: e84e02571301a9e8f2ac8dc4ac404153b81e8dd832d96b8f29cdf0789d98fd94a0663d5947e3c4fbaaa676131d1b4aad7ae4b94b43b09f69a11f1291a7dea73b

data/README.md

@@ -11,8 +11,10 @@ Blazing-fast-cross-platform-monkey-patch-free string XOR. Yes, that means JRuby
 require 'xorcist'
 
 a, b = 'a', 'b'
-Xorcist.xor(a, b)
-Xorcist.xor!(a, b)
+Xorcist.xor(a, b) # => "\u0003"
+a # => 'a'
+Xorcist.xor!(a, b) # => "\u0003"
+a # => "\u0003"
 ```
 
 You can `include Xorcist` to expose its methods:
@@ -46,30 +48,35 @@ require 'xorcist/string_methods'
 String.include(Xorcist::StringMethods)
 ```
 
+## Encodings
+
+Note the precise encoding `xor`'s output is undefined in the v1.0.x releases. In MRI `xor!` will return a string using your default encoding. With JRuby, `xor!` will return an ASCII-8BIT string.
+
 ## Benchmarks
 
-Disclaimer: these are run from my craptop. Run 'em yourself with `bin/benchmark`.
+Disclaimer: these are run from my craptop. Run 'em yourself with `bin/benchmark`. You'll need to have [`benchmark-ips`](https://github.com/evanphx/benchmark-ips) installed.
 
 ### MRI 2.2.1
 
 ```
 Calculating -------------------------------------
-                ruby    11.136k i/100ms
-             xorcist    71.472k i/100ms
+                ruby    26.378k i/100ms
+             xorcist    73.291k i/100ms
 -------------------------------------------------
-                ruby    144.198k (± 1.3%) i/s -    723.840k
-             xorcist      2.155M (± 0.7%) i/s -     10.792M
+                ruby    376.513k (± 0.5%) i/s -      1.899M
+             xorcist      2.150M (± 3.9%) i/s -     10.774M
 ```
 
 ### JRuby 1.7.19
 
 ```
+Picked up JAVA_TOOL_OPTIONS: -javaagent:/usr/share/java/jayatanaag.jar 
 Calculating -------------------------------------
-                ruby   142.000  i/100ms
-             xorcist    88.006k i/100ms
+                ruby    31.795k i/100ms
+             xorcist   118.084k i/100ms
 -------------------------------------------------
-                ruby      3.113k (±32.6%) i/s -     11.218k in   5.781000s
-             xorcist      3.184M (±32.9%) i/s -     12.321M
+                ruby    978.078k (±11.2%) i/s -      4.801M
+             xorcist      3.897M (±14.1%) i/s -     19.012M
 ```
 
 ## Installation
@@ -98,7 +105,8 @@ The gem is available as open source under the terms of the [MIT License](http://
 
 ## Special Thanks To...
 
- - [Steve Sloan][http://www.finagle.org] for his [fast_xor gem][https://github.com/CodeMonkeySteve/fast_xor] from which most of the tests are borrowed
- - [James Coglan][http://jcoglan.com] for his [guide on writing a JRuby Java extension][https://blog.jcoglan.com/2012/08/02/your-first-ruby-native-extension-java/]
+ - [Steve Sloan](http://www.finagle.org) for his [fast_xor gem](https://github.com/CodeMonkeySteve/fast_xor) from which most of the tests are borrowed
+ - [James Coglan](http://jcoglan.com) for his [guide on writing a JRuby Java extension](https://blog.jcoglan.com/2012/08/02/your-first-ruby-native-extension-java/)
+ - [Thomas Leitner](https://github.com/gettalong) for a faster pure Ruby XOR implementation that's used in the benchmark
  - To all [contributers](https://github.com/fny/xorcist/graphs/contributors)! :beers:
 

data/lib/xorcist/version.rb

@@ -1,3 +1,3 @@
 module Xorcist
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

metadata

@@ -1,25 +1,25 @@
 --- !ruby/object:Gem::Specification
 name: xorcist
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: java
 authors:
 - Faraz Yashar
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-13 00:00:00.000000000 Z
+date: 2015-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   prerelease: false
@@ -28,12 +28,12 @@ dependencies:
   name: minitest
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.7.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 5.7.0
   prerelease: false
@@ -42,12 +42,12 @@ dependencies:
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   prerelease: false
@@ -56,14 +56,14 @@ dependencies:
   name: rake-compiler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.5
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.5
   prerelease: false
   type: :development
 description: Blazing-fast-cross-platform-monkey-patch-free string XOR. Yes, that means JRuby too.
@@ -74,18 +74,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- ext/xorcist/Xorcist.java
-- ext/xorcist/XorcistService.java
-- ext/xorcist/extconf.rb
-- ext/xorcist/xorcist.c
 - lib/xorcist.jar
 - lib/xorcist.rb
 - lib/xorcist/refinements.rb
 - lib/xorcist/string_methods.rb
 - lib/xorcist/version.rb
-- test/refinements_test.rb
-- test/test_helper.rb
-- test/xorcist_test.rb
 homepage: https://github.com/fny/xorcist
 licenses:
 - MIT
@@ -96,17 +89,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.4.5
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: Blazing-fast-cross-platform-monkey-patch-free string XOR

data/ext/xorcist/Xorcist.java

@@ -1,22 +0,0 @@
-import org.jruby.anno.JRubyMethod;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.RubyString;
-import org.jruby.util.ByteList;
-
-public class Xorcist {
-    @JRubyMethod(name = "xor!", module = true)
-    public static RubyString xorInPlace(ThreadContext context, IRubyObject self, RubyString x, RubyString y) {
-        byte[] xBytes = x.getBytes();
-        byte[] yBytes = y.getBytes();
-
-        int length = yBytes.length < xBytes.length ? yBytes.length : xBytes.length;
-
-        for(int i = 0; i < length; i++) {
-            xBytes[i] = (byte) (xBytes[i] ^ yBytes[i]);
-        }
-
-        x.setValue(new ByteList(xBytes));
-        return x;
-    }
-}

data/ext/xorcist/XorcistService.java

@@ -1,14 +0,0 @@
-import java.io.IOException;
-
-import org.jruby.Ruby;
-import org.jruby.RubyModule;
-import org.jruby.runtime.load.BasicLibraryService;
-
-public class XorcistService implements BasicLibraryService {
-    @Override
-    public boolean basicLoad(final Ruby runtime) throws IOException {
-        RubyModule xorcist = runtime.defineModule("Xorcist");
-        xorcist.defineAnnotatedMethods(Xorcist.class);
-        return true;
-    }
-}

data/ext/xorcist/extconf.rb

@@ -1,4 +0,0 @@
-require 'mkmf'
-extension_name = 'xorcist'
-dir_config(extension_name)
-create_makefile(extension_name)

data/ext/xorcist/xorcist.c

@@ -1,36 +0,0 @@
-#include "ruby.h"
-
-VALUE Xorcist = Qnil;
-
-void Init_xorcist();
-
-VALUE xor_in_place(VALUE x, VALUE y, VALUE self);
-
-VALUE xor_in_place(VALUE self, VALUE x, VALUE y) {
-    const char *src = 0;
-    char *dest = 0;
-    size_t len;
-    size_t y_len;
-
-    rb_str_modify(x);
-    dest = RSTRING_PTR(x);
-    len = RSTRING_LEN(x);
-
-    src = RSTRING_PTR(y);
-    y_len = RSTRING_LEN(y);
-
-    if (y_len < len) {
-        len = y_len;
-    }
-
-    for (; len--; ++dest, ++src) {
-        *dest ^= *src;
-    }
-
-    return x;
-}
-
-void Init_xorcist() {
-    Xorcist = rb_define_module("Xorcist");
-    rb_define_module_function(Xorcist, "xor!", xor_in_place, 2);
-}

data/test/refinements_test.rb

@@ -1,23 +0,0 @@
-require 'test_helper'
-
-if RUBY_ENGINE != 'jruby' && RUBY_ENGINE != 'rbx' && RUBY_VERSION >= '2.0.0'
-  require 'xorcist/refinements'
-
-  class RefinementsTest < Minitest::Test
-    using Xorcist::Refinements
-
-    def test_xor
-      assert_equal ZERO, X.xor(X)
-      assert_equal ONE,  X.xor(INVX)
-      assert_equal X,    X.xor(ZERO)
-      assert_equal INVX, X.xor(ONE)
-    end
-
-    def test_xor_in_place
-      a = "String"
-      b = a
-      b.xor!(X)
-      assert_equal(a, b)
-    end
-  end
-end

data/test/test_helper.rb

@@ -1,11 +0,0 @@
-require 'xorcist'
-
-require 'minitest'
-require 'minitest/autorun'
-require 'minitest/pride'
-
-LEN  = 16
-ZERO = ([0x00].pack('C') * LEN).freeze
-ONE  = ([0xFF].pack('C') * LEN).freeze
-X    = (0...LEN).collect { rand 256 }.pack('C*').freeze
-INVX = (0...LEN).collect { |i| X[i].ord ^ 0xFF }.pack('C*').freeze

data/test/xorcist_test.rb

@@ -1,42 +0,0 @@
-require 'test_helper'
-
-class XorcistTest < Minitest::Test
-  include Xorcist
-
-  def test_xor
-    assert_equal ZERO, xor(X, X)
-    assert_equal ONE,  xor(X, INVX)
-    assert_equal X,    xor(X, ZERO)
-    assert_equal INVX, xor(X, ONE)
-  end
-
-  def test_xor_in_place
-    a = "String"
-    b = a
-    xor!(b, X)
-    assert_equal(a, b)
-  end
-
-  #
-  # Tests for different string storage behaviors in MRI.
-  # See http://patshaughnessy.net/2012/1/4/never-create-ruby-strings-longer-than-23-characters
-  # for details.
-  # Might as well run them in other Rubies too.
-  #
-
-  def test_embedded_string
-    a = "Embedded string"
-    assert a.size <= 23
-    b = a.dup
-    xor!(b, X)
-    refute_equal(a, b)
-  end
-
-  def test_heap_string
-    a = "A very long string that's stored on the heap"
-    assert a.size > 24
-    b = a.dup
-    xor!(b, X*2)
-    refute_equal(a, b)
-  end
-end