faster_path 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 739814304e0316723938ab4430c07c7b17d490a2
-  data.tar.gz: 108e7bcbf3ff76a25cc13abcc93139c6aa605f8b
+  metadata.gz: 9d4375a359961afcc5baa61ac3c67569797e7f2f
+  data.tar.gz: b73c128d729d3fd37d5b125f584149466463a83b
 SHA512:
-  metadata.gz: 87faa82ae7729a586da191ee691e41db88a24269aa26e9ab54d0f823c5ce140bd105ecc91066dc0f0d5ee8a4dd883b030a8af17e85705d250dc9f6b8a0d53785
-  data.tar.gz: 3d1861b3bd1238270820b6b1f688da630ebfc5556afab69cc37b2eb62bc02f3fe6a4538f5d3605fc97d9afb60681f561f5d3e4a4b6e08c2b7600339bee85f4d0
+  metadata.gz: 42ab2f7cf2f3d45acf871b1169722905bc7bc7081048fc8ec23d74f5163dc4a25c65247c01ca97edd9cb2202886e8a482a9c40518301a59a216c58ed76125ccd
+  data.tar.gz: 1800e1268585ef4970508199ea494be7aaf5382229dc7d4f1f5486bda8b94c3576144f5afb9783400a555509b8ac485a5d7e1a924049e9baa46ccb8470053958

data/Cargo.lock

@@ -3,6 +3,7 @@ name = "faster_path"
 version = "0.0.1"
 dependencies = [
  "array_tool 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ruby-sys 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)",
  "ruru 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 

data/Cargo.toml

@@ -13,5 +13,6 @@ name = "faster_path"
 crate-type = ["dylib"]
 
 [dependencies]
+ruby-sys = "0.2.20"
 ruru = "0.9.3"
 array_tool = "0.4.1"

data/README.md

@@ -3,7 +3,7 @@
 [![TravisCI Build Status](https://travis-ci.org/danielpclark/faster_path.svg?branch=master)](https://travis-ci.org/danielpclark/faster_path)
 [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/10ul0gk3cwhlt2lj/branch/master?svg=true)](https://ci.appveyor.com/project/danielpclark/faster-path/branch/master)
 [![Latest Tag](https://img.shields.io/github/tag/danielpclark/faster_path.svg)](https://github.com/danielpclark/faster_path/tags)
-[![Commits Since Last Release](https://img.shields.io/github/commits-since/danielpclark/faster_path/v0.1.11.svg)](https://github.com/danielpclark/faster_path/pulse)
+[![Commits Since Last Release](https://img.shields.io/github/commits-since/danielpclark/faster_path/v0.2.1.svg)](https://github.com/danielpclark/faster_path/pulse)
 [![Binary Release](https://img.shields.io/github/release/danielpclark/faster_path.svg)](https://github.com/danielpclark/faster_path/releases)
 [![Coverage Status](https://coveralls.io/repos/github/danielpclark/faster_path/badge.svg)](https://coveralls.io/github/danielpclark/faster_path)
 [![Inline docs](http://inch-ci.org/github/danielpclark/faster_path.svg?branch=master)](http://inch-ci.org/github/danielpclark/faster_path)

data/Rakefile

@@ -98,7 +98,7 @@ Rake::TestTask.new(minitest: :build_lib) do |t|
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-task test: [:cargo, :minitest, :lint] do |_t|
+task test: [:cargo, :minitest, :lint, :pbench] do |_t|
   exec 'spec/mspec/bin/mspec --format spec core/file/basename core/file/extname core/file/dirname library/pathname'
 end
 

data/faster_path.gemspec

@@ -27,7 +27,7 @@ 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 "method_source", "~> 0.8.2"
+  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"

data/lib/faster_path/optional/monkeypatches.rb

@@ -25,8 +25,6 @@ module FasterPath
         end
       end
     end
-
-    # rubocop:disable Metrics/MethodLength
     def self._ruby_library_pathname!
       ::Pathname.class_eval do
         def absolute?
@@ -38,9 +36,10 @@ module FasterPath
         end
         private :add_trailing_separator
 
-        def children(with_dir=true)
-          FasterPath.children(@path, with_dir)
-        end
+        # 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 chop_basename(pth)
           FasterPath.chop_basename(pth)
@@ -51,9 +50,10 @@ module FasterPath
           FasterPath.directory?(@path)
         end
 
-        def entries
-          FasterPath.entries(@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 has_trailing_separator?(pth)
           FasterPath.has_trailing_separator?(pth)

data/lib/faster_path/optional/refinements.rb

@@ -34,9 +34,10 @@ module FasterPath
       end
       private :add_trailing_separator
 
-      def children(with_dir=true)
-        FasterPath.children(@path, with_dir)
-      end
+      # 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 chop_basename(pth)
         FasterPath.chop_basename(pth)
@@ -47,9 +48,10 @@ module FasterPath
         FasterPath.directory?(@path)
       end
 
-      def entries
-        FasterPath.entries(@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 has_trailing_separator?(pth)
         FasterPath.has_trailing_separator?(pth)

data/lib/faster_path/version.rb

@@ -1,3 +1,3 @@
 module FasterPath
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/faster_path.rb

@@ -18,11 +18,13 @@ module FasterPath
     private :absolute?
     private :add_trailing_separator
     private :basename
-    private :children
+    private :children # String results
+    private :children_compat # wrap Pathname on each
     private :chop_basename
     private :directory?
     private :dirname
-    private :entries
+    private :entries # String results
+    private :entries_compat # wrap Pathname on each
     private :extname
     private :has_trailing_separator?
     private :plus

data/src/helpers.rs

@@ -0,0 +1,21 @@
+extern crate ruby_sys;
+use self::ruby_sys::string;
+
+use ruru::{AnyObject, Class};
+use ruru::types::{c_char, c_long, Value};
+
+#[inline]
+pub fn str_to_value(string: &str) -> Value {
+  let str_ptr = string.as_ptr() as *const c_char;
+  let len = string.len() as c_long;
+
+  unsafe { string::rb_str_new(str_ptr, len) }
+}
+
+pub fn str_to_any_obj(str_var: &str) -> AnyObject {
+  AnyObject::from(str_to_value(str_var))
+}
+
+pub fn class_new(klass: &str, params: Vec<AnyObject>) -> AnyObject {
+  Class::from_existing(klass).new_instance(params)
+}

data/src/lib.rs

@@ -9,6 +9,7 @@ extern crate ruru;
 
 class!(FasterPathname);
 
+mod helpers;
 mod pathname;
 mod basename;
 mod chop_basename;
@@ -26,23 +27,6 @@ methods!(
   FasterPathname,
   _itself,
 
-  // TOPATH = :to_path
-
-  // SAME_PATHS = if File::FNM_SYSCASE.nonzero?
-  //   # Avoid #zero? here because #casecmp can return nil.
-  //   proc {|a, b| a.casecmp(b) == 0}
-  // else
-  //   proc {|a, b| a == b}
-  // end
-
-  // if File::ALT_SEPARATOR
-  //   SEPARATOR_LIST = "#{Regexp.quote File::ALT_SEPARATOR}#{Regexp.quote File::SEPARATOR}"
-  //   SEPARATOR_PAT = /[#{SEPARATOR_LIST}]/
-  // else
-  //   SEPARATOR_LIST = "#{Regexp.quote File::SEPARATOR}"
-  //   SEPARATOR_PAT = /#{Regexp.quote File::SEPARATOR}/
-  // end
-
   fn pub_add_trailing_separator(pth: RString) -> RString {
     pathname::pn_add_trailing_separator(pth)
   }
@@ -61,6 +45,10 @@ methods!(
     pathname::pn_children(pth, with_dir)
   }
 
+  fn pub_children_compat(pth: RString, with_dir: Boolean) -> Array {
+    pathname::pn_children_compat(pth, with_dir)
+  }
+
   fn pub_chop_basename(pth: RString) -> Array {
     pathname::pn_chop_basename(pth)
   }
@@ -91,10 +79,16 @@ methods!(
   //   pathname::pn_each_filename(pth)
   // }
 
+  // pub_entries returns an array of String objects
   fn pub_entries(pth: RString) -> Array {
     pathname::pn_entries(pth)
   }
 
+  // pub_entries_compat returns an array of Pathname objects
+  fn pub_entries_compat(pth: RString) -> Array {
+    pathname::pn_entries_compat(pth)
+  }
+
   fn pub_extname(pth: RString) -> RString {
     pathname::pn_extname(pth)
   }
@@ -157,10 +151,12 @@ pub extern "C" fn Init_faster_pathname(){
     itself.def("add_trailing_separator", pub_add_trailing_separator);
     itself.def("basename", pub_basename);
     itself.def("children", pub_children);
+    itself.def("children_compat", pub_children_compat);
     itself.def("chop_basename", pub_chop_basename);
     itself.def("directory?", pub_is_directory);
     itself.def("dirname", pub_dirname);
     itself.def("entries", pub_entries);
+    itself.def("entries_compat", pub_entries_compat);
     itself.def("extname", pub_extname);
     itself.def("has_trailing_separator?", pub_has_trailing_separator);
     itself.def("plus", pub_plus);

data/src/pathname.rs

@@ -1,3 +1,4 @@
+use helpers::*;
 use basename;
 use chop_basename;
 use dirname;
@@ -9,7 +10,10 @@ use ruru::{RString, Boolean, Array};
 use std::path::{MAIN_SEPARATOR,Path};
 use std::fs;
 
-pub fn pn_add_trailing_separator(pth: Result<ruru::RString, ruru::result::Error>) -> RString {
+type MaybeString = Result<ruru::RString, ruru::result::Error>;
+type MaybeBoolean = Result<ruru::Boolean, ruru::result::Error>;
+
+pub fn pn_add_trailing_separator(pth: MaybeString) -> RString {
   let p = pth.ok().unwrap();
   let x = format!("{}{}", p.to_str(), "a");
   match x.rsplit_terminator(MAIN_SEPARATOR).next() {
@@ -18,7 +22,7 @@ pub fn pn_add_trailing_separator(pth: Result<ruru::RString, ruru::result::Error>
   }
 }
 
-pub fn pn_is_absolute(pth: Result<ruru::RString, ruru::result::Error>) -> Boolean {
+pub fn pn_is_absolute(pth: MaybeString) -> Boolean {
   Boolean::new(match pth.ok().unwrap_or(RString::new("")).to_str().chars().next() {
     Some(c) => c == MAIN_SEPARATOR,
     None => false
@@ -27,7 +31,7 @@ pub fn pn_is_absolute(pth: Result<ruru::RString, ruru::result::Error>) -> Boolea
 
 // pub fn pn_ascend(){}
 
-pub fn pn_basename(pth: Result<ruru::RString, ruru::result::Error>, ext: Result<ruru::RString, ruru::result::Error>) -> RString {
+pub fn pn_basename(pth: MaybeString, ext: MaybeString) -> RString {
   RString::new(
     &basename::basename(
       pth.ok().unwrap_or(RString::new("")).to_str(),
@@ -36,7 +40,7 @@ pub fn pn_basename(pth: Result<ruru::RString, ruru::result::Error>, ext: Result<
   )
 }
 
-pub fn pn_children(pth: Result<ruru::RString, ruru::result::Error>, with_dir: Result<ruru::Boolean, ruru::result::Error>) -> Array {
+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();
@@ -63,7 +67,40 @@ pub fn pn_children(pth: Result<ruru::RString, ruru::result::Error>, with_dir: Re
   arr
 }
 
-pub fn pn_chop_basename(pth: Result<ruru::RString, ruru::result::Error>) -> Array {
+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;
+  }
+  let mut arr = Array::new();
+
+  if let Ok(entries) = fs::read_dir(val) {
+    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())])
+            );
+          },
+          _ => {}
+        };
+      } else {
+        match entry {
+          Ok(v) => { arr.push(
+              class_new("Pathname", vec![str_to_any_obj(v.file_name().to_str().unwrap())])
+            );
+          },
+          _ => {}
+        };
+      }
+    }
+  }
+  arr
+}
+
+pub fn pn_chop_basename(pth: MaybeString) -> Array {
   let mut arr = Array::with_capacity(2);
   let results = chop_basename::chop_basename(pth.ok().unwrap_or(RString::new("")).to_str());
   match results {
@@ -76,17 +113,17 @@ pub fn pn_chop_basename(pth: Result<ruru::RString, ruru::result::Error>) -> Arra
   }
 }
 
-// pub fn pn_cleanpath(pth: Result<ruru::RString, ruru::result::Error>){}
+// pub fn pn_cleanpath(pth: MaybeString){}
 
-// pub fn pn_cleanpath_aggressive(pth: Result<ruru::RString, ruru::result::Error>){}
+// pub fn pn_cleanpath_aggressive(pth: MaybeString){}
 
-// pub fn pn_cleanpath_conservative(pth: Result<ruru::RString, ruru::result::Error>){}
+// pub fn pn_cleanpath_conservative(pth: MaybeString){}
 
-// pub fn pn_del_trailing_separator(pth: Result<ruru::RString, ruru::result::Error>){}
+// pub fn pn_del_trailing_separator(pth: MaybeString){}
 
 // pub fn pn_descend(){}
 
-pub fn pn_is_directory(pth: Result<ruru::RString, ruru::result::Error>) -> Boolean {
+pub fn pn_is_directory(pth: MaybeString) -> Boolean {
   Boolean::new(
     Path::new(
       pth.ok().unwrap_or(RString::new("")).to_str()
@@ -94,7 +131,7 @@ pub fn pn_is_directory(pth: Result<ruru::RString, ruru::result::Error>) -> Boole
   )
 }
 
-pub fn pn_dirname(pth: Result<ruru::RString, ruru::result::Error>) -> RString {
+pub fn pn_dirname(pth: MaybeString) -> RString {
   RString::new(
     &dirname::dirname(
       pth.ok().unwrap_or(RString::new("")).to_str()
@@ -104,11 +141,11 @@ pub fn pn_dirname(pth: Result<ruru::RString, ruru::result::Error>) -> RString {
 
 // pub fn pn_each_child(){}
 
-// pub fn pn_each_filename(pth: Result<ruru::RString, ruru::result::Error>) -> NilClass {
+// pub fn pn_each_filename(pth: MaybeString) -> NilClass {
 //   NilClass::new()
 // }
 
-pub fn pn_entries(pth: Result<ruru::RString, ruru::result::Error>) -> Array {
+pub fn pn_entries(pth: MaybeString) -> Array {
   let files = fs::read_dir(pth.ok().unwrap_or(RString::new("")).to_str()).unwrap();
   let mut arr = Array::new();
 
@@ -123,15 +160,30 @@ pub fn pn_entries(pth: Result<ruru::RString, ruru::result::Error>) -> Array {
   arr
 }
 
-pub fn pn_extname(pth: Result<ruru::RString, ruru::result::Error>) -> RString {
+pub fn pn_entries_compat(pth: MaybeString) -> Array {
+  let files = fs::read_dir(pth.ok().unwrap_or(RString::new("")).to_str()).unwrap();
+  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(&".."[..])]));
+
+  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[..])]));
+  }
+
+  arr
+}
+
+pub fn pn_extname(pth: MaybeString) -> RString {
   RString::new(
     &extname::extname(pth.ok().unwrap_or(RString::new("")).to_str())[..]
   )
 }
 
-// pub fn pn_find(pth: Result<ruru::RString, ruru::result::Error> ,ignore_error: Boolean){}
+// pub fn pn_find(pth: MaybeString ,ignore_error: Boolean){}
 
-pub fn pn_has_trailing_separator(pth: Result<ruru::RString, ruru::result::Error>) -> Boolean {
+pub fn pn_has_trailing_separator(pth: MaybeString) -> Boolean {
   let v = pth.ok().unwrap_or(RString::new(""));
   match chop_basename::chop_basename(v.to_str()) {
     Some((a,b)) => {
@@ -143,22 +195,22 @@ pub fn pn_has_trailing_separator(pth: Result<ruru::RString, ruru::result::Error>
 
 // pub fn pn_join(args: Array){}
 
-// pub fn pn_mkpath(pth: Result<ruru::RString, ruru::result::Error>) -> NilClass {
+// pub fn pn_mkpath(pth: MaybeString) -> NilClass {
 //   NilClass::new()
 // }
 
-// pub fn pn_is_mountpoint(pth: Result<ruru::RString, ruru::result::Error>){}
+// pub fn pn_is_mountpoint(pth: MaybeString){}
 
-// pub fn pn_parent(pth: Result<ruru::RString, ruru::result::Error>){}
+// pub fn pn_parent(pth: MaybeString){}
 
 // also need impl +
-pub fn pn_plus(pth1: Result<ruru::RString, ruru::result::Error>, pth2: Result<ruru::RString, ruru::result::Error>) -> RString {
+pub fn pn_plus(pth1: MaybeString, pth2: MaybeString) -> RString {
   RString::new(&plus::plus_paths(pth1.ok().unwrap().to_str(), pth2.ok().unwrap().to_str())[..])
 }
 
-// pub fn pn_prepend_prefix(prefix: Result<ruru::RString, ruru::result::Error>, relpath: Result<ruru::RString, ruru::result::Error>){}
+// pub fn pn_prepend_prefix(prefix: MaybeString, relpath: MaybeString){}
 
-pub fn pn_is_relative(pth: Result<ruru::RString, ruru::result::Error>) -> Boolean {
+pub fn pn_is_relative(pth: MaybeString) -> Boolean {
   Boolean::new(
     match pth.ok().unwrap_or(RString::new(&MAIN_SEPARATOR.to_string()[..])).to_str().chars().next() {
       Some(c) => c != MAIN_SEPARATOR,
@@ -167,13 +219,13 @@ pub fn pn_is_relative(pth: Result<ruru::RString, ruru::result::Error>) -> Boolea
   )
 }
 
-// pub fn pn_root(pth: Result<ruru::RString, ruru::result::Error>){}
+// pub fn pn_root(pth: MaybeString){}
 
-// pub fn pn_split_names(pth: Result<ruru::RString, ruru::result::Error>){}
+// pub fn pn_split_names(pth: MaybeString){}
 
 // pub fn pn_relative_path_from(){}
 
-// pub fn pn_rmtree(pth: Result<ruru::RString, ruru::result::Error>) -> NilClass {
+// 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.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Daniel P. Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-13 00:00:00.000000000 Z
+date: 2017-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
-  name: method_source
+  name: read_source
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.2.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +177,7 @@ files:
 - src/chop_basename.rs
 - src/dirname.rs
 - src/extname.rs
+- src/helpers.rs
 - src/lib.rs
 - src/path_parsing.rs
 - src/pathname.rs