win32-nio 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31fe6e337f6c93527d80360c231b9fb5766e2399
-  data.tar.gz: bac2e6d821bc01dd2814f8a09b749d476da7d74e
+  metadata.gz: d829b0d7823000b4e8c3ce911a129328e0d72db8
+  data.tar.gz: 3a23c84c020ac5a28f76623a4768c4882723ce7c
 SHA512:
-  metadata.gz: 2985ccd28d539b4433ebf2a163fe98567b596b965ef0259eccba7df26cdf670e6cf5a7cb102b58d7a4dfd3f3d04a52973f527248aba7d16687cd70efb7fe34af
-  data.tar.gz: eeae941454d811133a0d6cf7e84093a855fbfb992e633ce4e0a895140a6780ca75780f940dfda54cc5b82d0de2d7cc16a836a22bb1a029b359fe681811bedb33
+  metadata.gz: 564ff3198da3309c3ed9a6d2ec2136a499e093f71728643b2f397f8805abeb18ddbe60ea6e4a51f1dbc5600d82310a4b8606b3a52cd29c1e6d644817df82203d
+  data.tar.gz: 9c4dedc035094a63824032d57675d90fea431bdb740fccaa7297e3bbb9a08105efdeab023ca91513c319b95bccf636f665d480578dfa20489a2cc6dfd5e0df6a

data/CHANGES

@@ -1,3 +1,6 @@
+== 0.2.1 - 21-Jun-2015
+* Fixed some build warnings on mingw32.
+
 == 0.2.0 - 30-Mar-2015
 * Converted to C code for performance.
 * The NIO.readlines method now accepts an optional event object as

data/MANIFEST

@@ -4,10 +4,7 @@
 * README
 * win32-nio.gemspec
 * benchmarks/win32_nio_benchmarks.rb
-* lib/win32/nio.rb
-* lib/windows/constants.rb
-* lib/windows/functions.rb
-* lib/windows/macros.rb
-* lib/windows/structs.rb
+* ext/extconf.rb
+* ext/win32/nio.c
 * test/test_win32_nio_read.rb
 * test/test_win32_nio_readlines.rb

data/README

@@ -31,7 +31,7 @@
   to implement MRI methods would offer any practical advantage. The answer
   is a definite maybe.
 
-  Functionally, these library does offer something the MRI methods do not,
+  Functionally, this library does offer something the MRI methods do not,
   which is the ability to provide a block or event object that is called
   when a read is finished.
 
@@ -51,6 +51,7 @@
   NIO.read(medium)       0.015000   0.093000   0.108000 (  0.122542)
   IO.read(large)         1.654000   0.593000   2.247000 (  2.355478)
   NIO.read(large)        0.343000   0.765000   1.108000 (  1.222567)
+
   IO.readlines(small)    0.125000   0.000000   0.125000 (  0.119982)
   NIO.readlines(small)   0.094000   0.015000   0.109000 (  0.132461)
   IO.readlines(medium)   1.419000   0.234000   1.653000 (  1.764216)

data/Rakefile

@@ -5,6 +5,7 @@ include RbConfig
 
 CLEAN.include(
   '**/*.gem',               # Gem files
+  '**/*.txt',               # Benchmark files
   '**/*.rbc',               # Rubinius
   '**/*.o',                 # C object file
   '**/*.log',               # Ruby extension build log

data/ext/win32/nio.c

@@ -16,8 +16,12 @@ void rb_raise_syserr(const char* msg, int errnum){
 }
 
 /*
+* NIO.read(file, length=nil, offset=0, options=nil){ # optional block }
+*
 * This method is similar to Ruby's IO.read method except that it uses
-* native function calls.
+* native function calls. It also optionally accepts a Win32::Event object,
+* signalling it upon completion. If provided it calls a block upon completion
+* of the read.
 *
 * Examples:
 *
@@ -30,10 +34,10 @@ void rb_raise_syserr(const char* msg, int errnum){
 * # Read 50 bytes starting at offset 10
 * Win32::NIO.read(file, 50, 10)
 *
-* Note that the + options + that may be passed to this method are limited
-* to :encoding, : mode and : event because we're no longer using the open
-* function internally.In the case of:mode the only thing that is checked
-* for is the presence of the 'b' (binary)mode.
+* Note that the +options+ that may be passed to this method are limited
+* to :encoding, :mode and :event because we're no longer using the open
+* function internally. In the case of :mode the only thing that is checked
+* for is the presence of the 'b' (binary) mode.
 *
 * The :event option, if present, must be a Win32::Event object.
 */
@@ -103,7 +107,7 @@ static VALUE rb_nio_read(int argc, VALUE* argv, VALUE self){
 
     if (!NIL_P(v_event)){
       flags |= FILE_FLAG_OVERLAPPED;
-      olap.hEvent = (HANDLE)NUM2OFFT(rb_funcall(v_event, rb_intern("handle"), 0, 0));
+      olap.hEvent = (HANDLE)(uintptr_t)NUM2OFFT(rb_funcall(v_event, rb_intern("handle"), 0, 0));
     }
   }
   else{
@@ -189,8 +193,12 @@ static VALUE rb_nio_read(int argc, VALUE* argv, VALUE self){
 }
 
 /*
+ * NIO.readlines(file, sep="\r\n", event=nil)
+ *
  * Reads the entire file specified by portname as individual lines, and
- * returns those lines in an array. Lines are separated by +sep+.
+ * returns those lines in an array. Lines are separated by +sep+. The +event+
+ * argument must be a Win32::Event if present, and it is signalled upon
+ * completion.
  *
  * Examples:
  *
@@ -290,14 +298,14 @@ static VALUE rb_nio_readlines(int argc, VALUE* argv, VALUE self){
     if (NIL_P(v_event))
       olap.hEvent = NULL;
     else
-      olap.hEvent = (HANDLE)NUM2OFFT(rb_funcall(v_event, rb_intern("handle"), 0, 0));
+      olap.hEvent = (HANDLE)(uintptr_t)NUM2OFFT(rb_funcall(v_event, rb_intern("handle"), 0, 0));
 
     fse = (FILE_SEGMENT_ELEMENT*)malloc(sizeof(FILE_SEGMENT_ELEMENT) * (page_num + 1));
     memset(fse, 0, sizeof(FILE_SEGMENT_ELEMENT) * (page_num + 1));
     v_result = Qnil;
 
     for (i = 0; i < page_num; i++)
-      fse[i].Alignment = (ULONGLONG)base_address + (page_size * i);
+      fse[i].Alignment = (ULONGLONG)(uintptr_t)base_address + (page_size * i);
 
     rv = ReadFileScatter(h, fse, (DWORD)size, NULL, &olap);
 
@@ -342,6 +350,6 @@ void Init_nio(){
   rb_define_singleton_method(cNio, "read", rb_nio_read, -1);
   rb_define_singleton_method(cNio, "readlines", rb_nio_readlines, -1);
 
-  /* 0.2.0: The version of the win32-nio library */
-  rb_define_const(cNio, "VERSION", rb_str_new2("0.2.0"));
+  /* 0.2.1: The version of the win32-nio library */
+  rb_define_const(cNio, "VERSION", rb_str_new2("0.2.1"));
 }

data/test/test_win32_nio_read.rb

@@ -24,7 +24,7 @@ class TC_Win32_NIO_Read < Test::Unit::TestCase
   end
 
   test "version number is set to expected value" do
-    assert_equal('0.2.0', Win32::NIO::VERSION)
+    assert_equal('0.2.1', Win32::NIO::VERSION)
   end
 
   test "read method basic functionality" do
@@ -34,8 +34,6 @@ class TC_Win32_NIO_Read < Test::Unit::TestCase
 
   test "read method accepts a file name and returns a string of the expected size" do
     assert_kind_of(String, NIO.read(@@file))
-    p @size
-    p NIO.read(@@file).size
     assert_true(NIO.read(@@file).size == @size)
   end
 

data/win32-nio.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-nio'
-  spec.version    = '0.2.0'
+  spec.version    = '0.2.1'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Artistic 2.0'
   spec.email      = 'djberg96@gmail.com'
@@ -11,9 +11,8 @@ Gem::Specification.new do |spec|
   spec.files      = Dir['**/*'].reject{ |f| f.include?('git') }
   spec.extensions = ['ext/extconf.rb']
 
-  spec.rubyforge_project = 'Win32Utils'
   spec.extra_rdoc_files  = ['README', 'CHANGES', 'MANIFEST']
-  spec.required_ruby_version = '> 1.9.0'
+  spec.required_ruby_version = '>= 1.9.3'
 
   spec.add_dependency('win32-event', '>= 0.6.0')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: win32-nio
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-30 00:00:00.000000000 Z
+date: 2015-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: win32-event
@@ -86,16 +86,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.0
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: Win32Utils
+rubyforge_project: 
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4