hateda2md 0.0.2 → 0.0.3

data/README.md

@@ -24,8 +24,8 @@ Or install it yourself as:
 
     mdb = HateDa::MdBuilder.new('hatena-diary.xml')
 
-    # set several pre-defined filters
-    # 幾つかの定義済みフィルタをセットする
+    # set pre-defined filters
+    # 定義済みフィルタをセットする
     mdb.set :title
     mdb.set :subtitle
     mdb.set :link
@@ -56,9 +56,13 @@ To set all pre-defined filters, you can call `MdBuilder#pre_defined_filters` or
     # すべての定義済みフィルタをセットする
     filters.each { |f| mdb.set f }
 
-You can define filters.
+Filters of super_pre, footnote, hatebu, amazon, youtube, gist are create a liquid tag. Only for hatebu, youtube, gist, you can select html code to be created, instead of liquid tag by passing false as its second parameter. 
 
-独自フィルタを定義できます。
+super_pre, footnote, hatebu, amazon, youtube, gistの各フィルタはliquid tagを生成します。hatebu, youtube, gistのフィルタに関しては、その第２引数にfalseを渡すことで、liquid tagに代えてhtmlコードを生成させることができます。
+
+You can define your filters using `MdBuilder#filter` method.
+
+`MdBuilder#filter`を使って、独自フィルタを定義できます。
 
     # define a filter to convert wikipedia hatena tag to a correspond liquid tag
     # はてな記法によるwikipediaタグをliquid tagに変換するフィルタを定義する

data/lib/hateda2md/converter.rb

@@ -86,13 +86,13 @@ module HateDa::Converter
 
   def blockquote
     filter(/^>>\n(.*?)^<<$/m) do |md|
-      "\n" + md[1].lines.map { |line| "> #{line}" }.join
+      "\n" + md[1].gsub(/^.*$/, '> \0')
     end
   end
 
   def pre
     filter(/^>\|\n(.*?)^\|<$/m) do |md|
-      "\n" + md[1].lines.map { |line| "    #{line}" }.join
+      "\n" + md[1].gsub(/^.*$/, '    \0')
     end
   end
 
@@ -130,10 +130,14 @@ module HateDa::Converter
     end
   end
 
-  def hatebu
+  def hatebu(liquid=true)
     url_r = URI.regexp(['http', 'https'])
     filter(/\[(#{url_r}):bookmark\]/) do |md|
-      "{% hatebu #{md[1]} %}"
+      if liquid
+        "{% hatebu #{md[1]} %}"
+      else
+        hatebu_html(md[1])
+      end
     end
   end
 
@@ -152,9 +156,13 @@ module HateDa::Converter
     end
   end
 
-  def youtube
+  def youtube(liquid=true)
     filter(/[\(\[]?\s*https?:\/\/.*?youtube.*?\?v=([a-zA-Z0-9_-]+):movie\s*[\]\)]?/) do |md|
-      "{% youtube #{md[1]} %}"
+      if liquid
+        "{% youtube #{md[1]} %}"
+      else
+        youtube_html(md)
+      end
     end
   end
 
@@ -167,10 +175,33 @@ module HateDa::Converter
     end
   end
 
-  def gist
+  def gist(liquid=true)
     host = %r{https?://gist.github.com/}
     filter(/<script src=\"#{host}(\d+)\.js\?file=(.*?)\"><\/script>/) do |md|
-      "{% gist #{md[1]} #{md[2]} %}"
+      if liquid
+        "{% gist #{md[1]} #{md[2]} %}"
+      else
+        gist_html(md)
+      end
+    end
+  end
+
+  def hatebu_html(md)
+    url, title = md.to_s.match(/(https?:\/\/\S+)(.*)/){ [$1, $2] }
+    bm_url = %{<a href="http://b.hatena.ne.jp/entry/#{url}" class="http-bookmark" target="_blank"><img src="http://b.hatena.ne.jp/entry/image/#{url}" alt="" class="http-bookmark"></a>}
+
+    unless title.nil?
+      %{<a href="#{url}" target="_blank">#{title.strip} </a>} + bm_url
+    else
+      bm_url
     end
   end
-end
+
+  def gist_html(md)
+    %{<div><script src="https://gist.github.com/#{md[1]}.js?file=#{md[2]}"></script></div>%}
+  end
+
+  def youtube_html(md)
+    %{<iframe width="560" height="420" src="http://www.youtube.com/embed/#{md[1]}?color=white&theme=light"></iframe>}
+  end
+end

data/lib/hateda2md/version.rb

@@ -1,3 +1,3 @@
 module Hateda2md
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hateda2md
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-04 00:00:00.000000000 Z
+date: 2012-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160489100 !ruby/object:Gem::Requirement
+  requirement: &2153731440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160489100
+  version_requirements: *2153731440
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2160488640 !ruby/object:Gem::Requirement
+  requirement: &2153730980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160488640
+  version_requirements: *2153730980
 - !ruby/object:Gem::Dependency
   name: gsub_filter
-  requirement: &2160488220 !ruby/object:Gem::Requirement
+  requirement: &2153730560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160488220
+  version_requirements: *2153730560
 description: Convert Hatena-Diary XML file to Markdown files for Jekyll
 email:
 - postagie@gmail.com