hstatic 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e28fdd5d6b5c06be5827ca9461872b7fe74084f
-  data.tar.gz: e6442cf81ae3b0e4e087fb07e90db5a4307e7e95
+  metadata.gz: a87fb753e036fc90718781e2343ef78d7b043b89
+  data.tar.gz: 6e04b8a734f59391e3326ddd1ee9dc72bdbf0008
 SHA512:
-  metadata.gz: 16c706e8a492bed4f38ee61cd46c2f41b50396b4120f49c6e5d2358db86c76bf015fb6877545dffc67c7e95c896d6a4f76c1f0b64e0b2dfbce2b90a1366208bd
-  data.tar.gz: e4d9804bbd53e14414f6dd52f0a8e0007362581af10ffa419bbaf2b9b05001dfc596b63d5aa9b3fd58223bfee7771b7a162f074221f0ea43d58da2e8e5e6e365
+  metadata.gz: b0eeeaa9c35cda041f39a29fd07a0efdf1473370ab3970bf011f97461b9547809608f31a5742a79b34af9fbf753112670f0c207773ccb818156154db3aaa2f46
+  data.tar.gz: 80c515b13c7f5d6e01bc780e956db067a89fe8135768c09e2bde29fbb007e3626b28eab4ca63ce20d85cd7133d7e49f99164d4c3625c326a320e20864840395a

data/bin/hstatic

@@ -2,4 +2,4 @@
 
 require_relative '../lib/hstatic'
 
-Hstatic::App.launch ARGV
+Hstatic::App.launch ARGV

data/lib/hstatic/app.rb

@@ -1,10 +1,15 @@
 require 'sinatra/base'
-require "haml"
-require "slim"
+require 'haml'
+require 'slim'
 
+# Main gem namespace
 module Hstatic
   BASEDIR = File.join(File.dirname(__FILE__), '..', '..')
 
+  # Main Sinatra Application
+  #
+  # It handles the publishing index pages and instantiation of
+  # templates files
   class App < Sinatra::Base
     configure do
       set :views, File.join(BASEDIR, 'views')
@@ -16,11 +21,11 @@ module Hstatic
       def dynamic_size(size)
         case
         when size > 2**40
-          sprintf("%5.2f", size / 2**40) << ' GB'
+          sprintf('%5.2f', size / 2**40) << ' GB'
         when (size / 2**20) > 0.1
-          sprintf("%5.2f", size / 2**20) << ' MB'
+          sprintf('%5.2f', size / 2**20) << ' MB'
         else
-          sprintf("%5.2f", size / 2**10) << ' kB'
+          sprintf('%5.2f', size / 2**10) << ' kB'
         end
       end
     end
@@ -28,20 +33,18 @@ module Hstatic
     # Finally every Tilt supported template is rendered
     helpers do
       def render_file(path)
-        begin
-          if template = Tilt[path]
-            ext, _ =  Tilt.mappings.find { |k, v| v.include? template }
+        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
 
-            method.call(basename, { :views => File.dirname(path) })
-          else
-            raise Exception.new "No template found for #{path}"
+            return method.call basename, :views => File.dirname(path)
           end
-        rescue Exception => e
-          logger.info e.message
-          send_file path
         end
+
+        send_file path
       end
     end
 
@@ -85,9 +88,9 @@ module Hstatic
         @parent = File.dirname(request.path_info)
 
         Dir.foreach(path) do |entry|
-          next if entry == "." || entry == ".."
+          next if entry == '.' || entry == '..'
 
-          url_base = File.join("/", request.path_info)
+          url_base = File.join('/', request.path_info)
           link = File.join(url_base, entry)
           filename = File.expand_path(File.join(path, entry))
 
@@ -103,7 +106,7 @@ module Hstatic
         # Render view
         haml :index
       else
-        [404, "File not found"]
+        [404, 'File not found']
       end
     end
   end

data/lib/hstatic/version.rb

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

data/lib/hstatic.rb

@@ -1,53 +1,55 @@
-require "hstatic/version"
-require "hstatic/app"
+require 'hstatic/version'
+require 'hstatic/app'
 
 require 'yaml/store'
 
+# Main gem namespace
 module Hstatic
+  #
+  # Main Sinatra Application
+  #
+  # Added launch class method for handling settings and execution details
   class App
     def self.launch(argv)
       if argv.any?
         require 'optparse'
-        OptionParser.new { |op|
-          op.on("-o host",
-                "specify host (default is localhost)") { |val| set :bind, val }
+        OptionParser.new do |op|
+          op.on('-o host',
+                'specify host (default is localhost)') { |val| set :bind, val }
 
-          op.on("-p port",   "--port port",
-                "set the port (default is 4567)") do |val|
+          op.on('-p port',   '--port port',
+                'set the port (default is 4567)') do |val|
             @port_set = true
             set :port, Integer(val)
           end
 
-          op.on("-s server",
-                "specify rack server/handler (default is thin)") { |val| set :server, val }
+          op.on('-s server',
+                'specify server (default is thin)') { |val| set :server, val }
 
-          op.on("-x",
-                "turn on the mutex lock (default is off)")       {       set :lock, true }
+          op.on('-x',
+                'turn on the mutex lock (default is off)') { set :lock, true }
 
-          op.on("-v",        "--version",   "show version") do
+          op.on('-v', '--version', 'show version') do
             puts "hstatic tool: v#{VERSION}"
             exit
           end
-        }.parse!(ARGV.dup)
+        end.parse!(ARGV.dup)
       end
 
-      launches_file = File.join ENV['HOME'], ".cache/hstatic_launches"
+      launches_file = File.join ENV['HOME'], '.cache/hstatic_launches'
       @launches = Psych::Store.new launches_file, true
       @launches.transaction do
-        unless @port_set
-          set :port, @launches[Dir.pwd] || 4567
-        end
-
+        set :port, @launches[Dir.pwd] || 4567 unless @port_set
         @launches[Dir.pwd] = settings.port
       end
 
       # Processing path and port
-      pid_file = File.join(Dir.tmpdir, "hstatic.pid")
-      File.open(pid_file, File::CREAT|File::APPEND|File::RDWR) do |f|
+      pid_file = File.join(Dir.tmpdir, 'hstatic.pid')
+      File.open(pid_file, File::CREAT | File::APPEND | File::RDWR) do |f|
         f.readlines.each do |line|
-          instances = line.strip.split(":")
+          instances = line.strip.split(':')
           if instances[1] == settings.port.to_s
-            puts "hstatic instance running already on the same port. Bailing out"
+            puts 'hstatic instance running already on the same port. Exiting'
             exit
           end
         end
@@ -60,12 +62,12 @@ module Hstatic
       if File.exists? pid_file
         instances = File.open(pid_file, File::RDONLY) do |f|
           f.readlines.map do |line|
-            pair = line.strip.split(":")
+            pair = line.strip.split(':')
             pair unless pair[0] == Dir.pwd && pair[1] == settings.port.to_s
           end.compact
         end
 
-        File.open(pid_file, File::WRONLY|File::TRUNC) do |f|
+        File.open(pid_file, File::WRONLY | File::TRUNC) do |f|
           instances.each do |pair|
             f.write "#{pair[0]}:#{pair[1]}\n"
           end
@@ -73,7 +75,6 @@ module Hstatic
 
         File.unlink pid_file unless instances.length > 0
       end
-
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hstatic
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Erick Pérez Castellanos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler