RubyGems - codestock - Versions diffs - 0.1.2 → 0.1.3 - Mend

codestock 0.1.2 → 0.1.3

Files changed (47) hide show

data/Rakefile +1 -0
data/VERSION +1 -1
data/bin/cdweb +2 -2
data/codestock.gemspec +56 -10
data/lib/cdstk/cdstk.rb +4 -1
data/lib/codestock/cdweb/app.rb +136 -0
data/lib/codestock/cdweb/cli_cdweb.rb +84 -0
data/lib/codestock/cdweb/config.ru +3 -0
data/lib/codestock/cdweb/lib/coderay_wrapper.rb +94 -0
data/lib/codestock/cdweb/lib/command.rb +67 -0
data/lib/{cdweb → codestock/cdweb/lib}/database.rb +55 -28
data/lib/{cdweb → codestock/cdweb/lib}/grep.rb +24 -8
data/lib/codestock/cdweb/lib/mkurl.rb +56 -0
data/lib/{cdweb → codestock/cdweb/lib}/query.rb +3 -4
data/lib/codestock/cdweb/lib/search_contents.rb +117 -0
data/lib/codestock/cdweb/lib/search_files.rb +88 -0
data/lib/{cdweb → codestock/cdweb}/public/css/gren.css +16 -1
data/lib/codestock/cdweb/public/images/directory.png +0 -0
data/lib/codestock/cdweb/public/images/file.png +0 -0
data/lib/codestock/cdweb/views/filelist.haml +14 -0
data/lib/codestock/cdweb/views/help.haml +16 -0
data/lib/codestock/cdweb/views/index.haml +17 -0
data/lib/codestock/cdweb/views/layout.haml +33 -0
data/lib/codestock/cdweb/views/search.haml +12 -0
data/lib/codestock/cdweb/views/view.haml +16 -0
data/test/file_assert.rb +41 -0
data/test/test_coderay_wrapper.rb +22 -0
data/test/test_coderay_wrapper_data.rb +91 -0
data/test/test_database.rb +54 -0
data/test/test_mkurl.rb +30 -0
data/test/test_query.rb +54 -0
metadata +52 -26
data/lib/cdweb/cli_cdweb.rb +0 -54
data/lib/cdweb/coderay_wrapper.rb +0 -38
data/lib/cdweb/grenweb.ru +0 -35
data/lib/cdweb/help.rb +0 -40
data/lib/cdweb/home.rb +0 -40
data/lib/cdweb/html_renderer.rb +0 -243
data/lib/cdweb/searcher.rb +0 -130
data/lib/cdweb/viewer.rb +0 -52
data/test/test_grenweb_database.rb +0 -36
data/test/test_grenweb_html_renderer.rb +0 -41
data/test/test_grenweb_query.rb +0 -54
data/test/test_grenweb_searcher.rb +0 -35
/data/lib/{cdweb → codestock/cdweb}/public/css/coderay.css +0 -0
/data/lib/{cdweb → codestock/cdweb}/public/images/gren-icon-mini.png +0 -0
/data/lib/{cdweb → codestock/cdweb}/public/images/gren-icon.png +0 -0

data/lib/cdweb/html_renderer.rb DELETED Viewed

@@ -1,243 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# @file
-# @brief  HTMLの描画ルーチン
-# @author ongaeshi
-# @date   2010/10/17
-require 'rubygems'
-require 'pathname'
-require 'rack'
-require 'cdweb/grep'
-require 'cdweb/coderay_wrapper'
-module CodeStock
-  class HTMLRendeler
-    include Rack::Utils
-    def initialize(script_name)
-      # @script_name = Pathname(script_name)
-      @script_name = '/'
-    end
-    def header(title, header1)
-      <<EOS
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja">
-<head>
-  <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-  <!-- <meta name="robot" content="noindex,nofollow" /> -->
-  <title>#{title}</title>
-  <link rel="stylesheet" href="#{fullpath('css/gren.css')}"  type="text/css" media="all" />
-  <link rel="stylesheet" href="#{fullpath('css/coderay.css')}"  type="text/css" media="all" />
-</head>
-<body>
-<div class="header">
-  <h1>
-    <a href="#{fullpath('')}"><img src="#{fullpath('images/gren-icon-mini.png')}" alt="gren-icon" border="0"/></a>
-    #{header1}
-  </h1>
-</div>
-<div class="content">
-EOS
-    end
-    def footer
-      <<EOS
-</div>
-<div class="footer">
-</div>
-</body>
-</html>
-EOS
-    end
-    def header_home(title, header1, version)
-      <<EOS
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ja" lang="ja">
-<head>
-  <meta http-equiv="content-type" content="text/html; charset=UTF-8" />
-  <!-- <meta name="robot" content="noindex,nofollow" /> -->
-  <title>#{title}</title>
-  <link rel="stylesheet" href="#{fullpath('css/gren.css')}"  type="text/css" media="all" />
-</head>
-<body>
-<div align="center">
-<div class="header_home">
-  <h1>
-    <a href="#{fullpath('')}"><img src="#{fullpath('images/gren-icon.png')}" alt="gren-icon" border="0" height="100px"/></a>
-    #{header1} <font class="version">#{version}</font>
-  </h1>
-</div>
-<div class="content">
-EOS
-    end
-    def footer_home(package, files)
-      <<EOS
-</div>
-<div class="footer_home">
-  <!-- <a href="#{fullpath('::search/p:*')}">#{package}</a>のパッケージ , -->
-  <a href="#{fullpath('::search/f:*')}">#{files}</a>のファイル<br>
-  <a href="#{fullpath('::help')}">ヘルプ</a> ,
-  <a href="http://ongaeshi.github.com/gren">grenについて</a>
-</div>
-</div>
-</body>
-</html>
-EOS
-    end
-    def result_record(record, patterns, nth=1)
-      if (patterns.size > 0)
-        <<EOS
-    <dt class='result-record'><a href='#{fullpath("::view/" + Rack::Utils::escape_html(record.shortpath))}'>#{record.shortpath}</a></dt>
-    <dd>
-      <pre class='lines'>
-#{result_record_match_line(record, patterns, nth)}
-      </pre>
-    </dd>
-EOS
-      else
-        <<EOS
-    <dt class='result-record'><a href='#{fullpath("::view/" + Rack::Utils::escape_html(record.shortpath))}'>#{record.shortpath}</a></dt>
-EOS
-      end
-    end
-    def result_record_match_line(record, patterns, nth)
-      str = ""
-      grep = Grep.new(record.content)
-      lines = grep.match_lines_or(patterns)
-      unless (lines.empty?)
-        index = lines[0].index
-        (index - nth..index + nth).each do |i|
-          if (0 <= i && i < grep.content.size)
-            match_datas = (i == index) ? lines[0].match_datas : []
-            str << line(i + 1, grep.content[i], match_datas) + "\n"
-          end
-        end
-      end
-      str
-    end
-    def record_content(record)
-      CodeRayWrapper.html_memfile(record.content, record.shortpath)
-    end
-    def record_content_line(record)
-      str = ""
-      grep = Grep.new(record.content)
-      grep.content.each_with_index do |l, index|
-        str << line(index + 1, l, []) + "\n"
-      end
-      str
-    end
-    def line(lineno, line, match_datas)
-      sprintf("%5d: %s", lineno, match_strong(Rack::Utils::escape_html(line), match_datas))
-    end
-    def match_strong(line, match_datas)
-      match_datas.each do |m|
-        line = line.split(m[0]).join('<strong>' + m[0] + '</strong>') unless (m.nil?)
-      end
-      line
-    end
-    def pagination_link(page, label)
-      href = "?page=#{page}"
-      pagination_span("<a href='#{href}'>#{label}</a>")
-    end
-    def pagination_span(content)
-      "<span class='pagination-link'>#{content}</span>\n"
-    end
-    def empty_summary()
-      <<EOS
-  <div class='search-summary'>
-    <p>gren web検索</p>
-  </div>
-EOS
-    end
-    def search_summary(keyword, total_records, range, elapsed)
-      <<EOS
-  <div class='search-summary'>
-    <span class="keyword">#{keyword}</span>の検索結果:
-    <span class="total-entries">#{total_records}</span>件中
-    <span class="display-range">#{range.first} - #{range.last}</span>件（#{elapsed}秒）
-  </div>
-EOS
-    end
-    def view_summary(path, elapsed)
-      <<EOS
-  <div class='search-summary'>
-    <span class="keyword">#{path}</span>（#{elapsed}秒）
-  </div>
-EOS
-    end
-    def search_box(text = "")
-      <<EOS
-<form method="post" action="#{fullpath('::search')}">
-  <p>
-    <input name="query" type="text" size="60" value="#{text}" />
-    <input type="submit" value="検索" />
-  </p>
-</form>
-EOS
-    end
-    def sample_code
-      <<EOS
-  <div class='sample-code'>
-  <ol>
-    <li>キーワードで検索<br>
-      #{link('def open')}
-    <li>１フレーズとして検索<br>
-      #{link('"def open"')}
-    <li>パッケージ名で絞り込み<br>
-      #{link('def open p:gren')}
-    <li>ファイル名や拡張子で絞り込み<br>
-      #{link('def open f:test s:rb')}
-    <li>組み合わせ<br>
-      #{link('p:gren p:tidtools s:rb f:test assert f:cli')}
-  </ol>
-  </div>
-EOS
-    end
-    def link(keyword)
-      "<a href='#{fullpath('::search' + '/' + Rack::Utils::escape_html(keyword))}'>#{keyword}</a>"
-    end
-    def fullpath(path)
-      unless (path == '')
-        (@script_name + path).to_s
-      else
-        @script_name.to_s
-      end
-    end
-  end
-end

data/lib/cdweb/searcher.rb DELETED Viewed

@@ -1,130 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# @file
-# @brief  検索処理本体
-# @author ongaeshi
-# @date   2010/10/13
-require 'rubygems'
-require 'rack'
-require 'cdweb/database'
-require 'cdweb/html_renderer'
-require 'cdweb/query'
-module CodeStock
-  class Searcher
-    include Rack::Utils
-    def initialize
-    end
-    def call(env)
-      @request = Rack::Request.new(env)
-      @query = Query.new(@request)
-      @response = Rack::Response.new
-      @response["Content-Type"] = "text/html; charset=UTF-8"
-      @nth = 3                  # マッチした行の前後何行を表示するか
-      @rendeler = HTMLRendeler.new(@request.script_name + '/..')
-      if @request.post? or @request['query']
-        post_request
-      else
-        search
-      end
-    end
-    private
-    def post_request
-      query = @request['query'] || ''
-      if query.empty?
-        @request.path_info = "/"
-      else
-        @request.path_info = "/#{escape(query)}/"
-      end
-      @response.redirect(@request.url.split(/\?/, 2)[0])
-      @response.to_a
-    end
-    def search
-      render_header
-      render_search_box
-      render_search_result
-      render_footer
-      @response.to_a
-    end
-    def render_header
-      @response.write @rendeler.header("gren : #{@query.escape_html}", "gren")
-    end
-    def render_search_box
-      @response.write @rendeler.search_box(@query.escape_html)
-    end
-    def render_search_result
-      if @query.empty?
-        @response.write @rendeler.empty_summary
-      else
-        records, total_records, elapsed = Database.instance.search(@query.keywords, @query.packages, @query.fpaths, @query.suffixs, calcPage, calcLimit)
-        render_search_summary(records, total_records, elapsed)
-        records.each { |record| @response.write(@rendeler.result_record(record, @query.keywords, @nth)) }
-        render_pagination(calcPage, total_records)
-      end
-    end
-    def render_search_summary(records, total_records, elapsed)
-      pageStart = calcPage * calcLimit
-      @response.write @rendeler.search_summary(@query.query_string,
-                                                  total_records,
-                                                  (total_records.zero? ? 0 : pageStart + 1)..(pageStart + records.size),
-                                                  elapsed)
-    end
-    def render_pagination(page, total_records)
-      return if @query.empty?
-      return if total_records < calcLimit
-      last_page = (total_records / calcLimit.to_f).ceil
-      @response.write("<div class='pagination'>\n")
-      if page > 0
-        @response.write(@rendeler.pagination_link(page - 1, "<<"))
-      end
-      last_page.times do |i|
-        if i == page
-          @response.write(@rendeler.pagination_span(i))
-        else
-          @response.write(@rendeler.pagination_link(i, i))
-        end
-      end
-      if page < (last_page - 1)
-        @response.write(@rendeler.pagination_link(page + 1, ">>"))
-      end
-      @response.write("</div>\n")
-    end
-    def render_footer
-      @response.write @rendeler.footer
-    end
-    private
-    # 1ページに表示する最大レコードを計算
-    def calcLimit
-      if @query.keywords.size == 0
-        100
-      else
-        20
-      end
-    end
-    # 現在ページを計算
-    def calcPage
-      (@request['page'] || 0).to_i
-    end
-  end
-end

data/lib/cdweb/viewer.rb DELETED Viewed

@@ -1,52 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# @file
-# @brief  ソースコードを表示する
-# @author ongaeshi
-# @date   2010/10/13
-require 'rubygems'
-require 'rack'
-require 'cdweb/database'
-require 'cdweb/html_renderer'
-module CodeStock
-  class Viewer
-    include Rack::Utils
-    def initialize
-    end
-    def call(env)
-      @request = Rack::Request.new(env)
-      @response = Rack::Response.new
-      @response["Content-Type"] = "text/html; charset=UTF-8"
-      record, elapsed = Database.instance.record(req2query)
-      @rendeler = HTMLRendeler.new(@request.script_name + '/..')
-      if (record)
-        @response.write @rendeler.header("gren : #{record.shortpath}", "gren")
-        @response.write @rendeler.search_box("")
-        @response.write @rendeler.view_summary(record.shortpath, elapsed)
-        @response.write @rendeler.record_content(record)
-      else
-        @response.write @rendeler.header("gren : not found.", "gren")
-        @response.write @rendeler.search_box("")
-        @response.write @rendeler.empty_summary
-      end
-      @response.write @rendeler.footer
-      @response.to_a
-    end
-    private
-    def req2query
-      p @request.path_info
-      unescape(@request.path_info.gsub(/\A\/|\/z/, ''))
-    end
-  end
-end

data/test/test_grenweb_database.rb DELETED Viewed

@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# @file
-# @brief
-# @author ongaeshi
-# @date   2011/02/20
-require 'rubygems'
-require 'groonga'
-require 'test_helper'
-require 'file_test_utils'
-require 'cdweb/database'
-require 'common/dbdir'
-require 'cdstk/cdstk'
-require 'stringio'
-class TestMkgrendb < Test::Unit::TestCase
-  include FileTestUtils
-  include CodeStock
-  def test_setup_and_open
-    io = StringIO.new
-    obj = Cdstk.new(io)
-    obj.init
-    Database.setup('.')
-    Database.instance
-  end
-  def teardown
-    teardown_custom(true)
-#    teardown_custom(false)
-  end
-end

data/test/test_grenweb_html_renderer.rb DELETED Viewed

@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-require 'test_helper'
-require 'cdweb/html_renderer.rb'
-class TestGrenwebHTMLRendeler < Test::Unit::TestCase
-  include CodeStock
-  def setup
-    @rendeler = HTMLRendeler.new('/')
-  end
-  def test_pagination_line
-    assert_equal("<span class='pagination-link'><a href='?page=1'>test</a></span>\n", @rendeler.pagination_link(1, "test"))
-  end
-  def test_search_summary
-    assert_equal(@rendeler.search_summary(10, 500, 10..20, 0.00893),
-                 <<-EOS)
-  <div class='search-summary'>
-    <span class="keyword">10</span>の検索結果:
-    <span class="total-entries">500</span>件中
-    <span class="display-range">10 - 20</span>件（0.00893秒）
-  </div>
-EOS
-  end
-  def test_match_strong
-    assert_equal(@rendeler.match_strong("This is line.", [nil, nil]), "This is line.")
-  end
-  def test_search_box
-    assert_equal(@rendeler.search_box('test must'), <<-EOF)
-<form method="post" action="/::search">
-  <p>
-    <input name="query" type="text" size="60" value="test must" />
-    <input type="submit" value="検索" />
-  </p>
-</form>
-EOF
-  end
-end

data/test/test_grenweb_query.rb DELETED Viewed

@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# @file
-# @brief
-# @author ongaeshi
-# @date   2010/10/21
-require 'test_helper'
-require 'cdweb/query'
-class TestGrenWebQuery < Test::Unit::TestCase
-  include CodeStock
-  include Rack::Utils
-  def test_query
-    q = create_query("test fire beam")
-    assert_equal q.keywords, ['test', 'fire', 'beam']
-    assert_equal q.packages, []
-    assert_equal q.fpaths, []
-    assert_equal q.suffixs, []
-    assert_equal q.escape_html, 'test fire beam'
-    q = create_query("test fire beam f:testfile1")
-    assert_equal q.keywords, ['test', 'fire', 'beam']
-    assert_equal q.packages, []
-    assert_equal q.fpaths, ['testfile1']
-    assert_equal q.suffixs, []
-    q = create_query("test fire beam f:testfile1 filepath:dir32")
-    assert_equal q.keywords, ['test', 'fire', 'beam']
-    assert_equal q.packages, []
-    assert_equal q.fpaths, ['dir32', 'testfile1']
-    assert_equal q.suffixs, []
-    q = create_query("package:gren test fire beam f:testfile1 filepath:dir32 s:rb p:test suffix:pl")
-    assert_equal q.keywords, ['test', 'fire', 'beam']
-    assert_equal q.packages, ['gren', 'test']
-    assert_equal q.fpaths, ['dir32', 'testfile1']
-    assert_equal q.suffixs, ['pl', 'rb']
-    q = create_query("&p")
-    assert_equal q.escape_html, '&amp;p'
-    q = create_query("int &p")
-    assert_equal q.escape_html, 'int &amp;p'
-    q = create_query('"def update"')
-    assert_equal q.keywords, ['def update']
-  end
-  def create_query(query)
-    Query.new(Rack::Request.new({"PATH_INFO"=>"/#{escape(query)}/"}))
-  end
-end

data/test/test_grenweb_searcher.rb DELETED Viewed

@@ -1,35 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# @file
-# @brief
-# @author ongaeshi
-# @date   2010/10/21
-require 'test_helper'
-require 'cdweb/searcher.rb'
-require 'rack/mock'
-class TestGrenwebSearcher < Test::Unit::TestCase
-  def setup
-    @app = CodeStock::Searcher.new
-    @mr  = Rack::MockRequest.new(@app)
-  end
-  def test_get
-    res = nil
-    assert_nothing_raised('なんか失敗した') { res = @mr.get('/', :lint => true) }
-    assert_not_nil res, 'レスポンス来てない'
-    assert_equal 200, res.status, 'ステータスコードが変'
-    assert_equal 'text/html; charset=UTF-8', res['Content-Type'], 'Content-Typeが変'
-    #puts res.body
-  end
-  def test_post
-    res = nil
-    assert_nothing_raised('なんか失敗した') { res = @mr.post('/', :lint => true) }
-    assert_not_nil res, 'レスポンス来てない'
-    assert_equal 302, res.status, 'ステータスコードが変'
-    assert_equal 'text/html; charset=UTF-8', res['Content-Type'], 'Content-Typeが変'
-    #puts res.body
-  end
-end

/data/lib/{cdweb → codestock/cdweb}/public/css/coderay.css RENAMED Viewed

File without changes

/data/lib/{cdweb → codestock/cdweb}/public/images/gren-icon-mini.png RENAMED Viewed

File without changes

/data/lib/{cdweb → codestock/cdweb}/public/images/gren-icon.png RENAMED Viewed

File without changes