win32-xpath 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a356787d2a824c84435d4e0030d2332bc0e608c7
-  data.tar.gz: aa3c03d68d1cf089ec4cf98e459305d1b23e5f83
+SHA256:
+  metadata.gz: 57095d0364728770789c298d760f6c075edc3faedc66595415ab208e3570b2de
+  data.tar.gz: 45cdd6f3d4f05b1fcec3270cd23d8606d2f1f335667df718c0d5d63b1d4ce0c9
 SHA512:
-  metadata.gz: 319c66c30e057d2b7dfdc0fd92146981939e8231dc8337d8d6e8232ccc9ec49678de0713ea7ebcd631e33ffa95839b2bd0773c0bf665c6d8a47dd20ef5b57f27
-  data.tar.gz: 3d56bec08b78598926082214bed54e7631147c22e676d0f09fc794d5b05ef919d44263ad0d7a28e456dd426296a5e95c9419b831dcf8aecebce96dd1b09786c1
+  metadata.gz: 5caa0c94f6dd269df0f796fe986a5e779977697bc0b36d9234c5296e53786be145729d090fa1c01ac7cefa614f3d68fdcb74eae05e376394e17893b8e86b03f2
+  data.tar.gz: 14089d9172d55a185f9b3e5631f597832ccf6f47b8b1b0ab95976ff3f770b47d5209260b09efa094adc48e5891acf1618810597ca99f0e3f36fb4c777f5d1168

data/CHANGES

@@ -1,3 +1,13 @@
+= 1.1.1 - 3-Mar-2019
+* Switched RSTRING_PTR to StringValueCStr internally because apparently I
+  I didn't get the memo on null termination changes.
+* Fixed a warning caused by rb_funcall by switching it to rb_funcall2.
+* Fixed a bug where it would try to expand tildes for paths in 8.3 format.
+  Now tildes are only expanded if they are the first character in the path.
+* Updated the cert.
+* Updated the appveyor file to include Ruby 2.3, 2.4 and 2.5.
+* Added a win32-xpath.rb file for convenience.
+
 = 1.1.0 - 11-Jun-2016
 * Changed license to Apache 2.0.
 * Use PathCchXXX functions wherever I could that had not already been

data/MANIFEST

@@ -4,6 +4,7 @@ CHANGES
 certs/djberg96_pub.pem
 ext/extconf.rb
 ext/win32/xpath.c
+lib/win32-xpath.rb
 Rakefile
 README
 test/test_win32_xpath.rb

data/README

@@ -17,8 +17,9 @@
 = Known Issues
   * This library does not support drive-current paths for the 2nd argument.
   * This library does not support alt-stream name autocorrection.
+  * This library does not convert short paths to long paths.
 
-  It is very unlikely you will ever be affected by either of these things.
+  It is very unlikely you will ever be affected by any of these things.
   Drive-current paths are a relic of DOS 1.0, but even so this library
   will handle them in the first argument.
 
@@ -27,6 +28,9 @@
   for the default $DATA stream, and then only for a certain type of
   syntax error. I do not know when or why it was added.
 
+  Failure to convert short paths to long paths is irrelevant since that
+  has nothing to do with relative versus absolute paths.
+
   One possible "real" issue is that on Windows 7 or earlier you will be
   limited to 260 character paths. This is a limitation of the shlwapi.h
   functions that I use internally.
@@ -48,7 +52,7 @@
   Apache 2.0
 
 == Copyright
-  (C) 2003-2016 Daniel J. Berger, All Rights Reserved
+  (C) 2003-2019 Daniel J. Berger, All Rights Reserved
     
 == Warranty
   This package is provided "as is" and without any express or

data/appveyor.yml

@@ -2,17 +2,18 @@ version: '{build}'
 branches:
   only:
   - master
+  - appveyor
 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
+  - ruby_version: 23-x64
+    ruby_dir: 2.3.0
+  - ruby_version: 24-x64
+    ruby_dir: 2.4.0
+  - ruby_version: 25-x64
+    ruby_dir: 2.5.0
 install:
 - ps: >-
     $env:path = "C:\Ruby" + $env:ruby_version + "\bin;" + $env:path
@@ -25,10 +26,10 @@ install:
 
     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
+- C:\Ruby23-x64\lib\ruby\gems\2.3.0
+- C:\Ruby24-x64\lib\ruby\gems\2.4.0
+- C:\Ruby25-x64\lib\ruby\gems\2.5.0
 build: off
 test_script:
 - cmd: rake

data/bench/bench_win32_xpath.rb

@@ -1,6 +1,6 @@
 require 'benchmark'
 
-MAX = 100000
+MAX = 200000
 puts "\nOld File.expand_path"
 
 Benchmark.bm(30) do |x|

data/certs/djberg96_pub.pem

@@ -1,21 +1,26 @@
 -----BEGIN CERTIFICATE-----
-MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAhkamJl
+MIIEcDCCAtigAwIBAgIBATANBgkqhkiG9w0BAQsFADA/MREwDwYDVQQDDAhkamJl
 cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
-MB4XDTE1MDkwMjIwNDkxOFoXDTE2MDkwMTIwNDkxOFowPzERMA8GA1UEAwwIZGpi
+MB4XDTE4MDMxODE1MjIwN1oXDTI4MDMxNTE1MjIwN1owPzERMA8GA1UEAwwIZGpi
 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=
+bTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALgfaroVM6CI06cxr0/h
+A+j+pc8fgpRgBVmHFaFunq28GPC3IvW7Nvc3Y8SnAW7pP1EQIbhlwRIaQzJ93/yj
+u95KpkP7tA9erypnV7dpzBkzNlX14ACaFD/6pHoXoe2ltBxk3CCyyzx70mTqJpph
+75IB03ni9a8yqn8pmse+s83bFJOAqddSj009sGPcQO+QOWiNxqYv1n5EHcvj2ebO
+6hN7YTmhx7aSia4qL/quc4DlIaGMWoAhvML7u1fmo53CYxkKskfN8MOecq2vfEmL
+iLu+SsVVEAufMDDFMXMJlvDsviolUSGMSNRTujkyCcJoXKYYxZSNtIiyd9etI0X3
+ctu0uhrFyrMZXCedutvXNjUolD5r9KGBFSWH1R9u2I3n3SAyFF2yzv/7idQHLJJq
+74BMnx0FIq6fCpu5slAipvxZ3ZkZpEXZFr3cIBtO1gFvQWW7E/Y3ijliWJS1GQFq
+058qERadHGu1yu1dojmFRo6W2KZvY9al2yIlbkpDrD5MYQIDAQABo3cwdTAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUFZsMapgzJimzsbaBG2Tm8j5e
+AzgwHQYDVR0RBBYwFIESZGpiZXJnOTZAZ21haWwuY29tMB0GA1UdEgQWMBSBEmRq
+YmVyZzk2QGdtYWlsLmNvbTANBgkqhkiG9w0BAQsFAAOCAYEAW2tnYixXQtKxgGXq
+/3iSWG2bLwvxS4go3srO+aRXZHrFUMlJ5W0mCxl03aazxxKTsVVpZD8QZxvK91OQ
+h9zr9JBYqCLcCVbr8SkmYCi/laxIZxsNE5YI8cC8vvlLI7AMgSfPSnn/Epq1GjGY
+6L1iRcEDtanGCIvjqlCXO9+BmsnCfEVehqZkQHeYczA03tpOWb6pon2wzvMKSsKH
+ks0ApVdstSLz1kzzAqem/uHdG9FyXdbTAwH1G4ZPv69sQAFAOCgAqYmdnzedsQtE
+1LQfaQrx0twO+CZJPcRLEESjq8ScQxWRRkfuh2VeR7cEU7L7KqT10mtUwrvw7APf
+DYoeCY9KyjIBjQXfbj2ke5u1hZj94Fsq9FfbEQg8ygCgwThnmkTrrKEiMSs3alYR
+ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
+WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
 -----END CERTIFICATE-----

data/ext/win32/xpath.c

@@ -201,7 +201,7 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
   rb_scan_args(argc, argv, "11", &v_path_orig, &v_dir_orig);
 
   if (rb_respond_to(v_path_orig, rb_intern("to_path")))
-    v_path_orig = rb_funcall(v_path_orig, rb_intern("to_path"), 0, NULL);
+    v_path_orig = rb_funcall2(v_path_orig, rb_intern("to_path"), 0, NULL);
 
   SafeStringValue(v_path_orig);
 
@@ -223,10 +223,10 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
   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);
+  length = MultiByteToWideChar(CP_UTF8, 0, StringValueCStr(v_path), -1, NULL, 0);
   path = (wchar_t*)ruby_xmalloc(length * sizeof(wchar_t));
 
-  if(!MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(v_path), -1, path, length)){
+  if(!MultiByteToWideChar(CP_UTF8, 0, StringValueCStr(v_path), -1, path, length)){
     ruby_xfree(path);
     rb_raise_syserr("MultibyteToWideChar", GetLastError());
   }
@@ -235,8 +235,8 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
   while(wcsstr(path, L"/"))
     path[wcscspn(path, L"/")] = L'\\';
 
-  // Handle ~ expansion.
-  if (ptr = wcschr(path, L'~')){
+  // Handle ~ expansion if first character.
+  if ( (ptr = wcschr(path, L'~')) && ((int)(ptr - path) == 0) ){
     wchar_t* home;
 
     // Handle both ~/user and ~user syntax
@@ -291,10 +291,10 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
     // Prep string for modification
     rb_str_modify_expand(v_dir, MAX_WPATH);
 
-    length = MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(v_dir), -1, NULL, 0);
+    length = MultiByteToWideChar(CP_UTF8, 0, StringValueCStr(v_dir), -1, NULL, 0);
     dir = (wchar_t*)ruby_xmalloc(MAX_WPATH * sizeof(wchar_t));
 
-    if (!MultiByteToWideChar(CP_UTF8, 0, RSTRING_PTR(v_dir), -1, dir, length)){
+    if (!MultiByteToWideChar(CP_UTF8, 0, StringValueCStr(v_dir), -1, dir, length)){
       ruby_xfree(dir);
       rb_raise_syserr("MultibyteToWideChar", GetLastError());
     }
@@ -302,7 +302,8 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
     while (wcsstr(dir, L"/"))
       dir[wcscspn(dir, L"/")] = L'\\';
 
-    if (ptr = wcschr(dir, L'~')){
+    // Check for tilde in first character
+    if ( (ptr = wcschr(dir, L'~')) && ((int)(ptr - dir) == 0) ){
       if (ptr[1] && ptr[1] != L'\\'){
         dir = find_user(++ptr);
       }

data/lib/win32-xpath.rb

@@ -0,0 +1 @@
+require 'win32/xpath'

data/test/test_win32_xpath.rb

@@ -11,7 +11,7 @@ class Test_XPath < Test::Unit::TestCase
 
   def setup
     @pwd = Dir.pwd
-    @tmp = Dir.tmpdir
+    @tmp = 'C:/Temp'
     @root =  'C:/'
     @drive = ENV['HOMEDRIVE']
     @home = ENV['HOME'].tr('\\', '/')
@@ -118,6 +118,11 @@ class Test_XPath < Test::Unit::TestCase
     assert_equal("#{@home}/foo", File.expand_path('foo', '~'))
   end
 
+  test "doesn't attempt to expand a tilde unless it's the first character" do
+    assert_equal("C:/Progra~1", File.expand_path("C:/Progra~1"))
+    assert_equal("C:/Progra~1", File.expand_path("C:/Progra~1", "C:/Progra~1"))
+  end
+
   test "does not modify a HOME string argument" do
     str = "~/a"
     assert_equal("#{@home}/a", File.expand_path(str))

data/win32-xpath.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-xpath'
-  spec.version    = '1.1.0'
+  spec.version    = '1.1.1'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Apache 2.0'
   spec.email      = 'djberg96@gmail.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: win32-xpath
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -10,27 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDcDCCAligAwIBAgIBATANBgkqhkiG9w0BAQUFADA/MREwDwYDVQQDDAhkamJl
+  MIIEcDCCAtigAwIBAgIBATANBgkqhkiG9w0BAQsFADA/MREwDwYDVQQDDAhkamJl
   cmc5NjEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29t
-  MB4XDTE1MDkwMjIwNDkxOFoXDTE2MDkwMTIwNDkxOFowPzERMA8GA1UEAwwIZGpi
+  MB4XDTE4MDMxODE1MjIwN1oXDTI4MDMxNTE1MjIwN1owPzERMA8GA1UEAwwIZGpi
   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=
+  bTCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALgfaroVM6CI06cxr0/h
+  A+j+pc8fgpRgBVmHFaFunq28GPC3IvW7Nvc3Y8SnAW7pP1EQIbhlwRIaQzJ93/yj
+  u95KpkP7tA9erypnV7dpzBkzNlX14ACaFD/6pHoXoe2ltBxk3CCyyzx70mTqJpph
+  75IB03ni9a8yqn8pmse+s83bFJOAqddSj009sGPcQO+QOWiNxqYv1n5EHcvj2ebO
+  6hN7YTmhx7aSia4qL/quc4DlIaGMWoAhvML7u1fmo53CYxkKskfN8MOecq2vfEmL
+  iLu+SsVVEAufMDDFMXMJlvDsviolUSGMSNRTujkyCcJoXKYYxZSNtIiyd9etI0X3
+  ctu0uhrFyrMZXCedutvXNjUolD5r9KGBFSWH1R9u2I3n3SAyFF2yzv/7idQHLJJq
+  74BMnx0FIq6fCpu5slAipvxZ3ZkZpEXZFr3cIBtO1gFvQWW7E/Y3ijliWJS1GQFq
+  058qERadHGu1yu1dojmFRo6W2KZvY9al2yIlbkpDrD5MYQIDAQABo3cwdTAJBgNV
+  HRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUFZsMapgzJimzsbaBG2Tm8j5e
+  AzgwHQYDVR0RBBYwFIESZGpiZXJnOTZAZ21haWwuY29tMB0GA1UdEgQWMBSBEmRq
+  YmVyZzk2QGdtYWlsLmNvbTANBgkqhkiG9w0BAQsFAAOCAYEAW2tnYixXQtKxgGXq
+  /3iSWG2bLwvxS4go3srO+aRXZHrFUMlJ5W0mCxl03aazxxKTsVVpZD8QZxvK91OQ
+  h9zr9JBYqCLcCVbr8SkmYCi/laxIZxsNE5YI8cC8vvlLI7AMgSfPSnn/Epq1GjGY
+  6L1iRcEDtanGCIvjqlCXO9+BmsnCfEVehqZkQHeYczA03tpOWb6pon2wzvMKSsKH
+  ks0ApVdstSLz1kzzAqem/uHdG9FyXdbTAwH1G4ZPv69sQAFAOCgAqYmdnzedsQtE
+  1LQfaQrx0twO+CZJPcRLEESjq8ScQxWRRkfuh2VeR7cEU7L7KqT10mtUwrvw7APf
+  DYoeCY9KyjIBjQXfbj2ke5u1hZj94Fsq9FfbEQg8ygCgwThnmkTrrKEiMSs3alYR
+  ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
+  WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date: 2016-06-12 00:00:00.000000000 Z
+date: 2019-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -83,6 +88,8 @@ files:
 - ext/extconf.rb
 - ext/win32
 - ext/win32/xpath.c
+- lib
+- lib/win32-xpath.rb
 - MANIFEST
 - Rakefile
 - README
@@ -109,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Revamped File.expand_path for Windows