hike 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c46019e7383a433c30d2859e3e9da31a37623562
-  data.tar.gz: 25ec96e4f50c22d099f321c8ba11cf3a51c0d108
+  metadata.gz: 797933ddf4e64187ab3a4e714147a41602fcd58e
+  data.tar.gz: dd13bfc57bb7239db82fb1ca3d543928ab3ba94f
 SHA512:
-  metadata.gz: d3477f9cd81a43db8f296485ac46823c86749ca698745c68bcfd0bcca0061c8a9e654fed29138460c0f5ebf19198ba1da1c2773dcdf5ad141519ceca554a1a90
-  data.tar.gz: 0ba3c75b015858f23eee6960ab984a77e1226b0628bdcfc7f6ad5df89d2622a9f30ad27af1120063a947d42ab53f1ef8e12874ec6dffeb1d7372a23b5cc29dec
+  metadata.gz: 3483da81e21e40f322abe6c39d20ddb52f52ba438095431624d9186726d3eb424713f2b118fb28f65d4dc25aef894f8a046f418d62292306ab807622ff670234
+  data.tar.gz: 7bb837bb3856a8d1898964c3e497835ef83ebd34b528fc5c65acc10e777562ec90e300748568302dd8c2534b06a7eeede9940c1bca91cc86df9bb65d98eb5cc1

data/lib/hike.rb

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

data/lib/hike/cached_trail.rb

@@ -25,13 +25,16 @@ module Hike
       # `@aliases` would have unpredictable results.
       @paths      = paths.dup.freeze
       @extensions = extensions.dup.freeze
-      @aliases    = aliases.inject({}) { |h, (k, a)|
-                      h[k] = a.dup.freeze; h
-                   }.freeze
 
-      @stats    = {}
-      @entries  = {}
-      @patterns = {}
+      # Create a reverse mapping from extension to possible aliases.
+      @aliases = aliases.dup.freeze
+      @reverse_aliases = @aliases.inject({}) { |h, (k, a)|
+        (h[a] ||= []) << k; h
+      }
+
+      @stats    = Hash.new { |h, k| h[k] = FileUtils.stat(k) }
+      @entries  = Hash.new { |h, k| h[k] = FileUtils.entries(k) }
+      @patterns = Hash.new { |h, k| h[k] = pattern_for(k) }
     end
 
     # `CachedTrail#root` returns root path as a `String`. This attribute is immutable.
@@ -80,18 +83,13 @@ module Hike
     # `~` swap files. Returns an empty `Array` if the directory does
     # not exist.
     def entries(path)
-      @entries[path.to_s] ||= super
+      @entries[path]
     end
 
     # A cached version of `File.stat`. Returns nil if the file does
     # not exist.
     def stat(path)
-      key = path.to_s
-      if @stats.key?(key)
-        @stats[key]
-      else
-        @stats[key] = super
-      end
+      @stats[path]
     end
 
     protected
@@ -123,16 +121,16 @@ module Hike
       # any syscalls if necessary.
       def match(dirname, basename)
         # Potential `entries` syscall
-        matches = entries(dirname)
+        matches = @entries[dirname]
 
-        pattern = pattern_for(basename)
+        pattern = @patterns[basename]
         matches = matches.select { |m| m =~ pattern }
 
         sort_matches(matches, basename).each do |path|
           filename = File.join(dirname, path)
 
           # Potential `stat` syscall
-          stat = stat(filename)
+          stat = @stats[filename]
 
           # Exclude directories
           if stat && stat.file?
@@ -146,19 +144,14 @@ module Hike
         paths.any? { |path| dirname[0, path.length] == path }
       end
 
-      # Cache results of `build_pattern_for`
-      def pattern_for(basename)
-        @patterns[basename] ||= build_pattern_for(basename)
-      end
-
       # Returns a `Regexp` that matches the allowed extensions.
       #
       #     pattern_for("index.html") #=> /^index(.html|.htm)(.builder|.erb)*$/
-      def build_pattern_for(basename)
+      def pattern_for(basename)
         extname = File.extname(basename)
-        aliases = find_aliases_for(extname)
+        aliases = @reverse_aliases[extname]
 
-        if aliases.any?
+        if aliases
           basename = File.basename(basename, extname)
           aliases  = [extname] + aliases
           aliases_pattern = aliases.map { |e| Regexp.escape(e) }.join("|")
@@ -175,7 +168,8 @@ module Hike
       # priority. Extensions in the front of the `extensions` carry
       # more weight.
       def sort_matches(matches, basename)
-        aliases = find_aliases_for(File.extname(basename))
+        extname = File.extname(basename)
+        aliases = @reverse_aliases[extname] || []
 
         matches.sort_by do |match|
           extnames = match.sub(basename, '').scan(/\.[^.]+/)
@@ -190,12 +184,5 @@ module Hike
           end
         end
       end
-
-      def find_aliases_for(extension)
-        @aliases.inject([]) do |aliases, (key, value)|
-          aliases.push(key) if value == extension
-          aliases
-        end
-      end
   end
 end

metadata

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