faster_path 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7663e3cebaf52e71d0445b29c541e31ad1b6f87
-  data.tar.gz: 67071c8d8d399baf4d64705d1e7a5c147f56bc39
+  metadata.gz: 8ad592a885912e4267151be6ee15a9accfbd34ef
+  data.tar.gz: b2b22d3198284b6dc2bb177c72bd1c99bbcbb3a5
 SHA512:
-  metadata.gz: 1607471e1395c8fc7c583fb936e5bfe618dd5066eda0d59613040b3499565ff6d7fe106a55447dcec7a8dc705fb7af96c011e535ec165b2f06b5f7e4fc983ccf
-  data.tar.gz: 312ba0423e39dce09031e7d2b1f29bfc5562865c89b15854713a771047b89be668e2ca35c254f4471398836999f44037a2539012a0dcdd6935160cdcc6d36105
+  metadata.gz: 17eecf18612f14fa87de8fc58f2ae4b08cb4e7f98e4d62283f87457d09e1822a3aba7db72df2e14e4d9cddcab60abf7cc2148742d9ae301541454e7a62080201
+  data.tar.gz: 15ad8f6310ce3b5188533f957bbc5e0ba9280686dd148adca124d455249c6426b2ee1f4b9cff43383e6601daf5682fad78a0d376d343537fe1f81118a20fcb21

data/lib/faster_path/version.rb

@@ -1,3 +1,3 @@
 module FasterPath
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/src/add_trailing_separator.rs

@@ -4,25 +4,26 @@ use std::ffi::{CStr, CString};
 use std::str;
 
 #[no_mangle]
-pub extern "C" fn add_trailing_separator(string: *const c_char) -> *const c_char {
-    let c_str = unsafe {
-        assert!(!string.is_null());
-
-        CStr::from_ptr(string)
-    };
-    let r_str = str::from_utf8(c_str.to_bytes()).unwrap_or("");
-
-    if r_str.is_empty() {
-        return string;
+pub extern fn add_trailing_separator(string: *const c_char) -> *const c_char {
+  let c_str = unsafe {
+    if string.is_null() {
+      return string;
     }
+    CStr::from_ptr(string)
+  };
+  let r_str = str::from_utf8(c_str.to_bytes()).unwrap_or("");
+
+  if r_str.is_empty() {
+    return string;
+  }
 
-    let path = Path::new(r_str);
-    let out_str = if !(path.to_str().unwrap().chars().last().unwrap() == '/') {
-        format!("{}{}", path.to_str().unwrap(), MAIN_SEPARATOR)
-    } else {
-        path.to_str().unwrap().to_string()
-    };
+  let path = Path::new(r_str);
+  let out_str = if !(path.to_str().unwrap().chars().last().unwrap() == '/') {
+    format!("{}{}", path.to_str().unwrap(), MAIN_SEPARATOR)
+  } else {
+    path.to_str().unwrap().to_string()
+  };
 
-    let output = CString::new(out_str).unwrap();
-    output.into_raw()
+  let output = CString::new(out_str).unwrap();
+  output.into_raw()
 }

data/src/basename.rs

@@ -56,11 +56,15 @@ fn it_chomps_strings_correctly(){
 #[no_mangle]
 pub extern fn basename(str_pth: *const c_char, comp_ext: *const c_char) -> *const c_char {
   let c_str1 = unsafe {
-    assert!(!str_pth.is_null());
+    if str_pth.is_null(){
+      return str_pth;
+    } 
     CStr::from_ptr(str_pth)
   };
   let c_str2 = unsafe {
-    assert!(!comp_ext.is_null());
+    if comp_ext.is_null() {
+      return str_pth;
+    }
     CStr::from_ptr(comp_ext)
   };
   let string         = str::from_utf8(c_str1.to_bytes()).unwrap();

data/src/basename_for_chop.rs

@@ -6,8 +6,9 @@ use std::str;
 #[no_mangle]
 pub extern fn basename_for_chop(string: *const c_char) -> *const c_char {
   let c_str = unsafe {
-    assert!(!string.is_null());
-
+    if string.is_null() {
+      return string;
+    }
     CStr::from_ptr(string)
   };
 

data/src/both_are_blank.rs

@@ -5,11 +5,15 @@ use std::str;
 #[no_mangle]
 pub extern fn both_are_blank(s1: *const c_char, s2: *const c_char) -> bool {
   let c_str1 = unsafe {
-    assert!(!s1.is_null());
+    if s1.is_null() {
+      return true;
+    }
     CStr::from_ptr(s1)
   };
   let c_str2 = unsafe {
-    assert!(!s2.is_null());
+    if s2.is_null() {
+      return true;
+    }
     CStr::from_ptr(s2)
   };
 

data/src/dirname_for_chop.rs

@@ -6,8 +6,9 @@ use std::str;
 #[no_mangle]
 pub extern fn dirname_for_chop(string: *const c_char) -> *const c_char {
   let c_str = unsafe {
-    assert!(!string.is_null());
-
+    if string.is_null() {
+      return string
+    }
     CStr::from_ptr(string)
   };
 

data/src/is_absolute.rs

@@ -7,8 +7,9 @@ use std::path::MAIN_SEPARATOR;
 #[no_mangle]
 pub extern fn is_absolute(string: *const c_char) -> bool {
   let c_str = unsafe {
-    assert!(!string.is_null());
-
+    if string.is_null() {
+      return false;
+    }
     CStr::from_ptr(string)
   };
 

data/src/is_blank.rs

@@ -5,8 +5,9 @@ use std::str;
 #[no_mangle]
 pub extern fn is_blank(string: *const c_char) -> bool {
   let c_str = unsafe {
-    assert!(!string.is_null());
-
+    if string.is_null() {
+      return true;
+    }
     CStr::from_ptr(string)
   };
 

data/src/is_directory.rs

@@ -6,8 +6,9 @@ use std::path::Path;
 #[no_mangle]
 pub extern fn is_directory(string: *const c_char) -> bool {
   let c_str = unsafe {
-    assert!(!string.is_null());
-
+    if string.is_null() {
+      return false;
+    }
     CStr::from_ptr(string)
   };
 

data/src/is_relative.rs

@@ -6,8 +6,9 @@ use std::str;
 #[no_mangle]
 pub extern fn is_relative(string: *const c_char) -> bool {
   let c_str = unsafe {
-    assert!(!string.is_null());
-
+    if string.is_null() {
+      return false;
+    }
     CStr::from_ptr(string)
   };
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faster_path
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Daniel P. Clark
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-18 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Reimplementation of Pathname for better performance