faster_path 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db825eef6d7393b150a108c97a668088a0d403e7
-  data.tar.gz: 54ed210ae569bd548c3f6233e4f11b9d6d678688
+  metadata.gz: aa3f9dba549d669279573d0241b6d2c682f79662
+  data.tar.gz: aa054bab991c3002071a7ec48d73088294f2b01d
 SHA512:
-  metadata.gz: 0425ba04eb0e8579dc55b3d1c8b9a9ab30cbba96d548d7d8f52fe97ea2bcb2c66fa8a092ff1883c260ddefa071beb9453b6a2f99d54b1cf6a529a08837055c22
-  data.tar.gz: 3c4bcf0268e0ac6e74f487880081e60f367f56b8919e0b12348b9a194374bea01cb9c86c55ca8e5ec4c92a5c57ade1365b1021f23a34d7fb93f60568dace080a
+  metadata.gz: ea433ac9b113962f898e229af0a466f0b6c37136fcc709ed9ff0c07659c5515537c3747fffd518a88051c919c08757aada3b1b47f714af42aee15e85eccd9d6a
+  data.tar.gz: e813af21a48a83b4b278663a2e2ef4c7ce9874e682651ce3ef529165c923a4a84830c53341d9725757573e75e63ff0e6f1c921d5382d8ed67bd957fbcaf4d7a7

data/.gitignore

@@ -10,3 +10,4 @@
 /tmp/
 mkmf.log
 **/*.swp
+**/*.gem

data/Cargo.toml

@@ -14,4 +14,4 @@ crate-type = ["dylib"]
 
 [dependencies]
 libc = "0.2.11"
-#regex = "0.1.71"
+#regex = "0.1"

data/ext/faster_path/extconf.rb

@@ -11,9 +11,9 @@ unless find_executable('cargo')
   END { puts "Exiting..."}
 end
 
-Dir.chdir('../../') do
+Dir.chdir(File.expand_path("../../", File.dirname(__FILE__))) do
   system("rake build_src")
   system("rake clean_src")
 end
 
-create_makefile('faster_path/dummy')
+create_makefile('faster_path/dummy')

data/faster_path.gemspec

@@ -19,9 +19,11 @@ Gem::Specification.new do |spec|
   spec.extensions    << "ext/faster_path/extconf.rb"
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "ffi"
+  spec.add_dependency "ffi", "~> 1.9"
   spec.add_development_dependency "bundler", "~> 1.12"
   spec.add_development_dependency "method_source", "~> 0.8.2"
   spec.add_development_dependency "rake", "~> 11.1"
   spec.add_development_dependency "minitest", "~> 5.8"
+  spec.add_development_dependency "minitest-reporters", "~> 1.1"
+  spec.add_development_dependency "color_pound_spec_reporter", "~> 0.0.5"
 end

data/lib/faster_path/optional/monkeypatches.rb

@@ -1,10 +1,16 @@
 module FasterPath
   def self.sledgehammer_everything!
+    ::File.class_eval do
+      def basename(pth)
+        FasterPath.basename(pth)
+      end if FasterPath.respond_to? :basename
+    end unless true # No need to open class when we're not using it yet
+
     ::Pathname.class_eval do
       def absolute?
         FasterPath.absolute?(@path)
       end
-
+   
       def chop_basename(pth)
         FasterPath.chop_basename(pth)
       end

data/lib/faster_path/optional/refinements.rb

@@ -1,4 +1,12 @@
 module FasterPath
+  module RefineFile
+    refine File do
+      def basename(pth)
+        FasterPath.basename(pth)
+      end if FasterPath.respond_to? :basename
+    end
+  end unless true # No need to open class when we're not using it yet
+
   module RefinePathname
     refine Pathname do
       def absolute?

data/lib/faster_path/version.rb

@@ -1,3 +1,3 @@
 module FasterPath
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/faster_path.rb

@@ -26,6 +26,10 @@ module FasterPath
     Rust.is_blank(str)
   end
 
+  def self.basename(pth, ext="")
+    Rust.basename(pth, ext)
+  end unless true # WAY_TOO_SLOW! 5600X slower
+
   # EXAMPLE
   #def self.one_and_two
   #  Rust.one_and_two.to_a
@@ -52,7 +56,7 @@ module FasterPath
     attach_function :is_relative, [ :string ], :bool
     attach_function :is_blank, [ :string ], :bool
     attach_function :both_are_blank, [ :string, :string ], :bool
-    attach_function :basename, [ :string ], :string
+    #attach_function :basename, [ :string, :string ], :string
     attach_function :dirname, [ :string ], :string
     attach_function :basename_for_chop, [ :string ], :string # decoupling behavior
     attach_function :dirname_for_chop, [ :string ], :string # decoupling behavior

data/src/basename.rs

@@ -1,14 +1,21 @@
 #[no_mangle]
-pub extern fn basename(string: *const c_char) -> *const c_char {
-  let c_str = unsafe {
+pub extern fn basename(string: *const c_char, comp_ext: *const c_char) -> *const c_char {
+  let c_str1 = unsafe {
     assert!(!string.is_null());
-
     CStr::from_ptr(string)
   };
+  let c_str2 = unsafe {
+    assert!(!comp_ext.is_null());
+    CStr::from_ptr(comp_ext)
+  };
+  let r_str = str::from_utf8(c_str1.to_bytes()).unwrap();
+  let r_str_chomp = str::from_utf8(c_str2.to_bytes()).unwrap();
 
-  let r_str = str::from_utf8(c_str.to_bytes()).unwrap();
+  let r_str = if !r_str_chomp.is_empty() {
+    chomp_pathish_regex(r_str, r_str_chomp)
+  } else { r_str.to_string() };
 
-  let part = Path::new(r_str).file_name().unwrap_or(OsStr::new("")).to_str();
+  let part = Path::new(&r_str[..]).file_name().unwrap_or(OsStr::new("")).to_str();
   
   let output = CString::new(format!("{}", part.unwrap())).unwrap();
   output.into_raw()

data/src/lib.rs

@@ -1,10 +1,11 @@
-// Copyright 2015-2016 Daniel P. Clark & Other Combinatorics Developers
+// Copyright 2015-2016 Daniel P. Clark & Other FasterPath Developers
 //
 // Licensed under the Apache License, Version 2.0, <LICENSE-APACHE or
 // http://apache.org/licenses/LICENSE-2.0> or the MIT license <LICENSE-MIT or
 // http://opensource.org/licenses/MIT>, at your option. This file may not be
 // copied, modified, or distributed except according to those terms.
 extern crate libc;
+//extern crate regex;
 
 use std::path::{Path,MAIN_SEPARATOR};
 use libc::c_char;
@@ -12,13 +13,18 @@ use std::ffi::{CStr,CString,OsStr};
 use std::str;
 use std::mem;
 
+// Not including regex in current build so chomp_pathish_regex
+// and basename will be excluded in build
+//include!("tools/chomp_pathish_regex.rs");
+//include!("basename.rs");
+
+
 include!("ruby_string.rs");
 include!("ruby_array.rs");
 include!("is_absolute.rs");
 include!("is_relative.rs");
 include!("is_blank.rs");
 include!("both_are_blank.rs");
-include!("basename.rs");
 include!("dirname.rs");
 include!("basename_for_chop.rs");
 include!("dirname_for_chop.rs");

data/src/tools/chomp_pathish_regex.rs

@@ -0,0 +1,38 @@
+fn chomp_pathish_regex(string: &str, globish_string: &str) -> String {
+  use regex::Regex;
+  // Keep first match of Regex pattern
+  // \A(?:(.*)(?:\.{1}\w+)|(.*))\z
+  let mut reg_builder: String = String::with_capacity(globish_string.len()+30); // need 29 chars + gs
+  reg_builder.push_str(r"\A(?:(.*)");
+  if globish_string.len() != 0 {
+    let mut gs = globish_string.chars();
+    loop {
+      match gs.next() {
+        Some('.') => { reg_builder.push_str(r"(?:\.{1}") },
+        Some('*') => { reg_builder.push_str(r"\w+")   },
+        Some(x)   => { reg_builder.push(x)            },
+        None      => {
+          reg_builder.push_str(r")|(.*)");
+          break
+        },
+      }
+    }
+  }
+  reg_builder.push_str(r")\z");
+
+  let re = Regex::new(&reg_builder[..]).unwrap();
+  let caps = re.captures(string).unwrap();
+  caps.at(1).unwrap_or(caps.at(0).unwrap_or("")).to_string()
+}
+
+#[test]
+fn it_chomps_strings_correctly(){
+  assert_eq!(chomp_pathish_regex("",""), "");
+  assert_eq!(chomp_pathish_regex("ruby",""), "ruby");
+  assert_eq!(chomp_pathish_regex("ruby.rb",".rb"), "ruby");
+  assert_eq!(chomp_pathish_regex("ruby.rb",".*"), "ruby");
+  assert_eq!(chomp_pathish_regex(".ruby/ruby.rb",".rb"), ".ruby/ruby");
+  assert_eq!(chomp_pathish_regex(".ruby/ruby.rb.swp",".rb"), ".ruby/ruby.rb.swp");
+  assert_eq!(chomp_pathish_regex(".ruby/ruby.rb.swp",".swp"), ".ruby/ruby.rb");
+  assert_eq!(chomp_pathish_regex(".ruby/ruby.rb.swp",".*"), ".ruby/ruby.rb");
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faster_path
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Daniel P. Clark
@@ -14,16 +14,16 @@ dependencies:
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.8'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: color_pound_spec_reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.0.5
 description: FasterPath is a reimplementation of Pathname for better performance.
 email:
 - 6ftdan@gmail.com
@@ -115,6 +143,7 @@ files:
 - src/lib.rs
 - src/ruby_array.rs
 - src/ruby_string.rs
+- src/tools/chomp_pathish_regex.rs
 homepage: https://github.com/danielpclark/faster_path
 licenses:
 - MIT OR Apache-2.0