faster_path 0.2.6 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64eada185c9f0597ca475f6f94f77299b5ebf0458fe6de87d5a041d7a6d69dfe
-  data.tar.gz: 5d14a11a8a468eba873da3b6e4d2628e8fdbb5d88150c60575b6266a4df5f726
+  metadata.gz: 84e796cda8b8704b7a6f5e2a2e69acc012f611b66f89642f34149f88c645ae34
+  data.tar.gz: 8b20ae9b2bcaebaf44dbc56500ad539e5082169d729a24685c0c9a446ee4dd6b
 SHA512:
-  metadata.gz: 2c2121f4aa08b8979818480b78980f07563483befa52c2493821f7a562d0f213a762f192ed1b7ec3c67050c9f0a72bccbb65a0dcb1d7258316ffbe0ae7480c2f
-  data.tar.gz: 0c16b9cd5e5ff583717d664228bfac6ac4b6b5e46c7a92c8a3170ae050ae9ec6974dc597a1c9aff8232e77515b3d5cd70bfccd33c5fa67402091af660dd7f502
+  metadata.gz: '091d419f3c849b46f493a3ae47fcf59d064c83ffec898856032ffa47d84e68ace558e882437f95a662bd84b77cdbe0182f7b62c5cd1316fd250a54d49afe3046'
+  data.tar.gz: ecbdcad442c08c9eee827f30672f585f34450e0b4a72905936fe49a7eb251a7e8c461a0a5fcaa10d19a1e36ef304ada0b8b8f1bff1d0cab31017bad35ddd3743

data/Cargo.toml

@@ -8,6 +8,9 @@ repository = "https://github.com/danielpclark/faster_path"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 
+[package.metadata.thermite]
+github_releases = true
+
 [lib]
 name = "faster_path"
 crate-type = ["dylib"]

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.2.6.svg)](https://github.com/danielpclark/faster_path/pulse)
+[![Commits Since Last Release](https://img.shields.io/github/commits-since/danielpclark/faster_path/v0.3.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)
@@ -55,7 +55,7 @@ Running `stackprof tmp/2016-06-09T00:42:10-04:00-stackprof-cpu-myapp.dump`. Exec
        108   (1.5%)          14   (0.2%)     ActionView::Helpers::AssetUrlHelper#asset_path
 ```
 
-Here are some addtional stats.  From Rails loading to my home page, these methods are called _(not directly, Rails & gems call them)_ this many times.  And the home page has minimal content.
+Here are some additional stats.  From Rails loading to my home page, these methods are called _(not directly, Rails & gems call them)_ this many times.  And the home page has minimal content.
 ```ruby
 Pathname#to_s called 29172 times.
 Pathname#<=> called 24963 times.
@@ -97,8 +97,10 @@ I've said this about Sprockets but this required two other gems to be updated as
 ## Status
 
 * Rust compilation is working
-* Methods are _most likely_ stable
-* Testers and developers are most welcome!
+* Methods are stable
+* Thoroughly tested
+* Testers and developers are most welcome
+* Windows & encoding support is underway!
 
 ## Installation
 
@@ -113,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.2.3'
+gem 'faster_path', '~> 0.3.1'
 ```
 
 And then execute:
@@ -147,6 +149,7 @@ Current methods implemented:
 | `FasterPath.del_trailing_separator` | `Pathname#del_trailing_separator` | 80.6% |
 | `FasterPath.directory?` | `Pathname#directory?` | 11.3% |
 | `FasterPath.entries` | `Pathname#entries` | 8.4% |
+| `FasterPath.extname` | `File.extname` | 41.2% |
 | `FasterPath.has_trailing_separator?` | `Pathname#has_trailing_separator` | 67.6% |
 | `FasterPath.plus` | `Pathname#join` | 66.4% |
 | `FasterPath.plus` | `Pathname#plus` | 81.4% |
@@ -181,10 +184,9 @@ These will **not** be included by default in monkey-patches.  Be cautious when u
 |---|---|
 | `FasterPath.dirname` | `File.dirname` |
 | `FasterPath.basename` | `File.basename` |
-| `FasterPath.extname` | `File.extname` |
 
 It's been my observation (and some others) that the Rust implementation of the C code for `File` has similar results but
-performance seems to vary based on CPU cache on possibly 64bit/32bit system environmnets.  When these methods were initially written, and somewhat simplistic, they were faster than the C implementations on `File`.  After the implementations have been perfected to match the behavior in Ruby they don't perform as well and are therefore not included by default when the monkey patch method `FasterPath.sledgehammer_everything!` is executed.  If you don't want to pass the `WITH_REGRESSION` environment variable you can put any turthy parameter on the monkey patch method to include it.
+performance seems to vary based on CPU cache on possibly 64bit/32bit system environments.  When these methods were initially written, and somewhat simplistic, they were faster than the C implementations on `File`.  After the implementations have been perfected to match the behavior in Ruby they don't perform as well and are therefore not included by default when the monkey patch method `FasterPath.sledgehammer_everything!` is executed.
 
 ## Getting Started with Development
 
@@ -205,13 +207,7 @@ Learn and share performance tips on the [wiki](https://github.com/danielpclark/f
 
 ### Building and running tests
 
-First, bundle the gem's development dependencies by running `bundle`.
-
-Then, build the rust code:
-
-```sh
-rake build_src
-```
+First, bundle the gem's development dependencies by running `bundle`.  Rust compilation is included in the current rake commands.
 
 FasterPath is tested with [The Ruby Spec Suite](https://github.com/ruby/spec) to ensure it is compatible with the
 native implementation, and also has its own test suite testing its monkey-patching and refinements functionality.

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
-require 'fileutils'
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+require 'thermite/tasks'
 
 desc 'System Details'
 task :sysinfo do
@@ -24,6 +24,8 @@ task :sysinfo do
   end
 end
 
+thermite = Thermite::Tasks.new
+
 desc "Generate Contriburs.md Manifest"
 task :contrib do
   puts "Generating Contriburs.md Manifest"
@@ -61,36 +63,16 @@ task :libruby_debug do
   puts "libruby.so copied."
 end
 
-desc "Build Rust extension"
-task build_src: :libruby_release do
-  puts "Building extension..."
-  sh "cargo build --release"
-end
-
-desc "Clean up Rust build"
-task :clean_src do
-  puts "Cleaning up build..."
-  # Remove all but library file
-  FileUtils.
-    rm_rf(
-      Dir.
-      glob('target/release/*').
-      keep_if do |f|
-        !f[/\.(?:so|dll|dylib|deps)\z/]
-      end
-  )
+desc 'Build + clean up Rust extension'
+task build_lib: 'thermite:build' do
+  thermite.run_cargo 'clean'
 end
 
-desc "Build + clean up Rust extension"
-task build_lib: [:build_src, :clean_src] do
-  puts "Completed build!"
-end
-
-desc "Code Quality Check"
+desc 'Code Quality Check'
 task :lint do
   puts
-  puts "Quality check starting..."
-  sh "rubocop"
+  puts 'Quality check starting...'
+  sh 'rubocop'
   puts
 end
 
@@ -100,9 +82,8 @@ task cargo: :libruby_debug do
 end
 
 Rake::TestTask.new(minitest: :build_lib) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList['test/**/*_test.rb']
+  t.libs = %w[lib test]
+  t.pattern = 'test/**/*_test.rb'
 end
 
 task :init_mspec do |_t|

data/ext/Rakefile

@@ -0,0 +1,7 @@
+require 'thermite/tasks'
+
+project_toplevel_dir = File.dirname(File.dirname(__FILE__))
+Thermite::Tasks.new(cargo_project_path: project_toplevel_dir,
+                    ruby_project_path: project_toplevel_dir)
+
+task default: 'thermite:build'

data/faster_path.gemspec

@@ -16,21 +16,22 @@ Gem::Specification.new do |spec|
   spec.files         = [
     "Cargo.lock", "Cargo.toml", "Gemfile",
     "MIT-LICENSE.txt", "README.md", "Rakefile", "bin/console", "bin/setup",
-    "ext/faster_path/extconf.rb", "faster_path.gemspec"
+    "ext/Rakefile", "faster_path.gemspec"
   ]
   spec.files += Dir['lib/**/*']
   spec.files += Dir['src/**/*']
 
-  spec.extensions    << "ext/faster_path/extconf.rb"
+  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.51"
+  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"

data/lib/faster_path.rb

@@ -1,11 +1,16 @@
-require "faster_path/version"
+require 'faster_path/version'
 require 'pathname'
-require 'faster_path/platform'
+require 'thermite/config'
 require 'fiddle'
 require 'fiddle/import'
 
 module FasterPath
-  FFI_LIBRARY = FasterPath::Platform.ffi_library()
+  FFI_LIBRARY = begin
+    toplevel_dir = File.dirname(__dir__)
+    config = Thermite::Config.new(cargo_project_path: toplevel_dir,
+                                  ruby_project_path: toplevel_dir)
+    config.ruby_extension_path
+  end
 
   Fiddle::Function.
     new(Fiddle.dlopen(FFI_LIBRARY)['Init_faster_pathname'], [], Fiddle::TYPE_VOIDP).

data/lib/faster_path/optional/monkeypatches.rb

@@ -10,7 +10,7 @@ module FasterPath
           pth = pth.to_path if pth.respond_to? :to_path
           raise TypeError unless pth.is_a?(String) && ext.is_a?(String)
           FasterPath.basename(pth, ext)
-        end
+        end if !!ENV['WITH_REGRESSION']
 
         def self.extname(pth)
           pth = pth.to_path if pth.respond_to? :to_path
@@ -22,7 +22,7 @@ module FasterPath
           pth = pth.to_path if pth.respond_to? :to_path
           raise TypeError unless pth.is_a? String
           FasterPath.dirname(pth)
-        end
+        end if !!ENV['WITH_REGRESSION']
       end
     end
 
@@ -96,8 +96,8 @@ module FasterPath
   end
   private_constant :MonkeyPatches
 
-  def self.sledgehammer_everything!(include_file = !!ENV['WITH_REGRESSION'])
-    MonkeyPatches._ruby_core_file! if include_file # SLOW; DON'T AUTO INCLUDE
+  def self.sledgehammer_everything!()
+    MonkeyPatches._ruby_core_file!
     MonkeyPatches._ruby_library_pathname!
     "CAUTION: Monkey patching effects everything! Be very sure you want this!"
   end

data/lib/faster_path/version.rb

@@ -1,3 +1,3 @@
 module FasterPath
-  VERSION = "0.2.6"
+  VERSION = "0.3.1"
 end

data/src/extname.rs

@@ -1,13 +1,63 @@
-use path_parsing::extract_last_path_segment;
+use path_parsing::SEP;
+use std::str;
+
+struct ExtnameCoords {
+  word: bool,
+  pred: bool,
+  dot: bool,
+  start: usize,
+  end: usize,
+}
+
+impl ExtnameCoords {
+  pub fn dec(&mut self) {
+    self.start -= 1;
+    if !self.word {
+      self.end -= 1;
+    }
+  }
+}
 
 pub fn extname(pth: &str) -> &str {
-  let name = extract_last_path_segment(pth);
+  let path = pth.as_bytes();
+  let mut extname = ExtnameCoords {
+    word: false,
+    pred: false,
+    dot: false,
+    start: path.len(),
+    end: path.len(),
+  };
 
-  if let Some(dot_i) = name.rfind('.') {
-    if dot_i > 0 && dot_i < name.len() - 1 && name[..dot_i].chars().rev().next().unwrap() != '.' {
-      return &name[dot_i..]
+  for &item in path.iter().rev() {
+    if (item == b'.' && !extname.dot) || item == SEP {
+      if item == SEP && extname.word {
+        return ""
+      }
+
+      if !extname.pred {
+        extname.dec();
+      }
+
+      if extname.word {
+        extname.dot = true;
+      }
+    } else {
+      if extname.dot {
+        extname.pred = true;
+        break;
+      } else {
+        extname.word = true;
+      }
+
+      if !extname.pred {
+        extname.dec()
+      }
     }
   }
 
-  ""
+  if !extname.pred {
+    return "";
+  }
+
+  str::from_utf8(&path[extname.start..extname.end]).unwrap_or("")
 }

data/src/path_parsing.rs

@@ -1,5 +1,4 @@
 extern crate memchr;
-use self::memchr::memrchr;
 use std::path::MAIN_SEPARATOR;
 use std::str;
 
@@ -8,11 +7,6 @@ lazy_static! {
   pub static ref SEP_STR: &'static str = str::from_utf8(&[SEP]).unwrap();
 }
 
-pub fn extract_last_path_segment(path: &str) -> &str {
-  let end = (last_non_sep_i(path) + 1) as usize;
-  &path[memrchr(SEP, &path.as_bytes()[..end]).unwrap_or(0)..end]
-}
-
 // Returns the byte offset of the last byte preceding a MAIN_SEPARATOR.
 pub fn last_non_sep_i(path: &str) -> isize {
   last_non_sep_i_before(path, path.len() as isize - 1)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faster_path
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.3.1
 platform: ruby
 authors:
 - Daniel P. Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-03 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
+- !ruby/object:Gem::Dependency
+  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
   name: read_source
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +112,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: '0.53'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0.51'
+        version: '0.53'
 - !ruby/object:Gem::Dependency
   name: stop_watch
   requirement: !ruby/object:Gem::Requirement
@@ -127,7 +141,7 @@ email:
 - 6ftdan@gmail.com
 executables: []
 extensions:
-- ext/faster_path/extconf.rb
+- ext/Rakefile
 extra_rdoc_files: []
 files:
 - Cargo.lock
@@ -138,12 +152,12 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- ext/faster_path/extconf.rb
+- 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/platform.rb
 - lib/faster_path/version.rb
 - src/basename.rs
 - src/chop_basename.rs

data/ext/faster_path/extconf.rb

@@ -1,19 +0,0 @@
-require 'mkmf'
-
-have_header('Dummy Makefile')
-
-unless find_executable('cargo')
-  puts "You need to have Rust installed for this gem to build natively."
-  puts "Please install the latest nightly build:"
-  puts
-  puts "curl -sSf https://static.rust-lang.org/rustup.sh | sudo sh -s -- --channel=nightly"
-  puts
-  at_exit { puts "Exiting..."}
-end
-
-Dir.chdir(File.expand_path("../../", File.dirname(__FILE__))) do
-  `rake build_src`
-  `rake clean_src`
-end
-
-create_makefile('faster_path/dummy')

data/lib/faster_path/platform.rb

@@ -1,60 +0,0 @@
-module FasterPath
-  module Platform
-    class << self
-      def ffi_library
-        file = [
-          lib_prefix,
-          "faster_path.",
-          lib_suffix
-        ]
-
-        File.join(rust_release, file.join())
-      end
-
-      def operating_system
-        case host_os()
-        when /linux|bsd|solaris/
-          "linux"
-        when /darwin/
-          "darwin"
-        when /mingw|mswin/
-          "windows"
-        else
-          host_os()
-        end
-      end
-
-      def lib_prefix
-        case operating_system()
-        when /windows/
-          ''
-        when /cygwin/
-          'cyg'
-        else
-          'lib'
-        end
-      end
-
-      def lib_suffix
-        case operating_system()
-        when /darwin/
-          'dylib'
-        when /linux/
-          'so'
-        when /windows|cygwin/
-          'dll'
-        else
-          'so'
-        end
-      end
-
-      def rust_release
-        File.expand_path("../../target/release/", __dir__)
-      end
-
-      def host_os
-        RbConfig::CONFIG['host_os'].downcase
-      end
-    end
-  end
-end