codestock 0.1.1 → 0.1.2

data/HISTORY.rdoc

@@ -0,0 +1,5 @@
+=== 0.1.2 2011/07/03
+
+* Syntax highlighting (using CodeRay)
+
+

data/Rakefile

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'rubygems'
 require 'bundler'
 # begin
@@ -25,23 +26,35 @@ Jeweler::Tasks.new do |gem|
   gem.add_runtime_dependency 'rroonga','>= 1.0.0'
   gem.add_runtime_dependency 'rack','>=1.2.1'
   gem.add_runtime_dependency 'launchy', '>=0.3.7'
+  gem.add_runtime_dependency 'coderay', '>=0.9.8'
 
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   #  gem.add_development_dependency 'rspec', '> 1.2.3'
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-# require 'rake/testtask'
-# Rake::TestTask.new(:test) do |test|
-#   test.libs << 'lib' << 'test'
-#   test.pattern = 'test/**/test_*.rb'
-#   test.verbose = true
-# end
+require 'rake/testtask'
 
-task :test do
-  load "test/runner.rb"
+# groonga関連のテストが通らないため、独自のrake_test_loaderを読み込む
+module Rake
+  class TestTask < TaskLib
+    def rake_loader # :nodoc:
+      find_file('test/rake_test_loader') or
+        fail "unable to find rake test loader"
+    end
+  end
+end
+ 
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
 end
 
+# task :test do
+#   load "test/runner.rb"
+# end
+
 require 'rcov/rcovtask'
 Rcov::RcovTask.new do |test|
   test.libs << 'test'

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bin/cdstk

@@ -4,7 +4,7 @@
 #  Copyright (c) 2010. All rights reserved.
 
 require 'rubygems'
-require File.join(File.dirname(__FILE__), "../lib/cdstk/cli_cdstk")
+require 'cdstk/cli_cdstk'
 
 Version = "0.1.0"
 CodeStock::CLI_Cdstk.execute(STDOUT, ARGV)

data/bin/cdview

@@ -4,7 +4,7 @@
 #  Copyright (c) 2010. All rights reserved.
 
 require 'rubygems'
-require File.join(File.dirname(__FILE__), "../lib/cdview/cli_cdview")
+require 'cdview/cli_cdview'
 
 Version = "0.1.0"
 CodeStock::CLI_Cdview.execute(STDOUT, ARGV)

data/bin/cdweb

@@ -4,7 +4,7 @@
 #  Copyright (c) 2010. All rights reserved.
 
 require 'rubygems'
-require File.join(File.dirname(__FILE__), "../lib/cdweb/cli_cdweb")
+require 'cdweb/cli_cdweb'
 
 Version = "0.1.0"
 CodeStock::CLI_Cdweb.execute(STDOUT, ARGV)

data/codestock.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{codestock}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["ongaeshi"]
-  s.date = %q{2011-03-11}
+  s.date = %q{2011-06-08}
   s.description = %q{longer description of your gem}
   s.email = %q{ongaeshi0621@gmail.com}
   s.executables = ["cdweb", "cdv", "cdstk", "cdview"]
@@ -40,39 +40,15 @@ Gem::Specification.new do |s|
     "lib/common/util.rb",
     "lib/findgrep/findgrep.rb",
     "lib/findgrep/result.rb",
-    "lib/gren.rb",
-    "lib/gren/cli.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/cli_old.rb",
-    "lib/mkgrendb/grendbyaml.rb",
-    "lib/mkgrendb/mkgrendb.rb",
     "test/file_test_utils.rb",
     "test/runner.rb",
     "test/test_dbdir.rb",
-    "test/test_gren.rb",
     "test/test_gren_util.rb",
-    "test/test_grendbyaml.rb",
-    "test/test_grenweb_cli.rb",
     "test/test_grenweb_database.rb",
     "test/test_grenweb_html_renderer.rb",
     "test/test_grenweb_query.rb",
     "test/test_grenweb_searcher.rb",
     "test/test_helper.rb",
-    "test/test_mkgrendb.rb",
     "test/test_string_snip.rb"
   ]
   s.homepage = %q{http://github.com/ongaeshi/codestock}
@@ -84,16 +60,12 @@ Gem::Specification.new do |s|
     "test/file_test_utils.rb",
     "test/runner.rb",
     "test/test_dbdir.rb",
-    "test/test_gren.rb",
     "test/test_gren_util.rb",
-    "test/test_grendbyaml.rb",
-    "test/test_grenweb_cli.rb",
     "test/test_grenweb_database.rb",
     "test/test_grenweb_html_renderer.rb",
     "test/test_grenweb_query.rb",
     "test/test_grenweb_searcher.rb",
     "test/test_helper.rb",
-    "test/test_mkgrendb.rb",
     "test/test_string_snip.rb"
   ]
 

data/lib/cdstk/cdstk.rb

@@ -6,9 +6,9 @@ require 'rubygems'
 require 'groonga'
 require 'fileutils'
 require 'pathname'
-require File.join(File.dirname(__FILE__), 'cdstk_yaml')
-require File.join(File.dirname(__FILE__), '../common/grenfiletest')
-require File.join(File.dirname(__FILE__), '../common/util')
+require 'cdstk/cdstk_yaml'
+require 'common/grenfiletest'
+require 'common/util'
 include CodeStock
 
 module CodeStock

data/lib/cdstk/cli_cdstk.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'optparse'
-require File.join(File.dirname(__FILE__), 'cdstk')
-require File.join(File.dirname(__FILE__), '../common/dbdir.rb')
+require 'cdstk/cdstk'
+require 'common/dbdir.rb'
 include CodeStock
 
 module CodeStock

data/lib/cdview/cli_cdview.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'optparse'
-require File.join(File.dirname(__FILE__), '../findgrep/findgrep')
-require File.join(File.dirname(__FILE__), '../common/dbdir')
+require 'findgrep/findgrep'
+require 'common/dbdir'
 include CodeStock
 
 module CodeStock

data/lib/cdweb/cli_cdweb.rb

@@ -2,8 +2,8 @@
 require 'rubygems'
 require 'optparse'
 require 'fileutils'
-require File.join(File.dirname(__FILE__), 'database')
-require File.join(File.dirname(__FILE__), '../common/dbdir')
+require 'cdweb/database'
+require 'common/dbdir'
 include CodeStock
 require 'rack'
 require 'launchy'

data/lib/cdweb/coderay_wrapper.rb

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2011/07/03
+
+require 'rubygems'
+require 'coderay'
+require 'coderay/helpers/file_type'
+
+module CodeStock
+  class CodeRayWrapper
+    def self.html_memfile(content, filename)
+      to_html_code(content, file_type(filename))
+    end
+    
+    def self.to_html_code(code, kind)
+      CodeRay.scan(code, kind).
+        html(
+             :wrap => nil,
+             :line_numbers => :table,
+             :css => :class
+             )
+    end
+    
+    def self.file_type(filename)
+      case File.extname(filename)
+      when ".el"
+        :scheme
+      else
+        CodeRay::FileType.fetch filename, :plaintext
+      end
+    end
+  end
+end
+
+

data/lib/cdweb/database.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # @file 
-# @brief  Grenwebで使用するデータベース
+# @brief  CodeStockで使用するデータベース
 # @author ongaeshi
 # @date   2010/10/17
 
@@ -9,7 +9,7 @@ require 'rubygems'
 require 'pathname'
 require 'singleton'
 require 'groonga'
-require File.join(File.dirname(__FILE__), "../common/dbdir")
+require 'common/dbdir'
 include CodeStock
 
 module CodeStock

data/lib/cdweb/grenweb.ru

@@ -7,10 +7,10 @@
 
 require 'rubygems'
 require 'rack'
-require File.join(File.dirname(__FILE__), 'home')
-require File.join(File.dirname(__FILE__), 'searcher')
-require File.join(File.dirname(__FILE__), 'viewer')
-require File.join(File.dirname(__FILE__), 'help')
+require 'cdweb/home'
+require 'cdweb/searcher'
+require 'cdweb/viewer'
+require 'cdweb/help'
 
 use Rack::CommonLogger          
 use Rack::Runtime
@@ -18,18 +18,18 @@ use Rack::Static, :urls => ["/css", "/images"], :root => "public"
 use Rack::ContentLength
 
 map '/' do
-  run Grenweb::Home.new
+  run CodeStock::Home.new
 end
 
 map '/::search' do
-  run Grenweb::Searcher.new
+  run CodeStock::Searcher.new
 end
 
 map '/::view' do
-  run Grenweb::Viewer.new
+  run CodeStock::Viewer.new
 end
 
 map '/::help' do
-  run Grenweb::Help.new
+  run CodeStock::Help.new
 end
 

data/lib/cdweb/grep.rb

@@ -5,12 +5,12 @@
 # @author ongaeshi
 # @date   2010/10/18
 
-module Grenweb
+module CodeStock
   class Grep
     attr_reader :content
     
     def initialize(content)
-      @content = content.split("\n")
+      @content = content ? content.split("\n") : []
     end
 
     MatchLineResult = Struct.new(:index, :match_datas)

data/lib/cdweb/help.rb

@@ -7,11 +7,11 @@
 
 require 'rubygems'
 require 'rack'
-require File.join(File.dirname(__FILE__), 'database')
-require File.join(File.dirname(__FILE__), 'html_renderer')
-require File.join(File.dirname(__FILE__), 'query')
+require 'cdweb/database'
+require 'cdweb/html_renderer'
+require 'cdweb/query'
 
-module Grenweb
+module CodeStock
   class Help
     include Rack::Utils
 

data/lib/cdweb/home.rb

@@ -7,11 +7,11 @@
 
 require 'rubygems'
 require 'rack'
-require File.join(File.dirname(__FILE__), 'database')
-require File.join(File.dirname(__FILE__), 'html_renderer')
-require File.join(File.dirname(__FILE__), 'query')
+require 'cdweb/database'
+require 'cdweb/html_renderer'
+require 'cdweb/query'
 
-module Grenweb
+module CodeStock
   class Home
     include Rack::Utils
 

data/lib/cdweb/html_renderer.rb

@@ -8,14 +8,16 @@
 require 'rubygems'
 require 'pathname'
 require 'rack'
-require File.join(File.dirname(__FILE__), 'grep')
+require 'cdweb/grep'
+require 'cdweb/coderay_wrapper'
 
-module Grenweb
+module CodeStock
   class HTMLRendeler
     include Rack::Utils
 
     def initialize(script_name)
-      @script_name = Pathname(script_name)
+      # @script_name = Pathname(script_name)
+      @script_name = '/'
     end
 
     def header(title, header1)
@@ -29,6 +31,7 @@ module Grenweb
   <!-- <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">
@@ -132,11 +135,7 @@ EOS
     end
 
     def record_content(record)
-      <<EOS
-<pre>
-#{record_content_line(record)}
-</pre>
-EOS
+      CodeRayWrapper.html_memfile(record.content, record.shortpath)
     end
     
     def record_content_line(record)

data/lib/cdweb/public/css/coderay.css

@@ -0,0 +1,131 @@
+.CodeRay {
+  background-color: #f8f8f8;
+  border: 1px solid silver;
+  font-family: 'Courier New', 'Terminal', monospace;
+  color: #000;
+}
+.CodeRay pre { margin: 0px }
+
+div.CodeRay { }
+
+span.CodeRay { white-space: pre; border: 0px; padding: 2px }
+
+table.CodeRay { border-collapse: collapse; width: 100%; padding: 2px }
+table.CodeRay td { padding: 2px 4px; vertical-align: top }
+
+.CodeRay .line_numbers, .CodeRay .no {
+  background-color: #def;
+  color: gray;
+  text-align: right;
+}
+.CodeRay .line_numbers tt { font-weight: bold }
+.CodeRay .line_numbers .highlighted { color: red }
+.CodeRay .line { display: block; float: left; width: 100%; }
+.CodeRay .no { padding: 0px 4px }
+.CodeRay .code { width: 100% }
+
+ol.CodeRay { font-size: 10pt }
+ol.CodeRay li { white-space: pre }
+
+.CodeRay .code pre { overflow: auto }
+
+.CodeRay .debug { color:white ! important; background:blue ! important; }
+
+.CodeRay .af { color:#00C }
+.CodeRay .an { color:#007 }
+.CodeRay .at { color:#f08 }
+.CodeRay .av { color:#700 }
+.CodeRay .aw { color:#C00 }
+.CodeRay .bi { color:#509; font-weight:bold }
+.CodeRay .c  { color:#888; }
+
+.CodeRay .ch { color:#04D }
+.CodeRay .ch .k { color:#04D }
+.CodeRay .ch .dl { color:#039 }
+
+.CodeRay .cl { color:#B06; font-weight:bold }
+.CodeRay .cm { color:#A08; font-weight:bold }
+.CodeRay .co { color:#036; font-weight:bold }
+.CodeRay .cr { color:#0A0 }
+.CodeRay .cv { color:#369 }
+.CodeRay .de { color:#B0B; }
+.CodeRay .df { color:#099; font-weight:bold }
+.CodeRay .di { color:#088; font-weight:bold }
+.CodeRay .dl { color:black }
+.CodeRay .do { color:#970 }
+.CodeRay .dt { color:#34b }
+.CodeRay .ds { color:#D42; font-weight:bold }
+.CodeRay .e  { color:#666; font-weight:bold }
+.CodeRay .en { color:#800; font-weight:bold }
+.CodeRay .er { color:#F00; background-color:#FAA }
+.CodeRay .ex { color:#C00; font-weight:bold }
+.CodeRay .fl { color:#60E; font-weight:bold }
+.CodeRay .fu { color:#06B; font-weight:bold }
+.CodeRay .gv { color:#d70; font-weight:bold }
+.CodeRay .hx { color:#058; font-weight:bold }
+.CodeRay .i  { color:#00D; font-weight:bold }
+.CodeRay .ic { color:#B44; font-weight:bold }
+
+.CodeRay .il { background: #ddd; color: black }
+.CodeRay .il .il { background: #ccc }
+.CodeRay .il .il .il { background: #bbb }
+.CodeRay .il .idl { background: #ddd; font-weight: bold; color: #666 }
+.CodeRay .idl { background-color: #bbb; font-weight: bold; color: #666; }
+
+.CodeRay .im { color:#f00; }
+.CodeRay .in { color:#B2B; font-weight:bold }
+.CodeRay .iv { color:#33B }
+.CodeRay .la { color:#970; font-weight:bold }
+.CodeRay .lv { color:#963 }
+.CodeRay .oc { color:#40E; font-weight:bold }
+.CodeRay .of { color:#000; font-weight:bold }
+.CodeRay .op { }
+.CodeRay .pc { color:#038; font-weight:bold }
+.CodeRay .pd { color:#369; font-weight:bold }
+.CodeRay .pp { color:#579; }
+.CodeRay .ps { color:#00C; font-weight:bold }
+.CodeRay .pt { color:#074; font-weight:bold }
+.CodeRay .r, .kw  { color:#080; font-weight:bold }
+
+.CodeRay .ke { color: #808; }
+.CodeRay .ke .dl { color: #606; }
+.CodeRay .ke .ch { color: #80f; }
+.CodeRay .vl { color: #088; }
+
+.CodeRay .rx { background-color:#fff0ff }
+.CodeRay .rx .k { color:#808 }
+.CodeRay .rx .dl { color:#404 }
+.CodeRay .rx .mod { color:#C2C }
+.CodeRay .rx .fu  { color:#404; font-weight: bold }
+
+.CodeRay .s { background-color:#fff0f0; color: #D20; }
+.CodeRay .s .s { background-color:#ffe0e0 }
+.CodeRay .s .s  .s { background-color:#ffd0d0 }
+.CodeRay .s .k { }
+.CodeRay .s .ch { color: #b0b; }
+.CodeRay .s .dl { color: #710; }
+
+.CodeRay .sh { background-color:#f0fff0; color:#2B2 }
+.CodeRay .sh .k { }
+.CodeRay .sh .dl { color:#161 }
+
+.CodeRay .sy { color:#A60 }
+.CodeRay .sy .k { color:#A60 }
+.CodeRay .sy .dl { color:#630 }
+
+.CodeRay .ta { color:#070 }
+.CodeRay .tf { color:#070; font-weight:bold }
+.CodeRay .ts { color:#D70; font-weight:bold }
+.CodeRay .ty { color:#339; font-weight:bold }
+.CodeRay .v  { color:#036 }
+.CodeRay .xt { color:#444 }
+
+.CodeRay .ins { background: #afa; }
+.CodeRay .del { background: #faa; }
+.CodeRay .chg { color: #aaf; background: #007; }
+.CodeRay .head { color: #f8f; background: #505 }
+
+.CodeRay .ins .ins { color: #080; font-weight:bold }
+.CodeRay .del .del { color: #800; font-weight:bold }
+.CodeRay .chg .chg { color: #66f; }
+.CodeRay .head .head { color: #f4f; }

data/lib/cdweb/public/css/gren.css

@@ -34,16 +34,13 @@ dt.result-record {
     font-size: 105%;
 }
 
-pre.lines {
-}
-
 div.pagination {
     background-color:#FEFFF0;
     text-align: center;
     margin-bottom: 20px;
 }
 
-pre {
+pre.lines {
     border: 1px solid #dedede;
     margin-bottom: 5px;
     padding-left: 5px;

data/lib/cdweb/query.rb

@@ -8,7 +8,7 @@
 require 'rubygems'
 require 'rack'
 
-module Grenweb
+module CodeStock
   class Query
     include Rack::Utils
     attr_reader :query_string

data/lib/cdweb/searcher.rb

@@ -7,11 +7,11 @@
 
 require 'rubygems'
 require 'rack'
-require File.join(File.dirname(__FILE__), 'database')
-require File.join(File.dirname(__FILE__), 'html_renderer')
-require File.join(File.dirname(__FILE__), 'query')
+require 'cdweb/database'
+require 'cdweb/html_renderer'
+require 'cdweb/query'
 
-module Grenweb
+module CodeStock
   class Searcher
     include Rack::Utils
 

data/lib/cdweb/viewer.rb

@@ -7,10 +7,10 @@
 
 require 'rubygems'
 require 'rack'
-require File.join(File.dirname(__FILE__), 'database')
-require File.join(File.dirname(__FILE__), 'html_renderer')
+require 'cdweb/database'
+require 'cdweb/html_renderer'
 
-module Grenweb
+module CodeStock
   class Viewer
     include Rack::Utils
 

data/lib/common/grensnip.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-require File.join(File.dirname(__FILE__), 'string_snip')
+require 'common/string_snip'
 
 class GrenSnip
   MAX_LINE_SIZE = 256

data/lib/common/util.rb

@@ -2,6 +2,10 @@
 
 module Gren
   module Util
+    # アルファベットと演算子で表示する数を変える
+    ALPHABET_DISP_NUM = 5
+    OPERATOR_DISP_NUM = 10
+
     def time_s(time)
       t = time.truncate
       h = t / 3600
@@ -45,10 +49,6 @@ module Gren
     end
     module_function :size_s
 
-    # アルファベットと演算子で表示する数を変える
-    ALPHABET_DISP_NUM = 5
-    OPERATOR_DISP_NUM = 10
-
     def p_classtree(c)
       unless c.is_a?(Class)
         c = c.class

data/lib/findgrep/findgrep.rb

@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
 require 'find'
-require File.join(File.dirname(__FILE__), 'result')
+require 'findgrep/result'
 require 'rubygems'
 require 'termcolor'
 require 'kconv'
-require File.join(File.dirname(__FILE__), '../common/platform')
-require File.join(File.dirname(__FILE__), '../common/grenfiletest')
-require File.join(File.dirname(__FILE__), '../common/grensnip')
+require 'common/platform'
+require 'common/grenfiletest'
+require 'common/grensnip'
 require 'groonga'
-require File.join(File.dirname(__FILE__), '../common/util')
+require 'common/util'
 include Gren
 require 'cgi'
 

data/lib/findgrep/result.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 require 'find'
-require File.join(File.dirname(__FILE__), '../common/util')
+require 'common/util'
 include Gren
 
 module FindGrep

data/test/rake_test_loader.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+# Load the test files from the command line.
+require 'rubygems'
+require 'groonga'
+
+ARGV.each { |f| load f unless f =~ /^-/  }

data/test/test_bin_exec.rb

@@ -7,9 +7,9 @@
 
 require 'rubygems'
 require 'test/unit'
-require File.join(File.dirname(__FILE__), "../lib/cdstk/cli_cdstk")
-require File.join(File.dirname(__FILE__), "../lib/cdview/cli_cdview")
-require File.join(File.dirname(__FILE__), "../lib/cdweb/cli_cdweb")
+require 'cdstk/cli_cdstk'
+require 'cdview/cli_cdview'
+require 'cdweb/cli_cdweb'
 
 class TestBinExec < Test::Unit::TestCase
   def test_bin_exec

data/test/test_cdstk.rb

@@ -7,10 +7,10 @@
 
 require 'rubygems'
 require 'groonga'
-require File.join(File.dirname(__FILE__), "test_helper.rb")
-require File.join(File.dirname(__FILE__), "file_test_utils")
-require File.join(File.dirname(__FILE__), "../lib/cdstk/cli_cdstk.rb")
-require File.join(File.dirname(__FILE__), "../lib/cdstk/cdstk")
+require 'test_helper'
+require 'file_test_utils'
+require 'cdstk/cli_cdstk.rb'
+require 'cdstk/cdstk'
 require 'stringio'
 
 class TestCdstk < Test::Unit::TestCase

data/test/test_cdstk_yaml.rb

@@ -5,8 +5,8 @@
 # @author ongaeshi
 # @date   2011/02/20
 
-require File.join(File.dirname(__FILE__), "test_helper.rb")
-require File.join(File.dirname(__FILE__), "../lib/cdstk/cdstk_yaml.rb")
+require 'test_helper'
+require 'cdstk/cdstk_yaml.rb'
 require 'fileutils'
 
 class TestCdstkYaml < Test::Unit::TestCase

data/test/test_dbdir.rb

@@ -6,9 +6,9 @@
 # @date   2011/03/08
 
 require 'rubygems'
-require File.join(File.dirname(__FILE__), "test_helper")
-require File.join(File.dirname(__FILE__), "../lib/common/dbdir")
-require File.join(File.dirname(__FILE__), "file_test_utils")
+require 'test_helper'
+require 'common/dbdir'
+require 'file_test_utils'
 
 class TestDbDir< Test::Unit::TestCase
   include CodeStock

data/test/test_gren_util.rb

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

data/test/test_grenweb_database.rb

@@ -7,11 +7,11 @@
 
 require 'rubygems'
 require 'groonga'
-require File.join(File.dirname(__FILE__), "test_helper")
-require File.join(File.dirname(__FILE__), "file_test_utils")
-require File.join(File.dirname(__FILE__), "../lib/cdweb/database")
-require File.join(File.dirname(__FILE__), "../lib/common/dbdir")
-require File.join(File.dirname(__FILE__), "../lib/cdstk/cdstk")
+require 'test_helper' 
+require 'file_test_utils'
+require 'cdweb/database'
+require 'common/dbdir'
+require 'cdstk/cdstk'
 require 'stringio'
 
 class TestMkgrendb < Test::Unit::TestCase

data/test/test_grenweb_html_renderer.rb

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
-require File.join(File.dirname(__FILE__), "test_helper.rb")
-require File.join(File.dirname(__FILE__), "../lib/cdweb/html_renderer.rb")
+require 'test_helper'
+require 'cdweb/html_renderer.rb'
 
 class TestGrenwebHTMLRendeler < Test::Unit::TestCase
-  include Grenweb
+  include CodeStock
 
   def setup
     @rendeler = HTMLRendeler.new('/')

data/test/test_grenweb_query.rb

@@ -5,11 +5,11 @@
 # @author ongaeshi
 # @date   2010/10/21
 
-require File.join(File.dirname(__FILE__), 'test_helper')
-require File.join(File.dirname(__FILE__), '../lib/cdweb/query')
+require 'test_helper'
+require 'cdweb/query'
 
 class TestGrenWebQuery < Test::Unit::TestCase
-  include Grenweb
+  include CodeStock
   include Rack::Utils
 
   def test_query

data/test/test_grenweb_searcher.rb

@@ -5,13 +5,13 @@
 # @author ongaeshi
 # @date   2010/10/21
 
-require File.join(File.dirname(__FILE__), "test_helper.rb")
-require File.join(File.dirname(__FILE__), "../lib/cdweb/searcher.rb")
+require 'test_helper'
+require 'cdweb/searcher.rb'
 require 'rack/mock'
 
 class TestGrenwebSearcher < Test::Unit::TestCase
   def setup
-    @app = Grenweb::Searcher.new
+    @app = CodeStock::Searcher.new
     @mr  = Rack::MockRequest.new(@app)
   end
 

data/test/test_string_snip.rb

@@ -1,31 +1,31 @@
-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
-  end
-
-  def test_ranges_compound
-    ranges = [0..7, 8..232, 121..150, 248..255]
-    assert_equal(StringSnip.ranges_compound(ranges), [0..232, 248..255])
-
-    ranges = [10..20, 22..30, 33..40]
-    assert_equal(StringSnip.ranges_compound(ranges), [10..20, 22..30, 33..40])
-
-    ranges = [10..30, 20..30, 30..40]
-    assert_equal(StringSnip.ranges_compound(ranges), [10..40])
-  end
-  
-  def test_string_snip
-    str = "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789|123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789|12345678901234567890123456789012345678901234567890123456"
-
-    snipper = StringSnip.new
-    snip_str = snipper.snip(str, [0..7, -8..-1])
-    assert_equal(snip_str, str)
-
-    snipper = StringSnip.new(64)
-    snip_str = snipper.snip(str, [-8..-1, 10..20, 0..7])
-    assert_equal(snip_str, "12345678<<snip>>12345678901<<snip>>90123456")
-  end
-end
+require 'test_helper'
+require 'common/util.rb'
+require 'common/grensnip.rb'
+
+class TestStringSnip < Test::Unit::TestCase
+  def setup
+  end
+
+  def test_ranges_compound
+    ranges = [0..7, 8..232, 121..150, 248..255]
+    assert_equal(StringSnip.ranges_compound(ranges), [0..232, 248..255])
+
+    ranges = [10..20, 22..30, 33..40]
+    assert_equal(StringSnip.ranges_compound(ranges), [10..20, 22..30, 33..40])
+
+    ranges = [10..30, 20..30, 30..40]
+    assert_equal(StringSnip.ranges_compound(ranges), [10..40])
+  end
+  
+  def test_string_snip
+    str = "123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789|123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789|12345678901234567890123456789012345678901234567890123456"
+
+    snipper = StringSnip.new
+    snip_str = snipper.snip(str, [0..7, -8..-1])
+    assert_equal(snip_str, str)
+
+    snipper = StringSnip.new(64)
+    snip_str = snipper.snip(str, [-8..-1, 10..20, 0..7])
+    assert_equal(snip_str, "12345678<<snip>>12345678901<<snip>>90123456")
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - ongaeshi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 +09:00
+date: 2011-07-03 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -113,6 +113,20 @@ dependencies:
   requirement: *id007
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
+  name: coderay
+  requirement: *id008
+  prerelease: false
+  type: :runtime
 description: longer description of your gem
 email: ongaeshi0621@gmail.com
 executables: 
@@ -129,6 +143,7 @@ files:
 - .document
 - Gemfile
 - Gemfile.lock
+- HISTORY.rdoc
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -143,12 +158,14 @@ files:
 - lib/cdstk/cli_cdstk.rb
 - lib/cdview/cli_cdview.rb
 - lib/cdweb/cli_cdweb.rb
+- lib/cdweb/coderay_wrapper.rb
 - lib/cdweb/database.rb
 - lib/cdweb/grenweb.ru
 - lib/cdweb/grep.rb
 - lib/cdweb/help.rb
 - lib/cdweb/home.rb
 - lib/cdweb/html_renderer.rb
+- lib/cdweb/public/css/coderay.css
 - lib/cdweb/public/css/gren.css
 - lib/cdweb/public/images/gren-icon-mini.png
 - lib/cdweb/public/images/gren-icon.png
@@ -166,6 +183,7 @@ files:
 - lib/findgrep/findgrep.rb
 - lib/findgrep/result.rb
 - test/file_test_utils.rb
+- test/rake_test_loader.rb
 - test/runner.rb
 - test/test_bin_exec.rb
 - test/test_cdstk.rb
@@ -210,6 +228,7 @@ specification_version: 3
 summary: one-line summary of your gem
 test_files: 
 - test/file_test_utils.rb
+- test/rake_test_loader.rb
 - test/runner.rb
 - test/test_bin_exec.rb
 - test/test_cdstk.rb