win32-xpath 1.0.4 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abfaf67e2e2d0e7fc498fc836f6678dc37defa89
-  data.tar.gz: df097de20bcfc014b5ca618734f42e9d1c5a177a
+  metadata.gz: a356787d2a824c84435d4e0030d2332bc0e608c7
+  data.tar.gz: aa3c03d68d1cf089ec4cf98e459305d1b23e5f83
 SHA512:
-  metadata.gz: 123f110e37a7e28be35a8aa1c345df61b715f148da2f0171e22b04ac455e38f5ed5ff75b614f9d4741e1699e230cabf50318c15d824b0c9788c6cef2f6c37bcf
-  data.tar.gz: dc9fccc5225d2725c65fa629dd48c7cac9dfce7ada2f4e859c5c3ecf7cfd8f41cd8719ec5a1f31987d0d19cca98cfbbbef4022834025dc63e719bfb221ac8f08
+  metadata.gz: 319c66c30e057d2b7dfdc0fd92146981939e8231dc8337d8d6e8232ccc9ec49678de0713ea7ebcd631e33ffa95839b2bd0773c0bf665c6d8a47dd20ef5b57f27
+  data.tar.gz: 3d56bec08b78598926082214bed54e7631147c22e676d0f09fc794d5b05ef919d44263ad0d7a28e456dd426296a5e95c9419b831dcf8aecebce96dd1b09786c1

data/CHANGES

@@ -1,3 +1,10 @@
+= 1.1.0 - 11-Jun-2016
+* Changed license to Apache 2.0.
+* Use PathCchXXX functions wherever I could that had not already been
+  put into place.
+* Removed the "futzing" directory and contents.
+* Added an appveyor.yml file.
+
 = 1.0.4 - 26-Nov-2015
 * This gem is now signed.
 

data/MANIFEST

@@ -1,9 +1,9 @@
+appveyor.yml
 bench/bench_win32_xpath.rb
 CHANGES
 certs/djberg96_pub.pem
 ext/extconf.rb
 ext/win32/xpath.c
-futzing/futz.rb
 Rakefile
 README
 test/test_win32_xpath.rb

data/README

@@ -45,16 +45,10 @@
   Park Heesob for encoding advice and help.
 
 == License
-  Artistic 2.0
+  Apache 2.0
 
-== Contributions
-  Although this library is free, please consider having your company
-  setup a gittip if used by your company professionally.
-
-  http://www.gittip.com/djberg96/
-    
 == Copyright
-  (C) 2003-2015 Daniel J. Berger, All Rights Reserved
+  (C) 2003-2016 Daniel J. Berger, All Rights Reserved
     
 == Warranty
   This package is provided "as is" and without any express or

data/appveyor.yml

@@ -0,0 +1,35 @@
+version: '{build}'
+branches:
+  only:
+  - master
+skip_tags: true
+environment:
+  matrix:
+  - ruby_version: 21
+    ruby_dir: 2.1.0
+  - ruby_version: 21-x64
+    ruby_dir: 2.1.0
+  - ruby_version: 22
+    ruby_dir: 2.2.0
+  - ruby_version: 22-x64
+    ruby_dir: 2.2.0
+install:
+- ps: >-
+    $env:path = "C:\Ruby" + $env:ruby_version + "\bin;" + $env:path
+
+    $tpath = "C:\Ruby" + $env:ruby_version + "\lib\ruby\" + $env:ruby_dir + "\test"
+
+    if ((test-path $tpath) -eq $True){ rm -recurse -force $tpath }
+
+    gem update --system > $null
+
+    if ((gem query -i test-unit -v ">= 3.0") -eq $False){ gem install test-unit --no-document }
+cache:
+- C:\Ruby21\lib\ruby\gems\2.1.0
+- C:\Ruby21-x64\lib\ruby\gems\2.1.0
+- C:\Ruby22\lib\ruby\gems\2.2.0
+- C:\Ruby22-x64\lib\ruby\gems\2.2.0
+build: off
+test_script:
+- cmd: rake
+deploy: off

data/certs/djberg96_pub.pem

@@ -1,21 +1,21 @@
------BEGIN CERTIFICATE-----
-MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAhkamJl
-cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
-MB4XDTE1MDkwMjIwNDkxOFoXDTE2MDkwMTIwNDkxOFowPzERMA8GA1UEAwwIZGpi
-ZXJnOTYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
-bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyTkvXqRp6hLs9eoJOS
-Hmi8kRYbq9Vkf15/hMxJpotYMgJVHHWrmDcC5Dye2PbnXjTkKf266Zw0PtT9h+lI
-S3ts9HO+vaCFSMwFFZmnWJSpQ3CNw2RcHxjWkk9yF7imEM8Kz9ojhiDXzBetdV6M
-gr0lV/alUr7TNVBDngbXEfTWscyXh1qd7xZ4EcOdsDktCe5G45N/o3662tPQvJsi
-FOF0CM/KuBsa/HL1/eoEmF4B3EKIRfTHrQ3hu20Kv3RJ88QM4ec2+0dd97uX693O
-zv6981fyEg+aXLkxrkViM/tz2qR2ZE0jPhHTREPYeMEgptRkTmWSKAuLVWrJEfgl
-DtkCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFEwe
-nn6bfJADmuIDiMSOzedOrL+xMB0GA1UdEQQWMBSBEmRqYmVyZzk2QGdtYWlsLmNv
-bTAdBgNVHRIEFjAUgRJkamJlcmc5NkBnbWFpbC5jb20wDQYJKoZIhvcNAQEFBQAD
-ggEBAHmNOCWoDVD75zHFueY0viwGDVP1BNGFC+yXcb7u2GlK+nEMCORqzURbYPf7
-tL+/hzmePIRz7i30UM//64GI1NLv9jl7nIwjhPpXpf7/lu2I9hOTsvwSumb5UiKC
-/sqBxI3sfj9pr79Wpv4MuikX1XPik7Ncb7NPsJPw06Lvyc3Hkg5X2XpPtLtS+Gr2
-wKJnmzb5rIPS1cmsqv0M9LPWflzfwoZ/SpnmhagP+g05p8bRNKjZSA2iImM/GyYZ
-EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
-tGSHgAmcLlkdGgan182qsE/4kKM=
------END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAhkamJl
+cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
+MB4XDTE1MDkwMjIwNDkxOFoXDTE2MDkwMTIwNDkxOFowPzERMA8GA1UEAwwIZGpi
+ZXJnOTYxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2Nv
+bTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMyTkvXqRp6hLs9eoJOS
+Hmi8kRYbq9Vkf15/hMxJpotYMgJVHHWrmDcC5Dye2PbnXjTkKf266Zw0PtT9h+lI
+S3ts9HO+vaCFSMwFFZmnWJSpQ3CNw2RcHxjWkk9yF7imEM8Kz9ojhiDXzBetdV6M
+gr0lV/alUr7TNVBDngbXEfTWscyXh1qd7xZ4EcOdsDktCe5G45N/o3662tPQvJsi
+FOF0CM/KuBsa/HL1/eoEmF4B3EKIRfTHrQ3hu20Kv3RJ88QM4ec2+0dd97uX693O
+zv6981fyEg+aXLkxrkViM/tz2qR2ZE0jPhHTREPYeMEgptRkTmWSKAuLVWrJEfgl
+DtkCAwEAAaN3MHUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0OBBYEFEwe
+nn6bfJADmuIDiMSOzedOrL+xMB0GA1UdEQQWMBSBEmRqYmVyZzk2QGdtYWlsLmNv
+bTAdBgNVHRIEFjAUgRJkamJlcmc5NkBnbWFpbC5jb20wDQYJKoZIhvcNAQEFBQAD
+ggEBAHmNOCWoDVD75zHFueY0viwGDVP1BNGFC+yXcb7u2GlK+nEMCORqzURbYPf7
+tL+/hzmePIRz7i30UM//64GI1NLv9jl7nIwjhPpXpf7/lu2I9hOTsvwSumb5UiKC
+/sqBxI3sfj9pr79Wpv4MuikX1XPik7Ncb7NPsJPw06Lvyc3Hkg5X2XpPtLtS+Gr2
+wKJnmzb5rIPS1cmsqv0M9LPWflzfwoZ/SpnmhagP+g05p8bRNKjZSA2iImM/GyYZ
+EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
+tGSHgAmcLlkdGgan182qsE/4kKM=
+-----END CERTIFICATE-----

data/ext/win32/xpath.c

@@ -10,9 +10,10 @@
 
 #ifdef HAVE_PATHCCH_H
 #include <pathcch.h>
-#endif
-
+#define MAX_WPATH PATHCCH_MAX_CCH
+#else
 #define MAX_WPATH MAX_PATH * sizeof(wchar_t)
+#endif
 
 // Equivalent to raise SystemCallError.new(string, errnum)
 void rb_raise_syserr(const char* msg, DWORD errnum){
@@ -119,6 +120,9 @@ wchar_t* expand_tilde(){
     wchar_t* temp;
     const wchar_t* env2 = L"HOMEPATH";
     env = L"HOMEDRIVE";
+#ifdef HAVE_PATHCCH_H
+    HRESULT hr;
+#endif
 
     // If neither are found then raise an error
     size =  GetEnvironmentVariableW(env, NULL, 0);
@@ -140,8 +144,20 @@ wchar_t* expand_tilde(){
       rb_raise_syserr("GetEnvironmentVariable", GetLastError());
     }
 
-    if(!PathAppendW(home, temp))
+#ifdef HAVE_PATHCCH_H
+    hr = PathCchAppendEx(home, MAX_WPATH, temp, 1);
+    if(hr != S_OK){
+      ruby_xfree(home);
+      ruby_xfree(temp);
+      rb_raise_syserr("PathCchAppendEx", hr);
+    }
+#else
+    if(!PathAppendW(home, temp)){
+      ruby_xfree(home);
+      ruby_xfree(temp);
       rb_raise_syserr("PathAppend", GetLastError());
+    }
+#endif
   }
   else{
     home = (wchar_t*)ruby_xmalloc(MAX_WPATH);
@@ -204,7 +220,7 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
     rb_econv_close(ec);
   }
   
-  rb_str_modify_expand(v_path, MAX_PATH);
+  rb_str_modify_expand(v_path, MAX_WPATH);
 
   // Make our path a wide string for later functions
   length = MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(v_path), -1, NULL, 0);
@@ -229,17 +245,15 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
     }
     else{
 #ifdef HAVE_PATHCCHAPPENDEX
-      HRESULT result;
-      wchar_t buffer[PATHCCH_MAX_CCH];
-
-      wcscpy_s(buffer, PATHCCH_MAX_CCH, expand_tilde(path));
-      
-      result = PathCchAppendEx(buffer, MAX_PATH, ++ptr, PATHCCH_ALLOW_LONG_PATHS);
+      HRESULT hr;
+      home = expand_tilde(path);
 
-      if (result != S_OK)
-        rb_raise_syserr("PathCchAppend", result);
+      hr = PathCchAppendEx(home, MAX_WPATH, ++ptr, 1);
 
-      home = &buffer[0];
+      if(hr != S_OK){
+        ruby_xfree(home);
+        rb_raise_syserr("PathCchAppendEx", hr);
+      }
 #else
       home = expand_tilde(path);
 
@@ -258,6 +272,9 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
     wchar_t* dir;
     VALUE v_dir;
     rb_encoding* dir_encoding;
+#ifdef HAVE_PATHCCH_H
+    HRESULT hr;
+#endif
 
     dir_encoding = rb_enc_get(v_dir_orig);
 
@@ -272,10 +289,10 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
     }
 
     // Prep string for modification
-    rb_str_modify_expand(v_dir, MAX_PATH);
+    rb_str_modify_expand(v_dir, MAX_WPATH);
 
     length = MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(v_dir), -1, NULL, 0);
-    dir = (wchar_t*)ruby_xmalloc(MAX_PATH * sizeof(wchar_t));
+    dir = (wchar_t*)ruby_xmalloc(MAX_WPATH * sizeof(wchar_t));
 
     if (!MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(v_dir), -1, dir, length)){
       ruby_xfree(dir);
@@ -292,10 +309,19 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
       else{
         dir = expand_tilde();
 
+#ifdef HAVE_PATHCCH_H
+        hr = PathCchAppendEx(dir, MAX_WPATH, ++ptr, 1);
+
+        if(hr != S_OK){
+          ruby_xfree(dir);
+          rb_raise_syserr("PathCchAppendEx", hr);
+        }
+#else
         if (!PathAppendW(dir, ++ptr)){
           ruby_xfree(dir);
           rb_raise_syserr("PathAppend", GetLastError());
         }
+#endif
       }
     }
 
@@ -303,10 +329,20 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
       path = dir;
 
     if (PathIsRelativeW(path)){ 
+
+#ifdef HAVE_PATHCCH_H
+      hr = PathCchAppendEx(dir, MAX_WPATH, path, 1);
+
+      if(hr != S_OK){
+        ruby_xfree(dir);
+        rb_raise_syserr("PathCchAppendEx", hr);
+      }
+#else
       if(!PathAppendW(dir, path)){
         ruby_xfree(dir);
         rb_raise_syserr("PathAppend", GetLastError());
       }
+#endif
 
       // Remove leading slashes from relative paths
       if (dir[0] == L'\\')
@@ -350,7 +386,11 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
   }
 
   // Strip all trailing backslashes
+#ifdef HAVE_PATHCCH_H
+  while (PathCchRemoveBackslash(path, wcslen(path)+1) == S_OK);
+#else
   while (!*PathRemoveBackslashW(path));
+#endif
 
   // First call, get the length
   length = GetFullPathNameW(path, 0, buffer, NULL);

data/test/test_win32_xpath.rb

@@ -65,6 +65,12 @@ class Test_XPath < Test::Unit::TestCase
     assert_equal(File.join(@root, 'foo.rb'), File.expand_path("#{@root}foo.rb/"))
   end
 
+  test "removes trailing slashes from relative path" do
+    assert_equal(File.join(@pwd, 'foo'), File.expand_path("foo/"))
+    assert_equal(File.join(@pwd, 'foo'), File.expand_path("foo//"))
+    assert_equal(File.join(@pwd, 'foo'), File.expand_path("foo\\\\\\"))
+  end
+
   test "removes trailing spaces from absolute path" do
     assert_equal(File.join(@root, 'foo'), File.expand_path("#{@root}foo  "))
   end

data/win32-xpath.gemspec

@@ -2,9 +2,9 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-xpath'
-  spec.version    = '1.0.4'
+  spec.version    = '1.1.0'
   spec.author     = 'Daniel J. Berger'
-  spec.license    = 'Artistic 2.0'
+  spec.license    = 'Apache 2.0'
   spec.email      = 'djberg96@gmail.com'
   spec.homepage   = 'http://github.com/djberg96/win32-xpath'
   spec.summary    = 'Revamped File.expand_path for Windows'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-xpath
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -30,7 +30,7 @@ cert_chain:
   EJYzxdPOrx2n6NYR3Hk+vHP0U7UBSveI6+qx+ndQYaeyCn+GRX2PKS9h66YF/Q1V
   tGSHgAmcLlkdGgan182qsE/4kKM=
   -----END CERTIFICATE-----
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2016-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -73,6 +73,7 @@ extra_rdoc_files:
 - CHANGES
 - MANIFEST
 files:
+- appveyor.yml
 - bench
 - bench/bench_win32_xpath.rb
 - certs
@@ -82,9 +83,6 @@ files:
 - ext/extconf.rb
 - ext/win32
 - ext/win32/xpath.c
-- futzing
-- futzing/futz.rb
-- futzing/test.rb
 - MANIFEST
 - Rakefile
 - README
@@ -93,7 +91,7 @@ files:
 - win32-xpath.gemspec
 homepage: http://github.com/djberg96/win32-xpath
 licenses:
-- Artistic 2.0
+- Apache 2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -111,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Revamped File.expand_path for Windows

data/futzing/futz.rb

@@ -1,71 +0,0 @@
-require 'win32/xpath'
-require 'tmpdir'
-
-#p File.expand_path("~djberge", "foo")
-#p File.expand_path("~/foo")
-#p File.expand_path("", "~djberge")
-#p File.expand_path("~djberge")
-#p File.expand_path("~djberge/foo/bar")
-#p File.expand_path("~bogus")
-
-ENV['HOME'] = nil
-ENV['USERPROFILE'] = nil
-ENV['HOMEDRIVE'] = "D:/"
-#ENV['USERPROFILE'] = "C:/bogus"
-p File.expand_path("~")
-
-#p File.expand_path("foo", "~")
-#p File.expand_path("foo", "~")
-#p File.expand_path("", "~")
-#p File.expand_path("", "~")
-#p File.expand_path("foo", "~/bar")
-#p File.expand_path("foo", "~/bar")
-#p File.expand_path("")
-#p File.expand_path("C:/foo/bar")
-#p File.expand_path("C:/foo/bar///")
-#p File.expand_path('foo', Dir.tmpdir)
-#p File.expand_path("C:/foo/bar", "D:/foo")
-#p File.expand_path("foo")
-#p File.expand_path("foo", "bar")
-
-#ENV['HOME'] = nil
-#ENV['USERPROFILE'] = nil
-#p File.expand_path("~")
-
-#path = "../a"
-#tmp = Dir.tmpdir
-
-#p path
-#p tmp
-
-#100.times{
-#  File.expand_path(path, tmp)
-#  File.expand_path('foo', tmp)
-#}
-
-#p path
-#p tmp
-
-#p File.expand_path('../a', tmp)
-
-#p File.expand_path('../a', 'foo')
-#p File.expand_path('../a', 'foo')
-#p File.expand_path('../a', 'C:/foo')
-#p File.expand_path('../a', 'C:/foo')
-
-
-=begin
-p File.expand_path("/foo").tainted?
-p File.expand_path("foo").tainted? # True
-p File.expand_path("foo".taint).tainted? # True
-p File.expand_path("C:/foo").tainted? # False
-p File.expand_path("C:/foo".taint).tainted? # True
-=end
-
-=begin
-p File.expand_path("~")
-p File.expand_path("~/foo")
-p File.expand_path("//foo/bar")
-p File.expand_path("//foo/bar//")
-p File.expand_path("//foo/bar//")
-=end

data/futzing/test.rb

@@ -1,90 +0,0 @@
-require 'ffi'
-
-class Windows
-  extend FFI::Library
-  typedef :ulong, :dword
-
-  ffi_lib :shlwapi
-
-  attach_function :PathCanonicalizeA, [:buffer_out, :string], :bool
-  attach_function :PathStripToRootA, [:pointer], :bool
-  attach_function :PathIsRelativeA, [:string], :bool
-  attach_function :PathAppendA, [:buffer_out, :string], :bool
-  attach_function :PathSkipRootA, [:string], :string
-  attach_function :PathIsNetworkPathA, [:string], :bool
-
-  ffi_lib :kernel32
-  attach_function :GetFullPathNameA, [:string, :dword, :buffer_out, :pointer], :dword
-
-  def xpath(path, dir=nil)
-    path = path.tr("/", "\\")
-
-    buf = 0.chr * 512
-
-    p path
-    p PathIsRelativeA(path)
-
-    if !PathCanonicalizeA(buf, path)
-      raise
-    end
-
-    p buf.strip
-
-    #p dir
-    #p path
-
-    #regex = /\A(\w):([^\\]+)(.*)/i
-=begin
-    if m = regex.match(path)
-      drive = m.captures[0]
-      path = m.captures[1..-1].join
-      p drive
-      p path
-    end
-=end
-
-    #p PathIsNetworkPathA(path)
-    #p PathSkipRootA(path)
-    #p PathIsRelativeA(path)
-
-=begin
-    buf = 0.chr * 1024
-
-    if GetFullPathNameA(path, buf.size, buf, nil) == 0
-      raise SystemCallError.new('GetFullPathName', FFI.errno)
-    end
-
-    p buf.strip
-=end
-
-=begin
-    ptr = FFI::MemoryPointer.from_string(path)
-
-    p PathIsRelativeA(path)
-
-    unless PathStripToRootA(ptr)
-      raise SystemCallError.new('PathStripToRoot', FFI.errno)
-    end
-
-    p ptr.read_string
-=end
-
-=begin
-    unless PathCanonicalizeA(buf, path)
-      raise SystemCallError.new('PathCanonicalize', FFI.errno)
-    end
-
-    buf.strip
-=end
-  end
-end
-
-if $0 == __FILE__
-  Windows.new.xpath("/../../a", "foo")
-  #p Windows.new.xpath("C:/foo/../bar")
-  #p Windows.new.xpath("C:foo")
-  #Windows.new.xpath("C:foo")
-  #Windows.new.xpath("C:foo/bar")
-  #Windows.new.xpath("C:/foo")
-  #Windows.new.xpath("foo")
-end