hstatic 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ceb2c67d46e93fb54834d25cf1e4faba3cb3bb1
-  data.tar.gz: 2c02f31626be0e0fca914a030a07316d6aafc23a
+  metadata.gz: 0c55ec459ec18553bde8c6c9e99d91882f700913
+  data.tar.gz: 8e903f7d8f4efb60dd57463485843c40f8afec48
 SHA512:
-  metadata.gz: 818f4124e1601f6364c6f31172b17ed7b08c2aa83a685d5cfbec5a20c9bb10ca6322bdedcceb37770b9fdd4e12d4c2a048688c393d6246907ec25b817bfe1497
-  data.tar.gz: 225992a148f120eee14e60a08ebafe331d49920b924696ec789ad06395e79c6da8559eecb52f06f122b7c1af760b438acd9dcafc0e57f60589cbd87ef5791431
+  metadata.gz: 925aeea96736edda8a6f3025fcbe974a60c687f1cac1c5dffb4fb9b22ea9b469369d0f863a41e60ab29aa93944693976d83f96c316ee272604dc25ae38c6bd8d
+  data.tar.gz: 30fa22b6d0addef3e5b52345bd215ac9254d6023b9736e5fc060b3acab900765e348db14c56ee53b0ddc6ecf714339e13e0674637e27d06a3e237463a92cc6f4

data/TODO

@@ -1,5 +1,7 @@
 ## The TO-DO list
 
+* Add proper testing
+* Add proper -v option to cli tool
 * Add minify capability on production environment
 * Add config file
 * Add virtual hosting

data/hstatic.gemspec

@@ -25,4 +25,5 @@ It features a nice directory listing and automatic publishing of your index.html
 
   spec.add_runtime_dependency "sinatra"
   spec.add_runtime_dependency "haml"
+  spec.add_runtime_dependency "slim"
 end

data/lib/hstatic/app.rb

@@ -1,5 +1,6 @@
 require 'sinatra/base'
-require 'haml'
+require "haml"
+require "slim"
 
 module Hstatic
   BASEDIR = File.join(File.dirname(__FILE__), '..', '..')
@@ -13,26 +14,30 @@ module Hstatic
     helpers do
       def dynamic_size(size)
         case
-        when size > Math.ldexp(1, 40)
-          sprintf("%5.2f", size / Math.ldexp(1, 40)) << ' GB'
-        when (size / Math.ldexp(1, 20)) > 0.1
-          sprintf("%5.2f", size / Math.ldexp(1, 20)).to_s << ' MB'
+        when size > 2**40
+          sprintf("%5.2f", size / 2**40) << ' GB'
+        when (size / 2**20) > 0.1
+          sprintf("%5.2f", size / 2**20).to_s << ' MB'
         else
-          sprintf("%5.2f", size / Math.ldexp(1, 10)).to_s << ' kB'
+          sprintf("%5.2f", size / 2**10).to_s << ' kB'
         end
       end
     end
 
-    # For now just render [:haml, :erb]
+    # Finally every Tilt supported template is rendered
     helpers do
       def render_file(path)
-        case File.extname(path)
-        when /haml$|erb$/
-          method = self.method(Regexp.last_match(0))
-          basename = File.basename(path, File.extname(path)).to_sym
+        begin
+          if template  = Tilt[path]
+            ext, _ =  Tilt.mappings.find { |k, v| v.include? template }
+            method = self.method(ext)
+            basename = File.basename(path, File.extname(path)).to_sym
 
-          method.call(basename, { :views => File.dirname(path) })
-        else
+            method.call(basename, { :views => File.dirname(path) })
+          else
+            raise Exception.new "No matching template"
+          end
+        rescue
           send_file path
         end
       end
@@ -96,7 +101,7 @@ module Hstatic
         # Render view
         haml :index
       else
-        'not found'
+        [404, "File not found"]
       end
     end
   end

data/lib/hstatic/version.rb

@@ -1,3 +1,3 @@
 module Hstatic
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,69 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: hstatic
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Erick Pérez Castellanos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-21 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !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: 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: 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: haml
   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: slim
+  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'
 description: |-
@@ -77,7 +91,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -106,12 +120,12 @@ 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: []
@@ -121,3 +135,4 @@ signing_key:
 specification_version: 4
 summary: An HTTP server for you static files
 test_files: []
+has_rdoc: