bin_utils 0.0.3 → 0.0.4

data/ext/bin_utils/extconf.rb

@@ -1,6 +1,8 @@
-if RUBY_ENGINE == 'ruby'
+if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
   require 'mkmf'
-  create_makefile("native_bin_utils")
+  # rubinius has no rb_str_drop_bytes
+  have_func('rb_str_drop_bytes')
+  create_makefile("bin_utils")
 else
   File.open(File.dirname(__FILE__) + "/Makefile", 'w') do |f|
     f.write("install:\n\t#nothing to build")

data/ext/bin_utils/native.c

@@ -59,13 +59,24 @@ typedef unsigned long long uint64_t;
 
 ID rshft;
 ID band;
+#ifndef HAVE_RB_STR_DROP_BYTES
+/* rubinius has no rb_str_drop_bytes */
+ID aset;
+static VALUE
+rb_str_drop_bytes(VALUE str, long bytes)
+{
+    VALUE args[3] = {INT2FIX(0), INT2FIX(bytes), rb_str_new(0, 0)};
+    rb_funcall2(str, aset, 3, args);
+    return str;
+}
+#endif
 
 static long
 check_size(long i, long strlen, long ilen)
 {
     if (i < 0) { i += strlen; }
     if (i > strlen - ilen || i < 0) {
-        rb_raise(rb_eArgError, "index %ld be in range 0..%ld or in range -%ld..-%ld for string of size %ld", i, strlen-ilen, strlen, -ilen, strlen);
+        rb_raise(rb_eArgError, "index %ld should be in range 0..%ld or in range -%ld..-%ld for string of size %ld", i, strlen-ilen, strlen, -ilen, strlen);
     }
     return i;
 }
@@ -94,7 +105,6 @@ get_int16_le(VALUE rstr, VALUE ri)
     long i = NUM2LONG(ri);
     const uint8_t *ptr;
     uint32_t byte0, byte1;
-    int32_t res;
     StringValue(rstr);
     i = check_size(i, RSTRING_LEN(rstr), 2);
     ptr = (const uint8_t*)RSTRING_PTR(rstr);
@@ -481,7 +491,7 @@ get_ber(VALUE rstr, VALUE ri)
     StringValue(rstr);
     len = RSTRING_LEN(rstr);
     i = check_size(i, len, 1);
-    ptr = RSTRING_PTR(rstr) + i;
+    ptr = (const uint8_t*)RSTRING_PTR(rstr) + i;
     return parse_ber(ptr, len, &i);
 }
 
@@ -953,7 +963,7 @@ slice_ber(VALUE rstr, long *i)
     const uint8_t *ptr;
     StringValue(rstr);
     len = RSTRING_LEN(rstr);
-    ptr = RSTRING_PTR(rstr);
+    ptr = (const uint8_t*)RSTRING_PTR(rstr);
     return parse_ber(ptr, len, i);
 }
 
@@ -1583,12 +1593,15 @@ append_int_int(32, 24, be)
 /** APPEND COMPLEX END **/
 
 void
-Init_native_bin_utils()
+Init_bin_utils()
 {
     VALUE mod_bin_utils = rb_define_module("BinUtils");
     VALUE mod_native = rb_define_module_under(mod_bin_utils, "Native");
     rshft = rb_intern(">>");
     band = rb_intern("&");
+#ifndef HAVE_RB_STR_DROP_BYTES
+    aset = rb_intern("[]=");
+#endif
 
     rb_define_method(mod_native, "get_ber", rb_get_ber, -1);
     rb_define_method(mod_native, "get_int8", rb_get_int8, -1);

data/lib/bin_utils.rb

@@ -2,12 +2,17 @@ require "bin_utils/version"
 
 module BinUtils
   begin
-    require 'bin_utils/native_bin_utils'
-    extend Native
+    if RUBY_ENGINE == 'jruby'
+      require 'bin_utils/bin_utils.jar'
+    else
+      require 'bin_utils/bin_utils'
+    end
+    extend ::BinUtils::Native
   rescue LoadError
+    raise
     require 'bin_utils/pure_ruby'
     extend PureRuby
-    if RUBY_ENGINE == 'ruby'
+    if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'jruby'
       $stderr.puts "Attention: pure ruby version of BinUtils is used"
     end
   end

data/lib/bin_utils/version.rb

@@ -1,3 +1,3 @@
 module BinUtils
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/benchmark.rb

@@ -68,6 +68,11 @@ Benchmark.bmbm(6) do |x|
     i, i2 = b.unpack(_Vv)
     b[0, 6] = EMPTY
   } }
+  x.report('cut unpack i32le i16le') { N.times{|_|
+    b = a.dup
+    i, i2 = b.unpack(_Vv)
+    b.replace b[6..-1]
+  } }
   x.report('cut unpack i32le i16le ber') { N.times{|_|
     b = a.dup
     i, i2, i3 = b.unpack(_Vvw)

data/test/test_bin_utils.rb

@@ -460,7 +460,7 @@ describe 'pure_ruby' do
 end
 
 begin
-  require 'bin_utils/native_bin_utils'
+  require 'bin_utils/bin_utils'
   describe 'native' do
     let(:util){ BinUtils::Native }
     class_eval(&shared_example)

metadata

@@ -1,16 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: bin_utils
 version: !ruby/object:Gem::Version
-  version: 0.0.3
   prerelease: 
+  version: 0.0.4
 platform: ruby
 authors:
 - Sokolov Yura 'funny-falcon'
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-08 00:00:00.000000000 Z
-dependencies: []
+date: 2013-02-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  type: :development
+  name: rake-compiler
 description: utils for extracting binary integers from binary string and packing them
   back
 email:
@@ -20,13 +36,13 @@ extensions:
 - ext/bin_utils/extconf.rb
 extra_rdoc_files: []
 files:
-- ext/bin_utils/extconf.rb
-- ext/bin_utils/native.c
 - lib/bin_utils.rb
 - lib/bin_utils/pure_ruby.rb
 - lib/bin_utils/version.rb
 - test/benchmark.rb
 - test/test_bin_utils.rb
+- ext/bin_utils/extconf.rb
+- ext/bin_utils/native.c
 homepage: https://github.com/funny-falcon/bin_utils
 licenses: []
 post_install_message: 
@@ -35,17 +51,17 @@ require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.1
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+  none: false
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -56,4 +72,3 @@ summary: Faster alternative to String#unpack and Array#unpack, though not as com
 test_files:
 - test/benchmark.rb
 - test/test_bin_utils.rb
-has_rdoc: