httpit 0.3.4 → 0.4

data/.gitignore

@@ -0,0 +1 @@
+.sass-cache/

data/README.md

@@ -4,16 +4,20 @@ Build on sinatra, useful for developing JS applications and doing "psd => xhtml"
 
 ## Usage
 
-    $ sudo gem install httpit
-    $ cd /folder/for/server
-    $ httpit
-    # or you can set port
-    $ httpit <port number>
+```bash
+gem install httpit
+cd /folder/for/server
+httpit
+# or you can set port
+httpit 9081
+```
 
 ## Features
 
 * Haml support
-* Sass support
+* Sass support 
 * MarkDown support
 
+To complile `sass` file make request for `style.sass.css`
+
 See example

data/bin/httpit

@@ -4,11 +4,29 @@ require 'rubygems'
 require 'sinatra'
 require 'haml'
 require 'redcloth'
+require "pathname"
 
-ROOT = Dir.pwd
+GEM_ROOT = Pathname.new(__FILE__).dirname.join("..").expand_path
+
+require GEM_ROOT + "lib/search"
+
+ROOT = Pathname.pwd
+
+# this hack allow 
+# /some/folder/with/content + /subfolder => /some/folder/with/content/subfolder
+
+class <<ROOT
+  def join(*args)
+    super *args.map{|a| a.is_a?(String) && a[0] == ?/ ? a[1 .. a.size] : a }
+  end
+
+  def +(a)
+    super(a.is_a?(String) && a[0] == ?/ ? a[1 .. a.size] : a)
+  end
+end
 
 set :views, ROOT
-set :public,   ROOT
+set :public_folder, ROOT
 set :app_file, $0
 
 set :static, false
@@ -20,41 +38,54 @@ end
 
 
 # build array of contents and theris type for specified folder
-def get_content folder = nil
-  # building absolute path
-  abs_path = folder ? File.join(ROOT, folder) : ROOT
+def get_content(folder = nil, sort = nil)
+  abs_path = folder ? ROOT + folder : ROOT
   
-  # build array if pairs: [filename, :type]
-  Dir.entries(abs_path).map do |obj|
+  # build array if pairs: [filename, :type, is_textfile]
+  sorter = case sort
+    when 'name' then '| sort -f'
+    when 'ctime' then '-c'
+    when 'mtime' then '--sort=time'
+    when 'size' then '--sort=size'
+    else ''
+  end
+  
+  `cd "#{abs_path.to_s.gsub(?", '\"')}" && ls -A #{sorter}`.split("\n").map do |obj|
+    file_path = abs_path + obj
     [obj, 
-      if File.file? File.join(abs_path, obj)
-        :file
-      elsif File.directory? File.join(abs_path, obj)
-        :dir
-      elsif File.symlink? File.join(abs_path, obj)
-        :link
-      end
+      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)
     ]
   end
 end
 
+def view(tpl)
+  (Pathname.new(__FILE__).dirname + "../views/#{tpl}.haml").read
+end
+
+include Search
+
 # shows index.html or folder contents if index.html does not exists
 get '/' do 
   if File.file?('./index.html')
     File.open('./index.html') {|f| f.read }
   elsif File.file?('./index.haml')
-    haml :index
+    haml view(:index)
   else
     @path = ''
-    @files = get_content.select {|f| f[0] != '.' && f[0] != '..' }
-    haml :listing
+    @files = get_content(nil, params[:sort]).select {|f| f[0] != '.' && f[0] != '..' }
+    haml view(:listing)
   end
 end
 
 get '/__img_preview' do
-  params[:file] = params[:file].gsub ' ', '\ '
+  params[:file] = params[:file].gsub(' ', '\ ')
   tmppath = "/tmp/httpit_preview_#{Time.now.to_i}.jpeg"
-  `convert #{File.join ROOT, params[:file]} -resize 1024 -quality 100% #{tmppath}`
+  `convert #{ROOT + params[:file]} -resize 1024 -quality 100% #{tmppath}`
   content_type "image/jpeg"
   content = File.open(tmppath, 'rb') { |f| f.read }
   File.delete(tmppath)
@@ -64,21 +95,21 @@ end
 # shows folder contents
 get %r{.+} do
   return nil if request.path == '/favicon.ico'
-  @path = request.path
+  @path = URI.unescape(request.path)
   
-  abs_path = File.join(ROOT, @path)
+  abs_path = ROOT + @path
   
   if @path =~ /.+\.sass\.css/
+    return halt(404) unless File.file?(abs_path.to_s.chomp('.css'))
     content_type :css
     sass @path.chomp('.sass.css').to_sym
     
-  elsif !File.file?(abs_path) && !File.directory?(abs_path)
+  elsif !abs_path.file? && !abs_path.directory?
     halt 404
 
   elsif @path =~ /.+\.md/
     content_type :html
-    content = File.open(abs_path) {|f| f.read }
-    return RedCloth.new(content).to_html
+    return RedCloth.new(abs_path.read).to_html
     
   elsif @path =~ /.+\.haml/
     haml @path.chomp('.haml').to_sym
@@ -87,66 +118,12 @@ get %r{.+} do
     send_file(abs_path)
     
   else
-    @files = get_content(@path)
-    haml :listing
+    @files = get_content(@path, params[:sort])
+    haml view(:listing)
   end
 end
 
 error 404 do
   @path = request.path
-  haml :not_found
-end
-
-__END__
-
-@@ listing
-<style type="text/css">
-:sass
-  #wrap
-    :width 800px
-    :margin 50 auto
-
-  span
-    :color #777
-      
-  ul, li
-    :list-style-type none
-    
-  .preview_link
-    :color #55a075
-    :margin-left 20px
-</style>
-#wrap
-  = @path
-  %h1
-    %span Folder: 
-    = @path == '' ? '/' : @path
-    - if @path != ''
-      %a{:href => "#{@path}/.."} &larr;
-
-  %ul
-    - for file in @files
-      %li
-        - if file[1] == :file
-          %span= "&ndash;"
-        - elsif file[1] == :dir
-          %span= "+"
-        - elsif file[1] == :link
-          %span= "&rarr;"
-          
-        %a{:href => "#{@path}/#{file[0]}"}= file[0]
-        
-        - if %w{.jpg .jpeg .png .gif}.include?(File.extname(file[0]).downcase)
-          %a{:href => "/__img_preview?file=#{@path}/#{file[0]}", :class => "preview_link"} #1024
-
-@@ not_found
-<style type="text/css">
-:sass
-  #wrap
-    :width 800px
-    :margin 50 auto
-</style>
-#wrap
-  %h1 File not found
-  
-  %h3= "You requested <i>#{@path}</i>"
+  haml view(:not_found)
+end

data/example/index.haml

@@ -5,7 +5,7 @@
     
     %title HttpIt !!!
     
-    %link{ :rel => "stylesheet", :type => "text/css", :href => "/main.sass.css" }
+    %link{ :rel => "stylesheet", :type => "text/css", :href => "main.sass.css" }
     
   %body
     #wrap
@@ -20,10 +20,10 @@
           $ httpit <port number>
 
       %p
-        %a{ :href => "/images/bird.jpg" } Static file
+        %a{ :href => "images/bird.jpg" } Static file
       
       %p
-        %a{ :href => "/readme.md" } MarkDown example
+        %a{ :href => "readme.md" } MarkDown example
         
       %p
-        %a{ :href => "/images" } Gallery folder
+        %a{ :href => "images" } Gallery folder

data/example/readme.md

@@ -6,4 +6,4 @@ h2. Heading 2 gets more specific
 
 Now we're getting into the details.
 
-!/images/bird.jpg(This page is valid HTML)!
+!images/bird.jpg(This page is valid HTML)!

data/httpit.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "httpit"
-  s.version           = "0.3.4"
+  s.version           = "0.4"
   s.summary           = "Web server for static files"
   s.description       = "Just go to folder and run `httpit`"
   s.author            = "Pavel Evstigneev"
@@ -9,25 +9,10 @@ Gem::Specification.new do |s|
   s.has_rdoc          = false
   s.executables       = ["httpit"]
   s.rubyforge_project = "httpit"
-  s.files             = [ "bin/httpit", "README.md", "httpit.gemspec", "lib", "example", "example/index.haml", "example/main.sass", "example/readme.md", "example/images/bird.jpg"]
+  s.files             = `git ls-files`.split("\n")
   
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sinatra>, [">= 1.0"])
-      s.add_runtime_dependency(%q<haml>, [">= 3.0.10"])
-      s.add_runtime_dependency(%q<RedCloth>, [">= 4.2.3"])
-      
-    else
-      s.add_dependency(%q<sinatra>, [">= 1.0"])
-      s.add_dependency(%q<haml>, [">= 3.0.10"])
-      s.add_dependency(%q<RedCloth>, [">= 4.2.3"])
-    end
-  else
-    s.add_dependency(%q<sinatra>, [">= 1.0"])
-    s.add_dependency(%q<haml>, [">= 3.0.10"])
-    s.add_dependency(%q<RedCloth>, [">= 4.2.3"])
-  end
+  s.add_runtime_dependency 'sinatra', ">= 1.0"
+  s.add_runtime_dependency 'haml', '>= 3.0.10'
+  s.add_runtime_dependency 'RedCloth', ">= 4.2.3"
+  s.add_runtime_dependency 'rufus-tokyo', ">= 1.0.7"
 end

data/lib/search.rb

@@ -0,0 +1,34 @@
+module Search
+  def engine=(value)
+    @engine = value
+  end
+  
+  def engine; @engine; end
+  
+  def self.included(base)
+    base.class_eval do
+      Search.engine = Search::Find #Dystopia
+      
+      get '/__search' do
+        @path = ROOT + params[:path].to_s
+        s_time = Time.now.to_f
+        @found = Search.engine.find_in_folder(ROOT, @path, params[:q])
+        @total_time = Time.now.to_f - s_time
+        
+        haml view(:search)
+      end
+      
+      get '/__view' do
+        if !`file "#{ROOT.join(params[:file])}"`.index('text')
+          redirect params[:file]
+          return
+        end
+        @content = ROOT.join(params[:file]).read
+        haml view(:view)
+      end
+    end
+  end
+end
+
+require GEM_ROOT + "lib/search/find"
+require GEM_ROOT + "lib/search/dystopia"

data/lib/search/dystopia.rb

@@ -0,0 +1,65 @@
+# coding: utf-8
+
+require 'rufus/tokyo/dystopia'
+require 'digest'
+
+=begin
+  A B : searches for records including the two tokens.
+  A && B : searches for records including the two tokens.
+  A || B : searches for records including the one or both of the two tokens.
+  "A B..." : searches for records including the phrase.
+  [[A]] : searches for records including words exactly matching the token.
+  [[A*]] : searches for records including words beginning with the token.
+  [[*A]] : searches for records including words ending with the token.
+  [[[[A : searches for records beginning with the token.
+  A]]]] : searches for records ending with the token.
+  Note that the priority of "||" is higher than the one of "&&".
+=end
+
+module Search::Dystopia
+  extend self
+  
+  CMD = "find . -type d \\( -name '*.git*' \\) -prune -o -print"
+  
+  def find_in_folder(root, path, needle)
+    files = inst.search(needle).map do |id|
+      doc = inst.fetch(id)
+      doc[0, doc.index("\n")]
+    end
+    
+    if path != root
+      subdir = path.to_s.sub(root.to_s + '/', '')
+      files.select {|f| f[0, subdir.size] == subdir }.map {|f| f.sub(subdir + '/', '') }
+    else
+      files
+    end
+  end
+  
+  # return instance of searcher. and make indexing on first search
+  def inst
+    return @inst if @inst
+    db_file = "/tmp/httpit_index_#{Digest::MD5.hexdigest ROOT.to_s}"
+    @inst ||= Rufus::Tokyo::Dystopia::Core.new(db_file)
+    at_exit{ puts("removing #{db_file}"); `rm -r "#{db_file}"` }
+    index_dir()
+    @inst
+  end
+  
+  def index_dir()
+    files = `cd #{ROOT.to_s} && #{CMD}`.split("\n")
+    inst.clear
+    
+    puts "Indexing #{files.size} files"
+    files.each_with_index do |file, i|
+      next if file[0, 3] == './.'
+      
+      # if its a text file store its content
+      content = if `file "#{ROOT.join(file).to_s}"`.index('text')
+        (ROOT + file).read
+      else ""; end
+      inst.store(i, file.sub('./', '') + "\n" + content)
+    end
+    
+    inst
+  end
+end

data/lib/search/find.rb

@@ -0,0 +1,16 @@
+module Search::Find
+  extend self
+  CMD = "find . -type d \\( -name '*.git*' \\) -prune -o -exec file -F '&' {} \\; | grep text | cut -d\\& -f1 | sed 's/./\\\\&/g' | xargs -n 1 grep -i -l '###'"
+  CMD_LIST = "find . -type d \\( -name '*.git*' \\) -prune -o -print | grep -i '###'"
+  
+  def find_in_folder(root, path, needle)
+    in_filenames  = `cd #{path} && #{CMD_LIST.sub('###', needle)}`.split("\n")
+    in_text_files = `cd #{path} && #{CMD.sub('###', needle)}`.split("\n")
+    
+    (in_filenames + in_text_files.select {|f| !in_filenames.include?(f) }).map {|f| f.sub('./', '') }
+  end
+  
+  #def find_in_file(file, needle)
+  #  `cat #{file} | grep -n -B 1 -A 1 '#{needle}'`
+  #end
+end

data/views/listing.haml

@@ -0,0 +1,93 @@
+<style type="text/css">
+:sass
+  #wrap
+    :width 800px
+    :margin 30 auto 50px
+    
+  span
+    :color #777
+      
+  ul, li
+    :list-style-type none
+  
+  ul > header
+    :font-style italic
+    :margin-bottom 11px
+  
+  .preview_link
+    :color #55a075
+    :margin-left 20px
+    
+  input[type=search]
+    :width 300px
+  input[type=submit]
+    :display none
+  
+  = box-shadow($value)
+    :box-shadow $value
+    :-moz-box-shadow $value
+    :-webkit-box-shadow $value
+      
+  #files_search
+    > .results
+      :display none
+      :background #fff
+      +box-shadow(1px 1px 5px rgba(125, 125, 125, 0.7))
+      :width 620px
+      :position relative
+      :top 7px
+      :padding 5px 15px
+      em
+        :background-color yellow
+      ul
+        :padding 0
+        :margin 0
+        li
+          :margin 3px 0
+          :font-size 13px
+          &:hover
+            :background-color #def
+    &.loading
+      > .results
+        :display block
+</style>
+
+#wrap
+  .search
+    %form#files_search{:action => "/__search"}
+      %input{:type => "hidden", :name => "path", :value => @path}
+      %input{:type => "search", :placeholder => "Search...", :name => 'q', :value => params[:q]}
+      %input{:type => "submit"}
+      .results Finding...
+      
+  %h1
+    %span Folder: 
+    = @path == '' ? '/' : @path
+    - if @path != ''
+      %a{:href => @path.gsub(%r{/[^/]+/?$}, '') + '/'} &larr;
+  
+
+  %ul
+    %header
+      Sort
+      %select.sorting
+        - for key in %w{name size ctime mtime}
+          %option{params[:sort] == key ? {:selected => "selected"} : {}}= key
+      
+    - for file in @files
+      %li
+        - if file[1] == :file
+          %span= "&ndash;"
+        - elsif file[1] == :dir
+          %span= "+"
+        - elsif file[1] == :link
+          %span= "&rarr;"
+          
+        %a{:href => "#{@path}/#{file[0]}"}= file[0]
+        
+        - if %w{.jpg .jpeg .png .gif}.include?(File.extname(file[0]).downcase)
+          %a{:href => "/__img_preview?file=#{@path}/#{file[0]}", :class => "preview_link"} #1024
+        - if file[2]
+          %a{:href => "/__view?file=#{@path}/#{file[0]}", :class => "preview_link"} view
+
+%script{:type => "text/javascript"}= GEM_ROOT.join('views/search.js').read

data/views/not_found.haml

@@ -0,0 +1,11 @@
+<style type="text/css">
+:sass
+  #wrap
+    :width 800px
+    :margin 50 auto
+</style>
+
+#wrap
+  %h1 File not found
+  
+  %h3= "You requested <i>#{@path}</i>"

data/views/search.haml

@@ -0,0 +1,12 @@
+%ul
+  - for file in @found
+    %li<>
+      - if @path.join(file).file?
+        %a{:href => "/__view?file=#{File.join(params[:path], file)}" }= file.gsub(/#{params[:q]}/i) {|m| "<em>#{m}</em>" }
+      - else
+        %a{:href => File.join(params[:path], file)}= file.gsub(/#{params[:q]}/i) {|m| "<em>#{m}</em>" }
+
+- if @found.size == 0
+  %i Nothing
+
+%footer= "Complete in #{"%4.3fs" % @total_time}"

data/views/search.js

@@ -0,0 +1,59 @@
+Xhr = function (url, data, callback) {
+  var xhr = new XMLHttpRequest();
+  
+  xhr.open("GET", url + '?' + data, true);
+
+  xhr.onreadystatechange = function() {
+    if (xhr.readyState == 4 && xhr.status == 200) {
+      callback(xhr.responseText);
+    }
+  };
+  
+  xhr.send();
+};
+
+// get forms data for xhr request
+Xhr.formData = function (form) {
+  var results = [];
+  var elements = form.querySelectorAll('input, select, textarea');
+  
+  for(k in elements)
+    if (elements.hasOwnProperty(k) && elements[k].name)
+      results.push(elements[k].name + '=' + encodeURIComponent(elements[k].value))
+  
+  return results.join('&')
+};
+
+function $ (selector) {
+  return document.querySelector(selector);
+};
+
+function $$ (selector) {
+  return document.querySelectorAll(selector);
+};
+
+$('#files_search').addEventListener('submit', function (e) {
+  var form = e.target;
+  e.preventDefault();
+  
+  form.querySelector('.results').innerHTML = 'Finding...';
+  form.className = 'loading';
+  
+  new Xhr(form.action, Xhr.formData(form), function(data) {
+    form.querySelector('.results').innerHTML = data;
+  });
+}, true);
+
+// hide results when erase search field
+function hideResults (e) {
+  if (e.target.value == '') $('#files_search').className = '';
+}
+$('input[type=search]').addEventListener('change', hideResults, false);
+$('input[type=search]').addEventListener('keyup', hideResults, false);
+$('input[type=search]').addEventListener('click', hideResults, false);
+
+$('.sorting').addEventListener('change', function(e) {
+  var clean_path = (window.location + '').replace(/(\?|&)sort=[^=]*/, '');
+  clean_path += (clean_path.indexOf('?') == -1 ? '?' : '&') + 'sort=' + e.target.value
+  window.location = clean_path;
+}, false);

data/views/view.haml

@@ -0,0 +1,25 @@
+<style type="text/css">
+:sass
+  #wrap
+    :width 800px
+    :margin 50 auto
+    span
+      :color #777
+    textarea
+      :width 785px
+      :min-height 500px
+      :padding 5px 7px
+      :font
+        :family monospace, Monaco
+        :size 12px
+      :border 1px solid #ccc
+      :color #333
+</style>
+
+#wrap
+  %h1
+    %span
+      %a{:href => params[:file], :target => "_blank"} File:
+    = params[:file]
+    %a{:href => params[:file].gsub(%r{/[^/]+/?$}, '') + '/'} &larr;
+  %textarea= @content

metadata

@@ -1,119 +1,105 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: httpit
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 4
-  version: 0.3.4
+version: !ruby/object:Gem::Version
+  version: '0.4'
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Pavel Evstigneev
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-11-27 00:00:00 +03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2154284220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: haml
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2154284220
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &2154283620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 0
-        - 10
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.10
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: RedCloth
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2154283620
+- !ruby/object:Gem::Dependency
+  name: RedCloth
+  requirement: &2154282700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 4
-        - 2
-        - 3
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 4.2.3
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *2154282700
+- !ruby/object:Gem::Dependency
+  name: rufus-tokyo
+  requirement: &2154282220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.7
+  type: :runtime
+  prerelease: false
+  version_requirements: *2154282220
 description: Just go to folder and run `httpit`
 email: pavel.evst@gmail.com
-executables: 
+executables:
 - httpit
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- bin/httpit
+files:
+- .gitignore
 - README.md
-- httpit.gemspec
+- bin/httpit
+- example/images/bird.jpg
 - example/index.haml
 - example/main.sass
 - example/readme.md
-- example/images/bird.jpg
-has_rdoc: true
+- httpit.gemspec
+- lib/search.rb
+- lib/search/dystopia.rb
+- lib/search/find.rb
+- views/listing.haml
+- views/not_found.haml
+- views/search.haml
+- views/search.js
+- views/view.haml
 homepage: http://github.com/Paxa/httpit
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: httpit
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Web server for static files
 test_files: []
-