milkode 1.8.6 → 1.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12378f6077b1123ce6b9bcd84cbe0bb3c3ff07a8
-  data.tar.gz: 2f24db6c3d5662cda2ae568cfc2e6ba5a1beb5bb
+  metadata.gz: be80288c1f73665336ab5c3b751e2ea235ee3dd8
+  data.tar.gz: 633620e41f54780a8fd1c78d4e3e70c0bb618468
 SHA512:
-  metadata.gz: 22c74630e94f14eee72d8e29ed8d85bf8421c0b7b808741ca7bc3688b63a1a4ccb333413453910dbaa386de7564c9fd0dd21d656127149439f132fa2a6f38745
-  data.tar.gz: b75d71fa9ea0bb72666dabd45addf14613f1f8014f8c9132e61bf2f8c79ff71ce04a724d3d70a74eca1c18ad8a97333e55e1a3c01178159506da4c80e611d983
+  metadata.gz: dcd343b63e0a979066b2192d3af7a380ea94efcc732db62288e6ed4e2d4e0443e9991f60d4572268b6a3c19f25d0862ff3c7f3416547a7769239c47ba403c56c
+  data.tar.gz: 56079577b015b4e8f12c912cde8b4eb9a407f693d6c12f5afce3c74197fffcda90febbb3e5156c09820a1efecbfc41373b130149deccefbdfbd60439e7a53b7f

data/HISTORY.ja.rdoc

@@ -1,3 +1,10 @@
+=== 1.8.7 2015/06/22
+
+* milk web
+  * Add :eliminate_extname attribute
+  * Remove duplicated :type => :boolean
+  * Add the parameter of :tab_width for coderay
+
 === 1.8.6 2014/10/22
 
 * Phrase 'aaa(' is searchable in gmilk
@@ -10,7 +17,7 @@
 
 * milk
   * Add 'milk rm' command
-    * 'milk remove' is obsolate
+    * 'milk remove' is obsolete
   * Fix a failure when 'gem install milkode' at a empty environment
 
 === 1.8.3 2014/10/12

data/HISTORY.rdoc

@@ -1,3 +1,10 @@
+=== 1.8.7 2015/06/22
+
+* milk web
+  * Add :eliminate_extname attribute
+  * Remove duplicated :type => :boolean
+  * Add the parameter of :tab_width for coderay
+
 === 1.8.6 2014/10/22
 
 * Phrase 'aaa(' is searchable in gmilk
@@ -10,7 +17,7 @@
 
 * milk
   * Add 'milk rm' command
-    * 'milk remove' is obsolate
+    * 'milk remove' is obsolete
   * Fix a failure when 'gem install milkode' at a empty environment
 
 === 1.8.3 2014/10/12

data/lib/milkode/cdweb/cli_cdweb.rb

@@ -89,6 +89,8 @@ EOF
 
 :display_about_milkode: true
 :hide_update_button: false
+
+:eliminate_extname: ""
 EOF
         end
       end

data/lib/milkode/cdweb/lib/coderay_wrapper.rb

@@ -11,6 +11,7 @@ require 'coderay/helpers/file_type'
 require 'milkode/common/util'
 require 'milkode/cdweb/lib/coderay_html2'
 require 'milkode/cdweb/lib/coderay_php_utf8'
+require 'milkode/cdweb/lib/web_setting'
 
 module Milkode
   class CodeRayWrapper
@@ -51,6 +52,9 @@ module Milkode
     end
 
     def to_html
+      setting = WebSetting.new
+      layout_setting = setting.layout_setting
+
       CodeRay.scan(@content, file_type).
         html2(
               :wrap => nil,
@@ -61,11 +65,15 @@ module Milkode
               :line_number_anchors => false,
               :onclick_copy_line_number => true,
               :onclick_copy_prefix => "/#{@filename}:",
-              :keywords => @keywords
+              :keywords => @keywords,
+              :tab_width => layout_setting[:tab_width],
               )
     end
 
     def to_html_anchorlink(url)
+      setting = WebSetting.new
+      layout_setting = setting.layout_setting
+
       CodeRay.scan(@content, file_type).
         html2(
               :wrap => nil,
@@ -75,12 +83,20 @@ module Milkode
               :line_number_start => @line_number_start,
               :line_number_anchors => 'n',
               :line_number_anchor_url => url,
-              :keywords => @keywords
+              :keywords => @keywords,
+              :tab_width => layout_setting[:tab_width],
               )
     end
 
     def file_type
-      case File.extname(@filename)
+      @setting = WebSetting.new
+      @extname = File.extname(@filename)
+      @p_extname = "^\\#{@extname}$"
+      if @setting.eliminate_extname.split(" ").grep(/#{@p_extname}/).size > 0
+          @filename = File.basename(@filename, @extname)
+          @extname = File.extname(@filename)
+      end
+      case @extname
       when ".php"
         :php_utf8
       when ".el"

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

@@ -23,6 +23,12 @@ module Milkode
 
       :display_about_milkode => true,
       :hide_update_button => false,
+
+      :eliminate_extname => "",
+
+      :layout_setting => {
+        :tab_width => 8
+      }
     }
 
     def self.hash_method(name)
@@ -64,6 +70,9 @@ module Milkode
     end
 
     hash_method :hide_update_button
+    hash_method :eliminate_extname
+
+    hash_method :layout_setting
   end
 end
 

data/lib/milkode/cli.rb

@@ -66,7 +66,7 @@ EOF
     option :force, :type => :boolean, :aliases => '-f', :desc => 'Force remove.'
     option :verbose, :type => :boolean, :aliases => '-v', :desc => 'Be verbose.'
     def remove(*args)
-      $stdout.puts "[warning] 'milk remove' is obsolate. Please use 'milk rm'."
+      $stdout.puts "[warning] 'milk remove' is obsolete. Please use 'milk rm'."
 
       if args.empty? && !options[:all]
         CLI.task_help(shell, "remove")
@@ -175,7 +175,7 @@ EOF
     desc "web", "Startup web interface"
     option :customize, :type => :boolean, :desc => 'Create customize file.'
     option :db, :default => Milkode::CLI_Cdweb::select_dbdir, :desc => 'Database dir.'
-    option :no_browser, :type => :boolean, :default => false, :aliases => '-n', :type => :boolean, :desc => 'Do not launch browser.'
+    option :no_browser, :type => :boolean, :default => false, :aliases => '-n', :desc => 'Do not launch browser.'
     option :host, :default => '127.0.0.1', :aliases => '-o', :desc => 'Listen on HOST.'
     option :port, :default => 9292, :aliases => '-p', :desc => 'Use PORT.'
     option :server, :default => 'thin', :aliases => '-s', :desc => 'Use SERVER.'

data/lib/milkode/version.rb

@@ -1,3 +1,3 @@
 module Milkode
-  VERSION = "1.8.6"
+  VERSION = "1.8.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: milkode
 version: !ruby/object:Gem::Version
-  version: 1.8.6
+  version: 1.8.7
 platform: ruby
 authors:
 - ongaeshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -486,7 +486,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Milkode is line based local source code search engine.