Charu 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 870da5a0f711457e0bcef160d3d886fe6bab9055
-  data.tar.gz: 05f5526283ceea84390c32b71c6efb23951f9e92
+  metadata.gz: d610ffd3ffeb13cd5b0a660cc7aceb1c9fec0bef
+  data.tar.gz: e722e7d4297c64dd06aa248d9b01ed68abd8c454
 SHA512:
-  metadata.gz: 659d1caf563be710987517ef4594861d1dc8023467c3f3c99644ba01078c5b97578da0ee7992f7771cb899d1d635794d5a049746908082a8f45bfe0bd1928d2a
-  data.tar.gz: 38beba3a1a26436df923f4a030bde8a2ed80ccd8845abe3688b0388eedc08ce92513826cf9d08b7ef29130510aba52700e38543e029755868d7071acafeb54e3
+  metadata.gz: c5c7b71bff86efb298a468cc741343db7198f02fc735b7738e49e3cd85dd76f2223de786f58b4097b5c74c661af0bf5662ab1624926e3c2bb81c28b9d21d4a2d
+  data.tar.gz: 5594ebf3bee0bbc6e568f02b56acdd0d0dee61f506a9387866b87e87a11eebe49e6c74b754bbf30827b792ebc814e0f003f9223d3d27591cdf9df18b4585c758

data/Gemfile

@@ -3,3 +3,4 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in Charu.gemspec
 gemspec
 
+gem 'redcarpet'

data/lib/Charu/ChangeLogMemo.rb

@@ -1,5 +1,7 @@
 # -*- encoding: utf-8 -*-
 
+require 'redcarpet'
+
 module Charu
   class Category
     attr_accessor :category
@@ -92,7 +94,12 @@ module Charu
         @item_log.rstrip! # 文字列最後の空白削除
         @item_log.strip!  # 先頭と末尾の空白文字を除去
 
-        return @item_log.gsub!(/(\r\n|\r\f\n|\r|\n)/, "</p>\n<p>")
+        #@item_log.gsub!(/(\r\n|\r\f\n|\r|\n)/, "</p>\n<p>")
+
+        markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML)
+        html = markdown.render(@item_log)
+
+        return html
       end
       return ""
     end

data/lib/Charu/CreateHtml.rb

@@ -1,7 +1,5 @@
 # -*- encoding: utf-8 -*-
 
-#require 'redcarpet'
-
 require "erb"
 
 module Charu
@@ -38,22 +36,9 @@ module Charu
     attr_accessor :keyword, :css_theme_path, :link, :hiduke, :day, :title, :config
     def initialize(page)
       @config = Charu::Config.new()
-      #markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML)
-
-      source= '
-
-      # 見出し1
-      ## 見出し2
-
-      * リスト1
-      * リスト2
 
-      このサイトは[mukaer.com](http://mukaer.com)です。
-
-      '
       @page = page
 
-      #puts markdown.render(source)
       @header   = File.open("./CharuConfig/template/header.erb").read
       @footer   = File.open("./CharuConfig/template/footer.erb").read
       @body     = File.open("./CharuConfig/template/body.erb").read
@@ -93,9 +78,11 @@ module Charu
           }
         }
 =end
-        html = erb.result(binding)
+        @html = erb.result(binding)
+
+
         begin
-          File.write(@config.www_html_out_path + file_name, html)
+          File.write(@config.www_html_out_path + file_name, @html)
         rescue
           p "書き込みエラー"
         end

data/lib/Charu/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 module Charu
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Charu
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - ShiccaRorl