faster_path 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8487e703f71a357f9d42a04c8f4ba2b98291bad4
-  data.tar.gz: 4c2c24ac1f470bfddbae8ccbfec0447961476e07
+SHA256:
+  metadata.gz: 95885428dc6e619ea1069fd3473cd68ffd762eca29d09f1185ebfafc7cbcbebf
+  data.tar.gz: 4ad3a157841d4003e7314295fb955a01565c903c05942b112527a95818664f7c
 SHA512:
-  metadata.gz: 57e7745e69f3f30b32981731c250ffa001e4f4f58b5a4b44a0b6558ea786a0a741dc0ce225c959998055ed99c8070dcc78f995ec3c3bb538258cee9429bb71bc
-  data.tar.gz: b30307165e8fbdee36a2dd62bf92618af2f062d8bd93d94c4324c650d6c282fc45778508930d77e2f991a6a998ba6281dad53a742dca4c45751d346e42b3714f
+  metadata.gz: 881379d959fcadeaf9e23236327b9b2da8315a3e95307718cc4ff763002eb1ea11134b7607518f98a6b20a9d5b9db3b38d31174d85b8c5bbc3fdca6a3f8c8aac
+  data.tar.gz: 961dd0da7cff5e3ac96aa3745dfe803464d748784fabe51a49988afb254e6995d168e640abc25b7cae64379b1c1b53b6faa5f299ee74adcc2d01ad11cf05153a

data/Cargo.lock

@@ -10,7 +10,7 @@ dependencies = [
  "array_tool 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "ruru 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ruru 0.9.3 (git+https://github.com/danielpclark/ruru?branch=playground)",
 ]
 
 [[package]]
@@ -38,8 +38,8 @@ dependencies = [
 
 [[package]]
 name = "ruby-sys"
-version = "0.2.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+version = "0.3.0"
+source = "git+https://github.com/danielpclark/ruby-sys?branch=playground#08c96179e46ce8a5fec25e1b4aeb5d9c63a2245e"
 dependencies = [
  "libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -47,10 +47,10 @@ dependencies = [
 [[package]]
 name = "ruru"
 version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
+source = "git+https://github.com/danielpclark/ruru?branch=playground#aa4a08c48374bb13983cf6de5df7125a18ea1169"
 dependencies = [
  "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "ruby-sys 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ruby-sys 0.3.0 (git+https://github.com/danielpclark/ruby-sys?branch=playground)",
 ]
 
 [metadata]
@@ -59,5 +59,5 @@ dependencies = [
 "checksum lazy_static 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c8f31047daa365f19be14b47c29df4f7c3b581832407daabe6ae77397619237d"
 "checksum libc 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)" = "2370ca07ec338939e356443dac2296f581453c35fe1e3a3ed06023c49435f915"
 "checksum memchr 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "796fba70e76612589ed2ce7f45282f5af869e0fdd7cc6199fa1aa1f1d591ba9d"
-"checksum ruby-sys 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)" = "e71509f17ce93733dc196258e168b58050490a156b04563816a8120a74ba04c7"
-"checksum ruru 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6486d6c50b7a08246a492a61893635c1977d41c138041d443eb603f6298e0273"
+"checksum ruby-sys 0.3.0 (git+https://github.com/danielpclark/ruby-sys?branch=playground)" = "<none>"
+"checksum ruru 0.9.3 (git+https://github.com/danielpclark/ruru?branch=playground)" = "<none>"

data/Cargo.toml

@@ -13,7 +13,7 @@ name = "faster_path"
 crate-type = ["dylib"]
 
 [dependencies]
-ruru = "0.9.3"
+ruru = { git = "https://github.com/danielpclark/ruru", branch = "playground" }
 array_tool = "0.4.1"
 lazy_static = "1.0"
 memchr = "2.0.1"

data/faster_path.gemspec

@@ -26,13 +26,12 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "bundler", "~> 1.12"
   spec.add_dependency "rake", "~> 12.0"
-  spec.add_dependency "ffi", "~> 1.9"
   spec.add_development_dependency "read_source", "~> 0.2.6"
   spec.add_development_dependency "minitest", "~> 5.10"
   spec.add_development_dependency "minitest-reporters", "~> 1.1"
   spec.add_development_dependency "color_pound_spec_reporter", "~> 0.0.9"
   spec.add_development_dependency "rubocop", "~> 0.51"
-  spec.add_development_dependency "stop_watch", "~> 1.0.0"
+  spec.add_development_dependency "stop_watch", "~> 1.0"
   if !ENV['CI'] && ENV['GRAPH']
     spec.add_development_dependency "gruff", "~> 0.7.0"
   end

data/lib/faster_path.rb

@@ -1,55 +1,24 @@
 require "faster_path/version"
 require 'pathname'
-require "ffi"
+require 'faster_path/platform'
 require 'faster_path/asset_resolution'
+require 'fiddle'
+require 'fiddle/import'
 
 module FasterPath
-  FFI_LIBRARY = begin
-    prefix = Gem.win_platform? ? "" : "lib"
-    "#{File.expand_path("../target/release/", __dir__)}/#{prefix}faster_path.#{FFI::Platform::LIBSUFFIX}"
-  end
-  require 'fiddle'
-  library = Fiddle.dlopen(FFI_LIBRARY)
+  FFI_LIBRARY = FasterPath::Platform.ffi_library()
+
   Fiddle::Function.
-    new(library['Init_faster_pathname'], [], Fiddle::TYPE_VOIDP).
+    new(Fiddle.dlopen(FFI_LIBRARY)['Init_faster_pathname'], [], Fiddle::TYPE_VOIDP).
     call
 
-  FasterPathname::Public.class_eval do
-    private_class_method :absolute?
-    private_class_method :add_trailing_separator
+  Public.class_eval do
     private_class_method :basename
-    private_class_method :children # String results
-    private_class_method :children_compat # wrap Pathname on each
+    private_class_method :children
+    private_class_method :children_compat
     private_class_method :chop_basename
-    private_class_method :cleanpath_aggressive
-    private_class_method :directory?
-    private_class_method :dirname
-    private_class_method :entries # String results
-    private_class_method :entries_compat # wrap Pathname on each
-    private_class_method :extname
-    private_class_method :has_trailing_separator?
-    private_class_method :plus
-    private_class_method :relative?
-  end
-
-  FasterPathname.class_eval do
-    def initialize(arg)
-      unless arg.is_a? String
-        arg = arg.to_s
-      end
-      raise(ArgumentError, "null byte found") if arg.include?("\0")
-      @path = arg
-    end
-
-    # BAD; exposes private methods
-    # Need to reprivatize specific methods
-    def method_missing(method_name, *a, &b)
-      Public.send(method_name, @path, *a, &b)
-    end
-
-    def respond_to?(method_name, include_private = false)
-      Public.send(:respond_to?, method_name) || super
-    end
+    private_class_method :entries
+    private_class_method :entries_compat
   end
 
   def self.rust_arch_bits
@@ -60,68 +29,47 @@ module FasterPath
     1.size * 8
   end
 
-  def self.absolute?(pth)
-    FasterPathname::Public.send(:absolute?, pth)
-  end
-
-  def self.add_trailing_separator(pth)
-    FasterPathname::Public.send(:add_trailing_separator, pth)
-  end
-
   def self.blank?(str)
     "#{str}".strip.empty?
   end
 
   def self.basename(pth, ext="")
-    FasterPathname::Public.send(:basename, pth, ext)
+    Public.send(:basename, pth, ext)
   end
 
   def self.children(pth, with_directory=true)
-    FasterPathname::Public.send(:children, pth, with_directory)
+    result = Public.send(:children, pth, with_directory)
+    return result if result
+    raise Errno::NOENT, "No such file or directory @ dir_initialize - #{pth}"
   end
 
-  def self.chop_basename(pth)
-    result = FasterPathname::Public.send(:chop_basename, pth)
-    result unless result.empty?
+  def self.children_compat(pth, with_directory=true)
+    result = Public.send(:children_compat, pth, with_directory)
+    return result if result
+    raise Errno::NOENT, "No such file or directory @ dir_initialize - #{pth}"
   end
 
-  def self.cleanpath_aggressive(pth)
-    FasterPathname::Public.send(:cleanpath_aggressive, pth)
-  end
-
-  def self.directory?(pth)
-    FasterPathname::Public.send(:directory?, pth)
-  end
-
-  def self.dirname(pth)
-    FasterPathname::Public.send(:dirname, pth)
+  def self.chop_basename(pth)
+    result = Public.send(:chop_basename, pth)
+    result unless result.empty?
   end
 
   def self.entries(pth)
-    FasterPathname::Public.send(:entries, pth)
-  end
-
-  def self.extname(pth)
-    FasterPathname::Public.send(:extname, pth)
-  end
-
-  def self.has_trailing_separator?(pth)
-    FasterPathname::Public.send(:has_trailing_separator?, pth)
+    result = Public.send(:entries, pth)
+    return result if result
+    raise Errno::NOENT, "No such file or directory @ dir_initialize - #{pth}"
   end
 
-  def self.plus(pth, pth2)
-    FasterPathname::Public.send(:plus, pth, pth2)
-  end
-
-  def self.relative?(pth)
-    FasterPathname::Public.send(:relative?, pth)
+  def self.entries_compat(pth)
+    result = Public.send(:entries_compat, pth)
+    return result if result
+    raise Errno::NOENT, "No such file or directory @ dir_initialize - #{pth}"
   end
 
   module Rust
-    extend FFI::Library
-    ffi_lib ::FasterPath::FFI_LIBRARY
-
-    attach_function :rust_arch_bits, [], :int32
+    extend Fiddle::Importer
+    dlload FFI_LIBRARY
+    extern 'int rust_arch_bits()'
   end
   private_constant :Rust
 end

data/lib/faster_path/asset_resolution.rb

@@ -2,6 +2,8 @@
 # If the asset is not available and we can't compile it from this code then FAIL
 # on require of 'faster_path' with a very clear message as to why."
 
+require_relative './platform'
+
 module FasterPath
   module AssetResolution # BREAK IN CASE OF EMERGENCY ;-)
     class << self
@@ -50,8 +52,7 @@ module FasterPath
       end
 
       def lib_file
-        prefix = Gem.win_platform? ? "" : "lib"
-        "#{lib_dir}/#{prefix}faster_path.#{FFI::Platform::LIBSUFFIX}"
+        Platform.ffi_library()
       end
     end
   end

data/lib/faster_path/optional/monkeypatches.rb

@@ -38,10 +38,9 @@ module FasterPath
         end
         private :add_trailing_separator
 
-        # Do NOT remove; waiting for fix in ruru
-        # def children(with_dir=true)
-        #   FasterPathname::Public.allocate.send(:children_compat, @path, with_dir)
-        # end if !!ENV['WITH_REGRESSION']
+        def children(with_dir=true)
+          FasterPath.children_compat(@path, with_dir)
+        end if !!ENV['WITH_REGRESSION']
 
         def chop_basename(pth)
           FasterPath.chop_basename(pth)
@@ -57,10 +56,9 @@ module FasterPath
           FasterPath.directory?(@path)
         end
 
-        # Do NOT remove; waiting for fix in ruru
-        # def entries
-        #   FasterPathname::Public.allocate.send(:entries_compat, @path)
-        # end if !!ENV['WITH_REGRESSION']
+        def entries
+          FasterPath.entries_compat(@path)
+        end if !!ENV['WITH_REGRESSION']
 
         def has_trailing_separator?(pth)
           FasterPath.has_trailing_separator?(pth)

data/lib/faster_path/optional/refinements.rb

@@ -34,10 +34,9 @@ module FasterPath
       end
       private :add_trailing_separator
 
-      # Do NOT remove; waiting for fix in ruru
-      # def children(with_dir=true)
-      #   FasterPathname::Public.allocate.send(:children_compat, @path, with_dir)
-      # end if !!ENV['WITH_REGRESSION']
+      def children(with_dir=true)
+        FasterPath.children_compat(@path, with_dir)
+      end if !!ENV['WITH_REGRESSION']
 
       def chop_basename(pth)
         FasterPath.chop_basename(pth)
@@ -53,10 +52,9 @@ module FasterPath
         FasterPath.directory?(@path)
       end
 
-      # Do NOT remove; waiting for fix in ruru
-      # def entries
-      #   FasterPathname::Public.allocate.send(:entries_compat, @path)
-      # end if !!ENV['WITH_REGRESSION']
+      def entries
+        FasterPath.entries_compat(@path)
+      end if !!ENV['WITH_REGRESSION']
 
       def has_trailing_separator?(pth)
         FasterPath.has_trailing_separator?(pth)

data/lib/faster_path/platform.rb

@@ -0,0 +1,60 @@
+module FasterPath
+  module Platform
+    class << self
+      def ffi_library
+        file = [
+          lib_prefix,
+          "faster_path.",
+          lib_suffix
+        ]
+
+        File.join(rust_release, file.join())
+      end
+
+      def operating_system
+        case host_os()
+        when /linux|bsd|solaris/
+          "linux"
+        when /darwin/
+          "darwin"
+        when /mingw|mswin/
+          "windows"
+        else
+          host_os()
+        end
+      end
+
+      def lib_prefix
+        case operating_system()
+        when /windows/
+          ''
+        when /cygwin/
+          'cyg'
+        else
+          'lib'
+        end
+      end
+
+      def lib_suffix
+        case operating_system()
+        when /darwin/
+          'dylib'
+        when /linux/
+          'so'
+        when /windows|cygwin/
+          'dll'
+        else
+          'so'
+        end
+      end
+
+      def rust_release
+        File.expand_path("../../target/release/", __dir__)
+      end
+
+      def host_os
+        RbConfig::CONFIG['host_os'].downcase
+      end
+    end
+  end
+end

data/lib/faster_path/version.rb

@@ -1,3 +1,3 @@
 module FasterPath
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/src/helpers.rs

@@ -1,9 +1,13 @@
-use ruru::{AnyObject, Class, Object, RString};
+use ruru::{RString, Object, Class};
 
-pub fn str_to_any_obj(str_var: &str) -> AnyObject {
-  RString::new(str_var).to_any_object()
-}
+pub fn new_pathname_instance(path: &str) -> Class {
+  let mut path_instance = Class::from(
+    Class::from_existing("Pathname").send("allocate", None).value()
+  );
+  path_instance.instance_variable_set(
+    "@path",
+    RString::new(path).to_any_object()
+  );
 
-pub fn class_new(klass: &str, params: Vec<AnyObject>) -> AnyObject {
-  Class::from_existing(klass).new_instance(params)
+  path_instance
 }

data/src/lib.rs

@@ -10,7 +10,7 @@ extern crate ruru;
 #[macro_use]
 extern crate lazy_static;
 
-class!(FasterPathname);
+module!(FasterPath);
 
 mod helpers;
 mod pathname;
@@ -24,12 +24,12 @@ mod prepend_prefix;
 pub mod rust_arch_bits;
 mod path_parsing;
 
-use ruru::{Class, Object, RString, Boolean, Array};
+use ruru::{Module, Object, RString, Boolean, Array, AnyObject};
 
 // r_ methods are on the core class and may evaluate instance variables or self
 // pub_ methods must take all values as parameters
 methods!(
-  FasterPathname,
+  FasterPath,
   _itself,
 
   fn pub_add_trailing_separator(pth: RString) -> RString {
@@ -46,11 +46,11 @@ methods!(
     pathname::pn_basename(pth, ext)
   }
 
-  fn pub_children(pth: RString, with_dir: Boolean) -> Array {
+  fn pub_children(pth: RString, with_dir: Boolean) -> AnyObject {
     pathname::pn_children(pth, with_dir)
   }
 
-  fn pub_children_compat(pth: RString, with_dir: Boolean) -> Array {
+  fn pub_children_compat(pth: RString, with_dir: Boolean) -> AnyObject {
     pathname::pn_children_compat(pth, with_dir)
   }
 
@@ -87,12 +87,12 @@ methods!(
   // }
 
   // pub_entries returns an array of String objects
-  fn pub_entries(pth: RString) -> Array {
+  fn pub_entries(pth: RString) -> AnyObject {
     pathname::pn_entries(pth)
   }
 
   // pub_entries_compat returns an array of Pathname objects
-  fn pub_entries_compat(pth: RString) -> Array {
+  fn pub_entries_compat(pth: RString) -> AnyObject {
     pathname::pn_entries_compat(pth)
   }
 
@@ -146,28 +146,26 @@ methods!(
 #[allow(non_snake_case)]
 #[no_mangle]
 pub extern "C" fn Init_faster_pathname(){
-  Class::new("FasterPathname", None).define(|itself| {
-    itself.define_nested_class("Public", None);
-  });
-
-  // Public methods
-  // * methods for refinements, monkeypatching
-  // * methods that need all values as parameters
-  Class::from_existing("FasterPathname").get_nested_class("Public").define(|itself| {
+  Module::from_existing("FasterPath").define(|itself| {
     itself.def_self("absolute?", pub_is_absolute);
     itself.def_self("add_trailing_separator", pub_add_trailing_separator);
-    itself.def_self("basename", pub_basename);
-    itself.def_self("children", pub_children);
-    itself.def_self("children_compat", pub_children_compat);
-    itself.def_self("chop_basename", pub_chop_basename);
     itself.def_self("cleanpath_aggressive", pub_cleanpath_aggressive);
     itself.def_self("directory?", pub_is_directory);
     itself.def_self("dirname", pub_dirname);
-    itself.def_self("entries", pub_entries);
-    itself.def_self("entries_compat", pub_entries_compat);
     itself.def_self("extname", pub_extname);
     itself.def_self("has_trailing_separator?", pub_has_trailing_separator);
     itself.def_self("plus", pub_plus);
     itself.def_self("relative?", pub_is_relative);
+    itself.define_nested_class("Public", None);
+  });
+
+  // For methods requiring addition Ruby-side behavior
+  Module::from_existing("FasterPath").get_nested_class("Public").define(|itself| {
+    itself.def_self("basename", pub_basename);
+    itself.def_self("children", pub_children);
+    itself.def_self("children_compat", pub_children_compat);
+    itself.def_self("chop_basename", pub_chop_basename);
+    itself.def_self("entries", pub_entries);
+    itself.def_self("entries_compat", pub_entries_compat);
   });
 }

data/src/pathname.rs

@@ -1,4 +1,4 @@
-use helpers::*;
+use helpers::new_pathname_instance;
 use basename;
 use chop_basename;
 use cleanpath_aggressive;
@@ -7,7 +7,7 @@ use extname;
 use plus;
 
 use ruru;
-use ruru::{RString, Boolean, Array};
+use ruru::{RString, Boolean, Array, AnyObject, NilClass, Object};
 use std::path::{MAIN_SEPARATOR,Path};
 use std::fs;
 
@@ -41,16 +41,17 @@ pub fn pn_basename(pth: MaybeString, ext: MaybeString) -> RString {
   )
 }
 
-pub fn pn_children(pth: MaybeString, with_dir: MaybeBoolean) -> Array {
-  let rstring = pth.ok().unwrap_or(RString::new("."));
-  let val = rstring.to_str();
-  let mut with_directory = with_dir.ok().unwrap_or(Boolean::new(true)).to_bool();
-  if val == "." {
-    with_directory = false;
-  }
+pub fn pn_children(pth: MaybeString, with_dir: MaybeBoolean) -> AnyObject {
   let mut arr = Array::new();
+  let val = pth.ok().unwrap_or(RString::new("."));
+  let val = val.to_str();
 
   if let Ok(entries) = fs::read_dir(val) {
+    let mut with_directory = with_dir.ok().unwrap_or(Boolean::new(true)).to_bool();
+    if val == "." {
+      with_directory = false;
+    }
+
     for entry in entries {
       if with_directory {
         match entry {
@@ -64,41 +65,44 @@ pub fn pn_children(pth: MaybeString, with_dir: MaybeBoolean) -> Array {
         };
       }
     }
+
+    arr.to_any_object()
+  } else {
+    // TODO: When ruru exceptions are available switch the exception logic
+    // from the Ruby side to the Rust side
+    NilClass::new().to_any_object()
   }
-  arr
 }
 
-pub fn pn_children_compat(pth: MaybeString, with_dir: MaybeBoolean) -> Array {
-  let rstring = pth.ok().unwrap_or(RString::new("."));
-  let val = rstring.to_str();
-  let mut with_directory = with_dir.ok().unwrap_or(Boolean::new(true)).to_bool();
-  if val == "." {
-    with_directory = false;
-  }
+pub fn pn_children_compat(pth: MaybeString, with_dir: MaybeBoolean) -> AnyObject {
   let mut arr = Array::new();
+  let val = pth.ok().unwrap_or(RString::new("."));
+  let val = val.to_str();
 
   if let Ok(entries) = fs::read_dir(val) {
+    let mut with_directory = with_dir.ok().unwrap_or(Boolean::new(true)).to_bool();
+    if val == "." {
+      with_directory = false;
+    }
+
     for entry in entries {
       if with_directory {
-        match entry {
-          Ok(v) => { arr.push(
-              class_new("Pathname", vec![str_to_any_obj(v.path().to_str().unwrap())])
-            );
-          },
-          _ => {}
+        if let Ok(v) = entry {
+          arr.push(new_pathname_instance(v.path().to_str().unwrap()));
         };
       } else {
-        match entry {
-          Ok(v) => { arr.push(
-              class_new("Pathname", vec![str_to_any_obj(v.file_name().to_str().unwrap())])
-            );
-          },
-          _ => {}
+        if let Ok(v) = entry {
+          arr.push(new_pathname_instance(v.file_name().to_str().unwrap()));
         };
       }
     }
+
+    arr.to_any_object()
+  } else {
+    // TODO: When ruru exceptions are available switch the exception logic
+    // from the Ruby side to the Rust side
+    NilClass::new().to_any_object()
   }
-  arr
 }
 
 pub fn pn_chop_basename(pth: MaybeString) -> Array {
@@ -152,34 +156,44 @@ pub fn pn_dirname(pth: MaybeString) -> RString {
 //   NilClass::new()
 // }
 
-pub fn pn_entries(pth: MaybeString) -> Array {
-  let files = fs::read_dir(pth.ok().unwrap_or(RString::new("")).to_str()).unwrap();
+pub fn pn_entries(pth: MaybeString) -> AnyObject {
   let mut arr = Array::new();
 
-  arr.push(RString::new("."));
-  arr.push(RString::new(".."));
+  if let Ok(files) = fs::read_dir(pth.ok().unwrap_or(RString::new("")).to_str()) {
+    arr.push(RString::new("."));
+    arr.push(RString::new(".."));
 
-  for file in files {
-    let file_name_str = file.unwrap().file_name().into_string().unwrap();
-    arr.push(RString::new(&file_name_str[..]));
-  }
+    for file in files {
+      let file_name_str = file.unwrap().file_name().into_string().unwrap();
+      arr.push(RString::new(&file_name_str[..]));
+    }
 
-  arr
+    arr.to_any_object()
+  } else {
+    // TODO: When ruru exceptions are available switch the exception logic
+    // from the Ruby side to the Rust side
+    NilClass::new().to_any_object()
+  }
 }
 
-pub fn pn_entries_compat(pth: MaybeString) -> Array {
-  let files = fs::read_dir(pth.ok().unwrap_or(RString::new("")).to_str()).unwrap();
+pub fn pn_entries_compat(pth: MaybeString) -> AnyObject {
   let mut arr = Array::new();
 
-  arr.push(class_new("Pathname", vec![str_to_any_obj(&"."[..])]));
-  arr.push(class_new("Pathname", vec![str_to_any_obj(&".."[..])]));
+  if let Ok(files) = fs::read_dir(pth.ok().unwrap_or(RString::new("")).to_str()) {
+    arr.push(new_pathname_instance("."));
+    arr.push(new_pathname_instance(".."));
 
-  for file in files {
-    let file_name_str = file.unwrap().file_name().into_string().unwrap();
-    arr.push(class_new("Pathname", vec![str_to_any_obj(&file_name_str[..])]));
-  }
+    for file in files {
+      let file_name_str = file.unwrap().file_name().into_string().unwrap();
+      arr.push(new_pathname_instance(&file_name_str));
+    }
 
-  arr
+    arr.to_any_object()
+  } else {
+    // TODO: When ruru exceptions are available switch the exception logic
+    // from the Ruby side to the Rust side
+    NilClass::new().to_any_object()
+  }
 }
 
 pub fn pn_extname(pth: MaybeString) -> RString {
@@ -212,7 +226,12 @@ pub fn pn_has_trailing_separator(pth: MaybeString) -> Boolean {
 
 // also need impl +
 pub fn pn_plus(pth1: MaybeString, pth2: MaybeString) -> RString {
-  RString::new(&plus::plus_paths(pth1.ok().unwrap().to_str(), pth2.ok().unwrap().to_str())[..])
+  RString::new(
+    &plus::plus_paths(
+      pth1.ok().unwrap_or(RString::new("")).to_str(),
+      pth2.ok().unwrap_or(RString::new("")).to_str()
+    )[..]
+  )
 }
 
 // pub fn pn_prepend_prefix(prefix: MaybeString, relpath: MaybeString){}
@@ -235,3 +254,4 @@ pub fn pn_is_relative(pth: MaybeString) -> Boolean {
 // pub fn pn_rmtree(pth: MaybeString) -> NilClass {
 //   NilClass::new()
 // }
+//

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faster_path
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Daniel P. Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-05 00:00:00.000000000 Z
+date: 2018-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
-- !ruby/object:Gem::Dependency
-  name: ffi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: read_source
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.0'
 description: FasterPath is a reimplementation of Pathname for better performance.
 email:
 - 6ftdan@gmail.com
@@ -158,6 +144,7 @@ files:
 - lib/faster_path/asset_resolution.rb
 - lib/faster_path/optional/monkeypatches.rb
 - lib/faster_path/optional/refinements.rb
+- lib/faster_path/platform.rb
 - lib/faster_path/version.rb
 - src/basename.rs
 - src/chop_basename.rs
@@ -191,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Reimplementation of Pathname for better performance