codestock 0.1.2 → 0.1.3

data/Rakefile

@@ -27,6 +27,7 @@ Jeweler::Tasks.new do |gem|
   gem.add_runtime_dependency 'rack','>=1.2.1'
   gem.add_runtime_dependency 'launchy', '>=0.3.7'
   gem.add_runtime_dependency 'coderay', '>=0.9.8'
+  gem.add_runtime_dependency 'thin', '>=1.2.10'
 
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   #  gem.add_development_dependency 'rspec', '> 1.2.3'

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/bin/cdweb

@@ -4,7 +4,7 @@
 #  Copyright (c) 2010. All rights reserved.
 
 require 'rubygems'
-require 'cdweb/cli_cdweb'
+require 'codestock/cdweb/cli_cdweb'
 
-Version = "0.1.0"
+Version = "0.1.3"
 CodeStock::CLI_Cdweb.execute(STDOUT, ARGV)

data/codestock.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{codestock}
-  s.version = "0.1.1"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ongaeshi"]
-  s.date = %q{2011-06-08}
+  s.date = %q{2011-07-20}
   s.description = %q{longer description of your gem}
   s.email = %q{ongaeshi0621@gmail.com}
   s.executables = ["cdweb", "cdv", "cdstk", "cdview"]
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
     ".document",
     "Gemfile",
     "Gemfile.lock",
+    "HISTORY.rdoc",
     "LICENSE.txt",
     "README.rdoc",
     "Rakefile",
@@ -30,7 +31,34 @@ Gem::Specification.new do |s|
     "bin/cdview",
     "bin/cdweb",
     "codestock.gemspec",
+    "lib/cdstk/cdstk.rb",
+    "lib/cdstk/cdstk_yaml.rb",
+    "lib/cdstk/cli_cdstk.rb",
+    "lib/cdview/cli_cdview.rb",
     "lib/codestock.rb",
+    "lib/codestock/cdweb/app.rb",
+    "lib/codestock/cdweb/cli_cdweb.rb",
+    "lib/codestock/cdweb/config.ru",
+    "lib/codestock/cdweb/lib/coderay_wrapper.rb",
+    "lib/codestock/cdweb/lib/command.rb",
+    "lib/codestock/cdweb/lib/database.rb",
+    "lib/codestock/cdweb/lib/grep.rb",
+    "lib/codestock/cdweb/lib/mkurl.rb",
+    "lib/codestock/cdweb/lib/query.rb",
+    "lib/codestock/cdweb/lib/search_contents.rb",
+    "lib/codestock/cdweb/lib/search_files.rb",
+    "lib/codestock/cdweb/public/css/coderay.css",
+    "lib/codestock/cdweb/public/css/gren.css",
+    "lib/codestock/cdweb/public/images/directory.png",
+    "lib/codestock/cdweb/public/images/file.png",
+    "lib/codestock/cdweb/public/images/gren-icon-mini.png",
+    "lib/codestock/cdweb/public/images/gren-icon.png",
+    "lib/codestock/cdweb/views/filelist.haml",
+    "lib/codestock/cdweb/views/help.haml",
+    "lib/codestock/cdweb/views/index.haml",
+    "lib/codestock/cdweb/views/layout.haml",
+    "lib/codestock/cdweb/views/search.haml",
+    "lib/codestock/cdweb/views/view.haml",
     "lib/common/dbdir.rb",
     "lib/common/display_util.rb",
     "lib/common/grenfiletest.rb",
@@ -40,15 +68,21 @@ Gem::Specification.new do |s|
     "lib/common/util.rb",
     "lib/findgrep/findgrep.rb",
     "lib/findgrep/result.rb",
+    "test/file_assert.rb",
     "test/file_test_utils.rb",
+    "test/rake_test_loader.rb",
     "test/runner.rb",
+    "test/test_bin_exec.rb",
+    "test/test_cdstk.rb",
+    "test/test_cdstk_yaml.rb",
+    "test/test_coderay_wrapper.rb",
+    "test/test_coderay_wrapper_data.rb",
+    "test/test_database.rb",
     "test/test_dbdir.rb",
     "test/test_gren_util.rb",
-    "test/test_grenweb_database.rb",
-    "test/test_grenweb_html_renderer.rb",
-    "test/test_grenweb_query.rb",
-    "test/test_grenweb_searcher.rb",
     "test/test_helper.rb",
+    "test/test_mkurl.rb",
+    "test/test_query.rb",
     "test/test_string_snip.rb"
   ]
   s.homepage = %q{http://github.com/ongaeshi/codestock}
@@ -57,15 +91,21 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{one-line summary of your gem}
   s.test_files = [
+    "test/file_assert.rb",
     "test/file_test_utils.rb",
+    "test/rake_test_loader.rb",
     "test/runner.rb",
+    "test/test_bin_exec.rb",
+    "test/test_cdstk.rb",
+    "test/test_cdstk_yaml.rb",
+    "test/test_coderay_wrapper.rb",
+    "test/test_coderay_wrapper_data.rb",
+    "test/test_database.rb",
     "test/test_dbdir.rb",
     "test/test_gren_util.rb",
-    "test/test_grenweb_database.rb",
-    "test/test_grenweb_html_renderer.rb",
-    "test/test_grenweb_query.rb",
-    "test/test_grenweb_searcher.rb",
     "test/test_helper.rb",
+    "test/test_mkurl.rb",
+    "test/test_query.rb",
     "test/test_string_snip.rb"
   ]
 
@@ -81,6 +121,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rroonga>, [">= 1.0.0"])
       s.add_runtime_dependency(%q<rack>, [">= 1.2.1"])
       s.add_runtime_dependency(%q<launchy>, [">= 0.3.7"])
+      s.add_runtime_dependency(%q<coderay>, [">= 0.9.8"])
+      s.add_runtime_dependency(%q<thin>, [">= 1.2.10"])
     else
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
@@ -89,6 +131,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rroonga>, [">= 1.0.0"])
       s.add_dependency(%q<rack>, [">= 1.2.1"])
       s.add_dependency(%q<launchy>, [">= 0.3.7"])
+      s.add_dependency(%q<coderay>, [">= 0.9.8"])
+      s.add_dependency(%q<thin>, [">= 1.2.10"])
     end
   else
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -98,6 +142,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rroonga>, [">= 1.0.0"])
     s.add_dependency(%q<rack>, [">= 1.2.1"])
     s.add_dependency(%q<launchy>, [">= 0.3.7"])
+    s.add_dependency(%q<coderay>, [">= 0.9.8"])
+    s.add_dependency(%q<thin>, [">= 1.2.10"])
   end
 end
 

data/lib/cdstk/cdstk.rb

@@ -10,6 +10,7 @@ require 'cdstk/cdstk_yaml'
 require 'common/grenfiletest'
 require 'common/util'
 include CodeStock
+require 'kconv'
 
 module CodeStock
   class Cdstk
@@ -240,7 +241,9 @@ module CodeStock
       # タイムスタンプが新しければデータベースに格納
       if (document[:timestamp] < values[:timestamp])
         # 実際に使うタイミングでファイルの内容を読み込み
-        values[:content] = open(filename).read
+        # values[:content] = open(filename).read
+        # データベース内の文字コードは'utf-8'で統一
+        values[:content] = File.read(filename).kconv(Kconv::UTF8)
         
         # データベースに格納
         values.each do |key, value|

data/lib/codestock/cdweb/app.rb

@@ -0,0 +1,136 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2011/06/25
+
+require 'rubygems'
+require 'sinatra'
+require 'haml'
+require 'sass'
+
+$LOAD_PATH.unshift '../..'
+require 'codestock/cdweb/lib/database'
+require 'codestock/cdweb/lib/command'
+require 'codestock/cdweb/lib/mkurl'
+
+set :haml, :format => :html5
+
+get '/' do
+  @version = '0.1.2'
+  @package_num = Database.instance.fileList('').size
+  @file_num = Database.instance.fileNum
+  haml :index
+end
+
+post '/home*' do |path|
+  path = path.sub(/^\//, "")
+
+  case params[:shead]
+  when 'all'
+    path = ""
+  when 'package'
+    path = path.split('/')[0]
+  end
+
+  redirect Mkurl.new("home/#{path}", params).inherit_query_shead
+end
+
+get '/home*' do |path|
+  before = Time.now
+  path = path.sub(/^\//, "")
+  record = Database.instance.record(path)
+
+  if (record)
+    view(record, params, before)
+  else
+    unless (params[:query])
+      filelist(path, params, before)
+    else
+      search(path, params, before)
+    end
+  end
+end
+
+get %r{/help} do
+  haml :help
+end
+
+# -- helper function --
+
+helpers do
+  # -- escape functions --
+  alias h escape_html
+  alias escape_url escape
+
+  def escape_path(src)
+    escape_url(src).gsub("%2F", '/')
+  end
+  
+  # -- utility -- 
+  def link(query)
+    "<a href='#{'/home?query=' + escape_url(query)}'>#{query}</a>"
+  end
+
+  def create_form(path, query, shead)
+    shead = shead || 'directory'
+    
+    # こっちにすると'検索'ボタンを押した時に新しくウィンドウが開く
+    # <form action='' target='_blank' method='post'>
+    <<EOF
+  <form action='' method='post'>
+    <p>
+      <input name='query' size='60' type='text' value='#{query}' />
+      <input type='submit' value='検索'><br></input>
+      #{create_radio('all', shead)}
+      <label>全体を検索</label>
+      #{create_radio('package', shead)}
+      <label> #{package_name(path)} 以下</label>
+      #{create_radio('directory', shead)}
+      <label> #{current_name(path)} 以下</label>
+    </p>
+  </form>
+EOF
+  end
+
+  def create_radio(value, shead)
+    str = (value == shead) ? 'checked' : ''
+    "<input name='shead' type='radio' value='#{value}' #{str}/>"
+  end
+
+  def create_headmenu(path, query)
+    # href = "#{request.path_info}?'#{request.query_string}"
+    # href = '/home/rack-1.3.0/lib/rack/handler/cgi.rb?shead=directory'
+    href = Mkurl.new('/home/' + path, params).inherit_query_shead
+    <<EOF
+    <a href="/home" class="headmenu">全てのパッケージ</a>
+    <a href="#{href}" class="headmenu" onclick="window.open('#{href}'); return false;">新しい検索</a>
+EOF
+  end
+
+  def topic_path(path, params)
+    href = '/home'
+    path.split('/').map {|v|
+      href += '/' + v
+      "<a href='#{Mkurl.new(href, params).inherit_shead}'>#{v}</a>"
+    }.join('/')
+  end
+
+  def package_name(path)
+    (path == "") ? 'root' : path.split('/')[0]
+  end
+
+  def current_name(path)
+    (path == "") ? 'root' : File.basename(path)
+  end
+
+  def path_title(path)
+    (path == "") ? "root" : path
+  end
+
+  def filelist_title(path)
+    (path == "") ? "Package List" : path
+  end
+end
+

data/lib/codestock/cdweb/cli_cdweb.rb

@@ -0,0 +1,84 @@
+# -*- coding: utf-8 -*-
+require 'rubygems'
+require 'rack'
+require 'launchy'
+require 'optparse'
+
+module Rack
+  class Server
+    def start
+      if options[:warn]
+        $-w = true
+      end
+
+      if includes = options[:include]
+        $LOAD_PATH.unshift(*includes)
+      end
+
+      if library = options[:require]
+        require library
+      end
+
+      if options[:debug]
+        $DEBUG = true
+        require 'pp'
+        p options[:server]
+        pp wrapped_app
+        pp app
+      end
+
+      # Touch the wrapped app, so that the config.ru is loaded before
+      # daemonization (i.e. before chdir, etc).
+      wrapped_app
+
+      daemonize_app if options[:daemonize]
+      write_pid if options[:pid]
+
+      trap(:INT) do
+        if server.respond_to?(:shutdown)
+          server.shutdown
+        else
+          exit
+        end
+      end
+
+      server.run wrapped_app, options do
+        if (options[:LaunchBrowser])
+          host = options[:Host] || options[:BindAddress] # options[:BindAddress] for WEBrick
+          Launchy.open("http://#{host}:#{options[:Port]}")
+        end
+      end
+    end
+  end
+end
+
+module CodeStock
+  class CLI_Cdweb
+    def self.execute(stdout, argv)
+      options = {
+        :environment => ENV['RACK_ENV'] || "development",
+        :pid         => nil,
+        :Port        => 9292,
+        :Host        => "0.0.0.0",
+        :AccessLog   => [],
+        :config      => "config.ru",
+        # ----------------------------
+        :server      => "thin",
+        :LaunchBrowser => true
+      }
+
+      opts = OptionParser.new("#{File.basename($0)}")
+      opts.on('--db DB_DIR', 'Database dir (default : ~/.codestock)') {|v| options[:DbDir] = v }
+      opts.on("-o", "--host HOST", "listen on HOST (default: 0.0.0.0)") {|host| options[:Host] = host }
+      opts.on('-p', '--port PORT', 'use PORT (default: 9292)') {|v| options[:Port] = v }
+      opts.on('-n', '--no-browser', 'No launch browser.') {|v| options[:LaunchBrowser] = false }
+      opts.parse!(argv)
+      
+      # サーバースクリプトのある場所へ移動
+      FileUtils.cd(File.dirname(__FILE__))
+
+      # Rackサーバー起動
+      Rack::Server.start(options)
+    end
+  end
+end

data/lib/codestock/cdweb/config.ru

@@ -0,0 +1,3 @@
+require './app'
+run Sinatra::Application
+

data/lib/codestock/cdweb/lib/coderay_wrapper.rb

@@ -0,0 +1,94 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2011/07/03
+
+require 'rubygems'
+require 'coderay'
+require 'coderay/helpers/file_type'
+
+module CodeStock
+  class CodeRayWrapper
+    attr_reader :line_number_start
+    
+    def initialize(content, filename, match_lines = [])
+      @content = content
+      @filename = filename
+      @match_lines = match_lines
+      @highlight_lines = match_lines.map{|v|v.index+1}
+      @line_number_start = 1
+    end
+
+    def set_range(range)
+      content_a = @content.to_a
+      range = limit_range(range, content_a)
+      @content = content_a[range]
+      @line_number_start = range.first + 1
+    end
+
+    def limit_range(range, array)
+      Range.new(range.first < 0 ? 0 : range.first,
+                range.last >= array.size ? array.size - 1 : range.last)
+    end
+
+    def to_html
+      html = CodeRay.scan(@content, file_type).
+        html(
+             :wrap => nil,
+             :line_numbers => :table,
+             :css => :class,
+             :highlight_lines => @highlight_lines,
+             :line_number_start => @line_number_start
+             )
+
+      codestock_ornament(html)
+    end
+
+    def codestock_ornament(html)
+      a = html.split("\n")
+
+      line_number = @line_number_start
+      is_code_content = false
+
+      a.each_with_index do |l, index|
+        if (l =~ /  <td class="code"><pre (.*?)>(.*)<tt>/)
+          a[index] = "  <td class=\"code\"><pre #{$1}><span #{line_attr(line_number)}>#{$2}</span><tt>"
+          is_code_content = true
+          line_number += 1
+          next
+        elsif (l =~ %r|</tt></pre></td>|)
+          is_code_content = false
+        end
+
+        if (is_code_content)
+          if (l =~ %r|</tt>(.*)<tt>|)
+            a[index] = "</tt><span #{line_attr(line_number)}>#{$1}</span><tt>"
+            line_number += 1
+          end
+        end
+      end
+          
+      a.join("\n") + "\n"
+    end
+
+    def file_type
+      case File.extname(@filename)
+      when ".el"
+        :scheme
+      else
+        CodeRay::FileType.fetch @filename, :plaintext
+      end
+    end
+
+    def line_attr(no)
+      r = []
+      r << "id=\"#{no}\""
+      r << "class=\"highlight-line\"" if @highlight_lines.include?(no)
+      r.join(" ")
+    end
+  end
+end
+
+

data/lib/codestock/cdweb/lib/command.rb

@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2011/07/11
+
+require 'codestock/cdweb/lib/database'
+require 'codestock/cdweb/lib/coderay_wrapper'
+require 'codestock/cdweb/lib/search_contents'
+require 'codestock/cdweb/lib/search_files'
+require 'codestock/cdweb/lib/mkurl'
+
+module CodeStock
+  def view(record, params, before)
+    @title = record.shortpath
+    @path = record.shortpath
+
+    q = params[:query] && Query.new(params[:query]) 
+
+    if (q and !q.keywords.empty?)
+      grep = Grep.new(record.content)
+      match_lines = grep.match_lines_and(q.keywords)
+      @record_content = CodeRayWrapper.new(record.content, record.shortpath, match_lines).to_html
+    else
+      @record_content = CodeRayWrapper.new(record.content, record.shortpath).to_html
+    end
+    
+    @elapsed = Time.now - before
+    haml :view
+  end
+
+  def search(path, params, before)
+    @path = path
+    query = Query.new(params[:query])
+    @title = "'#{query.query_string}' in #{path_title(path)}"
+
+    if (query.keywords.size > 0)
+      searcher = SearchContents.new(path, params, query)
+    else
+      searcher = SearchFiles.new(path, params, query)
+    end
+    
+    @total_records = searcher.total_records
+    @range = searcher.data_range
+    @record_content = searcher.html_contents  + searcher.html_pagination;
+    @elapsed = Time.now - before
+    haml :search
+  end
+
+  def filelist(path, params, before)
+    @title = filelist_title(path)
+    @path = path
+    fileList = Database.instance.fileList(path)
+    @total_records = fileList.size
+    @record_content = fileList.map do |v|
+      "<dt class='result-file'>#{file_or_dirimg(v[1])}<a href='#{Mkurl.new('/home/' + v[0], params).inherit_query_shead}'>#{File.basename v[0]}</a></dt>"
+    end
+    @elapsed = Time.now - before
+    haml :filelist
+  end
+
+  def file_or_dirimg(is_file)
+    src = (is_file) ? '/images/file.png' : '/images/directory.png'
+    "<img alt='' style='vertical-align:bottom; border: 0; margin: 1px;' src='#{src}'>"
+  end
+end

data/lib/{cdweb → codestock/cdweb/lib}/database.rb

@@ -15,14 +15,15 @@ include CodeStock
 module CodeStock
   class Database
     include Singleton
-    include CodeStock
+
+    @@db_dir = nil
 
     def self.setup(db_dir)
       @@db_dir = db_dir
     end
 
     def initialize
-      open(@@db_dir)
+      open(@@db_dir || db_default_dir)
     end
 
     def open(db_dir)
@@ -38,34 +39,20 @@ module CodeStock
     end
 
     def record(shortpath)
-      before = Time.now
       table = @documents.select { |record| record.shortpath == shortpath }
-      elapsed = Time.now - before
-      return table.records[0], elapsed
+      return table.records[0]
     end
 
     def fileNum
       @documents.select.size
     end
-
-    def search(patterns, packages, fpaths, suffixs, page = 0, limit = -1)
-      before = Time.now
-
-      # 全てのパターンを検索
-      if (fpaths.include?("*"))
-        records, total_records = selectAll(page, limit)
-      else
-        records, total_records = searchMain(patterns, packages, fpaths, suffixs, page, limit)
-      end
-      
-      # 検索にかかった時間
-      elapsed = Time.now - before
-
-      # 結果
-      return records, total_records, elapsed
+    
+    def search(patterns, packages, fpaths, suffixs, offset = 0, limit = -1)
+      # @todo fpathを厳密に検索するには、検索結果からさらに先頭からのパスではないものを除外する
+      records, total_records = searchMain(patterns, packages, fpaths, suffixs, offset, limit)
     end
 
-    def selectAll(page, limit)
+    def selectAll(offset = 0, limit = -1)
       table = @documents.select
 
       # マッチ数
@@ -79,12 +66,45 @@ module CodeStock
       #                            :limit => limit)
       
       # ソート
-      records = table.records.sort_by{|record| record.shortpath.downcase }[page * limit, limit]
+      if (limit != -1)
+        records = table.records.sort_by{|record| record.shortpath.downcase }[offset, limit]
+      else
+        records = table.records.sort_by{|record| record.shortpath.downcase }[offset..limit]
+      end
+        
 
       return records, total_records
     end
 
-    def searchMain(patterns, packages, fpaths, suffixs, page, limit)
+    # @sample test/test_database.rb:43 TestDatabase#t_fileList
+    def fileList(base)
+      base_parts = base.split("/")
+      base_depth = base_parts.length
+      
+      # shortpathにマッチするものだけに絞り込む
+      if (base == "")
+        records = @documents.select.records
+      else
+        records = @documents.select {|record| record.shortpath =~ base }.to_a
+      end
+
+      # ファイルリストの生成
+      paths = records.map {|record|
+        record.shortpath.split("/")
+      }.find_all {|parts|
+        parts.length > base_depth and parts[0, base_depth] == base_parts
+      }.map {|parts|
+        is_file = parts.length == base_depth + 1
+        path = parts[0, base_depth + 1].join("/")
+        [path, is_file]
+      }.uniq
+      
+      paths
+    end
+
+    private 
+
+    def searchMain(patterns, packages, fpaths, suffixs, offset, limit)
       table = @documents.select do |record|
         expression = nil
 
@@ -132,15 +152,22 @@ module CodeStock
         expression
       end
 
-      # マッチ数
-      total_records = table.size
-      
       # スコアとタイムスタンプでソート
       records = table.sort([{:key => "_score", :order => "descending"},
                             {:key => "timestamp", :order => "descending"}],
-                           :offset => page * limit,
+                           :offset => offset,
                            :limit => limit)
+      
+      # パッケージの条件追加
+      if (packages.size > 0)
+        records.delete_if do |record|
+          !packages.any?{|package| record.shortpath.split('/')[0] =~ /#{package}/ }
+        end
+      end
 
+      # マッチ数
+      total_records = records.size
+      
       return records, total_records
     end
     private :searchMain