Charu 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 7593e74ecba569f1651e9d2ec44fcb4acdddf9f212059d0e55df584e687e2da5
-  data.tar.gz: a67a1799ed53cea511548c429efc35335c02157b7df246bbe943bc29c1ef9d16
+SHA1:
+  metadata.gz: 642236c79b07e0408025c9879fab8d063b8e880d
+  data.tar.gz: 90975c424f01cbdf82c5df1b06dad34c0989fce1
 SHA512:
-  metadata.gz: d6e440146ab2fc6e4f8dd827d0a5d60042c645a9269481954a450e864f12ac7e3c951bd361000a934787af97dc4a8e72647416ea242b4097e6685c2ea3e9251a
-  data.tar.gz: 36153ac660e56e1a1ea26c552ad032b747ef123a7c97280538386ecc3f5c4a3345f52820f109bde53ec243362fe83d03602413535deef69f08e60fe771e73859
+  metadata.gz: 309779a56c58f9a7c7c54023bf04b3d944850be1e8c0e3d383098a09d59d2f1decc156cfb0444e8bdd36af3008770a0c575f42d9f527e556f7afb256dbdeae1b
+  data.tar.gz: ee1d8d32e54ed1816dfedb0e3f6b1c995e19f57e1392f1ab1754264bd5b0f3a57965a18e5499d0842d948589e3317461ac1f37aa39b4b177bbb19ff38ee4bdea

data/Charu.gemspec

@@ -9,8 +9,13 @@ Gem::Specification.new do |spec|
   spec.authors       = ["ShiccaRorl"]
   spec.email         = ["shicca.rorl@gmail.com"]
 
-  spec.summary       = %q{ChangeLogMemo Html Converter Liblary}
-  spec.description   = %q{ChangeLogMemo Html Liblary}
+  spec.summary       = %q{ChangeLogMemo Html Converter}
+  spec.description   = %q{ChangeLogを日記にしているなら便利かも。
+  ChangeLogMemoとは？
+
+[横着プログラミング 第1回: Unixのメモ技術](http://0xcc.net/unimag/1/)
+
+[Change Log メモを試してみよう](http://at-aka.blogspot.jp/p/change-log.html)}
   spec.homepage      = "https://rubygems.org/gems/Charu"
   spec.license       = "MIT"
 
@@ -33,4 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  
+    spec.add_dependency 'redcarpet'
+  
 end

data/Gemfile

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

data/README.md

@@ -22,25 +22,28 @@ Or install it yourself as:
 
 ## Usage
 
-初期化
+### 初期化
 ```
-changelogmemo = Charu::ChangeLogMemo.new(file_path)
+./CharuConfig/CharuConfig.rb
 ```
+設定してください。
 
-アイテム取得
+### テンプレート
 ```
-changelogmemo.get_item_sort
+./CharuConfig/template/
 ```
 
-アイテム取得逆順
+### 実行
 ```
-changelogmemo.get_item_sort_reverse()
+bundle exec Charu
 ```
 
-カテゴリー取得
-```
-changelogmemo.get_category_list
-```
+### ChangeLogMemoとは？
+
+[横着プログラミング 第1回: Unixのメモ技術](http://0xcc.net/unimag/1/)
+
+[Change Log メモを試してみよう](http://at-aka.blogspot.jp/p/change-log.html)
+
 
 ## Development
 

data/lib/Charu/ChangeLogMemo.rb

@@ -1,23 +1,23 @@
 # -*- encoding: utf-8 -*-
 
 module Charu
-  class Cotegory
-    def initialize(title)
-      if title == nil then
-        title = ""
-      end
+  class Category
+    attr_accessor :category
+    def initialize()
       @category = []
-      title.scan(/\[(.*?)\]:/).each{|i|
-        self.add(i)
-      }
+      @config = Charu::Config.new()
+
+      # プライベートの設定
+      @private_category = true
     end
 
-    def add(category)
-      if category == nil then
-        category = []
+    def add(title_source)
+      if title_source == nil then
+        title_source = ""
       end
-      category.each{|i|
-        @category << i
+
+      title_source.scan(/\[(.*?)\]:/).each{|category|
+        @category << category[0]
       }
     end
 
@@ -25,23 +25,44 @@ module Charu
       @category.uniq! # 重複削除
       return @category
     end
+
+    def get_private_category()
+      # プライベートの設定
+      @category.each{|category|
+        @config.private_category.each{|private_category|
+          if category == private_category then
+            @private_category = false
+          end
+        }
+      }
+      return @private_category
+    end
   end
 
   class Item
-    attr_accessor :datetime, :item_title_source, :item_log, :cotegory
-    def initialize(time)
-      if time == nil then
+    attr_accessor :date, :item_title_source, :item_log, :category
+    def initialize(date)
+      if date == nil then
         p "アイテム初期化失敗"
-        time = Time.now
+        date = Time.now
         title = "アイテム初期化失敗"
       end
 
-      @datetime = time
+      @date = date
 
       @item_title_source = title
       @item_log = ""
 
       # カテゴリー
+      @item_private_list = []
+
+      @category = Charu::Category.new()
+
+    end
+
+    def set_item_title_source(item_title_source)
+      @item_title_source = item_title_source
+      @category.add(@item_title_source)
     end
 
     def get_item_title()
@@ -71,21 +92,31 @@ module Charu
       end
     end
 
+    # カテゴリーリスト
     def get_item_category()
-      @cotegory = Cotegory.new(@item_title_source)
-      if @cotegory == nil then
+      if @category == nil then
         return []
       end
-      return @cotegory.get_category_list()
+      return @category.get_category_list()
+    end
+
+    # プライベートのフラグを返す
+    def get_private_category()
+      return @category.get_private_category
+    end
+
+    def get_item_date_string()
+      return @date.strftime("%Y-%m-%d")
     end
+
   end
 
   class Entry
-    attr_accessor :datetime, :item_title, :item_log, :cotegory
+    attr_accessor :date, :item_title, :item_log, :category, :item_source_date
     def initialize(item_source)
-      @item_source_day = ""
+      @item_source_date = ""
       @item_source_contents = ""
-      @item_source_day = item_source[0]       # 時間データ・ソース
+      @item_source_date = item_source[0]       # 時間データ・ソース
       @item_source_contents = item_source[1]  # 内容データ
 
       if @item_source_contents == nil then
@@ -94,18 +125,17 @@ module Charu
     end
 
     def get_items() # 解析する
-
       @items = []
       item = nil
       # 一行づつ処理する
       @item_source_contents.split("\n").each{|line|
         if item == nil then
-          item = Item.new(@item_source_day)
+          item = Charu::Item.new(self.get_entry_time())
         end
         if line.match(/^\*\s.*?/) != nil or line.match(/^\t\*\s.*?/) != nil then
-          item = Item.new(@item_source_day)
+          item = Charu::Item.new(self.get_entry_time())
           @items << item
-          item.item_title_source = line
+          item.set_item_title_source(line)
         else
           if line == nil then
             line = ""
@@ -145,10 +175,10 @@ module Charu
       return @items
     end
 
-    def get_entry_time()    #@entry_datetime = Time.mktime($1.to_i, $2.to_i, $3.to_i)
+    def get_entry_time()    #@entry_date = Time.mktime($1.to_i, $2.to_i, $3.to_i)
       t = Time.now
       begin
-        t = Time.mktime(@item_source_day.split(/-/)[0].to_i, @item_source_day.split(/-/)[1].to_i, @item_source_day.split(/-/)[2].to_i)
+        t = Time.mktime(@item_source_date.split(/-/)[0].to_i, @item_source_date.split(/-/)[1].to_i, @item_source_date.split(/-/)[2].to_i)
       rescue
         p "日付変換エラー".encode(Encoding::SJIS)
       end
@@ -175,100 +205,143 @@ module Charu
         i = i + 2
         s = s + 2
         if entry_data[1] != nil then
-          entry = Entry.new(entry_data)
+          entry = Charu::Entry.new(entry_data)
           @entrys << entry
         end
 
       end
     end
+  end
+end
+
+# プライベートと分ける
+module Charu
+  class ChangeLogPrivate < ChangeLog
+    def get_item_private()
+      @item_list_private = Hash.new()
 
-    def get_category_list()
-      p "リスト".encode(Encoding::SJIS)
-      category_list = []
       @entrys.each{|entry|
         entry.get_items().each{|item|
-          item.get_item_category().each{|category|
-            category_list << category.get_category()
-          }
+          if item.get_private_category == true then
+            @item_list_private[item.get_item_date_string()] = [item]
+          end
         }
       }
-      category_list.uniq!
-      category_list.sort!{|a, b| a <=> b } # 並び替え
-      category_list.delete("")
-
-      return category_list
+      return @item_list_private
     end
   end
 
-  class ChangeLogPrivate < ChangeLog
-
-  end
-
   class ChangeLogPublic < ChangeLog
-
+    def get_item_private()
+      @item_list_private = []
+      @entrys.entrys.each{|entry|
+        entry.get_items().each{|item|
+          @item_list_private << item
+        }
+      }
+      return @item_list_private
+    end
   end
+end
 
+module Charu
   class ChangeLogMemo
-    attr_accessor :file_name
-    def initialize(file_name)
-      @file_name = file_name
+    def initialize()
+      @config = Charu::Config.new()
 
       # ChangeLogMemoファイル
-      File.open(@file_name, 'r:utf-8'){|f|
+      File.open(@config.change_log_path, 'r:utf-8'){|f|
         @source = f.read  # 全て読み込む
       }
 
-      @change_log_private = ChangeLogPrivate.new(@source)
+      @change_log_private = Charu::ChangeLogPrivate.new(@source)
 
-=begin
-      @change_log_private.entrys.each{|date|
-        date.get_items().each{|item|
-          p "======="
-          p date.get_items().size
-          p item.datetime
-          p item.get_item_title().encode(Encoding::SJIS)
-          p item.get_item_log().encode(Encoding::SJIS)
-          #p item
+      @item_list = @change_log_private.get_item_private()
+
+      # 全てのカテゴリーを取得
+      @all_category_list = []
+      @item_list.each{|key, items|
+        items.each{|item|
+          item.get_item_category().each{|category|
+            @all_category_list << category
+          }
         }
       }
-=end
     end
 
-    def get_item_sort()
-      i = []
-      @change_log_private.entrys.each{|date|
-        date.get_items().each{|item|
-          i << item
+    # アイテム数
+    def article_size_()
+      return @item_list.size()
+    end
+
+    # ページ数
+    def article_size_max()
+      return @item_list.size() / @config.article_size
+    end
+
 
-          i.sort!{|a, b| a.datetime <=> b.datetime }
+    # アイテム数を５０個とかで取り出せる
+    def article_size(item_list, cnt)
+      # [000-049] cnt 1 (1-1)*50 1*50-1
+      # [050-099] cnt 2 (2-1)*50 2*50-1
+      # [100-149] cnt 3 (3-1)*50 3*50-1
+
+      # ハッシュから配列に変換
+      items = []
+      item_list.each{|key, item|
+        items << item
+      }
+
+      # 配列で処理
+      i = [0, 0]
+      i[0] = (cnt - 1) * @config.article_size
+      i[1] = (cnt * @config.article_size) - 1
+
+      s = i[0]
+      t = []
+      while items[s] != nil and s <= i[1] do
+        t << items[s]
+        s = s + 1
+      end
+
+      # 配列からハッシュに変換
+      item_hash = Hash.new()
+      t.each{|items|
+        items.each{|item|
+          item_hash[item.get_item_date_string()] = [item]
         }
       }
-      return i
+
+      return item_hash
     end
 
-    def get_item_sort_reverse()
-      i = []
-      @change_log_private.entrys.each{|date|
-        date.get_items().each{|item|
-          i << item
+    # 並び替え
+    def get_item_sort(cnt)
+      return article_size( Hash[ @item_list.sort ], cnt)
+    end
 
-          i.sort!{|a, b| b.datetime <=> a.datetime }
-        }
+    # 逆順で並び替え
+    def get_item_sort_reverse(cnt)
+      return article_size( Hash[ @item_list.sort.reverse ], cnt)
+    end
+
+    # カテゴリーのカテゴリー数をハッシュで戻す
+    def get_category_cnt()
+      category_cnt = Hash.new()
+
+      uniq_category_list = [] # 重複削除すみ
+      uniq_category_list = self.get_category_list()
+
+      uniq_category_list.each{|uniq_category|
+        category_cnt[uniq_category] = @all_category_list.count(uniq_category)
       }
-      return i
+
+      return Hash[ category_cnt.sort ]
     end
 
+    # カテゴリーを取得する
     def get_category_list()
-      category_list = []
-      @change_log_private.entrys.each{|date|
-        date.get_items().each{|item|
-          item.get_item_category().each{|category|
-          category_list << category
-          }
-        }
-      }
-      category_list.uniq!
-      return category_list
+      return @all_category_list.uniq()
     end
   end
 end

data/lib/Charu/Config.rb

@@ -2,8 +2,13 @@
 
 config = ""
 config = '
+# -*- encoding: utf-8 -*-
+
 module Charu
   class Config
+    attr_accessor :home_title, :top_home_page, :home_category, :home_description, :css_theme_path, :private_category
+    attr_accessor :change_log_path, :article_size, :www_html_out_path, :www_html_out_path_private
+    attr_accessor :ftp_server, :ftp_port, :ftp_user, :ftp_pass
     def initialize()
       # ホームページタイトル
       @home_title = "TestPage"
@@ -12,19 +17,19 @@ module Charu
       @top_home_page = "http://hoge.com/hoge/index.html"
 
       # ホームページカテゴリー
-      @home_category = ["Ruby", "Python", "Java"]
+      @home_category = ["Ruby", "Python", "Java", "c++", "Ruby_on_Rails", "JavaSciript", "LIPS"]
 
       # ホームページのdescription
       @home_description = "日々勉強中"
 
       # CSS Path
-      @css_theme_path = "./css"
+      @css_theme_path = "./css/"
 
       # プライベートカテゴリー
-      @Private_category = ["Private", "P", "★", "2ch"]
+      @private_category = ["Private", "P", "★", "2ch", "5ch"]
 
       # Change_Log_path
-      @Change_Log_path = "./../Change_Log"
+      @change_log_path = "./../ChangeLog"
 
       # 一度に表示する記事数
       @article_size = 50
@@ -32,11 +37,19 @@ module Charu
       # ｈｔｍｌの作成先
       @www_html_out_path = "./www/"
 
+      # ｈｔｍｌの作成先 プライベート
+      @www_html_out_path_private = "./Private/"
+
       # FTPの設定
+      @ftp_server = ""
+      @ftp_port = "21"
+      @ftp_user = ""
+      @ftp_pass = ""
 
     end
   end
 end
+
 '
 
 # ディレクトリの確認

data/lib/Charu/CreateHtml.rb

@@ -1,9 +1,122 @@
 # -*- encoding: utf-8 -*-
 
+#require 'redcarpet'
+
+require "erb"
+
+module Charu
+  class Create_Day
+    def initialize()
+
+    end
+  end
+
+  class Create_Days
+    def initialize()
+      changelogmemo = Charu::ChangeLogMemo.new()
+    end
+  end
+end
+
+module Charu
+  class Create_Category
+    def initialize()
+
+    end
+  end
+
+  class Create_Categorys
+    def initialize()
+      changelogmemo = Charu::ChangeLogMemo.new()
+    end
+  end
+end
+
 module Charu
   class CreateHtml
     def initialize()
 
+      #markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML)
+
+      source= '
+
+      # 見出し1
+      ## 見出し2
+
+      * リスト1
+      * リスト2
+
+      このサイトは[mukaer.com](http://mukaer.com)です。
+
+      '
+      @config = Charu::Config.new()
+
+
+      #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
+      @day_body = File.open("./CharuConfig/template/day_body.erb").read
+    end
+
+    def keyword()
+      @keywords = @db[:keyword].select(:Keyword).all
+
+      @keyword = ""
+      @keywords.each{|i|
+        i.each{|key, value|
+          @keyword  = value + ", " + @keyword}
+      }
+      @keyword.encode!("UTF-8")
+    end
+
+    def create_body()
+      # くっつける
+
+      @htmls = []
+      @days.get_days().each{|day|
+        html = @header + @body + @footer
+        @htmls << [day.get_day_s(), day.get_tile(), html] # くっつける
+      }
+
+      @htmls.each{|day_time, tile, body|
+        erb = ERB.new(body)
+        @htmls << [day_time, tile, erb.result(binding)] # ファイル名とｈｔｍｌの配列
+      }
+      file_save()
+    end
+
+    def day_create_body()
+      @days.sort_data().each{|day_s| # 文字列だけのデータ
+        @daydata = []
+        @days.get_days.each{|day|
+          if day_s == day.get_day_s() then
+            @daydata << day
+          else
+            #@daydata << day
+          end
+          @daydata.sort!{|a, b| a.get_Datetime() <=> b.get_Datetime() }
+          @css_path = "./../theme/"
+          @css_theme_path = @css_path + @css_theme + "/" + @css_theme + ".css"
+          htmls = @header + @body + @footer
+          erb = ERB.new(htmls)
+          html = erb.result(binding)
+          # ファイル書き込み
+          begin
+            File.write(@thml_path + "index/" + day_s + ".html", html)
+          rescue
+            p day_s + ".html"
+            p "ファイル書き込みエラー".encode(Encoding::SJIS)
+          end
+        }
+      }
+    end
+
+    def file_save()
+      # ファイル書き込み
+      @days.get_days.each{|day_name, title, ｈｔｍｌ|
+        File.write(@thml_path + @file_name, ｈｔｍｌ)
+      }
     end
   end
 end

data/lib/Charu/FTP.rb

@@ -0,0 +1,47 @@
+# -*- encoding: utf-8 -*-
+
+require 'net/ftp'
+
+module Charu
+  class FtpClariant
+    def initialize()
+      @config = Charu::Config.new()
+
+      @server = @config.server
+      @port = @config.port
+      @user = @config.user
+      @pass = @config.pass
+      @dir = @config.www_html_out_path
+
+      @list = Dir.glob(@dir + '*.html')
+    end
+
+    def put_file()
+      ftp = Net::FTP.new
+      ftp.connect(@server, @port)
+      ftp.login(@user, @pass)
+
+      ftp.chdir('./')
+      p "./  :初期ディレクトリ".encode(Encoding::SJIS)
+      puts ftp.pwd
+
+      file_list = []
+      @list.each{|file|
+        file_list << File::expand_path(file)
+      }
+      ftp.chdir(@dir)
+      p @dir + ":移動ディレクトリ".encode(Encoding::SJIS)
+      puts ftp.pwd
+
+      # アップロード
+      file_list.each{|file|
+        p file
+        ftp.put(file)
+      }
+      p "完了".encode(Encoding::SJIS)
+      puts ftp.pwd
+
+      ftp.quit
+    end
+  end
+end

data/lib/Charu/version.rb

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

data/lib/Charu.rb

@@ -9,20 +9,26 @@ require 'Charu/ChangeLogMemo'
 require 'Charu/Config'
 require 'Charu/Template'
 require 'Charu/CreateHtml'
-
-
+require 'Charu/FTP'
 
 module Charu
   # Your code goes here...
 
 end
 
-if nil != ARGV[0] then
-  changelogmemo = Charu::ChangeLogMemo.new(ARGV[0])
-  changelogmemo.get_item_sort_reverse().each{|i|
-    #p i.datetime
-    #p i.get_item_title.encode(Encoding::SJIS)
+changelogmemo = Charu::ChangeLogMemo.new()
+changelogmemo.get_item_sort_reverse(1).each{|key, items|
+  items.each{|item|
+    #p item.date
+    #p item.get_item_title.encode(Encoding::SJIS)
     #p i.get_item_category()
   }
-  #changelogmemo.get_category_list()
-end
+}
+p changelogmemo.article_size_max()
+p changelogmemo.article_size_()
+#p changelogmemo.get_category_cnt()
+
+
+createhtml = Charu::CreateHtml.new()
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Charu
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
 platform: ruby
 authors:
 - ShiccaRorl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2018-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,7 +52,27 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: ChangeLogMemo Html Liblary
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: |-
+  ChangeLogを日記にしているなら便利かも。
+    ChangeLogMemoとは？
+
+  [横着プログラミング 第1回: Unixのメモ技術](http://0xcc.net/unimag/1/)
+
+  [Change Log メモを試してみよう](http://at-aka.blogspot.jp/p/change-log.html)
 email:
 - shicca.rorl@gmail.com
 executables:
@@ -78,6 +98,7 @@ files:
 - lib/Charu/ChangeLogMemo.rb
 - lib/Charu/Config.rb
 - lib/Charu/CreateHtml.rb
+- lib/Charu/FTP.rb
 - lib/Charu/template.rb
 - lib/Charu/version.rb
 homepage: https://rubygems.org/gems/Charu
@@ -100,8 +121,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.5.2.1
 signing_key: 
 specification_version: 4
-summary: ChangeLogMemo Html Converter Liblary
+summary: ChangeLogMemo Html Converter
 test_files: []