win32-mmap 0.2.0 → 0.2.2

data/CHANGES

@@ -1,3 +1,18 @@
+== 0.2.2 - 16-May-2007
+* Fixed a bug where marshalled data that happened to end with a "\0" would
+  cause the getter to fail.
+* Now runs -w clean.
+* Added more tests.
+* Removed the install.rb file. Installation is now handled via the 'rake
+  install' task.
+* Updated the MANIFEST file and made it rdoc friendly.
+
+== 0.2.1 - 22-Oct-2006
+* Removed the custom memcpy function since that function now does the right
+  thing regardless of argument type.
+* Now requires windows-pr 0.5.6 or later (to take advantage of the improved
+  memcpy).
+
 == 0.2.0 - 13-Oct-2006
 * Completely scrapped the old interface and code.  It is now pure Ruby and
   has a much different API, and some internal changes.
@@ -20,4 +35,4 @@
 * Fixed sprintf() bug in new().
 
 == 0.0.1 - 13-Mar-2004
-* Initial (Beta) release
+* Initial (Beta) release

data/MANIFEST

@@ -1,15 +1,11 @@
-CHANGES
-MANIFEST
-README
-install.rb
-win32-mmap.gemspec
-
-doc/mmap.rdoc
-
-examples/mmap_test.rb
-examples/test_client.rb
-examples/test_server.rb
-
-lib/win32/mmap.rb
-
-test/tc_mmap.rb
+* CHANGES
+* MANIFEST
+* README
+* Rakefile
+* win32-mmap.gemspec
+* doc/mmap.rdoc
+* examples/mmap_test.rb
+* examples/test_client.rb
+* examples/test_server.rb
+* lib/win32/mmap.rb
+* test/tc_mmap.rb

data/README

@@ -7,7 +7,8 @@
 
 = Installation
 == Standard Installation
-   ruby install.rb
+   rake test (optional)
+   rake install
 
 == Gem Installation
    ruby win32-mmap.gemspec
@@ -58,7 +59,7 @@
    Ruby's
     
 = Copyright
-   (C) 2003-2006 Daniel J. Berger, All Rights Reserved
+   (C) 2003-2007 Daniel J. Berger, All Rights Reserved
     
 = Warranty
    This package is provided "as is" and without any express or
@@ -67,4 +68,4 @@
     
 = Authors
    Daniel J. Berger
-   Park Heesob
+   Park Heesob

data/Rakefile

@@ -0,0 +1,21 @@
+require 'rake'
+require 'rake/testtask'
+require 'rbconfig'
+include Config
+
+desc 'Install the win32-mmap package (non-gem)'
+task :install do
+   sitelibdir = CONFIG['sitelibdir']
+   installdir = File.join(sitelibdir, 'win32')
+   file = 'lib\win32\mmap.rb'
+
+   Dir.mkdir(installdir) unless File.exists?(installdir)
+   FileUtils.cp(file, installdir, :verbose => true)
+end
+
+Rake::TestTask.new do |t|
+   t.libs << 'test'
+   t.verbose = true
+   t.warning = true
+   t.test_files = FileList['test/tc_mmap.rb']
+end

data/lib/win32/mmap.rb

@@ -11,12 +11,7 @@ module Win32
    # Memory mapped files for MS Windows.
    #
    class MMap
-      VERSION = '0.2.0'
-
-      # This is a slightly different version of memcpy than what's provided
-      # in the Windows::MSVCRT::Buffer module.  The difference is that the
-      # first argument is an address, not a char buffer.
-      MEMCPY = Win32API.new('msvcrt', 'memcpy', 'LPL', 'P')
+      VERSION = '0.2.2'
 
       # All errors generated by Win32::MMap are of type MMap::Error.
       #
@@ -129,7 +124,7 @@ module Win32
       # * timeout
       # * file
       #
-      # Please see the documentation for the individual attributes for
+      # Please see the documentation on the individual attributes for
       # further details.  Note that, although these are accessors, they
       # *must* be set in the constructor (if set at all).  Setting them
       # after the call to MMap.new will not have any effect.
@@ -151,6 +146,10 @@ module Win32
             base_address open autolock timeout
          /
 
+         @open     = nil
+         @file     = nil
+         @autolock = nil
+
          opts.each{ |key, value|
             key = key.to_s.downcase
             unless valid.include?(key)
@@ -196,7 +195,7 @@ module Win32
          end
 
          if @open
-            @mh = OpenFileMapping.call(@access, @inherit, @name)
+            @mh = OpenFileMapping(@access, @inherit, @name)
          else
             @mh = CreateFileMapping(@fh, @inherit, @protection, 0, @size, @name)
          end
@@ -307,7 +306,7 @@ module Win32
       #--
       # This replaces the getvar/setvar API from 0.1.0.
       # 
-      def method_missing(method_id, *args)
+      def method_missing(method_id, *args)        
          method = method_id.id2name
          args = args.first if args.length == 1
 
@@ -319,27 +318,27 @@ module Win32
                if mmap_lock
                   instance_variable_set("@#{method}", args)
                   marshal = Marshal.dump(@hash)
-                  MEMCPY.call(@address, marshal, marshal.length)
+                  memcpy(@address, marshal)
                   mmap_unlock
                end
             else
                instance_variable_set("@#{method}", args)
                marshal = Marshal.dump(@hash)
-               MEMCPY.call(@address, marshal, marshal.length)
+               memcpy(@address, marshal)
             end
          else                   # Getter
             buf = 0.chr * @size           
             if @autolock
                if mmap_lock
-                  marshal = memcpy(buf, @address, @size)
-                  hash = Marshal.load(marshal)
+                  memcpy(buf, @address, @size)
+                  hash = Marshal.load(buf)
                   val  = hash["#{method}"]
                   instance_variable_set("@#{method}", val)  
                   mmap_unlock 
                end             
             else
-               marshal = memcpy(buf, @address, @size)
-               hash = Marshal.load(marshal)
+               memcpy(buf, @address, @size)
+               hash = Marshal.load(buf)
                val  = hash["#{method}"]
                instance_variable_set("@#{method}", val)
             end

data/test/tc_mmap.rb

@@ -1,29 +1,48 @@
-#################################################
+#####################################################################
 # tc_mmap.rb
 #
-# Test suite for the win32-mmap package.
-#################################################
-Dir.chdir '..' if File.basename(Dir.pwd) == 'test'
-$LOAD_PATH.unshift Dir.pwd
-$LOAD_PATH.unshift Dir.pwd + '/lib'
-
+# Test suite for the win32-mmap package. This should be run via the
+# 'rake test' task.
+#####################################################################
 require 'test/unit'
 require 'win32/mmap'
 include Win32
 
-# The order of the tests matters (for now)
 class TC_Mmap < Test::Unit::TestCase
    def setup
       @mmap = MMap.new(:name => 'test', :size => 100)
    end
 
    def test_version
-      assert_equal('0.2.0', MMap::VERSION)
+      assert_equal('0.2.2', MMap::VERSION)
    end
    
-   def test_dynamic_value
+   def test_dynamic_string_value
       assert_nothing_raised{ @mmap.foo = 'test' }
+      assert_nothing_raised{ @mmap.bar = 'alpha123' }
       assert_equal('test', @mmap.foo)
+      assert_equal('alpha123', @mmap.bar)
+   end
+
+   def test_dynamic_integer_value
+      assert_nothing_raised{ @mmap.bar = 7 }
+      assert_nothing_raised{ @mmap.zero = 0 }
+      assert_equal(7, @mmap.bar)
+      assert_equal(0, @mmap.zero)
+   end
+
+   def test_dynamic_hash_value
+      assert_nothing_raised{ @mmap.ahash = {'foo' => 0} }
+      assert_nothing_raised{ @mmap.bhash = {'foo' => 0, 'bar' => 'hello'} }
+      assert_equal({'foo' => 0}, @mmap.ahash) 
+      assert_equal({'foo' => 0, 'bar' => 'hello'}, @mmap.bhash)
+   end
+
+   def test_dynamic_array_value
+      assert_nothing_raised{ @mmap.aarray = [1, 'x', 3] }
+      assert_nothing_raised{ @mmap.barray = [{1 => 2}, [1,2,3], 'foo'] }
+      assert_equal([1, 'x', 3], @mmap.aarray) 
+      assert_equal([{1=>2}, [1,2,3], 'foo'], @mmap.barray)
    end
    
    def test_valid_options
@@ -85,4 +104,4 @@ class TC_Mmap < Test::Unit::TestCase
    def teardown
       @mmap.close
    end
-end
+end

data/win32-mmap.gemspec

@@ -2,7 +2,7 @@ require "rubygems"
 
 spec = Gem::Specification.new do |gem|
    gem.name        = "win32-mmap"
-   gem.version     = "0.2.0"
+   gem.version     = "0.2.2"
    gem.author      = "Daniel J. Berger"
    gem.email       = "djberg96@gmail.com"
    gem.homepage    = "http://www.rubyforge.org/projects/win32utils"
@@ -14,8 +14,8 @@ spec = Gem::Specification.new do |gem|
    gem.files       = Dir["lib/win32/*.rb"] + Dir["test/*"] + Dir["[A-Z]*"]
    gem.files.reject! { |fn| fn.include? "CVS" }
    gem.require_path = "lib"
-   gem.extra_rdoc_files = ["README", "CHANGES"]
-   gem.add_dependency("windows-pr", ">= 0.5.5")
+   gem.extra_rdoc_files = ["MANIFEST", "README", "CHANGES"]
+   gem.add_dependency("windows-pr", ">= 0.5.6")
 end
 
 if $0 == __FILE__

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.3
 specification_version: 1
 name: win32-mmap
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2006-10-13 00:00:00 -06:00
+  version: 0.2.2
+date: 2007-05-16 00:00:00 -06:00
 summary: Memory mapped IO for Windows.
 require_paths: 
 - lib
@@ -30,13 +30,15 @@ authors:
 - Daniel J. Berger
 files: 
 - lib/win32/mmap.rb
+- test/CVS
 - test/tc_mmap.rb
 - CHANGES
+- CVS
 - doc
 - examples
-- install.rb
 - lib
 - MANIFEST
+- Rakefile
 - README
 - test
 - win32-mmap.gemspec
@@ -45,6 +47,7 @@ test_files:
 rdoc_options: []
 
 extra_rdoc_files: 
+- MANIFEST
 - README
 - CHANGES
 executables: []
@@ -61,5 +64,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.5
+        version: 0.5.6
     version: 

data/install.rb

@@ -1,11 +0,0 @@
-# For those who don't like gems...
-require 'rbconfig'
-require 'ftools'
-include Config
-
-sitelibdir = CONFIG['sitelibdir']
-installdir = sitelibdir + '/win32'
-file = 'lib\win32\mmap.rb'
-
-Dir.mkdir(installdir) unless File.exists?(installdir)
-File.copy(file, installdir, true)