milkode 0.8.1 → 0.9.0

data/Gemfile

@@ -21,4 +21,5 @@ gem 'thor', '~> 0.15.0'
 group :development do
   gem "bundler"
   gem "jeweler"
+  gem "rack-test"
 end

data/HISTORY.ja.rdoc

@@ -1,3 +1,39 @@
+=== 0.9.0 2012/07/09
+
+* milk web
+  * ページデザインを刷新
+    * メインページ以外もTwitter bootstrapに対応
+    * デザインの調整
+    * ファイル一覧 -> ディレクトリ に文章変更
+  * 検索時にキーワードにマッチするファイルも合わせて表示するように
+  * パッケージセレクタの追加
+    * 現在パッケージ名を選択
+    * パッケージの切り替え
+  * ダイレクトジャンプ
+    * viewモードで行番号をクリックするとダイレクトパス(現在行を表すテキスト)を表示
+    * ダイレクトパス入力時に指定行に直接ジャンプ出来るように
+  * 検索オプション追加
+    * fp(fpath_or_packages)
+    * k(keyword)
+    * 大文字／小文字を区別する(:sensitive)
+  * バグ修正
+    * 空ファイルを表示出来ない問題を修正
+    * 半角スペースを含むファイルが正しく表示出来ない
+    * ファイル検索時に次の100件が表示されない
+  * ヘルプに文言追加
+  * Webアプリのテストを追加(test_cdweb_app)
+
+* gmilk
+  * 引数解析して'-g'オプション無くても-gモードに移行出来るように
+  * ダイレクトパス入力時に指定行に直接ジャンプ出来るように
+
+* database
+  * fpath_or_packages(fp)オプションに対応
+
+=== 0.8.1 2012/06/20
+
+* gmilk -a -u 時にエラーになる問題を修正 (thanks hazy_moon)
+
 === 0.8.0 2012/06/20
 
 * milk web

data/HISTORY.rdoc

@@ -1,3 +1,23 @@
+=== 0.9.0 2012/07/09
+
+* milk web
+  * Renew page design
+  * Display match files when searching
+  * Add package selector
+  * Direct jump
+  * Add search options
+  * Bug fix
+
+* gmilk
+  * Direct jump
+
+* database
+  * fpath_or_packages
+
+=== 0.8.1 2012/06/20
+
+* Fix, gmilk -a -u error (thanks hazy_moon)
+
 === 0.8.0 2012/06/20
 
 * milk web

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.9.0

data/bin/gmilk

@@ -6,5 +6,5 @@
 require 'rubygems'
 require 'milkode/grep/cli_grep'
 
-Version = "0.8.0"
+Version = "0.9.0"
 Milkode::CLI_Grep.execute(STDOUT, ARGV)

data/bin/milk

@@ -6,5 +6,5 @@
 require 'rubygems'
 require 'milkode/cli'
 
-Version = "0.8.0"
+Version = "0.9.0"
 Milkode::CLI.start(ARGV)

data/lib/milkode/cdweb/app.rb

@@ -16,12 +16,13 @@ require 'milkode/cdweb/lib/command'
 require 'milkode/cdweb/lib/mkurl'
 require 'milkode/cdweb/lib/web_setting'
 require 'milkode/cdweb/lib/package_list'
+require 'milkode/common/util'
 
 set :haml, :format => :html5
 
 get '/' do
   @setting = WebSetting.new
-  @version = "0.8.0"
+  @version = "0.9.0"
   @package_num = Database.instance.yaml_package_num
   @file_num = Database.instance.totalRecords
   @package_list = PackageList.new(Database.instance.grndb)
@@ -49,7 +50,15 @@ post '/search*' do
       path = package_path(path)
     end
 
-    redirect Mkurl.new("#{path}", params).inherit_query_shead
+    query = Query.new(params[:query])
+    # gotolineモードで1つだけ渡された時は直接ジャンプ
+    if query.keywords.size == 1 && Milkode::Util::gotoline_keyword?(query.keywords[0])
+      gotoline = Milkode::Util::parse_gotoline(query.keywords)[0]
+      path2 = File.join('/home', gotoline[0][0])
+      redirect Mkurl.new(path2, params).inherit_query_shead + "#n#{gotoline[1]}"
+    else
+      redirect Mkurl.new("#{path}", params).inherit_query_shead
+    end
   end
 end
 
@@ -96,14 +105,37 @@ helpers do
     "<a href='#{'/home?query=' + escape_url(query)}'>#{query}</a>"
   end
 
-  def create_radio(value, shead)
-    str = (value == shead) ? 'checked' : ''
-    "<input name='shead' type='radio' value='#{value}' #{str}/>"
+  def create_select_shead(value)
+    value ||= "package"
+
+    data = [
+            ['all'      , '全て'        ],
+            ['package'  , 'パッケージ'  ],
+            ['directory', 'ディレクトリ'],
+           ]
+
+    <<EOF
+<select name="shead" id="shead">
+#{data.map{|v| "<option value='#{v[0]}' #{v[0] == value ? 'selected' : ''}>#{v[1]}</option>"}}
+</select>
+EOF
   end
 
-  def create_checkbox(name, value)
+  def create_select_package(path)
+    value = package_name(path)
+    value = '---' if value == "root"
+    data = ['---'] + Database.instance.packages(nil)
+
+    <<EOF
+<select name="package" id="package" onchange="select_package()">
+#{data.map{|v| "<option value='#{v}' #{v == value ? 'selected' : ''}>#{v}</option>"}}
+</select>
+EOF
+  end
+
+  def create_checkbox(name, value, label)
     str = (value) ? 'checked' : ''
-    "<input type='checkbox' name='#{name}' value='on' #{str}/>"
+    "<label class='checkbox inline'><input type='checkbox' name='#{name}' value='on' #{str}/>#{label}</label>"
   end
 
   def create_headmenu(path, query, flistpath = '')
@@ -112,7 +144,7 @@ helpers do
     <<EOF
     #{headicon('go-home-5.png')} <a href="/home" class="headmenu">全てのパッケージ</a>
     #{headicon('document-new-4.png')} <a href="#{href}" class="headmenu" onclick="window.open('#{href}'); return false;">新しい検索</a>
-    #{headicon('directory.png')} <a href="#{flist}" class="headmenu">ファイル一覧</a> 
+    #{headicon('directory.png')} <a href="#{flist}" class="headmenu">ディレクトリ</a> 
     #{headicon('help.png')} <a href="/help" class="headmenu">ヘルプ</a>
 EOF
   end
@@ -131,6 +163,35 @@ EOF
     }.join('/')
   end
 
+  HASH = {
+    '.h'   => ['.c', '.cpp', '.m', '.mm'],
+    '.c'   => ['.h'],
+    '.hpp' => ['.cpp'],
+    '.cpp' => ['.hpp', '.h'],
+    '.m'   => ['.h'],
+    '.mm'  => ['.h'],
+  }
+
+  def additional_info(path, parms)
+    suffix = File.extname path
+    cadet = HASH[suffix]
+
+    if (cadet)
+      result = cadet.find do |v|
+        Database.instance.record(path.gsub(/#{suffix}\Z/, v))
+      end
+
+      if (result)
+        path2 = path.gsub(/#{suffix}\Z/, result)
+        " (<a href='#{Mkurl.new(File.join('/home', path2), params).inherit_query_shead}'>#{result}</a>) "
+      else
+        ''
+      end
+    else
+      ''
+    end
+  end
+
   def package_name(path)
     (path == "") ? 'root' : path.split('/')[0]
   end

data/lib/milkode/cdweb/lib/coderay_html2.rb

@@ -72,22 +72,7 @@ module Encoders
         raise ArgumentError, "Invalid value %p for :line_number_start; Integer expected." % start
       end
       
-      anchor_prefix = options[:line_number_anchors]
-      anchor_prefix = 'line' if anchor_prefix == true
-      anchor_prefix = anchor_prefix.to_s[/\w+/] if anchor_prefix
-
-      anchor_url = options[:line_number_anchor_url] || ""
-      
-      anchoring =
-        if anchor_prefix
-          proc do |line|
-          line = line.to_s
-          anchor = anchor_prefix + line
-          "<a href=\"#{anchor_url}##{anchor}\" name=\"#{anchor}\">#{line}</a>"
-        end
-        else
-          proc { |line| line.to_s }  # :to_s.to_proc in Ruby 1.8.7+
-        end
+      anchoring = create_anchor(options)
       
       bold_every = options[:bold_every]
       highlight_lines = options[:highlight_lines]
@@ -166,6 +151,29 @@ module Encoders
 
       output
     end
+
+    def self.create_anchor(options)
+      anchor_prefix = options[:line_number_anchors]
+      anchor_prefix = 'line' if anchor_prefix == true
+      anchor_prefix = anchor_prefix.to_s[/\w+/] if anchor_prefix
+
+      if anchor_prefix
+        anchor_url = options[:line_number_anchor_url] || ""
+
+        proc do |line|
+          line = line.to_s
+          anchor = anchor_prefix + line
+          "<a href=\"#{anchor_url}##{anchor}\" name=\"#{anchor}\">#{line}</a>"
+        end
+      elsif options[:onclick_copy_line_number]
+        prefix = options[:onclick_copy_prefix] || ""
+        proc do |line|
+          "<a href=\"#!\" onclick=\"alert('#{prefix + line.to_s}');\" title=\"Display line number\">#{line.to_s}</a>"
+        end
+      else
+        proc { |line| line.to_s }  # :to_s.to_proc in Ruby 1.8.7+
+      end
+    end
   end
 end
 end

data/lib/milkode/cdweb/lib/coderay_wrapper.rb

@@ -55,7 +55,9 @@ module Milkode
               :css => :class,
               :highlight_lines => @highlight_lines,
               :line_number_start => @line_number_start,
-              :line_number_anchors => false
+              :line_number_anchors => false,
+              :onclick_copy_line_number => true,
+              :onclick_copy_prefix => "/#{@filename}:"
               )
     end
 

data/lib/milkode/cdweb/lib/command.rb

@@ -9,6 +9,7 @@ require 'milkode/cdweb/lib/database'
 require 'milkode/cdweb/lib/coderay_wrapper'
 require 'milkode/cdweb/lib/search_contents'
 require 'milkode/cdweb/lib/search_files'
+require 'milkode/cdweb/lib/search_gotoline'
 require 'milkode/cdweb/lib/mkurl'
 require 'milkode/common/util'
 
@@ -17,13 +18,25 @@ module Milkode
     @setting = WebSetting.new
     @title = record.shortpath
     @path = record.shortpath
+    is_sensitive = params[:sensitive] == 'on'
 
     q = params[:query] && Query.new(params[:query]) 
 
     if (Util::larger_than_oneline(record.content) and 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
+      if Util::gotoline_keyword? q.keywords[0]
+        gotolines = Util::parse_gotoline(q.keywords)
+        match_lines = []
+        gotolines.each do |v|
+          if v[0][0][1..-1] == record.shortpath
+              match_lines << Grep::MatchLineResult.new(v[1] - 1, nil)
+          end
+        end
+        @record_content = CodeRayWrapper.new(record.content, record.shortpath, match_lines).to_html
+      else
+        grep = Grep.new(record.content)
+        match_lines = grep.match_lines_and(q.keywords, is_sensitive)
+        @record_content = CodeRayWrapper.new(record.content, record.shortpath, match_lines).to_html
+      end
     else
       @record_content = CodeRayWrapper.new(record.content, record.shortpath).to_html
     end
@@ -40,7 +53,11 @@ module Milkode
     @title = "'#{query.query_string}' in #{path_title(path)}"
 
     if (query.keywords.size > 0)
-      searcher = SearchContents.new(path, params, query)
+      if Util::gotoline_keyword? query.keywords[0]
+        searcher = SearchGotoLine.new(path, params, query)
+      else
+        searcher = SearchContents.new(path, params, query)
+      end
     else
       searcher = SearchFiles.new(path, params, query)
     end

data/lib/milkode/cdweb/lib/database.rb

@@ -12,6 +12,7 @@ require 'groonga'
 require 'milkode/common/dbdir'
 require 'milkode/cdstk/yaml_file_wrapper'
 require 'milkode/database/groonga_database'
+require 'milkode/common/util'
 include Milkode
 
 module Milkode
@@ -42,18 +43,22 @@ module Milkode
 
     def open
       if !@grndb || @grndb.closed?
-        @grndb = GroongaDatabase.new
-        @grndb.open(Database.dbdir)
-        @grndb.yaml_sync(yaml_load.contents)
-        @documents = @grndb.documents
+        open_force
       end
     end
 
+    def open_force
+      @grndb = GroongaDatabase.new
+      @grndb.open(Database.dbdir)
+      @grndb.yaml_sync(yaml_load.contents)
+      @documents = @grndb.documents
+    end
+
     def record(shortpath)
       DocumentRecord.create @documents.find_shortpath(shortpath)
     end
 
-    def search(patterns, packages, current_path, fpaths, suffixs, offset = 0, limit = -1)
+    def search(patterns, keywords, packages, current_path, fpaths, suffixs, fpath_or_packages, offset = 0, limit = -1)
       paths = []
 
       # パッケージ名未指定の時は現在位置を検索条件に追加
@@ -73,11 +78,12 @@ module Milkode
       # 検索
       result = @documents.search(
         :patterns  => patterns,
-        # :keywords  => ,
+        :keywords  => keywords,
         :paths     => paths,
         :packages  => packages,
         :restpaths => fpaths,
         :suffixs   => suffixs,
+        :fpath_or_packages => fpath_or_packages,
         :offset    => offset,
         :limit     => limit
       )

data/lib/milkode/cdweb/lib/grep.rb

@@ -5,6 +5,8 @@
 # @author ongaeshi
 # @date   2010/10/18
 
+require 'milkode/common/util'
+
 module Milkode
   class Grep
     def initialize(content)
@@ -13,9 +15,9 @@ module Milkode
 
     MatchLineResult = Struct.new(:index, :match_datas)
 
-    def match_lines_stopover(patterns, max_match, start_index)
+    def match_lines_stopover(patterns, max_match, start_index, is_sensitive)
       result = []
-      patternRegexps = strs2regs(patterns, true)
+      patternRegexps = strs2regs(patterns, Util::ignore_case?(patterns, is_sensitive))
       index = start_index
 
       lines = @content.split($/)
@@ -41,9 +43,9 @@ module Milkode
       {:result => result, :next_line => index}
     end
     
-    def match_lines_and(patterns)
+    def match_lines_and(patterns, is_sensitive)
       result = []
-      patternRegexps = strs2regs(patterns, true)
+      patternRegexps = strs2regs(patterns, Util::ignore_case?(patterns, is_sensitive))
       index = 0
       
       @content.each_line do |line|
@@ -60,8 +62,8 @@ module Milkode
       result
     end
 
-    def one_match_and(patterns)
-      patternRegexps = strs2regs(patterns, true)
+    def one_match_and(patterns, is_sensitive)
+      patternRegexps = strs2regs(patterns, Util::ignore_case?(patterns, is_sensitive))
       index = 0
       
       @content.each_line do |line|

data/lib/milkode/cdweb/lib/mkurl.rb

@@ -7,7 +7,6 @@
 
 require 'rubygems'
 require 'rack'
-include Rack::Utils
 
 module Milkode
   class Mkurl
@@ -39,7 +38,12 @@ module Milkode
     private
 
     def escape_path(src)
-      escape(src).gsub("%2F", '/')
+      # /rack-1.3.0/lib/rack/utils.rb:29
+      Rack::Utils::escape_path(src).gsub("%2F", '/')
+    end
+
+    def escape(src)
+      Rack::Utils::escape(src)
     end
 
     def create_url(qp)
@@ -55,6 +59,7 @@ module Milkode
       qparam << "query=#{escape(@params[:query])}" if (query_inherit and @params[:query])
       qparam << "shead=#{escape(@params[:shead])}" if (shead_inherit and @params[:shead])
       qparam << "onematch=#{escape(@params[:onematch])}" if (shead_inherit and @params[:onematch])
+      qparam << "sensitive=#{escape(@params[:sensitive])}" if (shead_inherit and @params[:sensitive])
       qparam << "offset=#{escape(@params[:offset])}" if (offset_inherit and @params[:offset])
       qparam << "line=#{escape(@params[:line])}" if (offset_inherit and @params[:line])
       qparam << "sort=#{sort_kind}" if sort_kind