milkode 0.1.9 → 0.2.0

data/HISTORY.rdoc

@@ -1,3 +1,8 @@
+=== 0.2.0 2011/08/10
+
+* Issues#4 Bug fix, wrong display of search results. (thanks rakkoyaku, ryo)
+* Issues#5 Delete GoogleAnalytics code. (thanks vividtone)
+
 === 0.1.9 2011/08/05
 
 * Bug fix, can't move 'milk web'.

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.2.0

data/bin/milk

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

data/lib/milkode/cdweb/app.rb

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

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

@@ -44,6 +44,7 @@ module Milkode
     @total_records = searcher.total_records
     @range = searcher.data_range
     @record_content = searcher.html_contents  + searcher.html_pagination;
+    @match_num = searcher.match_num
     @elapsed = Time.now - before
     haml :search
   end

data/lib/milkode/cdweb/lib/database.rb

@@ -216,7 +216,7 @@ module Milkode
       end
 
       # マッチ数
-      total_records = records.size
+      total_records = table.size
       
       return records, total_records
     end

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

@@ -18,7 +18,10 @@ module Milkode
     DISP_NUM = 20              # 1ページの表示数
     LIMIT_NUM = 50             # 最大検索ファイル数
     NTH = 3                    # 表示範囲
-
+#     DISP_NUM = 1000              # 1ページの表示数
+#     LIMIT_NUM = 1000             # 最大検索ファイル数
+#     NTH = 3                      # 表示範囲
+    
     def initialize(path, params, query)
       @params = params
       @q = query
@@ -57,6 +60,10 @@ module Milkode
 EOF
     end
 
+    def match_num
+      @match_records.size
+    end
+
     private
 
     MatchRecord = Struct.new(:record, :match_line)
@@ -70,7 +77,7 @@ EOF
         match_line = grep.one_match_and(@q.keywords)
         @match_records << MatchRecord.new(record, match_line) if match_line
 
-        if @match_records.size > DISP_NUM
+        if @match_records.size >= DISP_NUM
           @next_index = index + 1
           break
         end

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

@@ -58,6 +58,10 @@ module Milkode
 EOF
     end
 
+    def match_num
+      @records.size
+    end
+
     private
 
     def pagination_link(offset, label)

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

@@ -13,21 +13,4 @@
 
     != yield
 
-    %script{:type=>"text/javascript"}
-      var _gaq = _gaq || [];
-      _gaq.push(['_setAccount', 'UA-13136329-8']);
-      _gaq.push(['_trackPageview']);
-
-      (function() {
-      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-      })();
-
--#     %hr
-
--#     %footer
--#       %p
--#         ! Develop by <a href="./contact.html">ongaeshi</a>
--#         ! Powered by <a href="http://www.ruby-lang.org/">Ruby</a> #{::RUBY_VERSION},
--#         ! <a href="http://www.sinatrarb.com/">Sinatra</a> #{Sinatra::VERSION}
+-#  GoogleAnalyticsを使いたい場合はここにコードを挿入して下さい。

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

@@ -8,5 +8,10 @@
   = create_form(@path, params[:query], params[:shead])
   
   .search-summary
-    <span class="keyword">#{topic_path(@path, params)}</span> <span class="total-entries">#{@total_records}</span>件中 <span class="display-range">#{@range.first} - #{@range.last}</span>件（#{@elapsed}秒）
+    <span class="keyword">#{topic_path(@path, params)}</span>
+    <span class="hit-num">#{@total_records}</span>件ヒット中</span>
+    <span class="search-range">#{@range.first}番から#{@range.last - @range.first + 1}件を検索</span>
+    <span class="match-num">#{@match_num}</span>件マッチ</span>
+    （#{@elapsed}秒）
+    
   ~ @record_content

data/milkode.gemspec

@@ -0,0 +1,148 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{milkode}
+  s.version = "0.2.0"
+
+  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.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.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "Gemfile.lock",
+    "HISTORY.rdoc",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/cdv",
+    "bin/cdview",
+    "bin/milk",
+    "lib/milkode/cdstk/cdstk.rb",
+    "lib/milkode/cdstk/cdstk_yaml.rb",
+    "lib/milkode/cdstk/cli_cdstk.rb",
+    "lib/milkode/cdstk/cli_cdstksub.rb",
+    "lib/milkode/cdview/cli_cdview.rb",
+    "lib/milkode/cdweb/app.rb",
+    "lib/milkode/cdweb/cli_cdweb.rb",
+    "lib/milkode/cdweb/config.ru",
+    "lib/milkode/cdweb/lib/coderay_wrapper.rb",
+    "lib/milkode/cdweb/lib/command.rb",
+    "lib/milkode/cdweb/lib/database.rb",
+    "lib/milkode/cdweb/lib/grep.rb",
+    "lib/milkode/cdweb/lib/mkurl.rb",
+    "lib/milkode/cdweb/lib/query.rb",
+    "lib/milkode/cdweb/lib/search_contents.rb",
+    "lib/milkode/cdweb/lib/search_files.rb",
+    "lib/milkode/cdweb/public/css/coderay.css",
+    "lib/milkode/cdweb/public/css/gren.css",
+    "lib/milkode/cdweb/public/images/MilkodeIcon135.png",
+    "lib/milkode/cdweb/public/images/directory.png",
+    "lib/milkode/cdweb/public/images/file.png",
+    "lib/milkode/cdweb/views/filelist.haml",
+    "lib/milkode/cdweb/views/help.haml",
+    "lib/milkode/cdweb/views/index.haml",
+    "lib/milkode/cdweb/views/layout.haml",
+    "lib/milkode/cdweb/views/search.haml",
+    "lib/milkode/cdweb/views/view.haml",
+    "lib/milkode/common/archive-zip.rb",
+    "lib/milkode/common/dbdir.rb",
+    "lib/milkode/common/dir.rb",
+    "lib/milkode/common/display_util.rb",
+    "lib/milkode/common/grenfiletest.rb",
+    "lib/milkode/common/grensnip.rb",
+    "lib/milkode/common/platform.rb",
+    "lib/milkode/common/string_snip.rb",
+    "lib/milkode/common/util.rb",
+    "lib/milkode/findgrep/findgrep.rb",
+    "lib/milkode/findgrep/result.rb",
+    "milkode.gemspec",
+    "test/data/abc.zip",
+    "test/data/nodir_abc.zip",
+    "test/data/nodir_abc_xpi.xpi",
+    "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",
+    "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.summary = %q{Line based local source code search engine & web-app.}
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= 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"])
+      s.add_runtime_dependency(%q<termcolor>, [">= 1.2.0"])
+      s.add_runtime_dependency(%q<rroonga>, [">= 1.0.0"])
+      s.add_runtime_dependency(%q<rack>, [">= 1.2.1"])
+      s.add_runtime_dependency(%q<sinatra>, [">= 1.2.6"])
+      s.add_runtime_dependency(%q<launchy>, [">= 0.3.7"])
+      s.add_runtime_dependency(%q<coderay>, [">= 0.9.8"])
+      s.add_runtime_dependency(%q<thin>, [">= 1.2.10"])
+      s.add_runtime_dependency(%q<archive-zip>, [">= 0.3.0"])
+      s.add_runtime_dependency(%q<haml>, [">= 3.1.2"])
+      s.add_runtime_dependency(%q<sass>, [">= 3.1.3"])
+    else
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<termcolor>, [">= 1.2.0"])
+      s.add_dependency(%q<rroonga>, [">= 1.0.0"])
+      s.add_dependency(%q<rack>, [">= 1.2.1"])
+      s.add_dependency(%q<sinatra>, [">= 1.2.6"])
+      s.add_dependency(%q<launchy>, [">= 0.3.7"])
+      s.add_dependency(%q<coderay>, [">= 0.9.8"])
+      s.add_dependency(%q<thin>, [">= 1.2.10"])
+      s.add_dependency(%q<archive-zip>, [">= 0.3.0"])
+      s.add_dependency(%q<haml>, [">= 3.1.2"])
+      s.add_dependency(%q<sass>, [">= 3.1.3"])
+    end
+  else
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<termcolor>, [">= 1.2.0"])
+    s.add_dependency(%q<rroonga>, [">= 1.0.0"])
+    s.add_dependency(%q<rack>, [">= 1.2.1"])
+    s.add_dependency(%q<sinatra>, [">= 1.2.6"])
+    s.add_dependency(%q<launchy>, [">= 0.3.7"])
+    s.add_dependency(%q<coderay>, [">= 0.9.8"])
+    s.add_dependency(%q<thin>, [">= 1.2.10"])
+    s.add_dependency(%q<archive-zip>, [">= 0.3.0"])
+    s.add_dependency(%q<haml>, [">= 3.1.2"])
+    s.add_dependency(%q<sass>, [">= 3.1.3"])
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: milkode
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-04 00:00:00.000000000Z
+date: 2011-08-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152283560 !ruby/object:Gem::Requirement
+  requirement: &2151836120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152283560
+  version_requirements: *2151836120
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152274740 !ruby/object:Gem::Requirement
+  requirement: &2151835340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2152274740
+  version_requirements: *2151835340
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2152273480 !ruby/object:Gem::Requirement
+  requirement: &2151834260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152273480
+  version_requirements: *2151834260
 - !ruby/object:Gem::Dependency
   name: termcolor
-  requirement: &2152272360 !ruby/object:Gem::Requirement
+  requirement: &2151833020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152272360
+  version_requirements: *2151833020
 - !ruby/object:Gem::Dependency
   name: rroonga
-  requirement: &2152271480 !ruby/object:Gem::Requirement
+  requirement: &2151831820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152271480
+  version_requirements: *2151831820
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2152270580 !ruby/object:Gem::Requirement
+  requirement: &2151830480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152270580
+  version_requirements: *2151830480
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &2152269340 !ruby/object:Gem::Requirement
+  requirement: &2151829080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.2.6
   type: :runtime
   prerelease: false
-  version_requirements: *2152269340
+  version_requirements: *2151829080
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &2152268260 !ruby/object:Gem::Requirement
+  requirement: &2151828080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 0.3.7
   type: :runtime
   prerelease: false
-  version_requirements: *2152268260
+  version_requirements: *2151828080
 - !ruby/object:Gem::Dependency
   name: coderay
-  requirement: &2152267220 !ruby/object:Gem::Requirement
+  requirement: &2151826860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.9.8
   type: :runtime
   prerelease: false
-  version_requirements: *2152267220
+  version_requirements: *2151826860
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &2152266100 !ruby/object:Gem::Requirement
+  requirement: &2151825960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: 1.2.10
   type: :runtime
   prerelease: false
-  version_requirements: *2152266100
+  version_requirements: *2151825960
 - !ruby/object:Gem::Dependency
   name: archive-zip
-  requirement: &2152265120 !ruby/object:Gem::Requirement
+  requirement: &2151824500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: 0.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152265120
+  version_requirements: *2151824500
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &2152264220 !ruby/object:Gem::Requirement
+  requirement: &2151823320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 3.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *2152264220
+  version_requirements: *2151823320
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &2152263200 !ruby/object:Gem::Requirement
+  requirement: &2151821740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +153,7 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *2152263200
+  version_requirements: *2151821740
 description: Line based local source code search engine & web-app.
 email: ongaeshi0621@gmail.com
 executables:
@@ -214,6 +214,7 @@ files:
 - lib/milkode/common/util.rb
 - lib/milkode/findgrep/findgrep.rb
 - lib/milkode/findgrep/result.rb
+- milkode.gemspec
 - test/data/abc.zip
 - test/data/nodir_abc.zip
 - test/data/nodir_abc_xpi.xpi