codestock 0.1.2 → 0.1.3

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

@@ -7,31 +7,47 @@
 
 module CodeStock
   class Grep
-    attr_reader :content
-    
     def initialize(content)
-      @content = content ? content.split("\n") : []
+      @content = content
     end
 
     MatchLineResult = Struct.new(:index, :match_datas)
     
-    def match_lines_or(patterns)
+    def match_lines_and(patterns)
       result = []
-      patternRegexps = strs2regs(patterns, true) # @todo ignoreオプションを付ける
+      patternRegexps = strs2regs(patterns, true)
+      index = 0
       
-      @content.each_with_index do |line, index|
+      @content.each_line do |line|
         match_datas = []
         patternRegexps.each {|v| match_datas << v.match(line)}
 
-        if (match_datas.any?)
+        if (match_datas.all?)
           result << MatchLineResult.new(index, match_datas)
         end
+
+        index += 1
       end
       
       result
     end
 
-    def context(result, num)
+    def one_match_and(patterns)
+      patternRegexps = strs2regs(patterns, true)
+      index = 0
+      
+      @content.each_line do |line|
+        match_datas = []
+        patternRegexps.each {|v| match_datas << v.match(line)}
+
+        if (match_datas.all?)
+          return MatchLineResult.new(index, match_datas)
+        end
+
+        index += 1
+      end
+      
+      nil
     end
 
     private

data/lib/codestock/cdweb/lib/mkurl.rb

@@ -0,0 +1,56 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2011/07/13
+
+require 'rubygems'
+require 'rack'
+include Rack::Utils
+
+module CodeStock
+  class Mkurl
+    def initialize(path, params)
+      @path = escape_path(path)
+      @params = params
+    end
+
+    def inherit_query_shead_offset
+      create_url(query_param(true, true, true))
+    end
+
+    def inherit_query_shead
+      create_url(query_param(true, true, false))
+    end
+
+    def inherit_shead
+      create_url(query_param(false, true, false))
+    end
+
+    private
+
+    def escape_path(src)
+      escape(src).gsub("%2F", '/')
+    end
+
+    def create_url(qp)
+      if (qp == "")
+        @path
+      else
+        "#{@path}?#{qp}"
+      end
+    end
+
+    def query_param(query_inherit, shead_inherit, offset_inherit)
+      qparam = []
+      qparam << "query=#{escape(@params[:query])}" if (query_inherit and @params[:query])
+      qparam << "shead=#{escape(@params[:shead])}" if (shead_inherit and @params[:shead])
+      qparam << "offset=#{escape(@params[:offset])}" if (offset_inherit and @params[:offset])
+      qparam.join('&')
+    end
+  end
+end
+
+
+

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

@@ -10,17 +10,16 @@ require 'rack'
 
 module CodeStock
   class Query
-    include Rack::Utils
     attr_reader :query_string
-  
+
     OPTIONS = [
                ['package',  'p'],
                ['filepath', 'fpath', 'f'],
                ['suffix',   's'],
               ]
 
-    def initialize(request)
-      @query_string = unescape(request.path_info.gsub(/\A\/|\/\z/, ''))
+    def initialize(str)
+      @query_string = str
       init_hash
       parse
     end

data/lib/codestock/cdweb/lib/search_contents.rb

@@ -0,0 +1,117 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2011/07/18
+
+require 'codestock/cdweb/lib/query'
+require 'codestock/cdweb/lib/grep'
+require 'codestock/cdweb/lib/mkurl'
+
+module CodeStock
+  class SearchContents
+    attr_reader :total_records
+    attr_reader :elapsed
+    attr_reader :page
+    
+    DISP_NUM = 20              # 1ページの表示数
+    LIMIT_NUM = 50             # 最大検索ファイル数
+    NTH = 3                    # 表示範囲
+
+    def initialize(path, params, query)
+      @params = params
+      @q = query
+      @page = params[:page].to_i || 0
+      @offset = params[:offset].to_i
+      fpaths = @q.fpaths
+      fpaths << path unless path == ""
+      @records, @total_records, @elapsed = Database.instance.search(@q.keywords, @q.packages, fpaths, @q.suffixs, @offset, LIMIT_NUM)
+      grep_contents
+    end
+
+    def query
+      @q.query_string
+    end
+
+    def next_offset
+      @offset + @next_index
+    end
+
+    def data_range
+      @offset..(next_offset - 1)
+    end
+
+    def html_contents
+      @match_records.map {|match_record| result_match_record(match_record)}.join
+    end
+    
+    def html_pagination
+      return "" if @q.empty?
+      return "" if next_offset >= @total_records
+
+      return <<EOF
+<div class='pagination'>
+#{pagination_link(next_offset, "next >>")}
+</div>
+EOF
+    end
+
+    private
+
+    MatchRecord = Struct.new(:record, :match_line)
+
+    def grep_contents
+      @match_records = []
+      @next_index = @records.size
+      
+      @records.each_with_index do |record, index|
+        grep = Grep.new(record.content)
+        match_line = grep.one_match_and(@q.keywords)
+        @match_records << MatchRecord.new(record, match_line) if match_line
+
+        if @match_records.size > DISP_NUM
+          @next_index = index + 1
+          break
+        end
+      end
+    end
+
+    def result_match_record(match_record)
+      record = match_record.record
+      match_line = match_record.match_line
+
+      first_index = match_line.index - NTH
+      last_index = match_line.index + NTH
+
+      coderay = CodeRayWrapper.new(record.content, record.shortpath, [match_line])
+      coderay.set_range(first_index..last_index)
+
+      <<EOS
+    <dt class='result-record'><a href='#{"/home/" + record_link(record) + "##{coderay.line_number_start}"}'>#{record.shortpath}</a></dt>
+    <dd>
+#{coderay.to_html}
+    </dd>
+EOS
+    end
+
+    def pagination_link(offset, label)
+      tmpp = @params
+      tmpp[:offset] = offset.to_s
+      href = Mkurl.new("", tmpp).inherit_query_shead_offset
+      pagination_span("<a href='#{href}'>#{label}</a>")
+    end
+
+    def pagination_span(content)
+      "<span class='pagination-link'>#{content}</span>\n"
+    end
+
+    def record_link(record)     # 
+      Mkurl.new(record.shortpath, @params).inherit_query_shead
+    end
+
+  end
+end
+
+
+

data/lib/codestock/cdweb/lib/search_files.rb

@@ -0,0 +1,88 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2011/07/18
+
+require 'codestock/cdweb/lib/query'
+require 'codestock/cdweb/lib/mkurl'
+require 'codestock/cdweb/lib/command'
+
+module CodeStock
+  class SearchFiles
+    attr_reader :total_records
+
+    DISP_NUM = 100              # 1ページの表示数
+    
+    def initialize(path, params, query)
+      @params = params
+      @q = query
+      
+      @offset = params[:offset].to_i
+
+      fpaths = @q.fpaths
+      fpaths << path unless path == ""
+
+      if (fpaths.include?("*"))
+        @records, @total_records = Database.instance.selectAll(@offset, DISP_NUM)
+      else
+        @records, @total_records = Database.instance.search(@q.keywords, @q.packages, fpaths, @q.suffixs, @offset, DISP_NUM)
+      end
+    end
+
+    def query
+      @q.query_string
+    end
+
+    def next_offset
+      @offset + @records.size
+    end
+
+    def data_range
+      @offset..(next_offset - 1)
+    end
+
+    def html_contents
+      @records.map {|record| result_record(record)}.join
+    end
+    
+    def html_pagination
+      return "" if @q.empty?
+      return "" if next_offset >= @total_records
+      
+      return <<EOF
+<div class='pagination'>
+#{pagination_link(next_offset, "next >>")}
+</div>
+EOF
+    end
+
+    private
+
+    def pagination_link(offset, label)
+      tmpp = @params
+      tmpp[:offset] = offset.to_s
+      href = Mkurl.new("", tmpp).inherit_query_shead_offset
+      pagination_span("<a href='#{href}'>#{label}</a>")
+    end
+
+    def pagination_span(content)
+      "<span class='pagination-link'>#{content}</span>\n"
+    end
+
+    def result_record(record)
+      <<EOS
+    <dt class='result-file'>#{file_or_dirimg(true)}<a href='#{"/home/" + record_link(record)}'>#{record.shortpath}</a></dt>
+EOS
+    end
+
+    def record_link(record)
+      Mkurl.new(record.shortpath, @params).inherit_query_shead
+    end
+
+  end
+end
+
+
+

data/lib/{cdweb → codestock/cdweb}/public/css/gren.css

@@ -34,6 +34,10 @@ dt.result-record {
     font-size: 105%;
 }
 
+dt.result-file {
+    font-size: 95%;
+}
+
 div.pagination {
     background-color:#FEFFF0;
     text-align: center;
@@ -57,4 +61,15 @@ span.keyword {
 
 font.version {
     font-size: 35%;
-}
+}
+
+span.highlight-line {
+   background-color: #d0ff9c;
+/*     background-color: #FFFF55; */
+}
+
+a.headmenu {
+    font-size: 40%;
+    font-weight: normal;
+}
+

data/lib/codestock/cdweb/views/filelist.haml

@@ -0,0 +1,14 @@
+.header
+  %h1
+    <a href="/"><img src="/images/gren-icon-mini.png" alt="gren-icon" border="0"/></a>
+    CodeStock
+    = create_headmenu(@path, params)
+
+.content
+  = create_form(@path, params[:query], params[:shead])
+
+  .search-summary
+    <span class="keyword">#{topic_path(@path, params)}</span> <span class="total-entries">#{@total_records}</span>件（#{@elapsed}秒）
+  ~ @record_content
+
+

data/lib/codestock/cdweb/views/help.haml

@@ -0,0 +1,16 @@
+- @title = 'help'
+
+.header
+  %h1
+    <a href="/"><img src="/images/gren-icon-mini.png" alt="gren-icon" border="0"/></a>
+    #{@title} - CodeStock
+
+.content
+  .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')}
+      

data/lib/codestock/cdweb/views/index.haml

@@ -0,0 +1,17 @@
+%div(align="center")
+  .header_home
+    %h1 <a href="/"><img src="/images/gren-icon.png" alt="gren-icon" border="0" height="100px"/></a> CodeStock <font class="version">#{@version}</font>
+
+  .content
+    %form(method="post" action="home")
+      %p
+        %input(name="query" type="text" size="60")
+        %input(type="submit" value="検索")
+  
+  .footer_home
+    <a href="/home">#{@package_num}</a>のパッケージ<br>
+    <a href="/home?query=f:*">#{@file_num}</a>のファイル<br>
+    <a href="/help">ヘルプ</a> , 
+    <a href="http://codestock.ongaeshi.me">codestockについて</a>
+
+

data/lib/codestock/cdweb/views/layout.haml

@@ -0,0 +1,33 @@
+!!!
+
+%html(lang='ja')
+  %head
+    %meta(charset='utf-8')
+    %title= [@title, 'CodeStock'].compact.join(' - ')
+    %link(rel="stylesheet" href="/css/gren.css"  type="text/css" media="all")
+    %link(rel="stylesheet" href="/css/coderay.css"  type="text/css" media="all")
+
+  %body
+    -# %header
+    -# %h1 <a href=".">CodeStock</a>
+
+    != yield
+
+    %script{:type=>"text/javascript"}
+      var _gaq = _gaq || [];
+      _gaq.push(['_setAccount', 'UA-13136329-8']);
+      _gaq.push(['_trackPageview']);
+
+      (function() {
+      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+      })();
+
+-#     %hr
+
+-#     %footer
+-#       %p
+-#         ! Develop by <a href="./contact.html">ongaeshi</a>
+-#         ! Powered by <a href="http://www.ruby-lang.org/">Ruby</a> #{::RUBY_VERSION},
+-#         ! <a href="http://www.sinatrarb.com/">Sinatra</a> #{Sinatra::VERSION}

data/lib/codestock/cdweb/views/search.haml

@@ -0,0 +1,12 @@
+.header
+  %h1
+    <a href="/"><img src="/images/gren-icon-mini.png" alt="gren-icon" border="0"/></a>
+    CodeStock
+    = create_headmenu(@path, params)
+
+.content
+  = create_form(@path, params[:query], params[:shead])
+  
+  .search-summary
+    <span class="keyword">#{topic_path(@path, params)}</span> <span class="total-entries">#{@total_records}</span>件中 <span class="display-range">#{@range.first} - #{@range.last}</span>件（#{@elapsed}秒）
+  ~ @record_content

data/lib/codestock/cdweb/views/view.haml

@@ -0,0 +1,16 @@
+.header
+  %h1
+    <a href="/"><img src="/images/gren-icon-mini.png" alt="gren-icon" border="0"/></a>
+    CodeStock
+    = create_headmenu(@path, params)
+
+.content
+  = create_form(@path, params[:query], params[:shead])
+
+  .search-summary
+    <span class="keyword">#{topic_path(@path, params)}</span>（#{@elapsed}秒）
+  ~ @record_content
+
+
+
+

data/test/file_assert.rb

@@ -0,0 +1,41 @@
+# -*- coding: utf-8 -*-
+#
+# @file
+# @brief ファイルテスト用アサート関数群
+# @author ongaeshi
+# @date 2011/06/22
+#
+# 以下の関数が使えます
+#
+# assert_diff_files(file1, file2)
+#
+# 二つのファイルが等しい場合はテスト成功
+# 失敗した場合は二つのファイルのdiffを表示します
+#
+# assert_lines(s1, s2)
+#
+# 文字列を行単位で比較します。
+#
+
+def assert_diff_files(file1, file2)
+  unless (IO.read(file1) == IO.read(file2))
+    puts `diff -c #{file1} #{file2}`
+    assert_equal true, false
+  else
+    assert_equal true, true
+  end
+end
+
+def assert_lines(s1, s2)
+  a1 = s1.to_a
+  a2 = s2.to_a
+  
+  a1.each_index do |i|
+    assert_equal a1[i], a2[i]
+  end
+
+  # s1の行数が長い時にエラーが出てしまう
+
+  assert_equal a1.size, a2.size
+end
+

data/test/test_coderay_wrapper.rb

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2011/07/16
+
+require 'test_helper'
+require 'file_assert'
+require 'test_coderay_wrapper_data'
+require 'codestock/cdweb/lib/coderay_wrapper'
+
+module CodeStock
+  class TestCodeRayWrapper < Test::Unit::TestCase
+    def test_basic
+      assert_lines JS_SHORT_HTML, CodeRayWrapper.new(JS_SHORT_CODE, "console-dir.js").to_html
+      assert_lines JS_HTML      , CodeRayWrapper.new(JS_CODE, "console-dir.js").to_html 
+    end
+  end
+end
+
+

data/test/test_coderay_wrapper_data.rb

@@ -0,0 +1,91 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2011/07/16
+
+module CodeStock
+  JS_SHORT_CODE = <<EOF
+console.dir_s = function (object, msg) {
+  var disp_properties  = function (properties, indent, out) {
+EOF
+
+  JS_SHORT_HTML = <<EOF
+<table class="CodeRay"><tr>
+  <td class="line_numbers" title="click to toggle" onclick="with (this.firstChild.style) { display = (display == '') ? 'none' : '' }"><pre>1<tt>
+</tt>2<tt>
+</tt></pre></td>
+  <td class="code"><pre ondblclick="with (this.style) { overflow = (overflow == 'auto' || overflow == '') ? 'visible' : 'auto' }"><span id="1">console.<span class="fu">dir_s</span> = <span class="kw">function</span> (object, msg) {</span><tt>
+</tt><span id="2">  <span class="kw">var</span> <span class="fu">disp_properties</span>  = <span class="kw">function</span> (properties, indent, out) {</span><tt>
+</tt></pre></td>
+</tr></table>
+EOF
+  
+  JS_CODE = <<EOF
+console.dir_s = function (object, msg) {
+  var disp_properties  = function (properties, indent, out) {
+    for (var i = 0; i < properties.length; ++i) {
+      var name = properties[i][0], value = properties[i][1];
+
+      if (typeof value == "string")
+        value = '"' + value + '"';
+
+      out.push(indent + name + ": " + value);
+    }
+  };
+  
+  var disp_funcs  = function (funcs, indent, out) {
+    for (var i = 0; i < funcs.length; ++i) {
+      var name = funcs[i][0], value = funcs[i][1];
+      out.push(indent + name + "()");
+    }
+  };
+EOF
+
+  JS_HTML = <<EOF
+<table class="CodeRay"><tr>
+  <td class="line_numbers" title="click to toggle" onclick="with (this.firstChild.style) { display = (display == '') ? 'none' : '' }"><pre>1<tt>
+</tt>2<tt>
+</tt>3<tt>
+</tt>4<tt>
+</tt>5<tt>
+</tt>6<tt>
+</tt>7<tt>
+</tt>8<tt>
+</tt>9<tt>
+</tt>10<tt>
+</tt>11<tt>
+</tt>12<tt>
+</tt>13<tt>
+</tt>14<tt>
+</tt>15<tt>
+</tt>16<tt>
+</tt>17<tt>
+</tt>18<tt>
+</tt></pre></td>
+  <td class="code"><pre ondblclick="with (this.style) { overflow = (overflow == 'auto' || overflow == '') ? 'visible' : 'auto' }"><span id="1">console.<span class="fu">dir_s</span> = <span class="kw">function</span> (object, msg) {</span><tt>
+</tt><span id="2">  <span class="kw">var</span> <span class="fu">disp_properties</span>  = <span class="kw">function</span> (properties, indent, out) {</span><tt>
+</tt><span id="3">    <span class="kw">for</span> (<span class="kw">var</span> i = <span class="i">0</span>; i &lt; properties.length; ++i) {</span><tt>
+</tt><span id="4">      <span class="kw">var</span> name = properties[i][<span class="i">0</span>], value = properties[i][<span class="i">1</span>];</span><tt>
+</tt><span id="5"></span><tt>
+</tt><span id="6">      <span class="kw">if</span> (<span class="kw">typeof</span> value == <span class="s"><span class="dl">&quot;</span><span class="k">string</span><span class="dl">&quot;</span></span>)</span><tt>
+</tt><span id="7">        value = <span class="s"><span class="dl">'</span><span class="k">&quot;</span><span class="dl">'</span></span> + value + <span class="s"><span class="dl">'</span><span class="k">&quot;</span><span class="dl">'</span></span>;</span><tt>
+</tt><span id="8"></span><tt>
+</tt><span id="9">      out.push(indent + name + <span class="s"><span class="dl">&quot;</span><span class="k">: </span><span class="dl">&quot;</span></span> + value);</span><tt>
+</tt><span id="10">    }</span><tt>
+</tt><span id="11">  };</span><tt>
+</tt><span id="12">  </span><tt>
+</tt><span id="13">  <span class="kw">var</span> <span class="fu">disp_funcs</span>  = <span class="kw">function</span> (funcs, indent, out) {</span><tt>
+</tt><span id="14">    <span class="kw">for</span> (<span class="kw">var</span> i = <span class="i">0</span>; i &lt; funcs.length; ++i) {</span><tt>
+</tt><span id="15">      <span class="kw">var</span> name = funcs[i][<span class="i">0</span>], value = funcs[i][<span class="i">1</span>];</span><tt>
+</tt><span id="16">      out.push(indent + name + <span class="s"><span class="dl">&quot;</span><span class="k">()</span><span class="dl">&quot;</span></span>);</span><tt>
+</tt><span id="17">    }</span><tt>
+</tt><span id="18">  };</span><tt>
+</tt></pre></td>
+</tr></table>
+EOF
+
+end
+
+