hateda2md 0.0.4 → 0.0.5

data/README.md

@@ -19,6 +19,9 @@ Or install it yourself as:
     $ gem install hateda2md
 
 ## Usage
+First of all, you get `username.xml` file from export section of your Hatena Dairy Admin. Then process followings:
+
+最初に`username.xml`ファイル(はてなの日記データ形式)を、はてなダイアリーのエクスポート頁から取得します。そして次のように処理します。
 
     require "Hateda2md"
 
@@ -35,13 +38,13 @@ Or install it yourself as:
     # 変換を実行する
     mdb.run
 
-    # save converted data to separated markdown files correspond to each entry
-    # 変換後のデータを各エントリーに対応した複数のMarkdownファイルに保存する
+    # save converted data to separated markdown files correspond to each diary
+    # 変換後のデータを各日記に対応した複数のMarkdownファイルに保存する
     mdb.save_to_files
 
-This process create several markdown files under `md` directory.
+This process create several markdown files, which correspond to each diary, not each entry, under `md` directory. The filenames are constructed from date and title of each diary. Non-ASCII words are removed from the title part in the filename.
 
-本処理により`md`ディレクトリ以下に、複数のmarkdownファイルが生成されます。
+本処理により`md`ディレクトリ以下に、（各エントリではなく）各日記に対応した複数のmarkdownファイルが生成されます。そのファイル名は各日記の日付とタイトルで構成されます。ASCII以外の文字はファイル名のタイトル部分から除去されます。
 
 To set all pre-defined filters, you can call `MdBuilder#pre_defined_filters` or `HateDa::Converter.pre_defined_filters` method.
 

data/hateda2md.gemspec

@@ -17,6 +17,5 @@ Gem::Specification.new do |gem|
   gem.version       = Hateda2md::VERSION
   gem.required_ruby_version = '>=1.9.2'
   gem.add_development_dependency 'rspec'
-  gem.add_dependency 'nokogiri'
   gem.add_dependency 'gsub_filter'
 end

data/lib/hateda2md.rb

@@ -4,6 +4,7 @@ module HateDa
   require_relative 'hateda2md/entry'
   require_relative 'hateda2md/mdbuilder'
   require_relative 'hateda2md/converter'
+  require_relative 'hateda2md/system_extension'
 
   Entry.send(:include, Converter)
 end

data/lib/hateda2md/mdbuilder.rb

@@ -1,15 +1,5 @@
 # encoding: UTF-8
-require "nokogiri"
-class String
-  def ~
-    mergin = scan(/^ +/).map(&:size).min
-    gsub(/^ {#{mergin}}/, '')
-  end
-
-  def to_nil
-    self.empty? ? nil : self
-  end
-end
+require "rexml/document"
 
 class HateDa::MdBuilder
   attr_reader :entries
@@ -18,14 +8,16 @@ class HateDa::MdBuilder
   end
   
   def build_entries(filepath)
-    xml = Nokogiri::XML(open filepath)
-    xml.search('day').map do |ent|
-      date = ent.attributes['date'].value
-      body = ent.css('body').text.strip
+    xml = REXML::Document.new(open filepath)
+    res = []
+    xml.elements.each('diary/day') do |ent|
+      date = ent.attributes['date']
+      body = ent.elements['body'].text.strip
       mdbody = nil
-      title = ent.attributes['title'].value
-      HateDa::Entry[date, body, mdbody, title]
+      title = ent.attributes['title']
+      res << HateDa::Entry[date, body, mdbody, title]
     end
+    res
   end
 
   def set(item, *args)
@@ -43,7 +35,7 @@ class HateDa::MdBuilder
   def run(*range)
     range = [0..-1] if range.empty?
     entries[*range].map do |entry|
-      md = entry.to_md(entry.ent_body)
+      md = entry.to_md(entry.ent_body) # place this before use of get_title()
       entry.ent_title = get_title(entry) if entry.ent_title.empty?
       entry.ent_mdbody = md
       entry

data/lib/hateda2md/system_extension.rb

@@ -0,0 +1,10 @@
+class String
+  def ~
+    mergin = scan(/^ +/).map(&:size).min
+    gsub(/^ {#{mergin}}/, '')
+  end
+
+  def to_nil
+    self.empty? ? nil : self
+  end
+end

data/lib/hateda2md/version.rb

@@ -1,3 +1,3 @@
 module Hateda2md
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/hateda_converter_spec.rb

@@ -7,18 +7,18 @@ include HateDa::Converter
 describe HateDa::Converter do
   context "pass a text to to_md method" do
     before(:each) do
-      @hdtext = <<EOS
-*p1*title1
-content1
-content2
-**subtitle1
-content3
-content4
-**subtitle2
-contetn5
-*123*title2
-
-EOS
+      @hdtext = ~<<-EOS
+      *p1*title1
+      content1
+      content2
+      **subtitle1
+      content3
+      content4
+      **subtitle2
+      contetn5
+      *123*title2
+
+      EOS
     end
     
     after(:each) do
@@ -119,29 +119,29 @@ EOS
       end
 
       it "change nested ordered list" do
-        hdtext = <<EOS
-+item1
-++item1-1
-++item1-2
-+item2
-+item3
-++item3-1
-+++item3-1-1
-+++item3-1-2
-++item3-2
-EOS
+        hdtext = ~<<-EOS
+        +item1
+        ++item1-1
+        ++item1-2
+        +item2
+        +item3
+        ++item3-1
+        +++item3-1-1
+        +++item3-1-2
+        ++item3-2
+        EOS
         
-        md = <<EOS
-1. item1
-    1. item1-1
-    1. item1-2
-1. item2
-1. item3
-    1. item3-1
-        1. item3-1-1
-        1. item3-1-2
-    1. item3-2
-EOS
+        md = ~<<-EOS
+        1. item1
+            1. item1-1
+            1. item1-2
+        1. item2
+        1. item3
+            1. item3-1
+                1. item3-1-1
+                1. item3-1-2
+            1. item3-2
+        EOS
         set :order_list
         to_md(hdtext).should eql md
       end
@@ -154,29 +154,29 @@ EOS
       end
 
       it "change nested unordered list" do
-        hdtext = <<EOS
--item1
---item1-1
---item1-2
--item2
--item3
---item3-1
----item3-1-1
----item3-1-2
---item3-2
-EOS
-
-        md = <<EOS
-- item1
-    - item1-1
-    - item1-2
-- item2
-- item3
-    - item3-1
-        - item3-1-1
-        - item3-1-2
-    - item3-2
-EOS
+        hdtext = ~<<-EOS
+        -item1
+        --item1-1
+        --item1-2
+        -item2
+        -item3
+        --item3-1
+        ---item3-1-1
+        ---item3-1-2
+        --item3-2
+        EOS
+
+        md = ~<<-EOS
+        - item1
+            - item1-1
+            - item1-2
+        - item2
+        - item3
+            - item3-1
+                - item3-1-1
+                - item3-1-2
+            - item3-2
+        EOS
         set :unorder_list
         to_md(hdtext).should eql md
       end
@@ -186,58 +186,58 @@ EOS
 
     context "pre" do
       it "change blockquote '>> <<' to '>'" do
-        hdtext = <<EOS
->>
-blockquoted
-blockquoted
-blockquoted
-<<
-EOS
-      md = <<EOS
-
-> blockquoted
-> blockquoted
-> blockquoted
-
-EOS
+        hdtext = ~<<-EOS
+        >>
+        blockquoted
+        blockquoted
+        blockquoted
+        <<
+        EOS
+        md = ~<<-EOS
+
+        > blockquoted
+        > blockquoted
+        > blockquoted
+
+        EOS
         set :blockquote
         to_md(hdtext).should eql md
       end
 
       it "change pre '>|' to 4 spaces" do
-        hdtext = <<EOS
->|
-blockquoted
-blockquoted
-blockquoted
-|<
-EOS
-      md = <<EOS
+        hdtext = ~<<-EOS
+        >|
+        blockquoted
+        blockquoted
+        blockquoted
+        |<
+        EOS
+        md = <<-EOS
 
     blockquoted
     blockquoted
     blockquoted
 
-EOS
+        EOS
         set :pre
         to_md(hdtext).should eql md
       end
 
       it "change super_pre '>|type|' to highlight tag" do
-        hdtext = <<EOS
->|ruby|
-def hello(name)
-  "hello, \#{name}!"
-end
-||<
-EOS
-      md = <<EOS
-{% highlight ruby %}
-def hello(name)
-  "hello, \#{name}!"
-end
-{% endhighlight %}
-EOS
+        hdtext = ~<<-EOS
+        >|ruby|
+        def hello(name)
+          "hello, \#{name}!"
+        end
+        ||<
+        EOS
+        md = ~<<-EOS
+        {% highlight ruby %}
+        def hello(name)
+          "hello, \#{name}!"
+        end
+        {% endhighlight %}
+        EOS
         set :super_pre
         to_md(hdtext).should eql md
       end
@@ -264,41 +264,41 @@ EOS
 
     context "link" do
       it "change a url to a link" do
-        hdtext = <<EOS
-sentence
-http://www.abc.com
-sentence http://www.efg.com/123_456 sentence
-sentence(https://www.xyz.co.jp),sen..
-EOS
-        md     = <<EOS
-sentence
-[http://www.abc.com](http://www.abc.com)
-sentence [http://www.efg.com/123_456](http://www.efg.com/123_456) sentence
-sentence([https://www.xyz.co.jp](https://www.xyz.co.jp)),sen..
-EOS
+        hdtext = ~<<-EOS
+        sentence
+        http://www.abc.com
+        sentence http://www.efg.com/123_456 sentence
+        sentence(https://www.xyz.co.jp),sen..
+        EOS
+        md     = ~<<-EOS
+        sentence
+        [http://www.abc.com](http://www.abc.com)
+        sentence [http://www.efg.com/123_456](http://www.efg.com/123_456) sentence
+        sentence([https://www.xyz.co.jp](https://www.xyz.co.jp)),sen..
+        EOS
         set :link
         to_md(hdtext).should eql md
       end
 
       it "change a url with title to a link" do
-        hdtext = <<EOS
-*p1*Title X
-sentence
-[http://www.abc.com/:title]
-sentence [http://www.efg.com/123_456:title=Title1] sentence
-*p3*Title Y
-sentence([https://www.xyz.co.jp/:title=Title no.2]),sen..
-http://mmm.ff.co.jp/
-EOS
-        md     = <<EOS
-#Title X
-sentence
-[Title X](http://www.abc.com/)
-sentence [Title1](http://www.efg.com/123_456) sentence
-#Title Y
-sentence([Title no.2](https://www.xyz.co.jp/)),sen..
-[http://mmm.ff.co.jp/](http://mmm.ff.co.jp/)
-EOS
+        hdtext = ~<<-EOS
+        *p1*Title X
+        sentence
+        [http://www.abc.com/:title]
+        sentence [http://www.efg.com/123_456:title=Title1] sentence
+        *p3*Title Y
+        sentence([https://www.xyz.co.jp/:title=Title no.2]),sen..
+        http://mmm.ff.co.jp/
+        EOS
+        md     = ~<<-EOS
+        #Title X
+        sentence
+        [Title X](http://www.abc.com/)
+        sentence [Title1](http://www.efg.com/123_456) sentence
+        #Title Y
+        sentence([Title no.2](https://www.xyz.co.jp/)),sen..
+        [http://mmm.ff.co.jp/](http://mmm.ff.co.jp/)
+        EOS
         set :title
         set :link
         to_md(hdtext).should eql md

data/spec/spec_helper.rb

@@ -2,3 +2,4 @@ $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require "rspec"
 require "hateda2md"
+require "hateda2md/system_extension"

data/spec/test2.xml

@@ -23,3 +23,4 @@ line4
 line5
 </body>
 </day>
+</diary>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hateda2md
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-06 00:00:00.000000000 Z
+date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156110820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156110820
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: &2156110360 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2156110360
 - !ruby/object:Gem::Dependency
   name: gsub_filter
-  requirement: &2156109940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +37,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156109940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Convert Hatena-Diary XML file to Markdown files for Jekyll
 email:
 - postagie@gmail.com
@@ -63,6 +62,7 @@ files:
 - lib/hateda2md/converter.rb
 - lib/hateda2md/entry.rb
 - lib/hateda2md/mdbuilder.rb
+- lib/hateda2md/system_extension.rb
 - lib/hateda2md/version.rb
 - spec/hateda_converter_spec.rb
 - spec/hateda_entry_spec.rb
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: This is a converter that build separated markdown files using for Jekyll