milkode 0.2.0 → 0.2.1

data/HISTORY.rdoc

@@ -1,3 +1,15 @@
+=== 0.2.1 2011/08/12
+
+Milkode repository is version up.
+Please rebuild repository.
+
+  milk rebuild
+
+* Support AutoPagerize. (thanks awasira)
+* 'documents' table type change, 'Groonga::Array -> Groonga:: Hash'.
+  * 'milk update' faster (thanks kou)
+  * Issues#6 CentOS 5.5 (32bit) in 'milk update' fails (thanks yoshikaw)
+
 === 0.2.0 2011/08/10
 
 * Issues#4 Bug fix, wrong display of search results. (thanks rakkoyaku, ryo)

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/bin/milk

@@ -6,5 +6,5 @@
 require 'rubygems'
 require 'milkode/cdstk/cli_cdstk'
 
-Version = "0.2.0"
+Version = "0.2.1"
 Milkode::CLI_Cdstk.execute(STDOUT, ARGV)

data/lib/milkode/cdstk/cdstk.rb

@@ -55,6 +55,10 @@ module Milkode
       end
     end
 
+    def compatible?
+      db_open(db_file)
+    end
+
     def update(args = nil)
       print_result do 
         yaml = yaml_load
@@ -251,6 +255,10 @@ module Milkode
     end
 
     def cleanup(options)
+      # 互換性テスト
+      db_open(db_file)
+
+      # cleanup開始
       if (options[:force] or yes_or_no("cleanup contents? (yes/no)"))
         print_result do 
           # yamlファイルのクリーンアップ
@@ -366,37 +374,44 @@ module Milkode
       
       unless dbfile.exist?
         Groonga::Database.create(:path => dbfile.to_s)
-        Groonga::Schema.define do |schema|
-          schema.create_table("documents") do |table|
-            table.string("path")
-            table.string("shortpath")
-            table.text("content")
-            table.time("timestamp")
-            table.text("suffix")
-          end
-
-          schema.create_table("terms",
-                              :type => :patricia_trie,
-                              :key_normalize => true,
-                              :default_tokenizer => DEFAULT_TOKENIZER) do |table|
-            table.index("documents.path", :with_position => true)
-            table.index("documents.shortpath", :with_position => true)
-            table.index("documents.content", :with_position => true)
-            table.index("documents.suffix", :with_position => true)
-          end
-        end
+        db_define
         @out.puts "create     : #{filename} created."
       else
         @out.puts "message    : #{filename} already exist."
       end
     end
 
+    def db_define
+      Groonga::Schema.define do |schema|
+        schema.create_table("documents", :type => :hash) do |table|          
+          table.string("path")
+          table.string("shortpath")
+          table.text("content")
+          table.time("timestamp")
+          table.text("suffix")
+        end
+
+        schema.create_table("terms",
+                            :type => :patricia_trie,
+                            :key_normalize => true,
+                            :default_tokenizer => DEFAULT_TOKENIZER) do |table|
+          table.index("documents.path", :with_position => true)
+          table.index("documents.shortpath", :with_position => true)
+          table.index("documents.content", :with_position => true)
+          table.index("documents.suffix", :with_position => true)
+        end
+      end
+    end
+
     def db_open(filename)
       dbfile = Pathname(File.expand_path(filename))
       
       if dbfile.exist?
+        # データベースを開く
         Groonga::Database.open(dbfile.to_s)
-        # @out.puts  "open       : #{dbfile} open."
+
+        # 互換性テスト
+        db_compatible?
       else
         raise "error      : #{dbfile.to_s} not found!!"
       end
@@ -429,18 +444,14 @@ module Milkode
       # 検索するデータベース
       documents = Groonga::Context.default["documents"]
       
-      # 既に登録されているファイルならばそれを上書き、そうでなければ新規レコードを作成
-      _documents = documents.select do |record|
-        record["path"] == values[:path]
-      end
-      
+      record = documents[ values[:path] ]
       isNewFile = false
 
-      if _documents.size.zero?
-        document = documents.add
+      unless record
+        document = documents.add(values[:path])
         isNewFile = true
       else
-        document = _documents.to_a[0].key
+        document = record
       end
       
       # タイムスタンプが新しければデータベースに格納
@@ -514,5 +525,20 @@ module Milkode
       @out.puts "[fatal] #{msg}"
     end
 
+    def db_compatible?
+      begin
+        db_define
+      rescue Groonga::Schema::Error => e
+        puts <<EOF
+Milkode repository is old -> #{db_dir_expand}.
+Please rebuild repository, 
+
+  milk rebuild
+
+See 'milk --help' or http://milkode.ongaeshi.me .
+EOF
+        exit -1
+      end
+    end
   end
 end

data/lib/milkode/cdstk/cli_cdstk.rb

@@ -70,6 +70,7 @@ EOF
         when 'dump'
           obj.dump
         when 'web'
+          obj.compatible?
           Milkode::CLI_Cdweb.execute_with_options(stdout, suboptions[subcommand])
         end
       else

data/lib/milkode/cdweb/app.rb

@@ -18,7 +18,7 @@ require 'milkode/cdweb/lib/mkurl'
 set :haml, :format => :html5
 
 get '/' do
-  @version = "0.2.0"
+  @version = "0.2.1"
   @package_num = Database.instance.fileList('').size
   @file_num = Database.instance.fileNum
   haml :index

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

@@ -43,7 +43,7 @@ module Milkode
     
     @total_records = searcher.total_records
     @range = searcher.data_range
-    @record_content = searcher.html_contents  + searcher.html_pagination;
+    @record_content = "<dl class='autopagerize_page_element'>#{searcher.html_contents}</dl>#{searcher.html_pagination}";
     @match_num = searcher.match_num
     @elapsed = Time.now - before
     haml :search

data/lib/milkode/cdweb/lib/search_contents.rb

@@ -106,7 +106,7 @@ EOS
       tmpp = @params
       tmpp[:offset] = offset.to_s
       href = Mkurl.new("", tmpp).inherit_query_shead_offset
-      pagination_span("<a href='#{href}'>#{label}</a>")
+      pagination_span("<a href='#{href}' rel='next'>#{label}</a>")
     end
 
     def pagination_span(content)

data/lib/milkode/cdweb/lib/search_files.rb

@@ -68,7 +68,7 @@ EOF
       tmpp = @params
       tmpp[:offset] = offset.to_s
       href = Mkurl.new("", tmpp).inherit_query_shead_offset
-      pagination_span("<a href='#{href}'>#{label}</a>")
+      pagination_span("<a href='#{href}' rel='next'>#{label}</a>")
     end
 
     def pagination_span(content)

data/milkode.gemspec

@@ -5,14 +5,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{milkode}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{ongaeshi}]
-  s.date = %q{2011-08-09}
+  s.authors = ["ongaeshi"]
+  s.date = %q{2011-08-12}
   s.description = %q{Line based local source code search engine & web-app.}
   s.email = %q{ongaeshi0621@gmail.com}
-  s.executables = [%q{cdv}, %q{cdview}, %q{milk}]
+  s.executables = ["cdv", "milk", "cdview"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -92,15 +92,36 @@ Gem::Specification.new do |s|
     "vendor/archive/support/io.rb"
   ]
   s.homepage = %q{http://github.com/ongaeshi/milkode}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Line based local source code search engine & web-app.}
+  s.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_dir.rb",
+    "test/test_gren_util.rb",
+    "test/test_helper.rb",
+    "test/test_mkurl.rb",
+    "test/test_query.rb",
+    "test/test_string_snip.rb",
+    "test/test_util.rb"
+  ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])

metadata

@@ -1,170 +1,214 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: milkode
-version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
-authors:
+authors: 
 - ongaeshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-09 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &2151836120 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+
+date: 2011-08-12 00:00:00 +09:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-  type: :development
+  name: bundler
+  requirement: *id001
   prerelease: false
-  version_requirements: *2151836120
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &2151835340 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 5
+        - 2
         version: 1.5.2
-  type: :development
+  name: jeweler
+  requirement: *id002
   prerelease: false
-  version_requirements: *2151835340
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &2151834260 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  name: rcov
+  requirement: *id003
   prerelease: false
-  version_requirements: *2151834260
-- !ruby/object:Gem::Dependency
-  name: termcolor
-  requirement: &2151833020 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 0
         version: 1.2.0
-  type: :runtime
+  name: termcolor
+  requirement: *id004
   prerelease: false
-  version_requirements: *2151833020
-- !ruby/object:Gem::Dependency
-  name: rroonga
-  requirement: &2151831820 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  name: rroonga
+  requirement: *id005
   prerelease: false
-  version_requirements: *2151831820
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: &2151830480 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.1
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 1
+        version: 1.2.1
+  name: rack
+  requirement: *id006
   prerelease: false
-  version_requirements: *2151830480
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: &2151829080 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.6
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 6
+        version: 1.2.6
+  name: sinatra
+  requirement: *id007
   prerelease: false
-  version_requirements: *2151829080
-- !ruby/object:Gem::Dependency
-  name: launchy
-  requirement: &2151828080 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.7
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 7
+        version: 0.3.7
+  name: launchy
+  requirement: *id008
   prerelease: false
-  version_requirements: *2151828080
-- !ruby/object:Gem::Dependency
-  name: coderay
-  requirement: &2151826860 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.9.8
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
+  name: coderay
+  requirement: *id009
   prerelease: false
-  version_requirements: *2151826860
-- !ruby/object:Gem::Dependency
-  name: thin
-  requirement: &2151825960 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.2.10
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 10
+        version: 1.2.10
+  name: thin
+  requirement: *id010
   prerelease: false
-  version_requirements: *2151825960
-- !ruby/object:Gem::Dependency
-  name: archive-zip
-  requirement: &2151824500 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.0
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 0
+        version: 0.3.0
+  name: archive-zip
+  requirement: *id011
   prerelease: false
-  version_requirements: *2151824500
-- !ruby/object:Gem::Dependency
-  name: haml
-  requirement: &2151823320 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.2
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 1
+        - 2
+        version: 3.1.2
+  name: haml
+  requirement: *id012
   prerelease: false
-  version_requirements: *2151823320
-- !ruby/object:Gem::Dependency
-  name: sass
-  requirement: &2151821740 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.3
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 1
+        - 3
+        version: 3.1.3
+  name: sass
+  requirement: *id013
   prerelease: false
-  version_requirements: *2151821740
+  type: :runtime
 description: Line based local source code search engine & web-app.
 email: ongaeshi0621@gmail.com
-executables:
+executables: 
 - cdv
-- cdview
 - milk
+- cdview
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE.txt
 - README.rdoc
-files:
+files: 
 - .document
 - Gemfile
 - Gemfile.lock
@@ -237,29 +281,52 @@ files:
 - test/test_string_snip.rb
 - test/test_util.rb
 - vendor/archive/support/io.rb
+has_rdoc: true
 homepage: http://github.com/ongaeshi/milkode
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Line based local source code search engine & web-app.
-test_files: []
+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_dir.rb
+- test/test_gren_util.rb
+- test/test_helper.rb
+- test/test_mkurl.rb
+- test/test_query.rb
+- test/test_string_snip.rb
+- test/test_util.rb