win32-file-attributes 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d64c60789cb492bfacc0ecf1381b97be3affc3c
-  data.tar.gz: e08e6072ea0776de56ce9a540f16b67c7aef7b73
+  metadata.gz: e979471f10493700b371adf06ef6ae4a78b25daa
+  data.tar.gz: d9d23da6540f250822ab25ee9ab8cf32e1a734a2
 SHA512:
-  metadata.gz: fc5e4cf1840d0d34cee7f697179048c734d9ada03e641da8c65fc9f5fbc21df42a16a4a924744d22a0bbaae3cfa0ea0efb67aeb17ae6160204ee5381cbf1b037
-  data.tar.gz: 2fbef9b336fdc7db8d837055716260ab724d153bea18b91deacbc0e37aa1ebab794ceffa09dfe2465b995ddf1290fd7addef1400648999f51f6cd28545aff4a7
+  metadata.gz: b09b0521108e59e35a98ed8357d7cf2df2f06db138c58cc3ca16efb29ffbcc952c4ed64abd06df76f709a2ef23ed37ea76c2e300a2b927a3eaf9713bd373ca69
+  data.tar.gz: 414fe460270f5702e118a7b6bda0e23abafb3a600d14bbc2202fa3439e929c6b48e2c21e24260243b108aa6466848cf9861490a50c28124a941dc472b7b29bfe

data/CHANGES

@@ -1,3 +1,9 @@
+= 1.0.3 - 8-Nov-2014
+* Make FFI functions private.
+* Removed reference to Rubyforge in gemspec.
+* Use require_relative internally.
+* Explicitly free some FFI memory pointers where appropriate.
+
 = 1.0.2 - 28-Apr-2014
 * The singleton methods now accept arguments that implement to_str or to_path.
 

data/lib/win32/file/attributes.rb

@@ -1,6 +1,6 @@
-require File.join(File.dirname(__FILE__), 'windows', 'constants')
-require File.join(File.dirname(__FILE__), 'windows', 'structs')
-require File.join(File.dirname(__FILE__), 'windows', 'functions')
+require_relative 'windows/constants'
+require_relative 'windows/structs'
+require_relative 'windows/functions'
 
 class File
   include Windows::File::Constants
@@ -10,7 +10,7 @@ class File
   extend Windows::File::Functions
 
   # The version of the win32-file library
-  WIN32_FILE_ATTRIBUTE_VERSION = '1.0.2'
+  WIN32_FILE_ATTRIBUTE_VERSION = '1.0.3'
 
   ## ABBREVIATED ATTRIBUTE CONSTANTS
 
@@ -276,12 +276,6 @@ class File
   # that compression is the default for newly created files and subdirectories.
   #
   def compressed=(bool)
-    in_buf = FFI::MemoryPointer.new(:ulong)
-    bytes  = FFI::MemoryPointer.new(:ulong)
-
-    compression_value = bool ? COMPRESSION_FORMAT_DEFAULT : COMPRESSION_FORMAT_NONE
-    in_buf.write_ulong(compression_value)
-
     # We can't use get_osfhandle here because we need specific attributes
     handle = CreateFileW(
       self.path.wincode,
@@ -297,6 +291,12 @@ class File
       raise SystemCallError.new("CreateFile", FFI.errno)
     end
 
+    in_buf = FFI::MemoryPointer.new(:ulong)
+    bytes  = FFI::MemoryPointer.new(:ulong)
+
+    compression_value = bool ? COMPRESSION_FORMAT_DEFAULT : COMPRESSION_FORMAT_NONE
+    in_buf.write_ulong(compression_value)
+
     begin
       bool = DeviceIoControl(
         handle,
@@ -314,6 +314,8 @@ class File
       end
     ensure
       CloseHandle(handle)
+      in_buf.free
+      bytes.free
     end
 
     self
@@ -449,8 +451,6 @@ class File
       return
     end
 
-    bytes = FFI::MemoryPointer.new(:ulong)
-
     handle = CreateFileW(
       self.path.wincode,
       FILE_READ_DATA | FILE_WRITE_DATA,
@@ -465,6 +465,8 @@ class File
       raise SystemCallError.new("CreateFile", FFI.errno)
     end
 
+    bytes = FFI::MemoryPointer.new(:ulong)
+
     begin
       bool = DeviceIoControl(
         handle,
@@ -482,6 +484,7 @@ class File
       end
     ensure
       CloseHandle(handle)
+      bytes.free
     end
 
     self

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

@@ -4,16 +4,25 @@ module Windows
   module File
     module Functions
       extend FFI::Library
+
+      private
+
+      # Wrapper method for attach_function + private
+      def self.attach_pfunc(*args)
+        attach_function(*args)
+        private args[0]
+      end
+
       typedef :ulong, :dword
       typedef :uintptr_t, :handle
 
       ffi_lib :kernel32
 
-      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
+      attach_pfunc :CloseHandle, [:handle], :bool
+      attach_pfunc :CreateFileW, [:buffer_in, :dword, :dword, :pointer, :dword, :dword, :handle], :handle
+      attach_pfunc :DeviceIoControl, [:handle, :dword, :pointer, :dword, :pointer, :dword, :pointer, :pointer], :bool
+      attach_pfunc :GetFileAttributesW, [:buffer_in], :dword
+      attach_pfunc :SetFileAttributesW, [:buffer_in, :dword], :bool
 
       def CTL_CODE(device, function, method, access)
          ((device) << 16) | ((access) << 14) | ((function) << 2) | (method)
@@ -31,9 +40,11 @@ module Windows
 end
 
 class String
-  # Convenience method for converting strings to UTF-16LE for wide character
-  # functions that require it.
-  def wincode
-    (self.tr(File::SEPARATOR, File::ALT_SEPARATOR) + 0.chr).encode('UTF-16LE')
+  unless instance_methods.include?(:wincode)
+    # Convenience method for converting strings to UTF-16LE for wide character
+    # functions that require it.
+    def wincode
+      (self.tr(File::SEPARATOR, File::ALT_SEPARATOR) + 0.chr).encode('UTF-16LE')
+    end
   end
 end

data/test/test_win32_file_attributes.rb

@@ -28,7 +28,7 @@ class TC_Win32_File_Attributes < Test::Unit::TestCase
   end
 
   test "version is set to expected value" do
-    assert_equal('1.0.2', File::WIN32_FILE_ATTRIBUTE_VERSION)
+    assert_equal('1.0.3', 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.2'
+  spec.version    = '1.0.3'
   spec.authors    = ['Daniel J. Berger', 'Park Heesob']
   spec.license    = 'Artistic 2.0'
   spec.email      = 'djberg96@gmail.com'
@@ -11,7 +11,6 @@ Gem::Specification.new do |spec|
   spec.test_files = Dir['test/test*']
   spec.files      = Dir['**/*'].reject{ |f| f.include?('git') }
 
-  spec.rubyforge_project = 'win32utils'
   spec.extra_rdoc_files  = ['README', 'CHANGES', 'MANIFEST']
 
   spec.add_dependency('ffi')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-file-attributes
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -9,34 +9,34 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |2
@@ -71,17 +71,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: win32utils
-rubygems_version: 2.2.2
+rubyforge_project: 
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: File attribute methods for the File class on MS Windows