Charu 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 425d0847c88c825fb8a6b102f46913ee08bb24b0
-  data.tar.gz: a891c6440a24a50a091c1e071d26ffae613936a6
+  metadata.gz: 870da5a0f711457e0bcef160d3d886fe6bab9055
+  data.tar.gz: 05f5526283ceea84390c32b71c6efb23951f9e92
 SHA512:
-  metadata.gz: bb67d6e3f154601041ea82786aa7a844e272bb85e1a7b307e464712251e6a16fd6548d0d4de3a87d8f8b995949bbca410e14ca332a00a4e21c39ed1bbb1d3614
-  data.tar.gz: 17039bfce3415fc94f1e06f14d8d1e6b1c5154a3545e5f2b5a2fab960bb6cb492b0a4e08ab529d7e7ca2aaa06ee72fc6d783a5ff18accc863a36456618fbb55b
+  metadata.gz: 659d1caf563be710987517ef4594861d1dc8023467c3f3c99644ba01078c5b97578da0ee7992f7771cb899d1d635794d5a049746908082a8f45bfe0bd1928d2a
+  data.tar.gz: 38beba3a1a26436df923f4a030bde8a2ed80ccd8845abe3688b0388eedc08ce92513826cf9d08b7ef29130510aba52700e38543e029755868d7071acafeb54e3

data/lib/Charu/ChangeLogMemo.rb

@@ -8,7 +8,8 @@ module Charu
       @config = Charu::Config.new()
 
       # プライベートの設定
-      @private_category = true
+      # 基本は全部プライベート
+      @private_category = false
     end
 
     def add(title_source)
@@ -27,6 +28,16 @@ module Charu
     end
 
     def get_private_category()
+      # プライベートの設定
+      # パブリックのカテゴリーに指定したものだけ、公開することにしてあります。
+      @category.each{|category|
+        @config.public_category.each{|public_category|
+          if category == public_category then
+            @private_category = true
+          end
+        }
+      }
+
       # プライベートの設定
       @category.each{|category|
         @config.private_category.each{|private_category|
@@ -191,12 +202,30 @@ module Charu
     def get_item_private()
       @item_list_private = Hash.new()
 
+      # プライベート集計
       @entrys.each{|entry|
+        necessary = []
+        day_s = ""
         entry.get_items().each{|item|
+          day_s = item.get_item_date_string()
           if item.get_private_category == true then
-            @item_list_private[item.get_item_date_string()] = [item]
+            necessary << item
           end
         }
+        @item_list_private[day_s] = necessary
+      }
+
+      # 配列の[]のを集計
+      delt = []
+      @item_list_private.each{|key, item|
+        if item == [] then
+          delt << key
+        end
+      }
+
+      # []を削除
+      delt.each{|del|
+        @item_list_private.delete(del)
       }
       return @item_list_private
     end
@@ -206,9 +235,13 @@ module Charu
     def get_item_private()
       @item_list_private = []
       @entrys.entrys.each{|entry|
+        i = []
+        s = ""
         entry.get_items().each{|item|
-          @item_list_private << item
+          s = item.get_item_date_string()
+          i << [item]
         }
+        @item_list_private[s] = i
       }
       return @item_list_private
     end
@@ -232,6 +265,8 @@ module Charu
       # 全てのカテゴリーを取得
       @all_category_list = []
       @item_list.each{|key, items|
+        #p "key " + key
+        #p items
         items.each{|item|
           item.get_item_category().each{|category|
             @all_category_list << category
@@ -250,7 +285,6 @@ module Charu
       return @item_list.size() / @config.article_size
     end
 
-
     # アイテム数を５０個とかで取り出せる
     def article_size(item_list, cnt)
       # [000-049] cnt 1 (1-1)*50 1*50-1
@@ -278,11 +312,8 @@ module Charu
       # 配列からハッシュに変換
       item_hash = Hash.new()
       t.each{|items|
-        items.each{|item|
-          item_hash[item.get_item_date_string()] = [item]
-        }
+        item_hash[items.first.get_item_date_string()] = items
       }
-
       return item_hash
     end
 

data/lib/Charu/Config.rb

@@ -1,13 +1,12 @@
 # -*- encoding: utf-8 -*-
 
 config = ""
-config = '
-# -*- encoding: utf-8 -*-
+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 :change_log_path, :article_size, :www_html_out_path, :www_html_out_path_private, :public_category
     attr_accessor :ftp_server, :ftp_port, :ftp_user, :ftp_pass
     def initialize()
       # ホームページタイトル
@@ -25,9 +24,12 @@ module Charu
       # CSS Path
       @css_theme_path = "./css/"
 
-      # プライベートカテゴリー
-      @private_category = ["Private", "P", "★", "2ch", "5ch"]
+	  # プライベートカテゴリー
+      @private_category = ["Private", "P", "★", "2ch", "5ch", "PS", "Life"]
 
+	  # パブリックカテゴリー
+      @public_category = ["Public"]
+	  
       # Change_Log_path
       @change_log_path = "./../ChangeLog"
 

data/lib/Charu/CreateHtml.rb

@@ -4,34 +4,6 @@
 
 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 PageCounter
     def initialize()
@@ -43,7 +15,7 @@ module Charu
       @pages = []
       while i <= @max_page do
         if i == 0 then
-          @pages << [[i, "index.html", changelogmemo.get_item_sort_reverse(i)]]
+          @pages << [[i, "index.html", changelogmemo.get_item_sort_reverse(1)]]
         else
           @pages << [[i, "index" + i.to_s + ".html", changelogmemo.get_item_sort_reverse(i)]]
         end
@@ -101,11 +73,10 @@ module Charu
 
     def create_body()
       # くっつける
-      p "==========="
 
       @htmls = []
       @page.each{|page, file_name, changelogmemo|
-        #p page
+        p "page " + page.to_s + " 作成中"
         #p file_name
         @changelogmemo = changelogmemo
 

data/lib/Charu/Template.rb

@@ -21,7 +21,7 @@ header = '<!doctype html>
 </head>
 
 <body>
-<a href="<%= @config.top_home_page %>"><h1><%= @config.home_title %></h1></a>
+<a href="<%= @config.top_home_page %>"><h1 style="text-align: center"><%= @config.home_title %></h1></a>
 <hr>
 '
 

data/lib/Charu/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Charu
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - ShiccaRorl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-07 00:00:00.000000000 Z
+date: 2018-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler