hike 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43eec4acb751a2c1c31260cfb077ce8dd15363d4
-  data.tar.gz: ee1ef167fd5ada201bf64325b154ede3ca6312c3
+  metadata.gz: c46019e7383a433c30d2859e3e9da31a37623562
+  data.tar.gz: 25ec96e4f50c22d099f321c8ba11cf3a51c0d108
 SHA512:
-  metadata.gz: fd38b8b3dae6aeb0d3c1a936251816d6d6f46ff1f1c635b67ddc06fe9a8505ce7adc8d47ed0ceca8a22fef3c4040a5f4af99bf01d6d6aac533cd6d92fb6a1fd7
-  data.tar.gz: f55ece855a07db30efc55ce1f913c33933c6685da9032a5121b518fd97c59d7e340e403245199991290eeb2f1dcab099ce95e82d0017e124a1707eaa58e7ffea
+  metadata.gz: d3477f9cd81a43db8f296485ac46823c86749ca698745c68bcfd0bcca0061c8a9e654fed29138460c0f5ebf19198ba1da1c2773dcdf5ad141519ceca554a1a90
+  data.tar.gz: 0ba3c75b015858f23eee6960ab984a77e1226b0628bdcfc7f6ad5df89d2622a9f30ad27af1120063a947d42ab53f1ef8e12874ec6dffeb1d7372a23b5cc29dec

data/lib/hike.rb

@@ -1,5 +1,5 @@
 module Hike
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 
   autoload :CachedTrail,     "hike/cached_trail"
   autoload :Extensions,      "hike/extensions"

data/lib/hike/cached_trail.rb

@@ -1,5 +1,3 @@
-require 'pathname'
-
 module Hike
   # `CachedTrail` is an internal cached variant of `Trail`. It assumes the
   # file system does not change between `find` calls. All `stat` and
@@ -20,7 +18,7 @@ module Hike
     # `CachedTrail.new` is an internal method. Instead of constructing it
     # directly, create a `Trail` and call `Trail#CachedTrail`.
     def initialize(root, paths, extensions, aliases)
-      @root = root
+      @root = root.to_s
 
       # Freeze is used here so an error is throw if a mutator method
       # is called on the array. Mutating `@paths`, `@extensions`, or
@@ -30,7 +28,6 @@ module Hike
       @aliases    = aliases.inject({}) { |h, (k, a)|
                       h[k] = a.dup.freeze; h
                    }.freeze
-      @pathnames  = paths.map { |path| Pathname.new(path) }
 
       @stats    = {}
       @entries  = {}
@@ -38,9 +35,7 @@ module Hike
     end
 
     # `CachedTrail#root` returns root path as a `String`. This attribute is immutable.
-    def root
-      @root.to_s
-    end
+    attr_reader :root
 
     # `CachedTrail#cached` returns `self` to be compatable with the `Trail` interface.
     def cached
@@ -66,10 +61,10 @@ module Hike
       return to_enum(__method__, *logical_paths) unless block_given?
 
       options = extract_options!(logical_paths)
-      base_path = Pathname.new(options[:base_path] || @root)
+      base_path = (options[:base_path] || root).to_s
 
       logical_paths.each do |logical_path|
-        logical_path = Pathname.new(logical_path.sub(/^\//, ''))
+        logical_path = logical_path.sub(/^\//, '')
 
         if relative?(logical_path)
           find_in_base_path(logical_path, base_path, &block)
@@ -104,23 +99,23 @@ module Hike
         arguments.last.is_a?(Hash) ? arguments.pop.dup : {}
       end
 
-      def relative?(logical_path)
-        logical_path.to_s =~ /^\.\.?\//
+      def relative?(path)
+        path =~ /^\.\.?\//
       end
 
       # Finds logical path across all `paths`
       def find_in_paths(logical_path, &block)
-        dirname, basename = logical_path.split
-        @pathnames.each do |base_path|
-          match(base_path.join(dirname), basename, &block)
+        dirname, basename = File.split(logical_path)
+        @paths.each do |base_path|
+          match(File.expand_path(dirname, base_path), basename, &block)
         end
       end
 
       # Finds relative logical path, `../test/test_trail`. Requires a
       # `base_path` for reference.
       def find_in_base_path(logical_path, base_path, &block)
-        candidate = base_path.join(logical_path)
-        dirname, basename = candidate.split
+        candidate = File.expand_path(logical_path, base_path)
+        dirname, basename = File.split(candidate)
         match(dirname, basename, &block) if paths_contain?(dirname)
       end
 
@@ -134,21 +129,21 @@ module Hike
         matches = matches.select { |m| m =~ pattern }
 
         sort_matches(matches, basename).each do |path|
-          pathname = dirname.join(path)
+          filename = File.join(dirname, path)
 
           # Potential `stat` syscall
-          stat = stat(pathname)
+          stat = stat(filename)
 
           # Exclude directories
           if stat && stat.file?
-            yield pathname.to_s
+            yield filename
           end
         end
       end
 
       # Returns true if `dirname` is a subdirectory of any of the `paths`
       def paths_contain?(dirname)
-        paths.any? { |path| dirname.to_s[0, path.length] == path }
+        paths.any? { |path| dirname[0, path.length] == path }
       end
 
       # Cache results of `build_pattern_for`
@@ -160,16 +155,16 @@ module Hike
       #
       #     pattern_for("index.html") #=> /^index(.html|.htm)(.builder|.erb)*$/
       def build_pattern_for(basename)
-        extname = basename.extname
+        extname = File.extname(basename)
         aliases = find_aliases_for(extname)
 
         if aliases.any?
-          basename = basename.basename(extname)
+          basename = File.basename(basename, extname)
           aliases  = [extname] + aliases
           aliases_pattern = aliases.map { |e| Regexp.escape(e) }.join("|")
-          basename_re = Regexp.escape(basename.to_s) + "(?:#{aliases_pattern})"
+          basename_re = Regexp.escape(basename) + "(?:#{aliases_pattern})"
         else
-          basename_re = Regexp.escape(basename.to_s)
+          basename_re = Regexp.escape(basename)
         end
 
         extension_pattern = extensions.map { |e| Regexp.escape(e) }.join("|")
@@ -180,10 +175,10 @@ module Hike
       # priority. Extensions in the front of the `extensions` carry
       # more weight.
       def sort_matches(matches, basename)
-        aliases = find_aliases_for(basename.extname)
+        aliases = find_aliases_for(File.extname(basename))
 
         matches.sort_by do |match|
-          extnames = match.sub(basename.to_s, '').scan(/\.[^.]+/)
+          extnames = match.sub(basename, '').scan(/\.[^.]+/)
           extnames.inject(0) do |sum, ext|
             if i = extensions.index(ext)
               sum + i + 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hike
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Sam Stephenson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake