hstatic 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a87fb753e036fc90718781e2343ef78d7b043b89
-  data.tar.gz: 6e04b8a734f59391e3326ddd1ee9dc72bdbf0008
+  metadata.gz: fc6c94e2c7443c787a8f337d732043cec4a42148
+  data.tar.gz: 6c0e6225987069a69316b783bca50a87cb7b6809
 SHA512:
-  metadata.gz: b0eeeaa9c35cda041f39a29fd07a0efdf1473370ab3970bf011f97461b9547809608f31a5742a79b34af9fbf753112670f0c207773ccb818156154db3aaa2f46
-  data.tar.gz: 80c515b13c7f5d6e01bc780e956db067a89fe8135768c09e2bde29fbb007e3626b28eab4ca63ce20d85cd7133d7e49f99164d4c3625c326a320e20864840395a
+  metadata.gz: 6a496aaf963162bac12600556f8e4fc8d9a80c931cee789ec1fefbb8d0d98a474deffa06018296fe125bb63a7073261e3c6413f1f0ef40798c1812c87b4985c3
+  data.tar.gz: 1384c6eaeb79655ee6d4e251307ff394409ece790182be5e5a79cfbab21499a69772a6368c7dd9136e3bb4b385577971f50b6e9e536f496155e84b82e60d2027

data/.rubocop.yml

@@ -0,0 +1,4 @@
+inherit_from: /home/erickpc/.rubocop.yml
+
+StringLiterals:
+  EnforcedStyle: single_quotes

data/Guardfile

@@ -0,0 +1,14 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard :minitest do
+  # with Minitest::Unit
+  watch(%r{^test/(.*)_test\.rb$})        { 'test' }
+  watch(%r{^lib/(.*/)?([^/]+)\.rb$})     { 'test' }
+  watch(%r{^test/test_helper\.rb$})      { 'test' }
+
+  # with Minitest::Spec
+  # watch(%r{^spec/(.*)_spec\.rb$})
+  # watch(%r{^lib/(.+)\.rb$})         { |m| "spec/#{m[1]}_spec.rb" }
+  # watch(%r{^spec/spec_helper\.rb$}) { 'spec' }
+end

data/Rakefile

@@ -1 +1,10 @@
 require "bundler/gem_tasks"
+
+require 'rake/testtask'
+
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  t.pattern = 'test/*_test.rb'
+  t.verbose = false
+end

data/hstatic.gemspec

@@ -22,6 +22,9 @@ It features a nice directory listing and automatic publishing of your index.html
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rack-test"
+  spec.add_development_dependency "guard"
+  spec.add_development_dependency "guard-minitest"
 
   spec.add_runtime_dependency "sinatra"
   spec.add_runtime_dependency "haml"

data/lib/hstatic/app.rb

@@ -1,10 +1,11 @@
+require 'pathname'
 require 'sinatra/base'
 require 'haml'
 require 'slim'
 
 # Main gem namespace
 module Hstatic
-  BASEDIR = File.join(File.dirname(__FILE__), '..', '..')
+  BASEDIR = Pathname.new(__FILE__).dirname.join('..', '..')
 
   # Main Sinatra Application
   #
@@ -12,7 +13,7 @@ module Hstatic
   # templates files
   class App < Sinatra::Base
     configure do
-      set :views, File.join(BASEDIR, 'views')
+      set :views, BASEDIR + 'views'
       set :environment, :development
       enable :logging
     end
@@ -33,14 +34,14 @@ module Hstatic
     # Finally every Tilt supported template is rendered
     helpers do
       def render_file(path)
-        if template = Tilt[path]
+        if (template = Tilt[path])
           ext, _ =  Tilt.mappings.find { |k, v| v.include? template }
 
           if self.respond_to? ext.to_sym
             method = self.method(ext)
-            basename = File.basename(path, File.extname(path)).to_sym
+            basename = path.basename(path.extname).to_s.to_sym
 
-            return method.call basename, :views => File.dirname(path)
+            return method.call basename, :views => path.dirname
           end
         end
 
@@ -49,62 +50,58 @@ module Hstatic
     end
 
     # Going around bootstrap
-    get '/.res/bootstrap.min.css' do
-      send_file(File.join(BASEDIR, 'res/bootstrap.min.css'))
-    end
-
-    get '/.res/style.css' do
-      send_file(File.join(BASEDIR, 'res/style.css'))
-    end
-
-    get '/.res/jquery-1.10.2.min.js' do
-      send_file(File.join(BASEDIR, 'res/jquery-1.10.2.min.js'))
-    end
-
-    get '/fonts/glyphicons-halflings-regular.woff' do
-      send_file(File.join(BASEDIR, 'res/glyphicons-halflings-regular.woff'))
-    end
-
-    get '/fonts/glyphicons-halflings-regular.ttf' do
-      send_file(File.join(BASEDIR, 'res/glyphicons-halflings-regular.ttf'))
+    %w(
+        /.res/bootstrap.min.css
+        /.res/style.css
+        /.res/jquery-1.10.2.min.js
+      ).each do |uri|
+      get uri do
+        send_file BASEDIR + uri.gsub(/^\/\./, '')
+      end
     end
 
-    get '/fonts/glyphicons-halflings-regular.svg' do
-      send_file(File.join(BASEDIR, 'res/glyphicons-halflings-regular.svg'))
+    %w(
+        /fonts/glyphicons-halflings-regular.woff
+        /fonts/glyphicons-halflings-regular.tff
+        /fonts/glyphicons-halflings-regular.svg
+      ).each do |uri|
+      get uri do
+        send_file BASEDIR + uri.gsub(/^\/fonts/, 'res')
+      end
     end
 
     # Catch all route
     get '*' do
-      path = File.expand_path(File.join(Dir.pwd, unescape(request.path_info)))
+      # resource absolute path
+      path = Pathname.new(Dir.pwd).join(unescape(request.path_info).gsub(/^\//, ''))
+      path_info = Pathname.new request.path_info
 
-      if File.file? path
+      if path.file?
         render_file path
-      elsif File.exists?(File.expand_path(File.join(path, 'index.html')))
-        redirect(File.join(request.path_info, 'index.html'))
-      elsif File.directory? path
-        # Building data
+      elsif path.directory?
+        %w(index.htm index.html).each do |file|
+          redirect(path_info + file) if (path + file).file?
+        end
+        # FIXME: ^^ using halt call inside redirect for control flow
+        # Building data for directory listing
         @folders = Array.new
         @files = Array.new
-        @parent = File.dirname(request.path_info)
-
-        Dir.foreach(path) do |entry|
-          next if entry == '.' || entry == '..'
+        @parent = path_info.dirname
 
-          url_base = File.join('/', request.path_info)
-          link = File.join(url_base, entry)
-          filename = File.expand_path(File.join(path, entry))
+        path.each_child do |entry|
+          link = path_info + entry.basename
 
-          if File.directory? filename
-            @folders << { name: entry, href: link }
+          if entry.directory?
+            @folders << { :name => entry.basename, :href => link }
           else
-            @files << { name: unescape(entry),
-                        size: dynamic_size(File.size(filename)),
-                        href: link }
+            @files << { :name => entry.basename,
+                        :size => dynamic_size(entry.size),
+                        :href => link }
           end
         end
 
         # Render view
-        haml :index
+        slim :index
       else
         [404, 'File not found']
       end

data/lib/hstatic/version.rb

@@ -1,4 +1,4 @@
 # Main gem namespace
 module Hstatic
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/res/style.css

@@ -5,4 +5,10 @@
 
 .panel-heading button {
     margin-left: 20px;
+}
+
+.folder {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
 }

data/test/dummy_folder/index.html

@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>Dummy Demo Index</title>
+    </head>
+    <body>
+        <p>This is a demo page</p>
+    </body>
+</html>

data/test/dummy_folder/sample.haml

@@ -0,0 +1,6 @@
+%p This is a haml sample
+%p This is another paragraph sample
+
+%ul
+  %li First item
+  %li Second item

data/test/dummy_folder/sample.slim

@@ -0,0 +1,6 @@
+p This is a haml sample
+p This is another paragraph sample
+
+ul
+  li First item
+  li Second item

data/test/index_test.rb

@@ -0,0 +1,33 @@
+require_relative 'test_helper'
+
+# Class for testing index.html redirection
+class IndexTest < Minitest::Test
+  include Rack::Test::Methods
+
+  CONTENT = <<-BODY.strip_heredoc
+    <!DOCTYPE html>
+    <html>
+        <head>
+            <title>Dummy Demo Index</title>
+        </head>
+        <body>
+            <p>This is a demo page</p>
+        </body>
+    </html>
+    BODY
+
+  def app
+    Dir.chdir Pathname.new(__FILE__).dirname
+    Hstatic::App.new
+  end
+
+  def test_index_redirect
+    get '/dummy_folder'
+
+    assert_equal last_response.status, 302, 'Redirect failed'
+
+    follow_redirect!
+    assert_equal 200, last_response.status, 'Request status failed'
+    assert_equal last_response.body, CONTENT, 'Body content mismatched'
+  end
+end

data/test/listing_test.rb

@@ -0,0 +1,64 @@
+require_relative 'test_helper'
+
+# Class for testing directory listing
+class ListTest < Minitest::Test
+  include Rack::Test::Methods
+
+  TEST_LISTING = <<-BODY.strip_heredoc
+  <!DOCTYPE html><html><head><meta content="width=device-width, initial-scale=1.0" name="viewport" /><!--Bootstrap--><link href="/.res/bootstrap.min.css" rel="stylesheet" /><link href="/.res/style.css" rel="stylesheet" /><script src="/.res/jquery-1.10.2.min.js" type="text/javascript"></script></head><body><div class="container-fluid"><div class="row"><div class="col-md-4 col-md-offset-4"><input autofocus="" class="form-control" placeholder="Search" type="text" /></div></div><div class="row"><div class="col-lg-3 col-md-3 col-sm-3"><div class="panel panel-default"><div class="panel-heading">Folders<a class="pull-right" href="/"><span class="glyphicon glyphicon-arrow-up"></span>Up</a></div><div class="list-group"><a class="list-group-item folder" href="/dummy_folder" title="dummy_folder">dummy_folder</a></div></div></div><div class="col-lg-9 col-md-9 col-sm-9"><div class="panel panel-default"><div class="panel-heading">Files</div><table class="table table-hover"><thead><tr><th>#</th><th>Name</th><th>Size</th></tr></thead><tbody><tr><td>1</td><td><a href="/test_helper.rb">test_helper.rb</a></td><td> 0.00 kB</td></tr><tr><td>2</td><td><a href="/template_test.rb">template_test.rb</a></td><td> 0.00 kB</td></tr><tr><td>3</td><td><a href="/index_test.rb">index_test.rb</a></td><td> 0.00 kB</td></tr><tr><td>4</td><td><a href="/listing_test.rb">listing_test.rb</a></td><td> 2.00 kB</td></tr></tbody></table></div></div></div></div><script type="text/javascript">$(document).ready(function () {
+    var re = new RegExp;
+    /!* filtering */
+    $('input').on('input', function () {
+      value = $(this).val();
+      $('a.list-group-item, tr:has(a)').show();
+      if (value == "") {
+        return false;
+      }
+      re.compile(value, "i");
+      $.each($('a.list-group-item'), function(i, e){
+        if (! re.test(e.innerHTML)) {
+          $(e).hide();
+        }
+      });
+      $.each($('tr:has(a)'), function(i, e){
+        if (! re.test($('a', e).html())) {
+          $(e).hide();
+        }
+      });
+    });
+    $('input').on('keyup', function (event) {
+      if (event.which == 27) {
+        $('input').val("");
+        $('input').trigger('input');
+      }
+    });
+  });</script></body></html>
+  BODY
+
+  def app
+    Dir.chdir Pathname.new(__FILE__).dirname
+    Hstatic::App.new
+  end
+
+  def test_root
+    get '/'
+
+    assert last_response.ok?
+  end
+
+  def test_resources
+    %w(/.res/style.css /.res/bootstrap.min.css /.res/jquery-1.10.2.min.js).each do |uri|
+      get uri
+
+      assert_equal last_response.status, 200, 'Request status failed'
+      assert last_response.body != 'File not found', 'Body content mismatched'
+    end
+  end
+
+  def test_content
+    get '/'
+
+    assert_equal 200, last_response.status, 'Request status failed'
+    assert_equal last_response.body, TEST_LISTING.rstrip, 'Body content mismatched'
+  end
+end

data/test/template_test.rb

@@ -0,0 +1,36 @@
+require_relative 'test_helper'
+
+# Class for testing template rendering
+class TemplateTest < Minitest::Test
+  include Rack::Test::Methods
+
+  HAML_CONTENT = <<-BODY.strip_heredoc
+    <p>This is a haml sample</p>
+    <p>This is another paragraph sample</p>
+    <ul>
+      <li>First item</li>
+      <li>Second item</li>
+    </ul>
+    BODY
+
+  SLIM_CONTENT = '<p>This is a haml sample</p><p>This is another paragraph sample</p><ul><li>First item</li><li>Second item</li></ul>'
+
+  def app
+    Dir.chdir Pathname.new(__FILE__).dirname
+    Hstatic::App.new
+  end
+
+  def test_haml_rendering
+    get '/dummy_folder/sample.haml'
+
+    assert_equal 200, last_response.status, 'Request status failed'
+    assert_equal last_response.body, HAML_CONTENT, 'Body content mismatched'
+  end
+
+  def test_slim_rendering
+    get '/dummy_folder/sample.slim'
+
+    assert_equal 200, last_response.status, 'Request status failed'
+    assert_equal last_response.body, SLIM_CONTENT, 'Body content mismatched'
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,12 @@
+require_relative '../lib/hstatic'
+
+require 'minitest/autorun'
+require 'rack/test'
+
+# Migrated activesuport String#strip_heredoc patching
+class String
+  def strip_heredoc
+    indent = scan(/^[ \t]*(?=\S)/).min.size || 0
+    gsub(/^[ \t]{#{indent}}/, '')
+  end
+end

data/views/index.slim

@@ -0,0 +1,76 @@
+/ UTF-8:
+
+doctype 5
+html
+  head
+    meta(name="viewport" content="width=device-width, initial-scale=1.0")
+
+    /! Bootstrap
+    link(href="/.res/bootstrap.min.css" rel="stylesheet")
+    link(href="/.res/style.css" rel="stylesheet")
+    script(src="/.res/jquery-1.10.2.min.js" type="text/javascript")
+  body
+    div.container-fluid
+      div.row
+        div.col-md-4.col-md-offset-4
+          input.form-control(type="text" placeholder="Search" autofocus)
+      div.row
+        div.col-lg-3.col-md-3.col-sm-3
+          div.panel.panel-default
+            div.panel-heading
+              | Folders
+              a.pull-right(href="#{@parent}")
+                span.glyphicon.glyphicon-arrow-up
+                | Up
+            div.list-group
+              - @folders.each do |folder|
+                a.list-group-item.folder(href="#{folder[:href]}" title="#{folder[:name]}") #{folder[:name]}
+
+        div.col-lg-9.col-md-9.col-sm-9
+          div.panel.panel-default
+            div.panel-heading Files
+            table.table.table-hover
+              thead
+                tr
+                  th #
+                  th Name
+                  th Size
+              tbody
+                - i = 1
+                - @files.each do |file|
+                  tr
+                    td= i
+                    td
+                      a(href="#{file[:href]}") #{file[:name]}
+                    td= file[:size]
+                    - i += 1
+
+    javascript:
+      $(document).ready(function () {
+        var re = new RegExp;
+        /!* filtering */
+        $('input').on('input', function () {
+          value = $(this).val();
+          $('a.list-group-item, tr:has(a)').show();
+          if (value == "") {
+            return false;
+          }
+          re.compile(value, "i");
+          $.each($('a.list-group-item'), function(i, e){
+            if (! re.test(e.innerHTML)) {
+              $(e).hide();
+            }
+          });
+          $.each($('tr:has(a)'), function(i, e){
+            if (! re.test($('a', e).html())) {
+              $(e).hide();
+            }
+          });
+        });
+        $('input').on('keyup', function (event) {
+          if (event.which == 27) {
+            $('input').val("");
+            $('input').trigger('input');
+          }
+        });
+      });

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hstatic
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Erick Pérez Castellanos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  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: guard
+  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: guard-minitest
+  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: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -92,7 +134,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -109,7 +153,14 @@ files:
 - res/glyphicons-halflings-regular.woff
 - res/jquery-1.10.2.min.js
 - res/style.css
-- views/index.haml
+- test/dummy_folder/index.html
+- test/dummy_folder/sample.haml
+- test/dummy_folder/sample.slim
+- test/index_test.rb
+- test/listing_test.rb
+- test/template_test.rb
+- test/test_helper.rb
+- views/index.slim
 homepage: https://github.com/erick2red/hstatic
 licenses:
 - MIT
@@ -130,9 +181,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An HTTP server for you static files
-test_files: []
+test_files:
+- test/dummy_folder/index.html
+- test/dummy_folder/sample.haml
+- test/dummy_folder/sample.slim
+- test/index_test.rb
+- test/listing_test.rb
+- test/template_test.rb
+- test/test_helper.rb
 has_rdoc: 

data/views/index.haml

@@ -1,78 +0,0 @@
--# UTF-8:
-
-!!! 5
-%html
-  %head
-    %meta(name="viewport" content="width=device-width, initial-scale=1.0")
-
-    / Bootstrap
-    %link(href="/.res/bootstrap.min.css" rel="stylesheet")
-    %link(href="/.res/style.css" rel="stylesheet")
-    %script(src="/.res/jquery-1.10.2.min.js" type="text/javascript")
-  %body
-    %div.container-fluid
-      %div.row
-        %div.col-md-4.col-md-offset-4
-          %input.form-control(type="text" placeholder="Search" autofocus)
-      %div.row
-        %div.col-lg-3.col-md-3.col-sm-3
-          %div.panel.panel-default
-            %div.panel-heading
-              Folders
-              %a.pull-right(href="#{@parent}")
-                %span.glyphicon.glyphicon-arrow-up
-                Up
-            %div.list-group
-              - @folders.each do |folder|
-                %a.list-group-item(href="#{folder[:href]}") #{folder[:name]}
-
-        %div.col-lg-9.col-md-9.col-sm-9
-          %div.panel.panel-default
-            %div.panel-heading Files
-            %table.table.table-hover
-              %thead
-                %tr
-                  %th #
-                  %th Name
-                  %th Size
-              %tbody
-                - i = 1
-                - @files.each do |file|
-                  %tr
-                    %td= i
-                    %td
-                      %a(href="#{file[:href]}") #{file[:name]}
-                    %td= file[:size]
-                    - i += 1
-
-    :javascript
-      $(document).ready(function () {
-        var re = new RegExp;
-        /* filtering */
-        $('input').on('input', function () {
-          value = $(this).val();
-          $('a.list-group-item, tr:has(a)').show();
-          if (value == "") {
-            return false;
-          }
-          re.compile(value, "i");
-          $.each($('a.list-group-item'), function(i, e){
-            if (! re.test(e.innerHTML)) {
-              $(e).hide();
-            }
-          });
-          $.each($('tr:has(a)'), function(i, e){
-            if (! re.test($('a', e).html())) {
-              $(e).hide();
-            }
-          });
-        });
-        $('input').on('keyup', function (event) {
-          if (event.which == 27) {
-            $('input').val("");
-            $('input').trigger('input');
-          }
-        });
-      });
-
-