milkode 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c43bd763ab7bdc781d2595fc9df76149db756f20
-  data.tar.gz: f2b515cd14b815fa9af6f4c720d3b120463b57c3
+  metadata.gz: 1caa99b674c764b9cb78ecdfc5688a43fb8f86c5
+  data.tar.gz: ec040b50c181f412068d76de6bfa1620fee18d62
 SHA512:
-  metadata.gz: 0a8611e756835e2c49917d48d5466a4add6139e112f1609d07728953626d929f4be91d2a0d8ab9cbf128bc8985b116f5a2db7a4ce92c95395301ca6e4360cb75
-  data.tar.gz: 86a7f32926e796b0866f8a45dee61bc4f403d5331109dfa369cbca8854486bc8d6243bbcd43bda8d401074b5d0ac284cb9fc6e58b25bb983a4610158ae39cb6f
+  metadata.gz: 5d968bba17caf2f486dcd0a1e02f90eb8a4bd95f765cd87701130410a577461f88c8f28bfe15ed63ce1d9f28fe15190bceee275ef2377cb8f04ef52917452b3a
+  data.tar.gz: 8adfee92b44ef759fd07357f46c747bd7a8d82f928df341d80882a6f0128656ffbabc943ae39a1807ec2b4fc24726422825c612307c156faa898228e70ba04cd

data/HISTORY.ja.rdoc

@@ -1,3 +1,14 @@
+=== 1.8.0 2014/06/26
+
+* milk web
+  * Keyboard shortcuts
+    * 's' .. Focus search bar
+    * 'S' (Select text)  .. Search using a selected text with new tab
+  * Add help of keyboard shortcut
+  * Hide the favorite list if it is empty
+  * Support for filtering by package name in 'f:*' search
+  * Support :home_font_size attribute in milkweb.yaml
+
 === 1.7.1 2014/06/17
 
 * milk web

data/HISTORY.rdoc

@@ -1,3 +1,14 @@
+=== 1.8.0 2014/06/26
+
+* milk web
+  * Keyboard shortcuts
+    * 's' .. Focus search bar
+    * 'S' (Select text)  .. Search using a selected text with new tab
+  * Add help of keyboard shortcut
+  * Hide the favorite list if it is empty
+  * Support for filtering by package name in 'f:*' search
+  * Support :home_font_size attribute in milkweb.yaml
+
 === 1.7.1 2014/06/17
 
 * milk web

data/lib/milkode/cdweb/app.rb

@@ -19,6 +19,7 @@ require 'milkode/cdweb/lib/web_setting'
 require 'milkode/cdweb/lib/package_list'
 require 'milkode/cdweb/lib/info_home'
 require 'milkode/cdweb/lib/info_package'
+require 'milkode/version'
 require 'sinatra/url_for'
 
 I18n.load_path += Dir[File.join(File.dirname(__FILE__), 'locales', '*.yml').to_s]
@@ -303,6 +304,8 @@ EOF
   end
 
   def create_favorite_list(package_list)
+    return "" if package_list.favorite_list_size == 0
+    
     <<EOF
       <div class="favorite_list">
         #{t(:favorite)}:

data/lib/milkode/cdweb/cli_cdweb.rb

@@ -78,8 +78,9 @@ EOF
         File.open(fname, "w") do |f|
           f.write <<EOF
 ---
-:home_title  : "Milkode"
-:home_icon   : "/images/MilkodeIcon135.png"
+:home_title     : "Milkode"
+:home_icon      : "/images/MilkodeIcon135.png"
+:home_font_size : "100%"
 
 :header_title: "Milkode"
 :header_icon : "/images/MilkodeIcon135.png"

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

@@ -113,8 +113,55 @@ module Milkode
       return records.map{|r| DocumentRecord.new(r)}, total_records, result
     end
 
-    def selectAll(offset, limit)
-      @documents.select_all_sort_by_shortpath(offset, limit)
+    def selectAll(current_path, offset, limit)
+      if current_path == ''
+        return @documents.select_all_sort_by_shortpath(offset, limit)
+      end
+
+      paths = []
+      strict_packages = []
+      is_not_search = false
+
+      package, restpath = Util.divide_shortpath(current_path)
+
+      grn_package = @grndb.packages[package]
+      if grn_package
+        # package name
+        strict_packages << package
+
+        # file path
+        directory = grn_package.directory
+        if restpath
+          paths << File.join(directory, restpath)
+        else
+          paths << directory
+        end
+      else
+        is_not_search = true
+      end
+
+      # search
+      records, total_records, result = [], 0, nil
+
+      begin
+        unless is_not_search
+          records, total_records, result = @documents.search_with_match(
+            :paths     => paths,
+            :strict_packages  => strict_packages,
+            :offset    => offset,
+            :limit     => limit
+          )
+        end
+      rescue Groonga::TooLargeOffset
+      end
+
+      if (limit != -1)
+        records = records.sort_by{|record| DocumentRecord::shortpath(record).downcase }
+      else
+        records = records.sort_by{|record| DocumentRecord::shortpath(record).downcase }
+      end
+
+      return records, result.size
     end
 
     # レコード数を得る

data/lib/milkode/cdweb/lib/package_list.rb

@@ -47,6 +47,10 @@ module Milkode
       top_list(a[0...FAV_NUM], 'favtime')
     end
 
+    def favorite_list_size
+      @grndb.packages.favs.size
+    end
+
     def favorite_list(params)
       names = @grndb.packages.favs.map{|r| r.name}[0..FAVORITE_LIST_NUM-1]
 

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

@@ -27,7 +27,7 @@ module Milkode
       @offset = params[:offset].to_i
 
       if (@q.fpaths.include?("*"))
-        @records, @total_records = Database.instance.selectAll(@offset, DISP_NUM)
+        @records, @total_records = Database.instance.selectAll(path, @offset, DISP_NUM)
       else
         @records, @total_records = Database.instance.search(@q.keywords, @q.multi_match_keywords, @q.packages, path, @q.fpaths, @q.suffixs, @q.fpath_or_packages, @offset, DISP_NUM)
       end

data/lib/milkode/cdweb/lib/web_setting.rb

@@ -14,6 +14,7 @@ module Milkode
     DEFAULT_SETTING = {
       :home_title    => "Milkode",
       :home_icon     => "/images/MilkodeIcon135.png",
+      :home_font_size => "100%",
 
       :header_title => "Milkode",
       :header_icon  => "/images/MilkodeIcon135.png",
@@ -47,6 +48,7 @@ module Milkode
 
     hash_method :home_title
     hash_method :home_icon
+    hash_method :home_font_size
     
     hash_method :header_title
     hash_method :header_icon

data/lib/milkode/cdweb/locales/en.yml

@@ -56,5 +56,9 @@ en:
   help_directpath_comment_03: You can pass more than one value if you separate them by blank
   help_directpath_gif: Get by clicking the line number
   help_emacs_milkode: Direct Path can work with <a href="https://github.com/ongaeshi/emacs-milkode">emacs-milkode</a>.
+  keyboard_shortcut: Keyboard Shortcut
+  keyboard_shortcut_s: Focus search bar
+  keyboard_shortcut_S: Search using a selected text with new tab 
+  select_text: Select text
 
 

data/lib/milkode/cdweb/locales/ja.yml

@@ -56,5 +56,9 @@ ja:
   help_directpath_comment_03: 空白で区切れば複数個渡せる
   help_directpath_gif: ファイルモードで行番号をクリックすると取得可能
   help_emacs_milkode: <a href="https://github.com/ongaeshi/emacs-milkode">emacs-milkode</a>との連携にも使う
+  keyboard_shortcut: キーボードショートカット
+  keyboard_shortcut_s: 検索バーに移動
+  keyboard_shortcut_S: 選択したテキストを使って新しいタブで検索
+  select_text: テキスト選択
   
 

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

@@ -7,6 +7,7 @@
     %ol
       %li <a href="#search">#{t(:help_search_by_keyword)}</a>
       %li <a href="#refine">#{t(:filter_options)}</a>
+      %li <a href="#keyboard_shortcut">#{t(:keyboard_shortcut)}</a>
       %li <a href="#directpath">#{t(:help_directpath)}</a>
 
     %h2#search #{t(:help_search_by_keyword)}
@@ -58,6 +59,11 @@
           w:7 read write                          <span class="comment"># #{t(:help_wide_search_comment_01)}</span>
           w:0 read write                          <span class="comment"># #{t(:help_wide_search_comment_02)}</span>
 
+    %h2#keyboard_shortcut #{t(:keyboard_shortcut)}
+    %ul
+      %li <b>s</b> .. #{t(:keyboard_shortcut_s)}
+      %li <b>S</b> (#{t(:select_text)}) .. #{t(:keyboard_shortcut_S)}
+
     %h2#directpath #{t(:help_directpath)}
     %p
       #{t(:help_directpath_description)}

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

@@ -18,13 +18,13 @@
     .container#toppage
       .row
         .span12.text-center
-          %h1 <a href="#{url_for '/'}"><img src=#{url_for @setting.home_icon} alt="milkode-icon" border="0" height="135px" /></a> #{@setting.home_title} <font class="version">#{@version}</font>
+          %h1 <a href="#{url_for '/'}"><img src=#{url_for @setting.home_icon} alt="milkode-icon" border="0" height="135px" /></a> <span style="font-size: #{@setting.home_font_size}">#{@setting.home_title}</span> <font class="version">#{@version}</font>
 
       .row
         .span12.text-center
           .form
             %form(method="post" action="#{url_for '/search'}")
-              %input(name="query" type="text" style="width: 419px;")
+              %input#query(name="query" type="text" style="width: 419px;")
               %input(type="submit" value="#{t(:search)}")
               %input(name='pathname' type='hidden' value='#{url_for '/home'}')
               &nbsp;&nbsp;<a href="#{url_for '/help'}">#{t(:help)}</a>

data/lib/milkode/cdweb/views/milkode.js

@@ -7,6 +7,19 @@ function escapeHTML(str) {
   return str.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
 
+function divideURL(url) {
+  var found = url.match(/^(.+?):\/\/([A-Za-z\d\-.]+?):?(\d+)?(\/.*)?$/);
+
+  var head = found[1] + "://" + found[2];
+  if (found[3]) {
+    head += ":" + found[3];
+  }
+
+  var path = found[4];
+
+  return [head, path];
+}
+
 function replace_query_param(url, value) {
   var url_s = url.split("?");
 
@@ -40,7 +53,7 @@ function topic_path(id) {
   document.getElementById(id).href = url;
 }
 
-function repalce_package_name(url, package_name) {
+function replace_package_name(url, package_name) {
   var url_s = url.split("?");
   url = url_s[0].replace(/\/home(\/.*)?/, "/home/" + package_name); // home以下をパッケージ名に置き換え
   return url;
@@ -53,7 +66,7 @@ function select_package() {
   if (name == '---')
     name = "";
 
-  url = repalce_package_name(url, name);
+  url = replace_package_name(url, name);
   url = replace_query_param(url, document.searchform.query.value);
   document.location = url;
 }
@@ -146,6 +159,20 @@ function open_newtab() {
   window.open(replace_query_param(document.URL, document.searchform.query.value));
 }
 
+function open_newtab_query(query) {
+  var dividedURL = divideURL(document.URL);
+  var url = dividedURL[0];
+
+  var paths = dividedURL[1].split("/"); // /home/pacakge_name/path/to/..
+  url += "/home"; // Support root
+
+  if (paths[2]) {
+    url += "/" + paths[2];
+  }
+
+  window.open(replace_query_param(url, query));
+}
+
 $(document).ready(function() {
   $("select#package").multiselect({
     multiple: false,
@@ -170,12 +197,13 @@ $(document).ready(function() {
   if ( match ) {
     $(match[1]).addClass("select-line");
   } else {
-    $("#query").select();
+    $("#query").focus();
+    // $("#query").select();
   }
 
-  $('#query').click(function(){
-    $(this).select();
-  });
+  // $('#query').click(function(){
+  //   $(this).select();
+  // });
 
   $('#shead').change(function(){
     $('#search').click();
@@ -203,4 +231,24 @@ $(document).ready(function() {
       }
     );
   });
+
+  $('body').keypress(function (e) {
+    var k = e.which;
+    var isFocused = $('#query').is(':focus');
+
+    // s .. Focus search bar
+    if (!isFocused && k == 115) {
+      $("#query").focus();
+      e.preventDefault();
+    }
+
+    // S .. Search using a selected text (New tab)
+    var selectText = window.getSelection().toString(); // @todo Support IE
+    if (!isFocused && k == 83 && selectText != '') { // S .. 83, d .. 100
+      open_newtab_query(selectText);
+      e.preventDefault();
+    }
+
+    // $('body').html(k);
+  });
 });

data/lib/milkode/version.rb

@@ -1,3 +1,3 @@
 module Milkode
-  VERSION = "1.7.1"
+  VERSION = "1.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: milkode
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - ongaeshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-16 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler