win32-dir 0.4.7 → 0.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5e981af6ec776b828331968e333f10e07a00da1
-  data.tar.gz: 6d4998906fc38e42b166b4f169bcd3e209e8fe50
+  metadata.gz: 09b52a947373ea7bb57b6daf0cc831f8e46d864a
+  data.tar.gz: d93f71ab02fb811c3b9ab5e7f61302479cad9a8e
 SHA512:
-  metadata.gz: 3f6d943d7546b4b5a6df5507bf06e2dca571fe4f708eac4cf6f483f24cb20e304f3ab5cbbfb075d98cce0112e6e676069f0551d555f7e37ac78f536f2a5b45a9
-  data.tar.gz: cb65e88ec9fa7d671c4a2744ed4f7e0cb80405d88f63a22a15411b33b04bbfef00adf37fa24a3120f1f274569e92fd06bcadb465ddefc63f591a541c5b9f44db
+  metadata.gz: 8db28589b375acc51ed21bd4301163309dda8ebda843f7a1982bfbfefdca06603a14a2f5fad581943e5b1fa5130c52b6b0dd7246322764c37706932ca2185517
+  data.tar.gz: 79324ed4a740c9e1d23f9dc0c331f972792d47faf5fc37fa74d2649285ee22b88d860ef4ac5113a0186e387aeaaabdb27efb457cad0a055ee4601714cebffb2b

data/CHANGES

@@ -1,3 +1,6 @@
+== 0.4.8 - 27-Apr-2014
+* More closely mimic Ruby's stringiness checks for overrided methods.
+
 == 0.4.7 - 26-Apr-2014
 * All arguments to methods are now interpolated so that they'll use whatever 
   to_str implemenation the argument provides instead of assuming String

data/lib/win32/dir.rb

@@ -8,7 +8,7 @@ class Dir
   extend Dir::Functions
 
   # The version of the win32-dir library.
-  VERSION = '0.4.7'
+  VERSION = '0.4.8'
 
   # CSIDL constants
   csidl = Hash[
@@ -113,9 +113,9 @@ class Dir
     #
     def glob(glob_pattern, flags = 0, &block)
       if glob_pattern.is_a?(Array)
-        temp = glob_pattern.map!{ |pattern| "#{pattern}".tr("\\", "/") }
+        temp = glob_pattern.map!{ |pattern| string_check(pattern).tr("\\", "/") }
       else
-        temp = "#{glob_pattern}".tr("\\", "/")
+        temp = string_check(glob_pattern).tr("\\", "/")
       end
 
       old_glob(temp, flags, &block)
@@ -192,8 +192,8 @@ class Dir
   #    Dir.create_junction('C:/to', 'C:/from')
   #
   def self.create_junction(to, from)
-    to   = "#{to}".wincode
-    from = "#{from}".wincode
+    to   = string_check(to).wincode
+    from = string_check(from).wincode
 
     from_path = (0.chr * 1024).encode('UTF-16LE')
 
@@ -292,7 +292,7 @@ class Dir
   def self.read_junction(junction)
     return false unless Dir.junction?("#{junction}")
 
-    junction = "#{junction}".wincode
+    junction = string_check(junction).wincode
 
     junction_path = (0.chr * 1024).encode('UTF-16LE')
 
@@ -399,6 +399,16 @@ class Dir
 
   private
 
+  class << self
+    # Simulate MRI's contortions for a stringiness check.
+    def string_check(arg)
+      return arg if arg.is_a?(String)
+      return arg.send(:to_str) if arg.respond_to?(:to_str, true) # MRI honors it, even if private
+      return arg.to_path if arg.respond_to?(:to_path)
+      raise TypeError
+    end
+  end
+
   # Macro from Windows header file, used by the create_junction method.
   def self.CTL_CODE(device, function, method, access)
     ((device) << 16) | ((access) << 14) | ((function) << 2) | (method)

data/test/test_win32_dir.rb

@@ -26,7 +26,7 @@ class TC_Win32_Dir < Test::Unit::TestCase
   end
 
   test "version number is set to expected value" do
-    assert_equal('0.4.7', Dir::VERSION)
+    assert_equal('0.4.8', Dir::VERSION)
   end
 
   test 'glob handles backslashes' do
@@ -60,6 +60,10 @@ class TC_Win32_Dir < Test::Unit::TestCase
     assert_true(Dir.glob([pattern1, pattern2]).size > 0)
   end
 
+  test "glob requires a stringy argument" do
+    assert_raise(TypeError){ Dir.glob(nil) }
+  end
+
   test 'ref handles backslashes' do
     pattern = "C:\\Program Files\\Common Files\\System\\*.dll"
     assert_nothing_raised{ Dir[pattern] }
@@ -105,6 +109,11 @@ class TC_Win32_Dir < Test::Unit::TestCase
     assert_equal(Dir.entries(@@from), Dir.entries(@ascii_to))
   end
 
+  test "create_junction requires stringy arguments" do
+    assert_raise(TypeError){ Dir.create_junction(nil, @@from) }
+    assert_raise(TypeError){ Dir.create_junction(@ascii_to, nil) }
+  end
+
   test "read_junction works as expected with ascii characters" do
     assert_nothing_raised{ Dir.create_junction(@ascii_to, @@from) }
     assert_true(File.exists?(@ascii_to))
@@ -129,6 +138,11 @@ class TC_Win32_Dir < Test::Unit::TestCase
     assert_equal(Dir.read_junction(@ascii_to), @@from)
   end
 
+  test "read_junction requires a stringy argument" do
+    assert_raise(TypeError){ Dir.read_junction(nil) }
+    assert_raise(TypeError){ Dir.read_junction([]) }
+  end
+
   test "junction? method returns boolean value" do
     assert_respond_to(Dir, :junction?)
     assert_nothing_raised{ Dir.create_junction(@ascii_to, @@from) }

data/win32-dir.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name      = 'win32-dir'
-  spec.version   = '0.4.7'
+  spec.version   = '0.4.8'
   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-dir
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
 platform: ruby
 authors:
 - Daniel J. Berger
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-26 00:00:00.000000000 Z
+date: 2014-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi