servel 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 368f3a82244101749c5bd21dda7e82d229d093c4
-  data.tar.gz: 66955c76c3cc09c6d38ea396da93ff3df65036b6
+  metadata.gz: 04bbc42b03ba43d1ec342e7f397178a97eeff3a9
+  data.tar.gz: 1a9a865af005bd23156c2a76053f4bbd6adbdbf1
 SHA512:
-  metadata.gz: 5d278f493f55dcff11d89d97c958e01564bb8bda9a80b82d4b13fc055726a53c771179803b32dcc913c7eb9c3a750a9d7b5cad5059b4f97c0e7cb1d45b6ad5f8
-  data.tar.gz: 8865989fd4ed41d1629753967e92bc4ef7a4b124aa456eaa129aa804c92a2900454d434ed6e28bd3d92135dc311c56f6a1700e2398c880e1415f82ebe9ffda15
+  metadata.gz: 4bdb0287d5b8c289e99b1e9c0ab940f4369fd63b7f3b55e350aebc6acbe3c838f18b81cd96262f9f23c2d7347f438743e12c8dc4227bd24adb185897e3eccade
+  data.tar.gz: ad5e295d7c21189dbe42934a97e424c03ef76a6280ab948ccf473864829038a9e9ef5c2da4cf1592682ad63ae003197bf42dbc3940aba4962416eb34cdac3a59

data/lib/servel/entry_factory.rb

@@ -41,6 +41,8 @@ class Servel::EntryFactory
 
   def self.for(path)
     new(path).entry
+  rescue Errno::EACCES
+    nil
   end
 
   def initialize(path)

data/lib/servel/index.rb

@@ -1,6 +1,6 @@
 class Servel::Index
   extend Servel::Instrumentation
-  LOCALS_CACHE = LruRedux::ThreadSafeCache.new(100)
+  RENDER_CACHE = LruRedux::ThreadSafeCache.new(100)
   SORT_METHODS = ["name", "mtime", "size", "type"]
   SORT_DIRECTIONS = ["asc", "desc"]
 
@@ -12,31 +12,15 @@ class Servel::Index
   end
 
   def render
-    Servel::HamlContext.render('index.haml', locals)
+    RENDER_CACHE.getset(render_cache_key) { Servel::HamlContext.render('index.haml', locals) }
   end
 
-  def sort_method
-    param = @params["_servel_sort_method"]
-    param = "name" unless SORT_METHODS.include?(param)
-    param
-  end
-
-  def sort_direction
-    param = @params["_servel_sort_direction"]
-    param = "asc" unless SORT_DIRECTIONS.include?(param)
-    param
-  end
-
-  def locals_cache_key
-    @locals_cache_key ||= [@fs_path.to_s, @fs_path.mtime.to_i, sort_method, sort_direction].join("-")
+  def render_cache_key
+    @render_cache_key ||= [@fs_path.to_s, @fs_path.mtime.to_i, sort_method, sort_direction].join("-")
   end
 
   def locals
-    LOCALS_CACHE.getset(locals_cache_key) { build_locals }
-  end
-
-  def build_locals
-    entries = @fs_path.children.map { |path| Servel::EntryFactory.for(path) }
+    entries = @fs_path.children.map { |path| Servel::EntryFactory.for(path) }.compact
 
     {
       url_root: @url_root,
@@ -50,6 +34,18 @@ class Servel::Index
     }
   end
 
+  def sort_method
+    param = @params["_servel_sort_method"]
+    param = "name" unless SORT_METHODS.include?(param)
+    param
+  end
+
+  def sort_direction
+    param = @params["_servel_sort_direction"]
+    param = "asc" unless SORT_DIRECTIONS.include?(param)
+    param
+  end
+
   def directories(entries)
     list = apply_sort(entries.select { |entry| entry.directory? })
 
@@ -83,9 +79,5 @@ class Servel::Index
     entries
   end
 
-  def sort_entries(entries)
-    Naturalsorter::Sorter.sort_by_method(entries, :name, true)
-  end
-
-  instrument :locals, :directories, :files, :sort_entries
+  instrument :render, :locals, :directories, :files, :apply_sort
 end

data/lib/servel/version.rb

@@ -1,3 +1,3 @@
 module Servel
-  VERSION = "0.12.0"
+  VERSION = "0.13.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: servel
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Brenton "B-Train" Fletcher