faster_path 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2f9feadf34476752439130f2871285f20bd67d5
-  data.tar.gz: 184c00898cdca31bc822bf9c0023ca24f729c839
+  metadata.gz: 175d2f5deb162ae5b91fd8c6a78f3a4ec9f2c614
+  data.tar.gz: 85f78d5451c0e8b34bc00d282e08e6c7d84715ea
 SHA512:
-  metadata.gz: 963c1a8874494f241daeb36c791c0136107be377df03739276b1e1c3b354a352616972c72ac137192cade9d8168ec5f863d1aaeb2c7974a949887f018652ce53
-  data.tar.gz: f66e104da591aa1b690eedbc5dca48eb636c0cdb27d5d150b3425d67e6e6c568932cf0474fd80915fae6d477715af85337d54a93065561db9fb03d404d0910ee
+  metadata.gz: 62cdddd68edc6109686eda078a585038d8d3c1737330d025b0cf9b863f39696e4074a916c82ac331a7801e62a01a9138ff84d2c0c4e5e1ac4ad93a157dce548e
+  data.tar.gz: a66eb90ede0d919ba85c04714f2fa3412d7b8f6e099e933a50210c6f81f8a1cc94ede8805c498c5ba80ec1b2c56c9be1acdbe7cb8d4df34119ca0aa00d6b6eb5

data/README.md

@@ -3,9 +3,7 @@
 [![Build Status](https://travis-ci.org/danielpclark/faster_path.svg?branch=master)](https://travis-ci.org/danielpclark/faster_path)
 [![Tweet This](https://raw.githubusercontent.com/danielpclark/faster_path/master/assets/tweet.png)](https://twitter.com/share?url=https%3A%2F%2Fgithub.com%2Fdanielpclark%2Ffaster_path&via=6ftdan&hashtags=Ruby&text=You%20could%20save%2015%25%20or%20more%20on%20website%20load%20time%20by%20switching%20to%20the%20FasterPath%20gem.)
 
-_Build is currently failing is for the monkey-patch tests only._
-
-#### As of gem version 0.0.9 this shaves off 66% of my Rails applications page load time.
+#### This gem shaves off more than 30% of my Rails application page load time.
 
 The primary **GOAL** of this project is to improve performance in the most heavily used areas of Ruby as
 path relation and file lookup is currently a huge bottleneck in performance.  As this is the case the
@@ -88,7 +86,7 @@ Current methods implemented:
 |---|---|:---:|
 | `FasterPath.absolute?` | `Pathname#absolute?` | 1234.6% |
 | `FasterPath.basename` | `File.basename` | 31.3% |
-| `FasterPath.chop_basename` | `Pathname#chop_basename` | 46.7% |
+| `FasterPath.chop_basename` | `Pathname#chop_basename` | 66.0% |
 | `FasterPath.relative?` | `Pathname#relative?` | 1262.3% |
 | `FasterPath.blank?` | | |
 

data/lib/faster_path/version.rb

@@ -1,3 +1,3 @@
 module FasterPath
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/src/basename.rs

@@ -1,18 +1,10 @@
 #[allow(dead_code)]
 fn rubyish_basename(string: &str, globish_string: &str) -> String {
-  let result = if globish_string.chars().next().unwrap_or("muffins".chars().next().unwrap()).eq(&".".chars().next().unwrap()) {
-    if globish_string == ".*" {
-      let base = string.rsplit_terminator(MAIN_SEPARATOR).nth(0).unwrap_or("");
-      let index = base.rfind(".");
-      let (first, _) = base.split_at(index.unwrap());
-      first
-    } else {
-      if &string[string.len()-globish_string.len()..] == globish_string {
-        &string[0..string.len()-globish_string.len()]
-      } else {
-        string
-      }.rsplit_terminator(MAIN_SEPARATOR).nth(0).unwrap_or("")
-    }
+  let result = if globish_string == ".*" {
+    let base = string.rsplit_terminator(MAIN_SEPARATOR).nth(0).unwrap_or("");
+    let index = base.rfind(".");
+    let (first, _) = base.split_at(index.unwrap());
+    first
   } else {
     if &string[string.len()-globish_string.len()..] == globish_string {
       &string[0..string.len()-globish_string.len()]
@@ -69,19 +61,11 @@ pub extern fn basename(str_pth: *const c_char, comp_ext: *const c_char) -> *cons
   let string         = str::from_utf8(c_str1.to_bytes()).unwrap();
   let globish_string = str::from_utf8(c_str2.to_bytes()).unwrap();
 
-  let result = if globish_string.chars().next().unwrap_or("muffins".chars().next().unwrap()).eq(&".".chars().next().unwrap()) {
-    if globish_string == ".*" {
-      let base = string.rsplit_terminator(MAIN_SEPARATOR).nth(0).unwrap_or("");
-      let index = base.rfind(".");
-      let (first, _) = base.split_at(index.unwrap());
-      first
-    } else {
-      if &string[string.len()-globish_string.len()..] == globish_string {
-        &string[0..string.len()-globish_string.len()]
-      } else {
-        string
-      }.rsplit_terminator(MAIN_SEPARATOR).nth(0).unwrap_or("")
-    }
+  let result = if globish_string == ".*" {
+    let base = string.rsplit_terminator(MAIN_SEPARATOR).nth(0).unwrap_or("");
+    let index = base.rfind(".");
+    let (first, _) = base.split_at(index.unwrap());
+    first
   } else {
     if &string[string.len()-globish_string.len()..] == globish_string {
       &string[0..string.len()-globish_string.len()]

data/src/basename_for_chop.rs

@@ -8,8 +8,18 @@ pub extern fn basename_for_chop(string: *const c_char) -> *const c_char {
 
   let r_str = str::from_utf8(c_str.to_bytes()).unwrap();
 
-  let part = Path::new(r_str).file_name().unwrap_or(OsStr::new("")).to_str();
+  let mut offset = 0;
+  let mut trailing_slashes = r_str.chars().rev();
+  loop {
+    match trailing_slashes.next() {
+      Some(MAIN_SEPARATOR) => { offset = offset + 1 },
+      _                    => { break               },
+    }
+  }
   
-  let output = CString::new(format!("{}", part.unwrap())).unwrap();
+  let r_str = &r_str[0..r_str.len()-offset];
+  let part = r_str.rsplit_terminator(MAIN_SEPARATOR).nth(0).unwrap_or("");
+  
+  let output = CString::new(part).unwrap();
   output.into_raw()
 }

data/src/dirname_for_chop.rs

@@ -12,14 +12,19 @@ pub extern fn dirname_for_chop(string: *const c_char) -> *const c_char {
     return string
   }
 
-  let path = Path::new(r_str).parent().unwrap_or(Path::new(""));
+  let mut offset = 0;
+  let mut trailing_slashes = r_str.chars().rev();
+  loop {
+    match trailing_slashes.next() {
+      Some(MAIN_SEPARATOR) => { offset = offset + 1 },
+      _                    => { break               },
+    }
+  }
+  
+  let r_str = &r_str[0..r_str.len()-offset];
 
-  let out_str = if !path.to_str().unwrap().is_empty() {
-    format!("{}{}", path.to_str().unwrap(), MAIN_SEPARATOR)
-  } else {
-    format!("{}", path.to_str().unwrap())
-  };
+  let base = r_str.rsplit_terminator(MAIN_SEPARATOR).nth(0).unwrap_or("");
 
-  let output = CString::new(out_str).unwrap();
+  let output = CString::new(&r_str[0..r_str.len()-base.len()]).unwrap();
   output.into_raw()
 }

data/src/lib.rs

@@ -8,7 +8,7 @@ extern crate libc;
 
 use std::path::{Path,MAIN_SEPARATOR};
 use libc::c_char;
-use std::ffi::{CStr,CString,OsStr};
+use std::ffi::{CStr,CString};
 use std::str;
 use std::mem;
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faster_path
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Daniel P. Clark
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi