milkode 0.8.1 → 0.9.0

data/lib/milkode/cdweb/public/js/milkode.js

@@ -8,7 +8,11 @@ function replace_query_param(url, value)
   var url_s = url.split("?");
 
   if (url_s.length <= 1) {
-    return url + "?query=" + value;
+    if (value.length > 0)
+      return url + "?query=" + value;
+    else
+      return url;
+      
   } else {
     var params = url_s[1].split("&");
     var found_query = false;
@@ -34,3 +38,17 @@ function topic_path(id)
   document.getElementById(id).href = url;
 }
 
+function repalce_package_name(url, package_name)
+{
+  var url_s = url.split("?");
+  url = url_s[0].replace(/\/home(\/.*)?/, "/home/" + package_name); // home以下をパッケージ名に置き換え
+  return url;
+}
+
+function select_package()
+{
+  var url = document.URL;
+  url = repalce_package_name(url, document.getElementById('package').value);
+  url = replace_query_param(url, document.searchform.query.value);
+  document.location = url;
+}

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

@@ -7,10 +7,23 @@
 
 .content
   .sample-code
+    %h2 基本
     %ol
       %li キーワードを並べてAND検索<br>#{link('def open')} 
       %li １フレーズとして検索<br>#{link('"def open"')}
+      
+    %h2 オプション
+    %ol
       %li パッケージ名で絞り込み<br>#{link('def open p:milkode')}
       %li ファイル名で絞り込み<br>#{link('def open f:test')}
       %li 拡張子で絞り込み<br>#{link('s:rb')}
+      %li ファイル名もしくはパッケージ名で絞り込み<br>#{link('fp:milkode')}
+      %li ファイル名、パッケージ名、もしくはファイルの内容<br>#{link('k:test')}
+      
+    %h2 ダイレクトパス
+    %ol
+      %li viewモードで行番号をクリックするとダイレクトパス(現在行を表すテキスト)を表示<br><a href='/home/milkode/lib/milkode/cdstk/cdstk.rb'>/home/milkode/lib/milkode/cdstk/cdstk.rb</a>
+      %li ダイレクトパスで検索すると直接ジャンプ<br>#{link('/milkode/lib/milkode/cdstk/cdstk.rb:81')}
+      %li 空白を含むダイレクトパスは""で囲む<br>#{link('"/export-memo/2010/Tweet - 7:59"')}
+      %li ダイレクトパスは空白で区切って複数渡せる<br>#{link('/milkode/lib/milkode/cli.rb:41 /milkode/lib/milkode/cdstk/cdstk.rb:121')}
       

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

@@ -4,15 +4,15 @@
   %head
     %meta(charset='utf-8')
     %title= [@title, @setting.home_title].compact.join(' - ')
+    %link(rel="stylesheet" href="/css/bootstrap.min.css"  type="text/css" media="all")
+    %link(rel="stylesheet" href="/css/bootstrap-responsive.min.css"  type="text/css" media="all")
     %link(rel="stylesheet" href="/css/milkode.css"  type="text/css" media="all")
     %link(rel="stylesheet" href="/css/coderay.css"  type="text/css" media="all")
     %link(rel="stylesheet" href="/css/coderay-patch.css"  type="text/css" media="all")
     %script(type='text/javascript' src='/js/milkode.js')
 
   %body
-    -# %header
-    -# %h1 <a href=".">Milkode</a>
-
-    != yield
+    .container-fluid#mainpage
+      != yield
 
 -#  GoogleAnalyticsを使いたい場合はここにコードを挿入して下さい。

data/lib/milkode/cdweb/views/search_form.haml

@@ -1,23 +1,19 @@
-:javascript
-  function set_pathname() {
-    document.searchform.pathname.value = location.pathname;
-  }
-%form(name="searchform" action="/search" method="post")
-  %p
-    %input#query(name="query" size="70" type="text"){:value => params[:query]}
-    %input#search(type="submit" name="search" value="検索" onclick="set_pathname()")
-    %input#clear(type="submit" name="clear" value="クリア" onclick="set_pathname()")
-    %br
-    %label
-      = create_radio('all', params[:shead])
-      全て
-    %label
-      = create_radio('package', params[:shead])
-      パッケージ(デフォルト)
-    %label
-      = create_radio('directory', params[:shead])
-      ディレクトリ
-    %label
-      = create_checkbox('onematch', params[:onematch])
-      = '1ファイル1マッチ'
-    %input(name="pathname" type="hidden" value="")
+.search_form
+  :javascript
+    function set_pathname() {
+      document.searchform.pathname.value = location.pathname;
+    }
+  %form(name="searchform" action="/search" method="post")
+    %p
+      %input#query(name="query" size="70" type="text" style="width: 419px;"){:value => params[:query]}
+      %input#search(type="submit" name="search" value="検索" onclick="set_pathname()")
+      %input#clear(type="submit" name="clear" value="クリア" onclick="set_pathname()")
+      %br
+      範囲:
+      = create_select_shead(params[:shead])
+      パッケージ:
+      = create_select_package(@path)
+      = create_checkbox('onematch', params[:onematch], '1ファイル1マッチ')
+      = create_checkbox('sensitive', params[:sensitive], '大文字／小文字を区別')
+      
+      %input(name="pathname" type="hidden" value="")

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

@@ -1,10 +1,10 @@
-= haml :header_menu, locals => {:flistpath => '..'}
+= haml :header_menu, :locals => {:flistpath => '..'}
 
 .content
   = haml :search_form
 
   .search-summary
-    <span class="keyword">#{topic_path(@path, params)}</span>（#{@elapsed}秒）
+    <span class="keyword">#{topic_path(@path, params)}</span>#{additional_info(@path, params)}（#{@elapsed}秒）
   ~ @record_content
 
 

data/lib/milkode/common/util.rb

@@ -89,7 +89,7 @@ module Milkode
     end
 
     def larger_than_oneline(content)
-      content.count($/) > 1      
+      content && content.count($/) > 1      
     end
 
     def normalize_filename(str)
@@ -104,6 +104,14 @@ module Milkode
       str == str.downcase
     end
 
+    def ignore_case?(pattens, is_sensitive)
+      !is_sensitive && (pattens.all? {|v| Util::downcase? v})
+    end
+
+    def gotoline_keyword?(keyword)
+      keyword =~ /\A\/.*:\d+\Z/
+    end
+
     # parse_gotoline(['a', '123', 'b']) #=> [['a', 'b'], 123]]
     # parse_gotoline(['a', '123', 'b', 55]) #=> [['a', 'b', '123'], 55]]
     # parse_gotoline(['a:5']) #=> [['a'], 55]]
@@ -153,6 +161,7 @@ module Milkode
     # 'package/to/a.txt' #=> 'package', 'to/a.txt'
     # 'package'          #=> 'package', nil
     def divide_shortpath(shortpath)
+      shortpath = shortpath[1..-1] if shortpath[0..0] == '/' # 先頭の'/'はカット
       a = shortpath.split('/')
 
       if (a.size >= 2)
@@ -165,7 +174,6 @@ module Milkode
     def git_url?(src)
       (src =~ /^(:?git[:@])|(:?ssh:)/) != nil
     end
-
   end
 end
 

data/lib/milkode/database/document_table.rb

@@ -160,6 +160,7 @@ module Milkode
       paths    = options[:paths]    || []
       restpaths = options[:restpaths]    || []
       suffixs  = options[:suffixs]  || []
+      fpath_or_packages = options[:fpath_or_packages] || []
       offset   = options[:offset]   || 0
       limit    = options[:limit]    || -1
       
@@ -228,6 +229,17 @@ module Milkode
           end
         end
         
+        # ファイル名かパッケージ名
+        fpath_or_packages.each do |word|
+          sub_expression = record.restpath =~ word
+          sub_expression |= record.package =~ word
+          if expression.nil?
+            expression = sub_expression
+          else
+            expression &= sub_expression
+          end
+        end
+        
         # 検索式
         expression
       end

data/lib/milkode/grep/cli_grep.rb

@@ -94,7 +94,11 @@ EOF
         return
       end
 
-      if option.packages.empty? && !my_option[:all]
+      # 最初の要素の先頭が'/'なら絶対パスモード
+      is_abs_path = my_option[:gotoline_data] && my_option[:gotoline_data].first && (my_option[:gotoline_data][0][0][0][0..0] == '/')
+
+      # 現在位置のパッケージを記録
+      if option.packages.empty? && !my_option[:all] && !is_abs_path
         if (package_dir_in? current_dir)
           option.filePatterns << current_dir
         else
@@ -105,8 +109,7 @@ EOF
 
       if (arguments.size > 0 || my_option[:find_mode])
         # ignore?
-        downcase_all = arguments.all? {|v| Util::downcase? v}
-        option.ignoreCase = true if downcase_all && !my_option[:case_sensitive]
+        option.ignoreCase = true if Util::ignore_case?(arguments, my_option[:case_sensitive])
 
         # update
         if my_option[:update]
@@ -132,11 +135,20 @@ EOF
           records = findGrep.pickupRecords
           # stdout.puts "#{records.size} records (#{findGrep.time_s})"
           stdout.puts "#{records.size} records"
-        elsif (my_option[:gotoline_data])
+        elsif my_option[:gotoline_data]
           # gotoline mode
           basePatterns = option.filePatterns 
+
           my_option[:gotoline_data].each do |v|
-            option.filePatterns = basePatterns + v[0]
+            if is_abs_path
+              package, restpath = Util::divide_shortpath(v[0][0])
+              # p [package, restpath]
+              option.packages = [package]
+              option.filePatterns = [restpath]
+            else
+              option.filePatterns = basePatterns + v[0]
+            end
+            
             option.gotoline = v[1]
             findGrep = FindGrep::FindGrep.new(arguments, option)
             findGrep.searchAndPrint(stdout)
@@ -198,11 +210,18 @@ EOF
             gsub("-k", ":k").
             gsub("-g", ":g")            
         end
+
       end
 
       def after
+        if @arguments.first
+          if Util::gotoline_keyword? @arguments[0]
+            @state = :gotoline
+          end
+        end
+
         result = []
-        
+
         @arguments.each do |v|
           case v
           when ":l"

data/milkode.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkode}
-  s.version = "0.8.1"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ongaeshi"]
-  s.date = %q{2012-06-20}
+  s.date = %q{2012-07-09}
   s.description = %q{Line based local source code search engine & grep-command & web-app.}
   s.email = %q{ongaeshi0621@gmail.com}
   s.executables = ["gmilk", "milk"]
@@ -46,6 +46,7 @@ Gem::Specification.new do |s|
     "lib/milkode/cdweb/lib/query.rb",
     "lib/milkode/cdweb/lib/search_contents.rb",
     "lib/milkode/cdweb/lib/search_files.rb",
+    "lib/milkode/cdweb/lib/search_gotoline.rb",
     "lib/milkode/cdweb/lib/web_setting.rb",
     "lib/milkode/cdweb/public/css/bootstrap-responsive.min.css",
     "lib/milkode/cdweb/public/css/bootstrap.min.css",
@@ -95,6 +96,7 @@ Gem::Specification.new do |s|
     "test/data/.gitignore",
     "test/data/a_project/cdstk.rb",
     "test/data/a_project/cdstk_yaml.rb",
+    "test/data/a_project/empty.txt",
     "test/data/abc.zip",
     "test/data/b_project/runner.rb",
     "test/data/b_project/test_dir.rb",
@@ -116,6 +118,7 @@ Gem::Specification.new do |s|
     "test/runner.rb",
     "test/test_cdstk.rb",
     "test/test_cdstk_command.rb",
+    "test/test_cdweb_app.rb",
     "test/test_cli.rb",
     "test/test_cli_grep.rb",
     "test/test_coderay_wrapper.rb",
@@ -165,6 +168,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<thor>, ["~> 0.15.0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
+      s.add_development_dependency(%q<rack-test>, [">= 0"])
     else
       s.add_dependency(%q<termcolor>, [">= 1.2.0"])
       s.add_dependency(%q<rroonga>, [">= 1.1.0"])
@@ -179,6 +183,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<thor>, ["~> 0.15.0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency(%q<rack-test>, [">= 0"])
     end
   else
     s.add_dependency(%q<termcolor>, [">= 1.2.0"])
@@ -194,6 +199,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<thor>, ["~> 0.15.0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency(%q<rack-test>, [">= 0"])
   end
 end
 

data/test/test_cdweb_app.rb

@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2012/06/23
+
+require 'milkode/cdweb/app'
+require 'milkode/cdweb/lib/database'
+require 'test_helper'
+require 'test/unit'
+require 'rack/test'
+require 'milkode_test_work'
+
+class TestCdwebApp < Test::Unit::TestCase
+  include Rack::Test::Methods
+
+  def setup
+    @work = MilkodeTestWork.new({:default_db => true})
+    @work.add_package "db1", @work.expand_path("../data/a_project")
+
+    Database.setup(Dbdir.default_dir)
+    Database.instance.open_force
+  end
+
+  def teardown
+    @work.teardown
+  end
+
+  def app
+    Sinatra::Application
+  end
+
+  def test_main
+    t_default
+    t_home
+    t_help
+    t_not_found
+    t_view_empty_file
+  end
+
+  private
+  
+  def t_default
+    get '/'
+    assert_equal 200, last_response.status
+  end
+
+  def t_home
+    get '/home'
+    assert_equal 200, last_response.status
+
+    get '/home', :query => 'test'
+    assert_equal 200, last_response.status
+  end
+
+  def t_help
+    get '/help'
+    assert_equal 200, last_response.status
+  end
+
+  def t_not_found
+    get '/not_found'
+    assert_equal 404, last_response.status
+  end
+
+  def t_view_empty_file
+    get '/home/a_project/empty.txt'
+    assert_equal 200, last_response.status # 空ファイルも表示出来るようにする
+  end
+end
+
+

data/test/test_query.rb

@@ -47,6 +47,31 @@ module Milkode
       assert_equal q.keywords, ['def update']
     end
 
+    def test_conv_keywords_to_fpath
+      q = create_query("array test s:rb")
+      assert_equal q.conv_keywords_to_fpath.query_string, 'f:array f:test s:rb'
+
+      q = create_query("hoge")
+      assert_equal q.conv_keywords_to_fpath.query_string, 'f:hoge'
+
+      q = create_query("hoge f:hoge")
+      assert_equal q.conv_keywords_to_fpath.query_string, 'f:hoge f:hoge'
+    end
+
+    def test_fp
+      q = create_query("key1 fp:pack fp:age")
+      assert_equal q.keywords, ['key1']
+      assert_equal q.packages, []
+      assert_equal q.fpaths, []
+      assert_equal q.suffixs, []
+      assert_equal q.fpath_or_packages, ['pack', 'age']
+    end
+
+    def test_conv_keywords_to_fpath_or_packages
+      q = create_query("array test s:rb")
+      assert_equal q.conv_keywords_to_fpath_or_packages.query_string, 'fp:array fp:test s:rb'
+    end
+
     def create_query(query)
       Query.new(query)
     end

data/test/test_util.rb

@@ -71,6 +71,13 @@ class TestUtil < Test::Unit::TestCase
     assert !Milkode::Util::downcase?("dummyNode")    
   end
 
+  def test_ignore_case?
+    assert_equal true,  Milkode::Util::ignore_case?(['a', 'b'], false)
+    assert_equal false, Milkode::Util::ignore_case?(['a', 'b'], true)
+    assert_equal false, Milkode::Util::ignore_case?(['a', 'B'], false)
+    assert_equal false, Milkode::Util::ignore_case?(['A', 'b'], true)
+  end
+
   def test_parse_gotoline
     assert_equal [[['a', 'b'], 123]],       Milkode::Util::parse_gotoline(['a', '123', 'b']) 
     assert_equal [[['a', '123', 'b'], 55]], Milkode::Util::parse_gotoline(['a', '123', 'b', '55'])
@@ -78,6 +85,7 @@ class TestUtil < Test::Unit::TestCase
     assert_equal [[['a'], 55]],    Milkode::Util::parse_gotoline(['a:55'])
     assert_equal [[['lib/aaa.c'], 8], [['test/bbb.rb'], 9]],    Milkode::Util::parse_gotoline(['lib/aaa.c:8', 'test/bbb.rb:9'])
     assert_equal [[['c:/tmp/ccc.txt'], 99]],    Milkode::Util::parse_gotoline(['c:/tmp/ccc.txt:99'])
+    assert_equal [[['/milkode/hoge.rb'], 99]],    Milkode::Util::parse_gotoline(['/milkode/hoge.rb:99'])
   end
   
   def test_gotoline_multi?
@@ -93,6 +101,16 @@ class TestUtil < Test::Unit::TestCase
     assert_equal  true, Milkode::Util::git_url?('git@github.com:ongaeshi/milkode.git')
     assert_equal  true, Milkode::Util::git_url?('ssh:foo@bar/baz.git')
   end
+
+  def test_divide_shortpath
+    package, restpath = Milkode::Util::divide_shortpath('package/to/a.txt')
+    assert_equal 'package', package
+    assert_equal 'to/a.txt', restpath
+
+    package, restpath = Milkode::Util::divide_shortpath('/package/to/a.txt')
+    assert_equal 'package', package
+    assert_equal 'to/a.txt', restpath
+  end
       
   
   def teardown