faster_path 0.3.2 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f424e30f95784fca0f8a926ed9fcc1bf685b9d9a7e19ffbd8f469db470ab231
-  data.tar.gz: f8ae55e8ffd704212b9c5dfa155bbed7599b494f0c628dd5d5815e018baf9a90
+  metadata.gz: 9810b638650c7a45d00f4e89971b0cac59275b7f93ecb0f14bef436178168d54
+  data.tar.gz: 50c8087b92194dc7ef647e10cfb196e1b34a3d07d4943a18f1fa3a2994ffe6e7
 SHA512:
-  metadata.gz: b40f9b24736616516f4ebad5d23532e63be150bedcb47d57a9f8eca488b7ec1844748c9a058d6345d6059a0fde72dafa75e4fcad0be62a065bf926924156cf31
-  data.tar.gz: cb1d557b873d1cf64a8b30754c5e53dc7fa18da2b35993a65af2aaf6017b81d9f3f1413cc9ac26ea012a9879a80a07e7988b5a3536b5ceb90b82e2bd0c399cdf
+  metadata.gz: ce61ad5a3197562c9cb5669fdd255ad612fee60bab943c38ce2a6f14eba888bd493bf4a91872a6dda83a1fb03cedabcc9cba6d68803073fed8ee126f80631bfc
+  data.tar.gz: be4799a77231a45b410e8b4207903a288c65ba284ec58bd68a6061ab2ca2440d52e159b1513abf75ce582d3505c5a586d08023854e2c4d7fd108f357824de484

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.3.2.svg)](https://github.com/danielpclark/faster_path/pulse)
+[![Commits Since Last Release](https://img.shields.io/github/commits-since/danielpclark/faster_path/v0.3.6.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)
@@ -115,7 +115,7 @@ curl -sSf https://static.rust-lang.org/rustup.sh | sh
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'faster_path', '~> 0.3.2'
+gem 'faster_path', '~> 0.3.6'
 ```
 
 And then execute:

data/Rakefile

@@ -1,6 +1,7 @@
 require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'thermite/tasks'
+require 'faster_path/thermite_initialize'
 
 desc 'System Details'
 task :sysinfo do

data/ext/Rakefile

@@ -1,6 +1,7 @@
 require 'thermite/tasks'
+require_relative '../lib/faster_path/thermite_initialize'
 
-project_toplevel_dir = File.dirname(File.dirname(__FILE__))
+project_toplevel_dir = File.dirname(__dir__)
 Thermite::Tasks.new(cargo_project_path: project_toplevel_dir,
                     ruby_project_path: project_toplevel_dir)
 

data/faster_path.gemspec

@@ -4,36 +4,36 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'faster_path/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "faster_path"
+  spec.name          = 'faster_path'
   spec.version       = FasterPath::VERSION
-  spec.authors       = ["Daniel P. Clark"]
-  spec.email         = ["6ftdan@gmail.com"]
+  spec.authors       = ['Daniel P. Clark']
+  spec.email         = ['6ftdan@gmail.com']
   spec.summary       = 'Reimplementation of Pathname for better performance'
   spec.description   = 'FasterPath is a reimplementation of Pathname for better performance.'
-  spec.homepage      = "https://github.com/danielpclark/faster_path"
-  spec.license       = "MIT OR Apache-2.0"
+  spec.homepage      = 'https://github.com/danielpclark/faster_path'
+  spec.license       = 'MIT OR Apache-2.0'
 
   spec.files         = [
-    "Cargo.lock", "Cargo.toml", "Gemfile",
-    "MIT-LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup",
-    "ext/Rakefile", "faster_path.gemspec"
+    'Cargo.lock', 'Cargo.toml', 'Gemfile',
+    'MIT-LICENSE.txt', 'README.md', 'Rakefile', 'bin/console', 'bin/setup',
+    'ext/Rakefile', 'faster_path.gemspec'
   ]
   spec.files += Dir['lib/**/*']
   spec.files += Dir['src/**/*']
 
-  spec.extensions    = ["ext/Rakefile"]
-  spec.require_paths = ["lib"]
+  spec.extensions    = ['ext/Rakefile']
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "bundler", "~> 1.12"
-  spec.add_dependency "rake", "~> 12.0"
-  spec.add_dependency "thermite", "~> 0.13.0"
-  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.53"
-  spec.add_development_dependency "stop_watch", "~> 1.0"
+  spec.add_dependency 'bundler', '~> 1.12'
+  spec.add_dependency 'rake', '~> 12.0'
+  spec.add_dependency 'thermite', '0.13.0'
+  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.53'
+  spec.add_development_dependency 'stop_watch', '~> 1.0'
   if !ENV['CI'] && ENV['GRAPH']
-    spec.add_development_dependency "gruff", "~> 0.7.0"
+    spec.add_development_dependency 'gruff', '~> 0.7.0'
   end
 end

data/lib/faster_path/thermite_initialize.rb

@@ -0,0 +1,16 @@
+require 'rubygems'
+require_relative './version'
+
+module Thermite
+  class Config
+    def ruby_version
+      "ruby#{RUBY_VERSION}"
+    end
+  end
+
+  class Tasks
+    def github_download_uri(_tag, version)
+      "#{github_uri}/releases/download/v#{FasterPath::VERSION}/#{config.tarball_filename(version)}"
+    end
+  end
+end

data/lib/faster_path/version.rb

@@ -1,3 +1,3 @@
 module FasterPath
-  VERSION = "0.3.2"
+  VERSION = "0.3.6"
 end

data/lib/faster_path.rb

@@ -1,6 +1,7 @@
 require 'faster_path/version'
 require 'pathname'
 require 'thermite/config'
+require 'faster_path/thermite_initialize'
 require 'fiddle'
 require 'fiddle/import'
 

data/src/helpers.rs

@@ -1,5 +1,7 @@
 use ruru::{RString, Object, Class, AnyObject};
+extern crate ruby_sys;
 use debug::RubyDebugInfo;
+use pathname::Pathname;
 
 pub trait TryFrom<T>: Sized {
   type Error;
@@ -30,7 +32,7 @@ pub fn anyobject_to_string(item: AnyObject) -> Result<String, RubyDebugInfo> {
   }
   
   if result.respond_to("to_path") {
-    return Ok(Class::from(result.send("to_path", None).value()).
+    return Ok(Pathname::from(result.send("to_path", None).value()).
       instance_variable_get("@path").
       try_convert_to::<RString>().
       unwrap_or(RString::new("")).

data/src/pathname.rs

@@ -9,6 +9,7 @@ use plus;
 use relative_path_from;
 use debug;
 use helpers::TryFrom;
+use pathname_sys::null_byte_check;
 
 use ruru;
 use ruru::{
@@ -20,6 +21,7 @@ use ruru::{
   Object,
   Class,
   VerifiedObject,
+  Exception as Exc,
   AnyException as Exception
 };
 use ruru::types::{Value, ValueType};
@@ -42,6 +44,31 @@ impl Pathname {
     Pathname { value: instance.value() }
   }
 
+  pub fn new_checked(path: AnyObject) -> Result<Pathname, Exception> {
+    let pth: Value = if Class::from_existing("String").case_equals(&path) {
+      path.value()
+    } else if path.respond_to("to_path") {
+      path.send("to_path", None).value()
+    } else {
+      return Err(
+        Exception::new(
+          "ArgumentError",
+          Some("The type for the argument provided to Pathname.new was invalid.")
+        )
+      )
+    };
+
+    if null_byte_check(path.value()) { 
+      return Err( Exception::new("ArgumentError", Some("pathname contains null byte")) )
+    }
+
+    // if it crashes then dup the path string here before assigning to @path
+    let mut instance = Class::from_existing("Pathname").allocate();
+    instance.instance_variable_set("@path", RString::from(pth).to_any_object());
+    
+    Ok(Pathname { value: instance.value() })
+  }
+
   pub fn to_any_object(&self) -> AnyObject {
     AnyObject::from(self.value())
   }
@@ -60,6 +87,8 @@ impl TryFrom<AnyObject> for Pathname {
       Ok(Pathname::new(&RString::from(obj.value()).to_string()))
     } else if Class::from_existing("Pathname").case_equals(&obj) {
       Ok(Pathname::from(obj.value()))
+    } else if obj.respond_to("to_path") {
+      Ok(Pathname::from(obj.send("to_path", None).value()))
     } else {
       Err(Self::Error::from(obj))
     }

data/src/pathname_sys.rs

@@ -2,8 +2,23 @@ use ruru::{AnyObject, Array, Object, AnyException};
 use ruru::types::{Argc, Value, CallbackPtr};
 use ruru::util::str_to_cstring;
 extern crate ruby_sys;
-use self::ruby_sys::{class, util, vm};
+use self::ruby_sys::{class, util, vm, string};
 use ::pathname;
+extern crate memchr;
+use self::memchr::memchr;
+use std::slice;
+
+pub fn null_byte_check(value: Value) -> bool {
+  unsafe {
+    let str = string::rb_string_value_ptr(&value) as *const u8;
+
+    // `rb_str_len` is a ruby_sys specific thing.  Consider:
+    // extern { fn rb_str_strlen(value: Value) -> c_long } as isize
+    let len = string::rb_str_len(value) as usize;
+
+    memchr(b'\0', slice::from_raw_parts(str, len)).is_some()
+  }
+}
 
 pub fn raise(exception: AnyException) {
   unsafe { vm::rb_exc_raise(exception.value()); }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faster_path
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.6
 platform: ruby
 authors:
 - Daniel P. Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-05 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,14 +42,14 @@ dependencies:
   name: thermite
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.13.0
 - !ruby/object:Gem::Dependency
@@ -155,8 +155,10 @@ files:
 - ext/Rakefile
 - faster_path.gemspec
 - lib/faster_path.rb
+- lib/faster_path.so
 - lib/faster_path/optional/monkeypatches.rb
 - lib/faster_path/optional/refinements.rb
+- lib/faster_path/thermite_initialize.rb
 - lib/faster_path/version.rb
 - src/basename.rs
 - src/chop_basename.rs