directory_listing 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cf8138fc74458cee692795f92ea3e8436cb795e
-  data.tar.gz: 10a82b76d2bbdbbb7b98fb379c90c40470ee92d4
+  metadata.gz: 513baf59cf0a27dc639d52bbff9ab369e8a2bd33
+  data.tar.gz: 4d7bde85c5440ef7fb3b83d38ac3eaefadbc779b
 SHA512:
-  metadata.gz: 050ce306863a84e889bd0caeb1e77736d355b652302c09cd8370d8fce04051cfdc9d48e4878ded09df5079cb72c27c1c27dc903f4229a1f5cb5b4e91a9e06cc8
-  data.tar.gz: 23bfe4fc941b14c4952e2663493d493a3ea65fbcc1985704e41f566fb51dd889a9d548b007cf327ad58a32177d2a5740349897c9a0c0e2f1f4b0b5749b4e0e30
+  metadata.gz: 69be2fc4333486ce6278e1c3fe5c29703e83793f2a9b30f268ecd0bdf496ce09da65771594295ccef5f33bf2700c21734941a2520ce5cfa8ad458ae9d6e724b1
+  data.tar.gz: dad9fab1bd163a162b484120d92385df7127d6f70f01c0ab46526f233ddaee3f79aadd1d97cd9b98e17d6284e91175a50f87a5a93d04ba922ae4e7e5faa02f38

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    directory_listing (0.4.3)
+    directory_listing (0.6.0)
       filesize (>= 0.0.2)
       sinatra
       truncate (>= 0.0.4)
@@ -11,12 +11,12 @@ GEM
   specs:
     filesize (0.0.3)
     rack (1.5.2)
-    rack-protection (1.5.2)
+    rack-protection (1.5.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
     rake (10.1.0)
-    sinatra (1.4.4)
+    sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)

data/README.md

@@ -10,8 +10,6 @@
 
 ```directory_listing``` also includes a number of configuration options - see the [Options](#options) section below.
 
-A short blog post / announcement exists [here](http://blog.catsanddogshavealltheluck.com/#Directory_Listings_in_Sinatra).
-
 ### Install
 
 For regular use:
@@ -69,6 +67,7 @@ Available options:
 - ```readme``` - an HTML string that will be appended at the footer of the generated directory listing
 - ```should_list_invisibles``` - whether the directory listing should include invisibles (dotfiles) - true or false, defaults to false
 - ```should_show_file_exts``` - whether the directory listing should show file extensions - true or false, defaults to true
+- ```smart_sort``` - whether sorting should ignore "[Tt]he " at the beginning of filenames - true or false, defaults to true
 - ```last_modified_format``` - [format](http://www.ruby-doc.org/core-2.0/Time.html) for last modified date - defaults to ```%Y-%m-%d %H:%M:%S```
 - ```filename_truncate_length``` - length to truncate file names to - integer, defaults to 40
 

data/lib/sinatra/directory_listing.rb

@@ -24,6 +24,7 @@ module Sinatra
       options = {
         :should_list_invisibles => false,
         :should_show_file_exts => true,
+        :smart_sort => true,
         :last_modified_format => "%Y-%m-%d %H:%M:%S",
         :filename_truncate_length => 40,
         :stylesheet => "",
@@ -36,6 +37,7 @@ module Sinatra
       page = Page.new
       page.should_list_invisibles = options[:should_list_invisibles]
       page.should_show_file_exts = options[:should_show_file_exts]
+      page.smart_sort = options[:smart_sort]
       page.last_modified_format = options[:last_modified_format]
       page.filename_truncate_length = options[:filename_truncate_length]      
       page.public_folder = settings.public_folder

data/lib/sinatra/directory_listing/page.rb

@@ -5,6 +5,7 @@ class Page
 
   attr_accessor :should_list_invisibles,
                 :should_show_file_exts,
+                :smart_sort,
                 :last_modified_format, 
                 :filename_truncate_length, 
                 :stylesheet,

data/lib/sinatra/directory_listing/resource.rb

@@ -5,13 +5,15 @@ class Resource
   ##
   # Class definition for a single resource to be listed. 
   # Each resource object has accessors for its file name, regular name, 
-  # size and mtime, as well as those components wrapped in html. 
+  # sortable name (removing "[Tt]he") size and mtime, as well as those 
+  # components wrapped in html. 
 
-  attr_accessor :file, :page, :name_html, :mtime, :mtime_html, :size, :size_html
+  attr_accessor :file, :page, :sort_name, :name_html, :mtime, :mtime_html, :size, :size_html
   
   def initialize(file, page)
     @page = page
     @file = file
+    @sort_name = file.gsub(/^[Tt]he /,"")
     @name_html = set_name(file)
     @mtime, @mtime_html = set_mtime(file)
     @size, @size_html = set_size(file)
@@ -136,6 +138,7 @@ class Resource
   # Direction should be "ascending" or "descending"
   
   def self.sort(resource_array, sortby, direction)
+    sortby = "sort_name" if resource_array[0].page.smart_sort == true #and sortby = "file"
     new_array = resource_array.sort_by {|a| a.send(sortby)}
     new_array.reverse! if direction == "descending"
     new_array

data/lib/sinatra/directory_listing/version.rb

@@ -1,3 +1,3 @@
 module Directory_listing
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

data/test/test_directory_listing.rb

@@ -72,7 +72,7 @@ class DirectoryListingTest < Test::Unit::TestCase
   ##
   # test sorting
 
-  def files_array(body)
+  def sorting_array(body)
     files = Array.new
     body.each_line do |line|
       files << $& if /(\d)k.dat/.match(line)
@@ -82,41 +82,41 @@ class DirectoryListingTest < Test::Unit::TestCase
 
   def test_sorting_name_ascending
     get '/sorting?sortby=file&direction=ascending'
-    files = files_array(last_response.body)
+    files = sorting_array(last_response.body)
     assert_equal ["1k.dat", "2k.dat", "3k.dat"], files
   end
 
   def test_sorting_name_descending
     get '/sorting?sortby=file&direction=descending'
-    files = files_array(last_response.body)
+    files = sorting_array(last_response.body)
     assert_equal ["3k.dat", "2k.dat", "1k.dat"], files
   end
   
   def test_sorting_mtime_ascending
     get '/sorting?sortby=mtime&direction=ascending'
-    files = files_array(last_response.body)
+    files = sorting_array(last_response.body)
     assert_equal ["2k.dat", "3k.dat", "1k.dat"], files
   end
 
   def test_sorting_mtime_descending
     get '/sorting?sortby=mtime&direction=descending'
-    files = files_array(last_response.body)
+    files = sorting_array(last_response.body)
     assert_equal ["1k.dat", "3k.dat", "2k.dat"], files
   end
 
   def test_sorting_size_ascending
     get '/sorting?sortby=size&direction=ascending'
-    files = files_array(last_response.body)
+    files = sorting_array(last_response.body)
     assert_equal ["1k.dat", "2k.dat", "3k.dat"], files
   end
 
   def test_sorting_size_descending
     get '/sorting?sortby=size&direction=descending'
-    files = files_array(last_response.body)
+    files = sorting_array(last_response.body)
     assert_equal ["3k.dat", "2k.dat", "1k.dat"], files
   end
 
-  ##
+##
   # test navigation bar
 
   def test_navigation_bar

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directory_listing
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Richard Myers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Easy, CSS-styled, Apache-like directory listings for Sinatra.