gren 0.2.4 → 0.3.0

data/test/test_grenweb_cli.rb

@@ -0,0 +1,10 @@
+require File.join(File.dirname(__FILE__), 'test_helper.rb')
+require File.join(File.dirname(__FILE__), '../lib/grenweb/cli.rb')
+require File.join(File.dirname(__FILE__), '../lib/grenweb/searcher.rb')
+require File.join(File.dirname(__FILE__), '../lib/grenweb/viewer.rb')
+
+class TestGrenwebCli < Test::Unit::TestCase
+  def test_print_default_output
+    # assert_match(/To update this executable/, @stdout)
+  end
+end

data/test/test_grenweb_html_renderer.rb

@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+require File.join(File.dirname(__FILE__), "test_helper.rb")
+require File.join(File.dirname(__FILE__), "../lib/grenweb/html_renderer.rb")
+
+class TestGrenwebHTMLRendeler < Test::Unit::TestCase
+  include Grenweb
+
+  def setup
+  end
+
+  def test_pagination_line
+    assert_equal("<span class='pagination-link'><a href='?page=1'>test</a></span>\n", HTMLRendeler.pagination_link(1, "test"))
+  end
+  
+  def test_search_summary
+    assert_equal(HTMLRendeler.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(HTMLRendeler.match_strong("This is line.", [nil, nil]), "This is line.")
+  end
+
+  def test_search_box
+    assert_equal(HTMLRendeler.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

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2010/10/21
+
+require File.join(File.dirname(__FILE__), 'test_helper')
+require File.join(File.dirname(__FILE__), '../lib/grenweb/query')
+
+class TestGrenWebQuery < Test::Unit::TestCase
+  include Grenweb
+  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

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2010/10/21
+
+require File.join(File.dirname(__FILE__), "test_helper.rb")
+require File.join(File.dirname(__FILE__), "../lib/grenweb/searcher.rb")
+require 'rack/mock'
+
+class TestGrenwebSearcher < Test::Unit::TestCase
+  def setup
+    @app = Grenweb::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/test/test_string_snip.rb

@@ -1,4 +1,6 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
+require File.join(File.dirname(__FILE__), "test_helper.rb")
+require File.join(File.dirname(__FILE__), "../lib/common/util.rb")
+require File.join(File.dirname(__FILE__), "../lib/common/grensnip.rb")
 
 class TestStringSnip < Test::Unit::TestCase
   def setup

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 4
-  version: 0.2.4
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - ongaeshi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-10 00:00:00 +09:00
+date: 2010-11-02 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,9 +46,37 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: rack
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 1
+        version: 1.2.1
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: launchy
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 7
+        version: 0.3.7
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rubyforge
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -58,11 +86,11 @@ dependencies:
         - 4
         version: 2.0.4
   type: :development
-  version_requirements: *id003
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: hoe
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -72,13 +100,14 @@ dependencies:
         - 1
         version: 2.6.1
   type: :development
-  version_requirements: *id004
+  version_requirements: *id006
 description: gren is a next grep tool.
 email: 
 - ongaeshi0621@gmail.com
 executables: 
 - gren
 - grendb
+- grenweb
 - mkgrendb
 extensions: []
 
@@ -97,6 +126,7 @@ files:
 - Rakefile
 - bin/gren
 - bin/grendb
+- bin/grenweb
 - bin/mkgrendb
 - lib/common/display_util.rb
 - lib/common/grenfiletest.rb
@@ -108,8 +138,20 @@ files:
 - lib/findgrep/result.rb
 - lib/gren.rb
 - lib/gren/cli.rb
-- lib/gren/findgrep.rb
 - lib/grendb/cli.rb
+- lib/grenweb/cli.rb
+- lib/grenweb/database.rb
+- lib/grenweb/grenweb.ru
+- lib/grenweb/grep.rb
+- lib/grenweb/help.rb
+- lib/grenweb/home.rb
+- lib/grenweb/html_renderer.rb
+- lib/grenweb/public/css/gren.css
+- lib/grenweb/public/images/gren-icon-mini.png
+- lib/grenweb/public/images/gren-icon.png
+- lib/grenweb/query.rb
+- lib/grenweb/searcher.rb
+- lib/grenweb/viewer.rb
 - lib/mkgrendb/cli.rb
 - lib/mkgrendb/mkgrendb.rb
 - rake_rdoc_custom.rb
@@ -117,11 +159,12 @@ files:
 - script/destroy
 - script/generate
 - test/test_gren.rb
-- test/test_gren_cli.rb
 - test/test_gren_util.rb
-- test/test_grendb_cli.rb
+- test/test_grenweb_cli.rb
+- test/test_grenweb_html_renderer.rb
+- test/test_grenweb_query.rb
+- test/test_grenweb_searcher.rb
 - test/test_helper.rb
-- test/test_mkgrendb_cli.rb
 - test/test_string_snip.rb
 has_rdoc: true
 homepage: http://ongaeshi.github.com/gren
@@ -156,9 +199,10 @@ specification_version: 3
 summary: gren is a next grep tool.
 test_files: 
 - test/test_gren.rb
-- test/test_gren_cli.rb
 - test/test_gren_util.rb
-- test/test_grendb_cli.rb
+- test/test_grenweb_cli.rb
+- test/test_grenweb_html_renderer.rb
+- test/test_grenweb_query.rb
+- test/test_grenweb_searcher.rb
 - test/test_helper.rb
-- test/test_mkgrendb_cli.rb
 - test/test_string_snip.rb

data/lib/gren/findgrep.rb

@@ -1,215 +0,0 @@
-# -*- coding: utf-8 -*-
-require 'find'
-require File.join(File.dirname(__FILE__), 'result')
-require 'rubygems'
-require 'termcolor'
-
-module Gren
-  class FindGrep
-    IGNORE_FILE = /(\A#.*#\Z)|(~\Z)|(\A\.#)/
-    IGNORE_DIR = /(\A\.svn\Z)|(\A\.git\Z)|(\ACVS\Z)/
-    
-    Option = Struct.new(:directory,
-                        :depth,
-                        :ignoreCase,
-                        :colorHighlight,
-                        :isSilent,
-                        :debugMode,
-                        :filePatterns,
-                        :ignoreFiles,
-                        :ignoreDirs)
-    
-    def initialize(patterns, option)
-      @option = option
-      @patternRegexps = strs2regs(patterns, @option.ignoreCase)
-      @filePatterns = strs2regs(option.filePatterns)
-      @ignoreFiles = strs2regs(option.ignoreFiles)
-      @ignoreDirs = strs2regs(option.ignoreDirs)
-      @result = Result.new(option.directory)
-    end
-
-    def strs2regs(strs, ignore = false)
-      regs = []
-
-      strs.each do |v|
-        option = 0
-        option |= Regexp::IGNORECASE if (ignore)
-        regs << Regexp.new(v, option)
-      end
-
-      regs
-    end
-
-    def searchAndPrint(stdout)
-      searchAndPrintIN(stdout, @option.directory, 0)
-
-      @result.time_stop
-      
-      unless (@option.isSilent)
-        if (@option.debugMode)
-          stdout.puts
-          stdout.puts "--- search --------"
-          print_fpaths stdout, @result.search_files
-          stdout.puts "--- match --------"
-          print_fpaths stdout, @result.match_files
-          stdout.puts "--- ignore-file --------"
-          print_fpaths stdout, @result.ignore_files
-          stdout.puts "--- ignore-dir --------"
-          print_fpaths stdout, @result.prune_dirs
-          stdout.puts "--- unreadable --------"
-          print_fpaths stdout, @result.unreadable_files
-        end
-
-        unless (@option.colorHighlight)
-          stdout.puts
-        else
-          stdout.puts TermColor.parse("<7>------------------------------------------------------------</7>")
-        end
-
-        @result.print(stdout)
-      end
-    end
-
-    def searchAndPrintIN(stdout, dir, depth)
-      if (@option.depth != -1 && depth > @option.depth)
-        return
-      end
-      
-      Dir.foreach(dir) do |name|
-        next if (name == '.' || name == '..')
-          
-        fpath = File.join(dir,name)
-        fpath_disp = fpath.gsub(/^.\//, "")
-        
-        # 除外ディレクトリならばパス
-        if ignoreDir?(fpath)
-          @result.prune_dirs << fpath_disp if (@option.debugMode)
-          next;
-        end
-
-        # 読み込み不可ならばパス
-        unless FileTest.readable?(fpath)
-          @result.unreadable_files << fpath_disp if (@option.debugMode)
-          next
-        end
-
-        # ファイルならば中身を探索、ディレクトリならば再帰
-        case File.ftype(fpath)
-        when "directory"
-          searchAndPrintIN(stdout, fpath, depth + 1)
-        when "file"
-          searchFile(stdout, fpath, fpath_disp)
-        end          
-      end
-    end
-    private :searchAndPrintIN
-
-    def print_fpaths(stdout, data)
-      stdout.print data.join("\n")
-      stdout.puts if data.count > 0
-      stdout.puts "total: #{data.count}"
-      stdout.puts
-    end
-    private :print_fpaths
-
-    def ignoreDir?(fpath)
-      FileTest.directory?(fpath) &&
-      (IGNORE_DIR.match(File.basename(fpath)) || ignoreDirUser?(fpath))
-    end
-    private :ignoreDir?
-
-    def ignoreDirUser?(fpath)
-      @ignoreDirs.any? {|v| v.match File.basename(fpath) }
-    end
-    private :ignoreDirUser?
-
-    def ignoreFile?(fpath)
-      !correctFileUser?(fpath) ||
-      IGNORE_FILE.match(File.basename(fpath)) ||
-      ignoreFileUser?(fpath) ||
-      binary?(fpath)
-    end
-    private :ignoreFile?
-
-    def correctFileUser?(fpath)
-      @filePatterns.empty? ||
-      @filePatterns.any? {|v| v.match File.basename(fpath) }
-    end
-    private :correctFileUser?
-
-    def ignoreFileUser?(fpath)
-      @ignoreFiles.any? {|v| v.match File.basename(fpath) }
-    end
-    private :ignoreFileUser?
-
-    def binary?(file)
-      s = File.read(file, 1024) or return false
-      return s.index("\x00")
-    end
-
-    def searchFile(stdout, fpath, fpath_disp)
-      @result.count += 1
-      @result.size += FileTest.size(fpath)
-
-      # 除外ファイル
-      if ignoreFile?(fpath)
-        @result.ignore_files << fpath_disp if (@option.debugMode)
-        return
-      end
-      
-      @result.search_count += 1
-      @result.search_size += FileTest.size(fpath)
-
-      # 検索本体
-      @result.search_files << fpath_disp if (@option.debugMode)
-
-      open(fpath, "r") { |file|
-        match_file = false
-        file.each() { |line|
-          line.chomp!
-
-          result, match_datas = match?(line)
-
-          if ( result )
-            unless (@option.colorHighlight)
-              stdout.puts "#{fpath_disp}:#{file.lineno}:#{line}"
-            else
-              header = "#{fpath_disp}:#{file.lineno}"
-                
-              begin
-                stdout.puts TermColor.parse("<34>#{header}</34>:") + coloring(line, match_datas)
-              rescue REXML::ParseException
-                stdout.puts header + line
-              end
-            end
-
-            unless match_file
-              @result.match_file_count += 1
-              @result.match_files << fpath_disp if (@option.debugMode)
-              match_file = true
-            end
-
-            @result.match_count += 1
-          end
-        }
-      }
-    end
-    private :searchFile
-
-    def match?(line)
-      match_datas = []
-      @patternRegexps.each {|v| match_datas << v.match(line)}
-      return match_datas.all?, match_datas
-    end
-    private :match?
-
-    def coloring(line, match_datas)
-      match_datas.each do |m|
-        line = line.split(m[0]).join(TermColor.parse("<42>#{m[0]}</42>"))
-      end
-      line
-    end
-    private :coloring
-
-  end
-end