mamemose 0.4.0.4 → 0.4.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 7f1a0ae5f014e6a2a75c439f1d7103ff82ee68cc
+  data.tar.gz: 0291e781ffc6c51e4f0586601bc0f35e32a025cf
+SHA512:
+  metadata.gz: e1bfc7755e7cae746db1df9958eea3a38ee05ebf0cd5a5e19a818a5b2e60cfb4f5f1576b91b93d88c00385c0d4c2eb93291b55d2e82b58c71c2631a8c34e5b0f
+  data.tar.gz: 579fce45060fd1a59928e60e4dc6652c020024481415c060b8149d7e21959af6bf05df5c9778f2d568e3ed8b5a52c29a4ba920c9fd88a0642f07c12b792901ee

data/README.md

@@ -1,7 +1,7 @@
 mamemose: Markdown memo server
 ====
 
-version 0.4.0.4
+version 0.4.1
 
 概要
 ----
@@ -112,9 +112,8 @@ $ mamemose s /path/to/file 8000
 ### シンタックスハイライト
 
 [コード部分に GitHub Flavored Markdown の記法](http://github.github.com/github-flavored-markdown/)
-を使い、シンタックスハイライトに
-[SyntaxHighlighter](http://alexgorbatchev.com/SyntaxHighlighter/)
-を使うことができます。設定例を参照。
+を使うとシンタックスハイライトされます。ハイライトエンジンは
+[CodeRay](https://github.com/rubychan/coderay) を使用。
 
 ### 数式
 
@@ -161,7 +160,7 @@ $ mamemose s /path/to/file 8000
 ```ruby
 ['_Store','.AppleDouble','.LSOverride','Icon',/^\./,/~$/,
  '.Spotlight-V100','.Trashes','Thumbs.db','ehthumbs.db',
- 'Desktop.ini','$RECYCLE.BIN',/^#/,'MathJax','syntaxhighlighter']
+ 'Desktop.ini','$RECYCLE.BIN',/^#/,'MathJax']
 ```
 
 ### 設定ファイル例
@@ -187,44 +186,6 @@ CUSTOM_HEADER = <<HEADER
 <script src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS_HTML">
 </script>
 HEADER
-
-# すべてのページで SyntaxHighlighter が使えるように
-host = "http://alexgorbatchev.com/pub/sh/current" # 変数も使えます
-CUSTOM_FOOTER = <<FOOTER
-<link href="#{host}/styles/shCoreDefault.css" rel="stylesheet" />
-<script src="#{host}/scripts/shCore.js"></script>
-<script src="#{host}/scripts/shAutoloader.js"></script>
-<script>
-SyntaxHighlighter.autoloader(
-'AS3 as3 #{host}/scripts/shBrushAS3.js',
-'AppleScript applescript #{host}/scripts/shBrushAppleScript.js',
-'Bash bash #{host}/scripts/shBrushBash.js',
-'CSharp csharp #{host}/scripts/shBrushCSharp.js',
-'ColdFusion coldfusion #{host}/scripts/shBrushColdFusion.js',
-'Cpp cpp #{host}/scripts/shBrushCpp.js',
-'Css css #{host}/scripts/shBrushCss.js',
-'Delphi delphi #{host}/scripts/shBrushDelphi.js',
-'Diff diff #{host}/scripts/shBrushDiff.js',
-'Erlang erlang #{host}/scripts/shBrushErlang.js',
-'Groovy groovy #{host}/scripts/shBrushGroovy.js',
-'JScript jscript #{host}/scripts/shBrushJScript.js',
-'Java java #{host}/scripts/shBrushJava.js',
-'JavaFX javafx #{host}/scripts/shBrushJavaFX.js',
-'Perl perl #{host}/scripts/shBrushPerl.js',
-'Php php #{host}/scripts/shBrushPhp.js',
-'Plain plain #{host}/scripts/shBrushPlain.js',
-'PowerShell powershell #{host}/scripts/shBrushPowerShell.js',
-'Python python #{host}/scripts/shBrushPython.js',
-'Ruby ruby #{host}/scripts/shBrushRuby.js',
-'Sass sass #{host}/scripts/shBrushSass.js',
-'Scala scala #{host}/scripts/shBrushScala.js',
-'Sql sql #{host}/scripts/shBrushSql.js',
-'Vb vb #{host}/scripts/shBrushVb.js',
-'Xml xml #{host}/scripts/shBrushXml.js'
-);
-SyntaxHighlighter.all();
-</script>
-FOOTER
 ```
 
 ### 使用例
@@ -263,8 +224,6 @@ FOOTER
 
 ![](https://raw.github.com/daimatz/mamemose/master/sample.png)
 
-MathJax と SyntaxHighlighter はローカルにダウンロードして使うのが親切だと思います。
-
 検索
 ----
 
@@ -281,9 +240,6 @@ FAQ と予想されるもの
     - 検索が遅いのはどうしようもないです。 5KB 〜 10KB くらいのメモが 3000 件くらいまでなら
       まあ使えるかなというのは確認したつもりですが
     - SSD 積んでますか？
-- 他の言語もシンタックスハイライトしたいんだけど
-    - SyntaxHighlighter の構文ファイルを自分で書いて読み込むようにしましょう
-    - Haskell 用のは書きました [gist](https://gist.github.com/3969549)
 - reStructuredText 対応して
     - Python で書いてください
 - 更新のとき自動でページ最下部に行ってほしい

data/lib/mamemose/env.rb

@@ -7,9 +7,7 @@ PORT = 20000 if !defined?(PORT)
 WS_PORT = 20001 if !defined?(WS_PORT)
 RECENT_NUM = 10 if !defined?(RECENT_NUM)
 RECENT_PATTERN = /.*/ if !defined?(RECENT_PATTERN)
-IGNORE_FILES = ['.DS_Store','.AppleDouble','.LSOverride','Icon',/^\./,/~$/,
-                '.Spotlight-V100','.Trashes','Thumbs.db','ehthumbs.db',
-                'Desktop.ini','$RECYCLE.BIN',/^#/,'MathJax','syntaxhighlighter'] if !defined?(IGNORE_FILES)
+IGNORE_FILES = [/^\./,/^#/,/~$/,'Icon','Thumbs.db','ehthumbs.db', 'Desktop.ini','$RECYCLE.BIN','hidden'] if !defined?(IGNORE_FILES)
 MARKDOWN_PATTERN = /\.(md|markdown)$/ if !defined?(MARKDOWN_PATTERN)
 INDEX_PATTERN = /^README/i if !defined?(INDEX_PATTERN)
 CUSTOM_HEADER = '' if !defined?(CUSTOM_HEADER)

data/lib/mamemose/html.rb

@@ -19,8 +19,8 @@ body {
 pre {
     border: 1px solid #090909;
     background-color: #f8f8f8;
-    padding: 0.5em;
-    margin: 0.5em 1em;
+    padding: 0;
+    margin: 0;
 }
 code {
     border: 1px solid #cccccc;
@@ -139,6 +139,25 @@ table tr th :first-child, table tr td :first-child {
 table tr th :last-child, table tr td :last-child {
     margin-bottom: 0;
 }
+table.CodeRay {
+    width: 95%;
+    border: 1px solid black;
+}
+table.CodeRay tr {
+    border: 0;
+}
+table.CodeRay td.line-numbers {
+    width: 26px;
+    border-right: 1px solid black;
+    text-align: right;
+}
+table.CodeRay td {
+    border: 0;
+    padding: 0 5px;
+}
+table.CodeRay td pre {
+    border: 0;
+}
 --></style>
 <script>
 function copy(text) {

data/lib/mamemose/version.rb

@@ -1,5 +1,5 @@
 module Mamemose
-  VERSION = "0.4.0.4"
+  VERSION = "0.4.1"
 
   module WebSocket
     VERSION = "0.1.0"

data/lib/mamemose.rb

@@ -4,6 +4,7 @@ require 'find'
 require 'uri'
 require 'redcarpet'
 require 'htmlentities'
+require 'coderay'
 
 require 'mamemose/version'
 
@@ -14,9 +15,8 @@ require 'mamemose/env'
 
 class HTMLwithSyntaxHighlighter < Redcarpet::Render::XHTML
   def block_code(code, lang)
-    code = HTMLEntities.new.encode(code)
-    lang ||= "plain"
-    return "<pre class='brush: #{lang}'>#{code}</pre>"
+    lang ||= 'plain'
+    CodeRay.scan(code, lang.to_sym).div(:line_numbers => :table)
   end
 end
 

data/mamemose.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency "htmlentities", ">= 4.3.0"
   gem.add_dependency "thor", ">= 0.17.0"
   gem.add_dependency "em-websocket", ">= 0.5.0"
+  gem.add_dependency "coderay", ">= 1.1.0"
 end

metadata

@@ -1,80 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: mamemose
 version: !ruby/object:Gem::Version
-  version: 0.4.0.4
-  prerelease: 
+  version: 0.4.1
 platform: ruby
 authors:
 - daimatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-06 00:00:00.000000000 Z
+date: 2013-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: em-websocket
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: coderay
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: Markdown memo server
 email:
 - dai@daimatz.net
@@ -103,26 +108,25 @@ files:
 - sample.png
 homepage: https://github.com/daimatz/mamemose
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 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'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Markdown memo server
 test_files: []