win32-xpath 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57095d0364728770789c298d760f6c075edc3faedc66595415ab208e3570b2de
-  data.tar.gz: 45cdd6f3d4f05b1fcec3270cd23d8606d2f1f335667df718c0d5d63b1d4ce0c9
+  metadata.gz: 8f386aff8075f1869d7b1d5931145726e2f741a192c96a8ecb214adb95e57775
+  data.tar.gz: 5964f619e3c44bfcd183a9b9368dad576dc72ae5dba21b566fe372a9645d7a12
 SHA512:
-  metadata.gz: 5caa0c94f6dd269df0f796fe986a5e779977697bc0b36d9234c5296e53786be145729d090fa1c01ac7cefa614f3d68fdcb74eae05e376394e17893b8e86b03f2
-  data.tar.gz: 14089d9172d55a185f9b3e5631f597832ccf6f47b8b1b0ab95976ff3f770b47d5209260b09efa094adc48e5891acf1618810597ca99f0e3f36fb4c777f5d1168
+  metadata.gz: 62429d580dafba1c74a90ba822365738ecadc6f00d231cb31e2a1665a955eb249dbe355914cce275613f3724aeba45aa11371470fc59b03b358a17defb20b6b6
+  data.tar.gz: f2d0ee1f647ea21b18854d19a1490dbf51e0335fd25925d4c08c4f6a21240c7a9ee400123a4cf554131cf154350d2f517440e9adc6801c72be886500e268bd41

data/{CHANGES → CHANGES.md}

@@ -1,4 +1,10 @@
-= 1.1.1 - 3-Mar-2019
+## 1.1.2 - 8-Aug-2021
+* The relative path directory argument now accepts anything that responds
+  to the to_path method.
+* Now skips taint checking tests on Ruby 2.7+
+* Added a .gitignore file.
+
+## 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.
@@ -8,24 +14,24 @@
 * 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
+## 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
+## 1.0.4 - 26-Nov-2015
 * This gem is now signed.
 
-= 1.0.3 - 3-Jul-2015
+## 1.0.3 - 3-Jul-2015
 * Use PathCchXXX functions where available to improve long path handling.
 
-= 1.0.2 - 17-Jun-2015
+## 1.0.2 - 17-Jun-2015
 * Deal with non-standard swprintf issues so that it works with mingw compiler.
 
-= 1.0.1 - 2-Apr-2015
+## 1.0.1 - 2-Apr-2015
 * Altered internal handling of native C function failures.
 
-= 1.0.0 - 26-Feb-2015
+## 1.0.0 - 26-Feb-2015
 * Initial release

data/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org' do
+  gemspec
+end

data/LICENSE

@@ -0,0 +1,177 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS

data/MANIFEST.md

@@ -0,0 +1,14 @@
+* appveyor.yml
+* bench/bench_win32_xpath.rb
+* CHANGES.md
+* certs/djberg96_pub.pem
+* ext/extconf.rb
+* ext/win32/xpath.c
+* Gemfile
+* lib/win32-xpath.rb
+* LICENSE
+* MANIFEST.md
+* Rakefile
+* README.md
+* test/test_win32_xpath.rb
+* win32-xpath.gemspec

data/README.md

@@ -0,0 +1,64 @@
+## Description
+A custom `File.expand_path` method for Ruby on Windows that's much faster and works better.
+
+## Installation
+`gem install win32-xpath`
+
+## Synopsis
+```ruby
+require 'win32/xpath'
+
+# That's it, you are now using this library when you call File.expand_path
+```
+
+## Features
+* A 5x average performance boost over MRI's current method.
+* Support for ~user expansion.
+
+## 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 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.
+
+I don't support alt-stream mangling because I don't believe it's the
+job of this method to peform autocorrection. Even in MRI it only works
+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.
+
+If you discover any other issues, please report them on the project
+page at https://github.com/djberg96/win32-xpath.
+
+## Mingw and Devkit
+Make sure you have a recent version of the Devkit installed if you're
+using the one-click installer. If you see this warning then you need
+to upgrade your Devkit.
+
+`"implicit declaration of function 'ConvertSidToStringSidW'"`
+
+## Acknowledgements
+Park Heesob for encoding advice and help.
+
+## License
+Apache-2.0
+
+## Copyright
+(C) 2003-2019 Daniel J. Berger, All Rights Reserved
+    
+## Warranty
+This package is provided "as is" and without any express or
+implied warranties, including, without limitation, the implied
+warranties of merchantability and fitness for a particular purpose.
+
+## Author
+Daniel Berger

data/Rakefile

@@ -7,6 +7,7 @@ include RbConfig
 CLEAN.include(
   '**/*.gem',               # Gem files
   '**/*.rbc',               # Rubinius
+  '**/*.lock',              # Bundler
   '**/*.o',                 # C object file
   '**/*.log',               # Ruby extension build log
   '**/Makefile',            # C Makefile
@@ -35,7 +36,7 @@ namespace :gem do
   desc "Build the win32-xpath gem"
   task :create => [:clean] do
     require 'rubygems/package'
-    spec = eval(IO.read('win32-xpath.gemspec'))
+    spec = Gem::Specification.load('win32-xpath.gemspec')
     spec.signing_key = File.join(Dir.home, '.ssh', 'gem-private_key.pem')
     Gem::Package.build(spec, true)
   end

data/ext/win32/xpath.c

@@ -205,8 +205,12 @@ static VALUE rb_xpath(int argc, VALUE* argv, VALUE self){
 
   SafeStringValue(v_path_orig);
 
-  if (!NIL_P(v_dir_orig))
+  if (!NIL_P(v_dir_orig)){
+    if (rb_respond_to(v_dir_orig, rb_intern("to_path")))
+      v_dir_orig = rb_funcall2(v_dir_orig, rb_intern("to_path"), 0, NULL);
+
     SafeStringValue(v_dir_orig);
+  }
 
   // Dup and prep string for modification
   path_encoding = rb_enc_get(v_path_orig);

data/test/test_win32_xpath.rb

@@ -92,6 +92,7 @@ class Test_XPath < Test::Unit::TestCase
   end
 
   test "returns tainted strings or not" do
+    omit_if(RUBY_VERSION.to_f >= 2.7, "skipping taint checks on Ruby 2.7+")
     assert_true(File.expand_path('foo').tainted?)
     assert_true(File.expand_path('foo'.taint).tainted?)
     assert_true(File.expand_path('/foo').tainted?)
@@ -179,12 +180,18 @@ class Test_XPath < Test::Unit::TestCase
     assert_equal("./a/b/../c", str)
   end
 
-  test "accepts objects that have a to_path method" do
+  test "accepts objects that have a to_path method for main argument" do
     klass = Class.new{ def to_path; "a/b/c"; end }
     obj = klass.new
     assert_equal("#{@pwd}/a/b/c", File.expand_path(obj))
   end
 
+  test "accepts objects that have a to_path method for relative dir argument" do
+    klass = Class.new{ def to_path; "bar"; end }
+    obj = klass.new
+    assert_equal("#{@pwd}/bar/foo", File.expand_path('foo', obj))
+  end
+
   test "works with unicode characters" do
     assert_equal("#{@pwd}/Ελλάσ", File.expand_path("Ελλάσ"))
   end

data/win32-xpath.gemspec

@@ -2,9 +2,9 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-xpath'
-  spec.version    = '1.1.1'
+  spec.version    = '1.1.2'
   spec.author     = 'Daniel J. Berger'
-  spec.license    = 'Apache 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'
@@ -12,11 +12,18 @@ Gem::Specification.new do |spec|
   spec.files      = Dir['**/*'].reject{ |f| f.include?('git') }
   spec.cert_chain = Dir['certs/*']
 
-  spec.extra_rdoc_files  = ['README', 'CHANGES', 'MANIFEST']
-
   spec.extensions = ['ext/extconf.rb']
   spec.add_development_dependency('rake')
-  spec.add_development_dependency('test-unit', '>= 3.0.0')
+  spec.add_development_dependency('test-unit', '~> 3.4')
+
+  spec.metadata = {
+    'homepage_uri'      => 'https://github.com/djberg96/win32-xpath',
+    'bug_tracker_uri'   => 'https://github.com/djberg96/win32-xpath/issues',
+    'changelog_uri'     => 'https://github.com/djberg96/win32-xpath/blob/main/CHANGES.md',
+    'documentation_uri' => 'https://github.com/djberg96/win32-xpath/wiki',
+    'source_code_uri'   => 'https://github.com/djberg96/win32-xpath',
+    'wiki_uri'          => 'https://github.com/djberg96/win32-xpath/wiki'
+  }
 
   spec.description = <<-EOF
     The win32-xpath library provides a revamped File.expand_path method

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: win32-xpath
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Daniel J. Berger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -35,7 +35,7 @@ cert_chain:
   ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
   WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date: 2019-03-03 00:00:00.000000000 Z
+date:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -55,16 +55,16 @@ dependencies:
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.4'
 description: |2
       The win32-xpath library provides a revamped File.expand_path method
       for MS Windows. It is significantly faster, and supports ~user
@@ -73,34 +73,39 @@ email: djberg96@gmail.com
 executables: []
 extensions:
 - ext/extconf.rb
-extra_rdoc_files:
-- README
-- CHANGES
-- MANIFEST
+extra_rdoc_files: []
 files:
 - appveyor.yml
 - bench
 - bench/bench_win32_xpath.rb
 - certs
 - certs/djberg96_pub.pem
-- CHANGES
+- CHANGES.md
 - ext
 - ext/extconf.rb
 - ext/win32
 - ext/win32/xpath.c
+- Gemfile
 - lib
 - lib/win32-xpath.rb
-- MANIFEST
+- LICENSE
+- MANIFEST.md
 - Rakefile
-- README
+- README.md
 - test
 - test/test_win32_xpath.rb
 - win32-xpath.gemspec
 homepage: http://github.com/djberg96/win32-xpath
 licenses:
-- Apache 2.0
-metadata: {}
-post_install_message: 
+- Apache-2.0
+metadata:
+  homepage_uri: https://github.com/djberg96/win32-xpath
+  bug_tracker_uri: https://github.com/djberg96/win32-xpath/issues
+  changelog_uri: https://github.com/djberg96/win32-xpath/blob/main/CHANGES.md
+  documentation_uri: https://github.com/djberg96/win32-xpath/wiki
+  source_code_uri: https://github.com/djberg96/win32-xpath
+  wiki_uri: https://github.com/djberg96/win32-xpath/wiki
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -115,9 +120,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.19
+signing_key:
 specification_version: 4
 summary: Revamped File.expand_path for Windows
 test_files:

data/MANIFEST

@@ -1,11 +0,0 @@
-appveyor.yml
-bench/bench_win32_xpath.rb
-CHANGES
-certs/djberg96_pub.pem
-ext/extconf.rb
-ext/win32/xpath.c
-lib/win32-xpath.rb
-Rakefile
-README
-test/test_win32_xpath.rb
-win32-xpath.gemspec

data/README

@@ -1,63 +0,0 @@
-= Description
-  A custom File.expand_path method for Ruby on Windows that's much
-  faster and works better.
-
-= Installation
-  gem install win32-xpath
-
-= Synopsis
-  require 'win32/xpath'
-
-  # That's it, you are now using this library when you call File.expand_path
-
-= Features
-  * A 5x average performance boost over MRI's current method.
-  * Support for ~user expansion.
-
-= 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 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.
-
-  I don't support alt-stream mangling because I don't believe it's the
-  job of this method to peform autocorrection. Even in MRI it only works
-  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.
-
-  If you discover any other issues, please report them on the project
-  page at https://github.com/djberg96/win32-xpath.
-
-= Mingw and Devkit
-  Make sure you have a recent version of the Devkit installed if you're
-  using the one-click installer. If you see this warning then you need
-  to upgrade your Devkit.
-
-  "implicit declaration of function 'ConvertSidToStringSidW'"
-
-= Acknowledgements
-  Park Heesob for encoding advice and help.
-
-== License
-  Apache 2.0
-
-== Copyright
-  (C) 2003-2019 Daniel J. Berger, All Rights Reserved
-    
-== Warranty
-  This package is provided "as is" and without any express or
-  implied warranties, including, without limitation, the implied
-  warranties of merchantability and fitness for a particular purpose.
-
-= Author
-  Daniel Berger