codestock 0.1.2 → 0.1.3

data/test/test_database.rb

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2011/02/20
+
+require 'rubygems'
+require 'groonga'
+require 'test_helper' 
+require 'file_test_utils'
+require 'stringio'
+require 'cdstk/cdstk'
+require 'codestock/cdweb/lib/database'
+
+module CodeStock
+  class TestDatabase < Test::Unit::TestCase
+    include FileTestUtils
+
+    def setup_db
+      # データベース作成
+      io = StringIO.new
+      obj = Cdstk.new(io)
+      obj.init
+      obj.add('../../test')
+      obj.add('../../lib')
+      # puts io.string
+
+      # データベースのセットアップ
+      Database.setup('.')
+    end
+
+    def test_database
+      setup_db
+      t_open
+      t_fileList
+    end
+
+    def t_open
+      Database.instance
+    end
+
+    def t_fileList
+      db = Database.instance
+      assert_equal [['test', false], ['lib', false]], db.fileList('')
+      assert db.fileList('test').include? ['test/test_database.rb', true]
+      assert_equal ['lib/cdstk', false],              db.fileList('lib')[0]
+      assert_equal ['lib/cdstk/cdstk.rb', true],      db.fileList('lib/cdstk')[0]
+      assert_equal nil,                               db.fileList('lib/cdstk/cdstk.rb')[0]
+    end
+  end
+end
+
+

data/test/test_mkurl.rb

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2010/10/21
+
+require 'test_helper'
+require 'codestock/cdweb/lib/mkurl'
+
+module CodeStock
+  class TestMkurl < Test::Unit::TestCase
+    def test_basic
+      p1 = {:query => 'test', :shead => 'package', :page => '2'}
+      p2 = {:query => 'test', :page => '2'}
+      p3 = {:page => '2'}
+
+      assert_equal '/home/foo/bar.hpp?query=test&shead=package', Mkurl.new('/home/foo/bar.hpp', p1).inherit_query_shead
+      assert_equal '.?query=test&shead=package', Mkurl.new('.', p1).inherit_query_shead
+      assert_equal '/home/foo/bar.hpp?query=test', Mkurl.new('/home/foo/bar.hpp', p2).inherit_query_shead
+      assert_equal '/home/foo/bar.hpp', Mkurl.new('/home/foo/bar.hpp', p3).inherit_query_shead
+
+      assert_equal '/home/foo/bar.hpp?shead=package', Mkurl.new('/home/foo/bar.hpp', p1).inherit_shead
+      assert_equal '.?shead=package', Mkurl.new('.', p1).inherit_shead
+      assert_equal '/home/foo/bar.hpp', Mkurl.new('/home/foo/bar.hpp', p2).inherit_shead
+      assert_equal '/home/foo/bar.hpp', Mkurl.new('/home/foo/bar.hpp', p3).inherit_shead
+      
+    end
+  end
+end

data/test/test_query.rb

@@ -0,0 +1,54 @@
+# -*- coding: utf-8 -*-
+#
+# @file 
+# @brief
+# @author ongaeshi
+# @date   2010/10/21
+
+require 'test_helper'
+require 'codestock/cdweb/lib/query'
+
+module CodeStock
+  class TestQuery < Test::Unit::TestCase
+    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 "&p", q.query_string
+      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(query)
+    end
+  end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - ongaeshi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-03 00:00:00 +09:00
+date: 2011-07-20 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -127,6 +127,20 @@ dependencies:
   requirement: *id008
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 10
+        version: 1.2.10
+  name: thin
+  requirement: *id009
+  prerelease: false
+  type: :runtime
 description: longer description of your gem
 email: ongaeshi0621@gmail.com
 executables: 
@@ -157,22 +171,30 @@ files:
 - lib/cdstk/cdstk_yaml.rb
 - 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
-- lib/cdweb/query.rb
-- lib/cdweb/searcher.rb
-- lib/cdweb/viewer.rb
 - lib/codestock.rb
+- lib/codestock/cdweb/app.rb
+- lib/codestock/cdweb/cli_cdweb.rb
+- lib/codestock/cdweb/config.ru
+- lib/codestock/cdweb/lib/coderay_wrapper.rb
+- lib/codestock/cdweb/lib/command.rb
+- lib/codestock/cdweb/lib/database.rb
+- lib/codestock/cdweb/lib/grep.rb
+- lib/codestock/cdweb/lib/mkurl.rb
+- lib/codestock/cdweb/lib/query.rb
+- lib/codestock/cdweb/lib/search_contents.rb
+- lib/codestock/cdweb/lib/search_files.rb
+- lib/codestock/cdweb/public/css/coderay.css
+- lib/codestock/cdweb/public/css/gren.css
+- lib/codestock/cdweb/public/images/directory.png
+- lib/codestock/cdweb/public/images/file.png
+- lib/codestock/cdweb/public/images/gren-icon-mini.png
+- lib/codestock/cdweb/public/images/gren-icon.png
+- lib/codestock/cdweb/views/filelist.haml
+- lib/codestock/cdweb/views/help.haml
+- lib/codestock/cdweb/views/index.haml
+- lib/codestock/cdweb/views/layout.haml
+- lib/codestock/cdweb/views/search.haml
+- lib/codestock/cdweb/views/view.haml
 - lib/common/dbdir.rb
 - lib/common/display_util.rb
 - lib/common/grenfiletest.rb
@@ -182,19 +204,21 @@ files:
 - lib/common/util.rb
 - lib/findgrep/findgrep.rb
 - lib/findgrep/result.rb
+- test/file_assert.rb
 - test/file_test_utils.rb
 - test/rake_test_loader.rb
 - test/runner.rb
 - test/test_bin_exec.rb
 - test/test_cdstk.rb
 - test/test_cdstk_yaml.rb
+- test/test_coderay_wrapper.rb
+- test/test_coderay_wrapper_data.rb
+- test/test_database.rb
 - test/test_dbdir.rb
 - test/test_gren_util.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_mkurl.rb
+- test/test_query.rb
 - test/test_string_snip.rb
 has_rdoc: true
 homepage: http://github.com/ongaeshi/codestock
@@ -227,17 +251,19 @@ signing_key:
 specification_version: 3
 summary: one-line summary of your gem
 test_files: 
+- test/file_assert.rb
 - test/file_test_utils.rb
 - test/rake_test_loader.rb
 - test/runner.rb
 - test/test_bin_exec.rb
 - test/test_cdstk.rb
 - test/test_cdstk_yaml.rb
+- test/test_coderay_wrapper.rb
+- test/test_coderay_wrapper_data.rb
+- test/test_database.rb
 - test/test_dbdir.rb
 - test/test_gren_util.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_mkurl.rb
+- test/test_query.rb
 - test/test_string_snip.rb

data/lib/cdweb/cli_cdweb.rb

@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-require 'rubygems'
-require 'optparse'
-require 'fileutils'
-require 'cdweb/database'
-require 'common/dbdir'
-include CodeStock
-require 'rack'
-require 'launchy'
-
-module CodeStock
-  class CLI_Cdweb
-    def self.execute(stdout, arguments=[])
-      option = {
-        :Port => 9292,
-        :DbDir => db_default_dir,
-      }
-      
-      opt = OptionParser.new("#{File.basename($0)}")
-      opt.on('--db DB_DIR', 'Database dir (default : ~/.codestock)') {|v| option[:DbDir] = v }
-      opt.on('-p', '--port PORT', 'use PORT (default: 9292)') {|v| option[:Port] = v }
-      opt.on('--no-browser', 'No launch browser.') {|v| option[:NoBrowser] = true }
-      opt.parse!(arguments)
-
-      # webサーバー起動
-      stdout.puts <<EOF
-Start up grenweb !!
-URL : http://localhost:#{option[:Port]}
-DB  : #{option[:DbDir]}
-----------------------------------------
-EOF
-
-      # 使用するデータベースの位置設定
-      Database.setup(option[:DbDir])
-      
-      # サーバースクリプトのある場所へ移動
-      FileUtils.cd(File.dirname(__FILE__))
-      
-      # ブラウザ起動
-      Launchy.open("http://localhost:#{option[:Port]}") unless (option[:NoBrowser])
-      
-      # サーバー起動
-      Rack::Server.start(
-                         :environment => "development",
-                         :pid         => nil,
-                         :Port        => option[:Port],
-                         :Host        => "0.0.0.0",
-                         :AccessLog   => [],
-                         :config      => "grenweb.ru"
-                         )
-
-    end
-  end
-end

data/lib/cdweb/coderay_wrapper.rb

@@ -1,38 +0,0 @@
-# -*- 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/grenweb.ru

@@ -1,35 +0,0 @@
-# -*- mode: ruby; coding: utf-8 -*-
-#
-# @file   
-# @brief  gren web検索
-# @author ongaeshi
-# @date   2010/10/13
-
-require 'rubygems'
-require 'rack'
-require 'cdweb/home'
-require 'cdweb/searcher'
-require 'cdweb/viewer'
-require 'cdweb/help'
-
-use Rack::CommonLogger          
-use Rack::Runtime
-use Rack::Static, :urls => ["/css", "/images"], :root => "public"
-use Rack::ContentLength
-
-map '/' do
-  run CodeStock::Home.new
-end
-
-map '/::search' do
-  run CodeStock::Searcher.new
-end
-
-map '/::view' do
-  run CodeStock::Viewer.new
-end
-
-map '/::help' do
-  run CodeStock::Help.new
-end
-

data/lib/cdweb/help.rb

@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# @file 
-# @brief  ホーム画面
-# @author ongaeshi
-# @date   2010/10/13
-
-require 'rubygems'
-require 'rack'
-require 'cdweb/database'
-require 'cdweb/html_renderer'
-require 'cdweb/query'
-
-module CodeStock
-  class Help
-    include Rack::Utils
-
-    def call(env)
-      @env = env
-      @request = Rack::Request.new(env)
-      @query = Query.new(@request)
-
-      @response = Rack::Response.new
-      @response["Content-Type"] = "text/html; charset=UTF-8"
-
-      render
-    end
-
-    private
-
-    def render
-      r = HTMLRendeler.new(@request.script_name + '/..')
-      @response.write r.header("gren - help", "gren - help")
-      @response.write r.sample_code
-      @response.write r.footer
-      @response.to_a
-    end
-  end
-end
-

data/lib/cdweb/home.rb

@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# @file 
-# @brief  ホーム画面
-# @author ongaeshi
-# @date   2010/10/13
-
-require 'rubygems'
-require 'rack'
-require 'cdweb/database'
-require 'cdweb/html_renderer'
-require 'cdweb/query'
-
-module CodeStock
-  class Home
-    include Rack::Utils
-
-    def call(env)
-      @env = env
-      @request = Rack::Request.new(env)
-      @query = Query.new(@request)
-
-      @response = Rack::Response.new
-      @response["Content-Type"] = "text/html; charset=UTF-8"
-
-      render
-    end
-
-    private
-
-    def render
-      r = HTMLRendeler.new(@request.script_name)
-      @response.write r.header_home("gren", "gren", Version)
-      @response.write r.search_box
-      @response.write r.footer_home("??", Database.instance.fileNum)
-      @response.to_a
-    end
-  end
-end
-