httpit 0.4.6 → 0.4.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 98c43fc1129be5731066b38bb0fe2f30dd0b1a67
+  data.tar.gz: fc6cf57c5eec0b74e4e294900fcaa31ad23adfe6
+SHA512:
+  metadata.gz: 75a9b1f86921ca2dce0394b4b3990e51541c42659de70ad5cffcf664d6e20c0cae9c51451d5de754b6d15dfa675156d17f77f6c1e5a641af6a7174748753bc57
+  data.tar.gz: 0040ad430f5f5adf7d331326c35031014e1dcfefb888df53cf9c51f1903941063c269a7824832cc14fed1e8af388bd57aa6c635a5f5a0bac39385d6a80e89007

data/README.md

@@ -12,6 +12,8 @@ httpit
 httpit 9081
 ```
 
+![screen shot 2013-12-25 at 10 39 44 am](https://f.cloud.github.com/assets/26019/1807805/598cf174-6d16-11e3-9553-494ff5a8f337.png)
+
 ## Features
 
 * Haml support

data/bin/httpit

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
+
 require "rubygems"
 
 require "fileutils"
 require "pathname"
+require 'shellwords'
 
 GEM_ROOT = Pathname.new(__FILE__).dirname.join("..").expand_path
 ENV['BUNDLE_GEMFILE'] ||= GEM_ROOT.join("Gemfile").to_s
@@ -11,6 +13,7 @@ require "bundler/setup"
 require 'sinatra/base'
 require 'haml'
 require 'sass'
+require 'sass/plugin'
 require 'redcloth'
 
 ROOT = Pathname.pwd
@@ -18,6 +21,13 @@ ROOT = Pathname.pwd
 TMP_DIR = File.expand_path("#{Dir.tmpdir}/#{Time.now.to_i}#{rand(1000)}/")
 FileUtils.mkdir_p(TMP_DIR)
 
+class Tilt::SassTemplate
+  alias_method :sass_options_original, :sass_options
+  def sass_options
+    sass_options_original.merge(:cache_location => File.join(TMP_DIR, 'sass-cache'))
+  end
+end
+
 # this hack allow 
 # /some/folder/with/content + /subfolder => /some/folder/with/content/subfolder
 class << ROOT
@@ -40,7 +50,7 @@ class HttpIt < Sinatra::Base
   set :public_folder, ROOT
   set :app_file, $0
   set :static, false
-  set :sass, :cache => true, :cache_location => File.join(TMP_DIR, 'sass-cache')
+  set :sass, :cache => false, :cache_location => File.join(TMP_DIR, 'sass-cache')
 
   helpers do
     def with_layout(template, &block)
@@ -52,12 +62,18 @@ class HttpIt < Sinatra::Base
       end
     end
 
-    def file_url(path, file)
+    def file_url(path, file, type = nil)
       path = "#{path}/#{file}"
-      path.split("/").map {|p| CGI::escape(p) }.join('/')
+      path.split("/").map {|p| CGI::escape(p) }.join('/') + (type == :dir ? '/' : '')
     end
   end
 
+  def list_files(path, sorter)
+    cmd = %{cd "#{path.to_s.shellescape}" && ls -A #{sorter}}
+    result = `#{cmd}`.force_encoding(Encoding::UTF_8)
+    result.split("\n")
+  end
+
   # build array of contents and theris type for specified folder
   def get_content(folder = nil, sort = nil)
     abs_path = folder ? ROOT + folder : ROOT
@@ -71,15 +87,15 @@ class HttpIt < Sinatra::Base
       else ''
     end
 
-    `cd "#{abs_path.to_s.gsub(?", '\"')}" && ls -A #{sorter}`.split("\n").map do |obj|
+    list_files(abs_path, sorter).map do |obj|
       file_path = abs_path + obj
       [obj,
         if file_path.file?;         :file
         elsif file_path.directory?; :dir
         elsif file_path.symlink?;   :link
         end,
-      
-        !!`file "#{file_path.to_s.gsub(?", '\"')}"`.sub(file_path.to_s, '').index(/text/i)
+        
+        !!`file "#{file_path.to_s.shellescape}"`.force_encoding(Encoding::UTF_8).sub(file_path.to_s, '').index(/text/i)
       ]
     end
   end
@@ -110,7 +126,7 @@ class HttpIt < Sinatra::Base
   end
 
   get '/__img_preview' do
-    params[:file] = params[:file].gsub(' ', '\ ')
+    params[:file] = params[:file].shellescape
     tmppath = "/tmp/httpit_preview_#{Time.now.to_i}.jpeg"
     `convert #{ROOT + params[:file]} -resize 1024 -quality 100% #{tmppath}`
     content_type "image/jpeg"
@@ -119,6 +135,20 @@ class HttpIt < Sinatra::Base
     content
   end
 
+  get '/__view' do
+    params[:file] = params[:file].shellescape.sub(/^.\//, '/')
+    begin
+      @content = File.open(ROOT + params[:file], 'r:utf-8', &:read)
+      haml view(:view)
+    rescue Errno::ENOENT => e
+      if e.message =~ /No such file or directory/
+        halt 404
+      else
+        raise e
+      end
+    end
+  end
+
   # shows folder contents
   get %r{.+} do
     return nil if request.path == '/favicon.ico'
@@ -160,7 +190,7 @@ class HttpIt < Sinatra::Base
   end
 
   error 404 do
-    @path = request.path
+    @path = params[:file] || request.path
     haml view(:not_found)
   end
 end

data/httpit.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "httpit"
-  s.version           = "0.4.6"
+  s.version           = "0.4.7"
   s.summary           = "Web server for static files"
   s.description       = "Just go to folder and run `httpit` to make it avaliable as web-server"
   s.author            = "Pavel Evstigneev"
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.has_rdoc          = false
   s.executables       = ["httpit"]
   s.rubyforge_project = "httpit"
-  s.files             = `git ls-files`.split("\n")
+  s.files             = File.read(__FILE__).match(/__#{'END'}__(.+)\z/m)[1].strip.split("\n")
   s.licenses          = ['MIT', 'GPL-2']
   
   s.add_runtime_dependency 'sinatra', "~> 1.4.2"
@@ -17,3 +17,24 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'RedCloth', "~> 4.2.9"
   s.add_runtime_dependency 'sass', "~> 3.2.8"
 end
+
+# git ls-files
+__END__
+.gitignore
+Gemfile
+Gemfile.lock
+LICENSE
+README.md
+bin/httpit
+example/images/bird.jpg
+example/index.haml
+example/main.sass
+example/readme.md
+example/testing_design/_header.haml
+example/testing_design/index.haml
+example/testing_design/layout.sass
+httpit.gemspec
+views/listing.haml
+views/not_found.haml
+views/utils.js
+views/view.haml

data/views/listing.haml

@@ -7,6 +7,11 @@
         :width 800px
         :margin 30 auto 50px
 
+      a
+        :color #1777E0
+        &:hover
+          :color #006db2
+
       span
         :color #777
 
@@ -52,11 +57,11 @@
             - elsif file[1] == :link
               %span= "→"
           
-            %a{:href => file_url(@path, file[0])}= file[0]
+            %a{:href => file_url(@path, file[0], file[1])}= file[0]
         
             - if %w{.jpg .jpeg .png .gif}.include?(File.extname(file[0]).downcase)
               %a{:href => "/__img_preview?file=#{file_url(@path, file[0])}", :class => "preview_link"} #1024
             - if file[2]
-              %a{:href => "/__view?file=#{file_url(@path, file[0])}", :class => "preview_link"} view
+              %a{:href => "/__view?file=.#{file_url(@path, file[0])}", :class => "preview_link"} view
 
     %script{:type => "text/javascript"}= GEM_ROOT.join('views/utils.js').read

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: httpit
 version: !ruby/object:Gem::Version
-  version: 0.4.6
-  prerelease: 
+  version: 0.4.7
 platform: ruby
 authors:
 - Pavel Evstigneev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-18 00:00:00.000000000 Z
+date: 2013-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,26 +95,26 @@ homepage: http://github.com/Paxa/httpit
 licenses:
 - MIT
 - GPL-2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: httpit
-rubygems_version: 1.8.25
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Web server for static files
 test_files: []
+has_rdoc: false