directory_listing 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c2dc527bc7f8aa022a20a464c7b4abb48393699
-  data.tar.gz: 9f83a244aea36ff3d8a8ad14cee9b191e550bf1b
+  metadata.gz: dafec9303b09bba3b378369ea69caf916042d0d0
+  data.tar.gz: 8c7fbc3853f6abaa6c64bd9df2267baffa94a636
 SHA512:
-  metadata.gz: 570426a11a70859e3f940d2fbc3239bed91af7dfef4a5f2aa2a4b1d8c5bef850982ca17a3cce43ecd3886cc7a5a918c343cf8beca58bf5359691f320740f9bf7
-  data.tar.gz: c043cefe91c3d33692936f9f4940f003ea6a237be2a26cf359130080f339c43178808645da04b49ad7faaacdbe94920e2d5275b3b8d35e7c76fa4ebc0fe98a75
+  metadata.gz: cbb6f227915de4813952c2829d4e143a476aed24ddc1b175d015a8011a8c3feafb706681ff2843d39ccbf87c454fe1b96f8173678ffc32f37119f5893cb7bd62
+  data.tar.gz: 2d64dd51da5c6d7e66cedc3757a5f2ebeaf956b1172f9d83c723c2c20933af347160b327ec8d233b9dc65b4dc1c634e03c062fbbfd6cce0acba4be973eca5e63

data/Gemfile.lock

@@ -1,18 +1,26 @@
 PATH
   remote: .
   specs:
-    directory_listing (0.4.2)
+    directory_listing (0.4.3)
       filesize (>= 0.0.2)
+      sinatra
       truncate (>= 0.0.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    filesize (0.0.2)
+    filesize (0.0.3)
     rack (1.5.2)
+    rack-protection (1.5.2)
+      rack
     rack-test (0.6.2)
       rack (>= 1.0)
     rake (10.1.0)
+    sinatra (1.4.4)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    tilt (1.4.1)
     truncate (0.1.0)
     yard (0.8.7)
 

data/LICENSE

@@ -1,13 +1,22 @@
-           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-                   Version 2, December 2004
+The MIT License
 
-Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+Copyright (c) 2013 Richard Myers &lt;rick.myers@me.com&gt;
 
-Everyone is permitted to copy and distribute verbatim or modified
-copies of this license document, and changing it is allowed as long
-as the name is changed.
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
 
-           DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-  TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
 
- 0. You just DO WHAT THE FUCK YOU WANT TO.
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -68,6 +68,7 @@ Available options:
 - ```stylesheet``` - a stylesheet to style the generated directory listing with, relative to your ```public_folder```
 - ```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
 - ```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
 
@@ -122,11 +123,15 @@ Here are the latest [commits](https://github.com/movesmyers/directory_listing/co
 ### Contributing
 
 1. Fork it
-2. Create your feature branch (```git checkout -b my-new-feature```)
-3. Commit your changes (```git commit -am 'Add some feature'```)
-4. Push to the branch (```git push origin my-new-feature```)
+2. Create your feature branch: ```git checkout -b my-new-feature```
+3. Commit your changes (remember to include a test!): ```git commit -am 'Add some feature'```
+4. Push to the branch: ```git push origin my-new-feature```
 5. Create new Pull Request
 
+#### Note: 
+
+Out of the box, the test suite will fail, as one of the tests tries to sort via mtime, and [git doesn't preserve mtimes](https://git.wiki.kernel.org/index.php/GitFaq#Why_isn.27t_Git_preserving_modification_time_on_files.3F). You'll want to touch those files in the following order to make them pass - ```2k.dat```, ```3k.dat```, ```1k.dat```.
+
 ### License
 
-```directory_listing``` is licensed under the DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE. See the LICENSE file for details.
+```directory_listing``` is licensed under the MIT license. See the LICENSE file for details.

data/lib/sinatra/directory_listing/page.rb

@@ -3,7 +3,8 @@ class Page
   ##
   # Class definition for the page to be generated.
 
-  attr_accessor :should_list_invisibles, 
+  attr_accessor :should_list_invisibles,
+                :should_show_file_exts,
                 :last_modified_format, 
                 :filename_truncate_length, 
                 :stylesheet,

data/lib/sinatra/directory_listing/resource.rb

@@ -54,10 +54,12 @@ class Resource
   def set_name(file)
 
     ##
-    # Make sure we're working with an unescaped file name and truncate it.
+    # Make sure we're working with an unescaped file name.
+    # Remove the extension if neccesary and truncate it.
     # URI.unescape seems to work best to decode uris. 
 
     file = URI.unescape(file)
+    file = file.gsub(File.extname(file), "") if @page.should_show_file_exts == false
     file_truncated = file.truncate(@page.filename_truncate_length, '...')
 
     ##

data/lib/sinatra/directory_listing/version.rb

@@ -1,3 +1,3 @@
 module Directory_listing
-  VERSION = '0.4.3'
+  VERSION = '0.5.0'
 end

data/lib/sinatra/directory_listing.rb

@@ -23,6 +23,7 @@ module Sinatra
       
       options = {
         :should_list_invisibles => false,
+        :should_show_file_exts => true,
         :last_modified_format => "%Y-%m-%d %H:%M:%S",
         :filename_truncate_length => 40,
         :stylesheet => "",
@@ -34,6 +35,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.last_modified_format = options[:last_modified_format]
       page.filename_truncate_length = options[:filename_truncate_length]      
       page.public_folder = settings.public_folder

data/test/test_directory_listing.rb

@@ -60,6 +60,14 @@ class DirectoryListingTest < Test::Unit::TestCase
     assert (last_response.body.include?('/should_list_invisibles/.') and 
       last_response.body.include?('/should_list_invisibles/..'))
   end
+  
+  ##
+  # test showing file extensions
+
+  def test_should_show_file_exts
+    get '/should_show_file_exts'
+    assert !(last_response.body.include?('test.txt'))
+  end
 
   ##
   # test sorting

data/test/test_directory_listing_app.rb

@@ -20,6 +20,12 @@ get '/should_list_invisibles' do
   })
 end
 
+get '/should_show_file_exts' do 
+  list({
+    :should_show_file_exts => false
+  })
+end
+
 get '*' do |path|
   if File.exist?(File.join(settings.public_folder, path))
     if File.directory?(File.join(settings.public_folder, path))

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: directory_listing
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Richard Myers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: filesize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: truncate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.6.2
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7
 description: A Sinatra extension for generating easy, CSS-styled, Apache-like directory
@@ -115,7 +115,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -134,6 +134,7 @@ files:
 - test/public/level1/test
 - test/public/readme/test.txt
 - test/public/should_list_invisibles/test.txt
+- test/public/should_show_file_exts/test.txt
 - test/public/sorting/1k.dat
 - test/public/sorting/2k.dat
 - test/public/sorting/3k.dat
@@ -150,17 +151,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Easy, CSS-styled, Apache-like directory listings for Sinatra.
@@ -172,6 +173,7 @@ test_files:
 - test/public/level1/test
 - test/public/readme/test.txt
 - test/public/should_list_invisibles/test.txt
+- test/public/should_show_file_exts/test.txt
 - test/public/sorting/1k.dat
 - test/public/sorting/2k.dat
 - test/public/sorting/3k.dat