win32-file-attributes 1.0.0 → 1.0.1

data/CHANGES

@@ -1,2 +1,7 @@
+= 1.0.1 - 8-Apr-2013
+* Fixed the HANDLE prototypes in the underlying FFI code for 64 bit Ruby.
+* Fixed the return type for SetFileAttributes, and adjusted the code to match.
+* Added some tests for constants.
+
 = 1.0.0 - 26-Nov-2012
 * Initial release as an independent library.

data/lib/win32/file/attributes.rb

@@ -10,7 +10,7 @@ class File
   extend Windows::File::Functions
 
   # The version of the win32-file library
-  WIN32_FILE_ATTRIBUTE_VERSION = '1.0.0'
+  WIN32_FILE_ATTRIBUTE_VERSION = '1.0.1'
 
   ## ABBREVIATED ATTRIBUTE CONSTANTS
 
@@ -112,7 +112,7 @@ class File
 
     attributes |= flags
 
-    if SetFileAttributesW(wfile, attributes) == 0
+    unless SetFileAttributesW(wfile, attributes)
       raise SystemCallError.new("SetFileAttributes", FFI.errno)
     end
 
@@ -131,7 +131,7 @@ class File
 
     attributes &= ~flags
 
-    if SetFileAttributesW(wfile, attributes) == 0
+    unless SetFileAttributesW(wfile, attributes)
       raise SystemCallError.new("SetFileAttributes", FFI.errno)
     end
 
@@ -264,7 +264,7 @@ class File
       attributes &= ~FILE_ATTRIBUTE_ARCHIVE;
     end
 
-    if SetFileAttributesW(wide_path, attributes) == 0
+    unless SetFileAttributesW(wide_path, attributes)
       raise SystemCallError.new("SetFileAttributes", FFI.errno)
     end
 
@@ -336,7 +336,7 @@ class File
       attributes &= ~FILE_ATTRIBUTE_HIDDEN;
     end
 
-    if SetFileAttributesW(wide_path, attributes) == 0
+    unless SetFileAttributesW(wide_path, attributes)
       raise SystemCallError.new("SetFileAttributes", FFI.errno)
     end
 
@@ -361,7 +361,7 @@ class File
       attributes |= FILE_ATTRIBUTE_NOT_CONTENT_INDEXED;
     end
 
-    if SetFileAttributesW(wide_path, attributes) == 0
+    unless SetFileAttributesW(wide_path, attributes)
       raise SystemCallError.new("SetFileAttributes", FFI.errno)
     end
 
@@ -379,7 +379,7 @@ class File
       raise ArgumentError, "only 'true' may be passed as an argument"
     end
 
-    if SetFileAttributesW(self.path.wincode, FILE_ATTRIBUTE_NORMAL) == 0
+    unless SetFileAttributesW(self.path.wincode, FILE_ATTRIBUTE_NORMAL)
       raise SystemCallError.new("SetFileAttributes", FFI.errno)
     end
 
@@ -408,7 +408,7 @@ class File
       attributes &= ~FILE_ATTRIBUTE_OFFLINE;
     end
 
-    if SetFileAttributesW(wide_path, attributes) == 0
+    unless SetFileAttributesW(wide_path, attributes)
       raise SystemCallError.new("SetFileAttributes", FFI.errno)
     end
 
@@ -433,7 +433,7 @@ class File
       attributes &= ~FILE_ATTRIBUTE_READONLY;
     end
 
-    if SetFileAttributesW(wide_path, attributes) == 0
+    unless SetFileAttributesW(wide_path, attributes)
       raise SystemCallError.new("SetFileAttributes", FFI.errno)
     end
 
@@ -504,7 +504,7 @@ class File
       attributes &= ~FILE_ATTRIBUTE_SYSTEM;
     end
 
-    if SetFileAttributesW(wide_path, attributes) == 0
+    unless SetFileAttributesW(wide_path, attributes)
       raise SystemCallError.new("SetFileAttributes", FFI.errno)
     end
 
@@ -533,7 +533,7 @@ class File
       attributes &= ~FILE_ATTRIBUTE_TEMPORARY;
     end
 
-    if SetFileAttributesW(wide_path, attributes) == 0
+    unless SetFileAttributesW(wide_path, attributes)
       raise SystemCallError.new("SetFileAttributes", FFI.errno)
     end
 

data/lib/win32/file/windows/functions.rb

@@ -4,13 +4,16 @@ module Windows
   module File
     module Functions
       extend FFI::Library
+      typedef :ulong, :dword
+      typedef :uintptr_t, :handle
+
       ffi_lib :kernel32
 
-      attach_function :CloseHandle, [:ulong], :bool
-      attach_function :CreateFileW, [:buffer_in, :ulong, :ulong, :pointer, :ulong, :ulong, :ulong], :ulong
-      attach_function :DeviceIoControl, [:ulong, :ulong, :pointer, :ulong, :pointer, :ulong, :pointer, :pointer], :bool
-      attach_function :GetFileAttributesW, [:buffer_in], :ulong
-      attach_function :SetFileAttributesW, [:buffer_in, :ulong], :ulong
+      attach_function :CloseHandle, [:handle], :bool
+      attach_function :CreateFileW, [:buffer_in, :dword, :dword, :pointer, :dword, :dword, :handle], :handle
+      attach_function :DeviceIoControl, [:handle, :dword, :pointer, :dword, :pointer, :dword, :pointer, :pointer], :bool
+      attach_function :GetFileAttributesW, [:buffer_in], :dword
+      attach_function :SetFileAttributesW, [:buffer_in, :dword], :bool
 
       def CTL_CODE(device, function, method, access)
          ((device) << 16) | ((access) << 14) | ((function) << 2) | (method)

data/test/test_win32_file_attribute_constants.rb

@@ -0,0 +1,25 @@
+#############################################################################
+# test_win32_file_attribute_constants.rb
+#
+# Test cases for the "shortcut" constants for File attributes.
+#############################################################################
+require 'test-unit'
+require 'win32/file/attributes'
+
+class TC_Win32_File_Attribute_Constants < Test::Unit::TestCase
+  test "shortcut constants are defined" do
+    assert_not_nil(File::ARCHIVE)
+    assert_not_nil(File::HIDDEN)
+    assert_not_nil(File::NORMAL)
+    assert_not_nil(File::INDEXED)
+    assert_not_nil(File::OFFLINE)
+    assert_not_nil(File::READONLY)
+    assert_not_nil(File::SYSTEM)
+    assert_not_nil(File::TEMPORARY)
+    assert_not_nil(File::CONTENT_INDEXED)
+  end
+
+  test "CONTENT_INDEXED is identical to INDEXED" do
+    assert_equal(File::INDEXED, File::CONTENT_INDEXED)
+  end
+end

data/test/test_win32_file_attributes.rb

@@ -27,7 +27,7 @@ class TC_Win32_File_Attributes < Test::Unit::TestCase
   end
 
   test "version is set to expected value" do
-    assert_equal('1.0.0', File::WIN32_FILE_ATTRIBUTE_VERSION)
+    assert_equal('1.0.1', File::WIN32_FILE_ATTRIBUTE_VERSION)
   end
 
   test "temporary? singleton method basic functionality" do

data/win32-file-attributes.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-file-attributes'
-  spec.version    = '1.0.0'
+  spec.version    = '1.0.1'
   spec.authors    = ['Daniel J. Berger', 'Park Heesob']
   spec.license    = 'Artistic 2.0'
   spec.email      = 'djberg96@gmail.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-file-attributes
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-26 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -63,6 +63,7 @@ files:
 - Rakefile
 - README
 - test/test_win32_file_attributes.rb
+- test/test_win32_file_attribute_constants.rb
 - win32-file-attributes.gemspec
 homepage: http://github.com/djberg96/win32-file-attributes
 licenses:
@@ -91,3 +92,4 @@ specification_version: 3
 summary: File attribute methods for the File class on MS Windows
 test_files:
 - test/test_win32_file_attributes.rb
+- test/test_win32_file_attribute_constants.rb