tdiary 5.0.1 → 5.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e9f502241c930b8f9a0e6f29e898cd21bbf1eed
-  data.tar.gz: 9ea9e4f08e078a50d80335baa66e115776e6732d
+  metadata.gz: 7cf83199a3f4ec801168051a15c3b84bb64a0d15
+  data.tar.gz: fec8c343fbd4ad7682a7d799dcecedac2fa0604f
 SHA512:
-  metadata.gz: b1b02f2d57f7fb8dfe44b9e72ad01fa448623f5baa5fc7557bf21c167efc39422d5db368715a91b78e042503e84b37c01e446fa2257d5b170aae396d3dafe64f
-  data.tar.gz: a9977fc745949475ed3747c6f0fdf7c93adeb446642d933350789ca95470fa470c1d21eef0c883cf5946f87058c6671be3f3f2de44977d71597982637f0dfcbe
+  metadata.gz: 25bbaf59b1683e578da7f42d4df947be80fd8809f06ec738c398e9c42ea5f40aaa5e57889a8a027d4eda33990b1c9cab44a3528aa4f3bc6af9af9e2ba7c73a51
+  data.tar.gz: 02882dbf62e836fae073403b87b83274ee05e4a703af39846f96ff17c62ca6e47bd99b23e8da84f9461a0364bb9500732e80fc5407919469fd4c385ee9665d4d

data/ChangeLog

@@ -1,3 +1,13 @@
+2016-09-29  TADA Tadashi <t@tdtds.jp>
+	* update some documents: add using Gemfile.local
+	* release 5.0.2
+
+2016-08-23  TADA Tadashi <t@tdtds.jp>
+	* base.css, default.css: define img.right and img.left after img.photo
+
+2016-06-30  TADA Tadashi <t@tdtds.jp>
+	* skip loading octokit on production mode in Rakefile
+
 2016-06-29  TADA Tadashi <t@tdtds.jp>
 	* move preview plugin from contrib
 	* release 5.0.1

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rack'
+gem 'rack', '~> 1.6' # ~> 2.0 requires ruby 2.2.2 or later.
 gem 'hikidoc'
 gem 'fastimage'
 gem 'emot'

data/Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     addressable (2.4.0)
     byebug (9.0.5)
-    capybara (2.7.1)
+    capybara (2.8.0)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -30,7 +30,7 @@ GEM
       multipart-post (>= 1.2, < 3)
     fastimage (2.0.0)
       addressable (~> 2)
-    ffi (1.9.10)
+    ffi (1.9.14)
     hikidoc (0.1.0)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
@@ -59,7 +59,7 @@ GEM
     pit (0.0.7)
     pkg-config (1.1.7)
     power_assert (0.3.0)
-    pry (0.10.3)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -78,19 +78,19 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.2)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
     rubyzip (1.2.0)
     sawyer (0.7.0)
       addressable (>= 2.3.5, < 2.5)
@@ -99,23 +99,23 @@ GEM
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    sequel (4.35.0)
+    sequel (4.37.0)
     simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
       simplecov-html (~> 0.9.0)
     simplecov-html (0.9.0)
     slop (3.6.0)
-    sprockets (3.6.2)
+    sprockets (3.7.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sqlite3 (1.3.11)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
-    test-unit (3.2.0)
+    test-unit (3.2.1)
       power_assert
     thor (0.19.1)
-    tins (1.10.2)
+    tins (1.12.0)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
@@ -138,7 +138,7 @@ DEPENDENCIES
   octokit
   pit
   pry-byebug
-  rack
+  rack (~> 1.6)
   racksh
   rake
   redcarpet

data/doc/INSTALL-cgi.md

@@ -3,10 +3,10 @@ tDiaryのインストール (CGI環境)
 
 一般的なCGIの実行を許可しているISPやレンタルサーバ上で利用する場合を想定し、以下のような環境を例に説明します。
 
-  - WWWサーバ: Apache 1.3.x
+  - WWWサーバ: Apache 2.x
   - ユーザ名: foo
-  - 日記のURL: http://www.hoge.example.org/~foo/diary/
-  - 上記URLのパス: /home/foo/public\_html/diary
+  - 日記のURL: `http://www.hoge.example.org/~foo/diary/`
+  - 上記URLのパス: `/home/foo/public_html/diary`
 
 ## tDiaryの取得
 
@@ -31,14 +31,12 @@ tDiaryのダウンロードサイトから、配布アーカイブを取得し
 ```
 % git clone git://github.com/tdiary/tdiary-core.git tdiary
 % cd tdiary
-% bundle install --without coffee:memcached:redis:gfm:server:development:test
+% bundle install --without development
 ```
 
-上記の例では tDiary を動作させるのに最低限必要なライブラリのみインストールしています。もし、memcached にキャッシュを保存したり、GFM スタイルを使用する場合は --without オプションから該当ライブラリの文字列を削除して実行してください。
-
 ## CGIスクリプトの設定
 
-配布アーカイブを展開し、中身をすべて/home/foo/public\_html/diaryにコピーします。以下の2つのファイルがCGIスクリプト本体なので、WWWサーバの権限で実行可能なようにパーミッションを設定してください。
+配布アーカイブを展開し、中身をすべて`/home/foo/public_html/diary`にコピーします。以下の2つのファイルがCGIスクリプト本体なので、WWWサーバの権限で実行可能なようにパーミッションを設定してください。
 
   - index.rb
   - update.rb
@@ -75,7 +73,7 @@ Require user  foo
   - CGIの実行を可能にし、
   - サフィックス「.rb」のファイルをCGIと認識させ、
   - index.rbをデフォルトのファイルに設定し、
-  - *.rhtmlとtdiary.*のファイルの参照を禁止して、
+  - `*.rhtml`と`tdiary.*`のファイルの参照を禁止して、
   - update.rbへのアクセスにはユーザ認証が必要
 
 という設定になっています。とりあえず書き換えが必要なのは、AuthUserFileとRequire userでしょう。意味はWebででも調べて下さい。AuthUseFileは、あらかじめhtpasswdコマンドで作成しておく必要があります(これもWebで調べればわかります)。

data/doc/INSTALL-rack.md

@@ -95,3 +95,19 @@ $ cd [tDiaryの設置ディレクトリ]
 $ tdiary update
 $ bundle install
 ```
+
+## 追加のgemを使うには
+
+tDiaryの関連ライブラリは、別のgemになっている場合があります。これらを使いたい場合、Rubyで一般的な`Gemfile`ではなく、`tdiary new`コマンドで作成した先(このドキュメントの場合はdirayディレクトリ)にある`Gemfile.local`に使いたいgemを指定します。例えばBlogKitを使いたい場合には以下のように指定します:
+
+```
+gem 'tdiary-blogkit'
+```
+
+このあと、`bundle install`をして、指定したgemをインストールします:
+
+```
+$ bundle install
+```
+
+他にも、日記の保存先をデータベースにするIO系のgem、スタイルを追加するgem、Thin以外のWebサーバを使いたい場合にも`Gemfile.local`に記述します。

data/doc/INSTALL.md

@@ -19,13 +19,13 @@ tDiaryの設定ファイルであるtdiary.confを作ります。
 
 初めてtDiaryをインストールする人には、付属のtdiary.conf.beginnerを使うのがオススメです。最初に使えるようにしておくと良いプラグインがあらかじめONになっていたり、spamフィルタにある程度の設定がされているなど、インストールしてすぐに使いやすい状態になっています。
 
-tdiary.conf.beginnerをtdiary.confにリネームして、内容を書き換えます。tDiaryの設定はほとんどWebブラウザ経由で行えます。ただし、@data\_pathは必要に応じて最初に書き換えてください。
+tdiary.conf.beginnerをtdiary.confにリネームして、内容を書き換えます。tDiaryの設定はほとんどWebブラウザ経由で行えます。ただし、`@data_path`は必要に応じて最初に書き換えてください。
 
 ```
 @data_path = 'data'
 ```
 
-@data\_pathは、日記のデータを保存するディレクトリです。ほとんどのレンタルサーバで使われているApache HTTPサーバ向けには、このディレクトリをWWWサーバ経由で参照されないように.htaccessファイルによるアクセス制御を設定済みです。他のWebサーバを使用する場合には、WWWサーバ経由でアクセスできない(public\_html配下でない)ディレクトリを指定するか、アクセス制御を設定してください。また、このディレクトリはWWWサーバの権限で書き込めるパーミッションにしておく必要があります。
+`@data_path`は、日記のデータを保存するディレクトリです。ほとんどのレンタルサーバで使われているApache HTTPサーバ向けには、このディレクトリをWWWサーバ経由で参照されないように.htaccessファイルによるアクセス制御を設定済みです。他のWebサーバを使用する場合には、WWWサーバ経由でアクセスできない(`public_html`配下でない)ディレクトリを指定するか、アクセス制御を設定してください。また、このディレクトリはWWWサーバの権限で書き込めるパーミッションにしておく必要があります。
 
 tdiary.confには、他にもいろいろな設定項目を記述できます。これらの項目には以下の3つの種類があります。
 
@@ -51,7 +51,7 @@ require 'tdiary/io/default'
 
 #### CGIで設定できない項目
 
-@data\_pathのように、CGIでは設定できない項目です。これらの項目は、tdiary.confファイルを直接編集して変更しなければいけません。
+`@data_path`のように、CGIでは設定できない項目です。これらの項目は、tdiary.confファイルを直接編集して変更しなければいけません。
 
 #### CGIで設定できる項目
 
@@ -61,7 +61,7 @@ require 'tdiary/io/default'
 
 tdiary.confに記述しておくことで、CGIの設定画面からは編集できないが追加はできるといった設定をできる項目があります(リンク元記録除外や、リンク元変換表)。あらかじめtdiary.confに記述しておくことで、複数の人が同一サーバ上でtDiaryを使うような場合に手間を省くことができます。
 
-各々の項目については、tdiary.conf.sampleの説明を読んでください。一般的な使用では、@data\_pathだけを正しく設定すれば、あとはブラウザから変更が可能です。
+各々の項目については、tdiary.conf.sampleの説明を読んでください。一般的な使用では、`@data_path`だけを正しく設定すれば、あとはブラウザから変更が可能です。
 
 また、サフィックス.rbのファイルをCGIスクリプトとして指定できない環境では、index.rbやupdate.rbのファイル名を変更する必要がありますが、この変更をtDiaryに教えるために、@indexや@updateという変数が用意されています。環境によってはこれも指定する必要があるでしょう。
 
@@ -72,7 +72,7 @@ tDiaryの実行
 
 ### 日記の更新
 
-ページの先頭には、「トップ」「更新」の2つのリンクがあります。「トップ」は@index\_pageで指定した表紙へ、「更新」は日記を更新するフォームへ移動します。もし「更新」をクリックした時、認証ダイアログが出なかったら、.htaccessの記述が正しくない可能性があります。
+ページの先頭には、「トップ」「更新」の2つのリンクがあります。「トップ」は`@index_page`で指定した表紙へ、「更新」は日記を更新するフォームへ移動します。もし「更新」をクリックした時、認証ダイアログが出なかったら、.htaccessの記述が正しくない可能性があります。
 
 更新ページの先頭にもメニューがあります。一番右端に「設定」が増えているでしょう。ここをクリックすると、設定用のページが開きます。詳しくはを参照してください。
 
@@ -86,7 +86,7 @@ tDiaryの実行
 
 更新画面で「設定」をクリックすると、設定画面になります。ここではtDiaryのさまざまな設定項目をブラウザから設定できます。各項目の説明は画面中に記述してありますから、それを参考にいろいろと設定を変えてみてください。また、ページ中には利用しやすくするために「OK」ボタンがたくさん置いてありますが、すべて同じものです。つまり、どの「OK」を押してもすべての項目が保存されます。
 
-なお、この設定画面で行った変更は、@data\_pathで指定したディレクトリに別のtdiary.confとして保存されます(初期設定時に手動で書き換えたtdiary.confではありません)。このファイルは、元のtdiary.confのあとに読み込まれるので、設定の内容はブラウザから指定したものが優先されます(ただし、元のtdiary.conf中の設定を変えることで、読み込むタイミングは変更できます)。
+なお、この設定画面で行った変更は、`@data_path`で指定したディレクトリに別のtdiary.confとして保存されます(初期設定時に手動で書き換えたtdiary.confではありません)。このファイルは、元のtdiary.confのあとに読み込まれるので、設定の内容はブラウザから指定したものが優先されます(ただし、元のtdiary.conf中の設定を変えることで、読み込むタイミングは変更できます)。
 
 ### 日記の参照
 

data/js/comment_emoji_autocomplete.js

@@ -10,7 +10,7 @@ $(function() {
    var config = new Object();
    config.candidates = [":blush:",":scream:",":smirk:",":smiley:",":stuck_out_tongue_closed_eyes:",":stuck_out_tongue_winking_eye:",":rage:",":disappointed:",":sob:",":kissing_heart:",":wink:",":pensive:",":confounded:",":flushed:",":relaxed:",":mask:",":heart:",":broken_heart:",":sunny:",":umbrella:",":cloud:",":snowflake:",":snowman:",":zap:",":cyclone:",":foggy:",":ocean:",":cat:",":dog:",":mouse:",":hamster:",":rabbit:",":wolf:",":frog:",":tiger:",":koala:",":bear:",":pig:",":pig_nose:",":cow:",":boar:",":monkey_face:",":monkey:",":horse:",":racehorse:",":camel:",":sheep:",":elephant:",":panda_face:",":snake:",":bird:",":baby_chick:",":hatched_chick:",":hatching_chick:",":chicken:",":penguin:",":turtle:",":bug:",":honeybee:",":ant:",":beetle:",":snail:",":octopus:",":tropical_fish:",":fish:",":whale:",":whale2:",":dolphin:",":cow2:",":ram:",":rat:",":water_buffalo:",":tiger2:",":rabbit2:",":dragon:",":goat:",":rooster:",":dog2:",":pig2:",":mouse2:",":ox:",":dragon_face:",":blowfish:",":crocodile:",":dromedary_camel:",":leopard:",":cat2:",":poodle:",":paw_prints:",":bouquet:",":cherry_blossom:",":tulip:",":four_leaf_clover:",":rose:",":sunflower:",":hibiscus:",":maple_leaf:",":leaves:",":fallen_leaf:",":herb:",":mushroom:",":cactus:",":palm_tree:",":evergreen_tree:",":deciduous_tree:",":chestnut:",":seedling:",":blossom:",":ear_of_rice:",":shell:",":globe_with_meridians:",":sun_with_face:",":full_moon_with_face:",":new_moon_with_face:",":new_moon:",":waxing_crescent_moon:",":first_quarter_moon:",":waxing_gibbous_moon:",":full_moon:",":waning_gibbous_moon:",":last_quarter_moon:",":waning_crescent_moon:",":last_quarter_moon_with_face:",":first_quarter_moon_with_face:",":moon:",":earth_africa:",":earth_americas:",":earth_asia:",":volcano:",":milky_way:",":partly_sunny:",":octocat:",":squirrel:",":bamboo:",":gift_heart:",":dolls:",":school_satchel:",":mortar_board:",":flags:",":fireworks:",":sparkler:",":wind_chime:",":rice_scene:",":jack_o_lantern:",":ghost:",":santa:",":christmas_tree:",":gift:",":bell:",":no_bell:",":tanabata_tree:",":tada:",":confetti_ball:",":balloon:",":crystal_ball:",":cd:",":dvd:",":floppy_disk:",":camera:",":video_camera:",":movie_camera:",":computer:",":tv:",":iphone:",":phone:",":telephone:",":telephone_receiver:",":pager:",":fax:",":minidisc:",":vhs:",":sound:",":speaker:",":mute:",":loudspeaker:",":mega:",":hourglass:",":hourglass_flowing_sand:",":alarm_clock:",":watch:",":radio:",":satellite:",":loop:",":mag:",":mag_right:",":unlock:",":lock:",":lock_with_ink_pen:",":closed_lock_with_key:",":key:",":bulb:",":flashlight:",":high_brightness:",":low_brightness:",":electric_plug:",":battery:",":calling:",":email:",":mailbox:",":postbox:",":bath:",":bathtub:",":shower:",":toilet:",":wrench:",":nut_and_bolt:",":hammer:",":seat:",":moneybag:",":yen:",":dollar:",":pound:",":euro:",":credit_card:",":money_with_wings:",":e-mail:",":inbox_tray:",":outbox_tray:",":envelope:",":incoming_envelope:",":postal_horn:",":mailbox_closed:",":mailbox_with_mail:",":mailbox_with_no_mail:",":door:",":smoking:",":bomb:",":gun:",":hocho:",":pill:",":syringe:",":page_facing_up:",":page_with_curl:",":bookmark_tabs:",":bar_chart:",":chart_with_upwards_trend:",":chart_with_downwards_trend:",":scroll:",":clipboard:",":calendar:",":date:",":card_index:",":file_folder:",":open_file_folder:",":scissors:",":pushpin:",":paperclip:",":black_nib:",":pencil2:",":straight_ruler:",":triangular_ruler:",":closed_book:",":green_book:",":blue_book:",":orange_book:",":notebook:",":notebook_with_decorative_cover:",":ledger:",":books:",":bookmark:",":name_badge:",":microscope:",":telescope:",":newspaper:",":football:",":basketball:",":soccer:",":baseball:",":tennis:",":8ball:",":rugby_football:",":bowling:",":golf:",":mountain_bicyclist:",":bicyclist:",":horse_racing:",":snowboarder:",":swimmer:",":surfer:",":ski:",":spades:",":hearts:",":clubs:",":diamonds:",":gem:",":ring:",":trophy:",":musical_score:",":musical_keyboard:",":violin:",":space_invader:",":video_game:",":black_joker:",":flower_playing_cards:",":game_die:",":dart:",":mahjong:",":clapper:",":memo:",":pencil:",":book:",":art:",":microphone:",":headphones:",":trumpet:",":saxophone:",":guitar:",":shoe:",":sandal:",":high_heel:",":lipstick:",":boot:",":shirt:",":tshirt:",":necktie:",":womans_clothes:",":dress:",":running_shirt_with_sash:",":jeans:",":kimono:",":bikini:",":ribbon:",":tophat:",":crown:",":womans_hat:",":mans_shoe:",":closed_umbrella:",":briefcase:",":handbag:",":pouch:",":purse:",":eyeglasses:",":fishing_pole_and_fish:",":coffee:",":tea:",":sake:",":baby_bottle:",":beer:",":beers:",":cocktail:",":tropical_drink:",":wine_glass:",":fork_and_knife:",":pizza:",":hamburger:",":fries:",":poultry_leg:",":meat_on_bone:",":spaghetti:",":curry:",":fried_shrimp:",":bento:",":sushi:",":fish_cake:",":rice_ball:",":rice_cracker:",":rice:",":ramen:",":stew:",":oden:",":dango:",":egg:",":bread:",":doughnut:",":custard:",":icecream:",":ice_cream:",":shaved_ice:",":birthday:",":cake:",":cookie:",":chocolate_bar:",":candy:",":lollipop:",":honey_pot:",":apple:",":green_apple:",":tangerine:",":lemon:",":cherries:",":grapes:",":watermelon:",":strawberry:",":peach:",":melon:",":banana:",":pear:",":pineapple:",":sweet_potato:",":eggplant:",":tomato:",":corn:",":alien:",":angel:",":anger:",":angry:",":anguished:",":astonished:",":baby:",":blue_heart:",":blush:",":boom:",":bow:",":bowtie:",":boy:",":bride_with_veil:",":broken_heart:",":bust_in_silhouette:",":busts_in_silhouette:",":clap:",":cold_sweat:",":collision:",":confounded:",":confused:",":construction_worker:",":cop:",":couple_with_heart:",":couple:",":couplekiss:",":cry:",":crying_cat_face:",":cupid:",":dancer:",":dancers:",":dash:",":disappointed:",":dizzy_face:",":dizzy:",":droplet:",":ear:",":exclamation:",":expressionless:",":eyes:",":facepunch:",":family:",":fearful:",":feelsgood:",":feet:",":finnadie:",":fire:",":fist:",":flushed:",":frowning:",":girl:",":goberserk:",":godmode:",":green_heart:",":grey_exclamation:",":grey_question:",":grimacing:",":grin:",":grinning:",":guardsman:",":haircut:",":hand:",":hankey:",":hear_no_evil:",":heart_eyes_cat:",":heart_eyes:",":heart:",":heartbeat:",":heartpulse:",":hurtrealbad:",":hushed:",":imp:",":information_desk_person:",":innocent:",":japanese_goblin:",":japanese_ogre:",":joy_cat:",":joy:",":kiss:",":kissing_cat:",":kissing_closed_eyes:",":kissing_heart:",":kissing_smiling_eyes:",":kissing:",":laughing:",":lips:",":love_letter:",":man_with_gua_pi_mao:",":man_with_turban:",":man:",":mask:",":massage:",":metal:",":muscle:",":musical_note:",":nail_care:",":neckbeard:",":neutral_face:",":no_good:",":no_mouth:",":nose:",":notes:",":ok_hand:",":ok_woman:",":older_man:",":older_woman:",":open_hands:",":open_mouth:",":pensive:",":persevere:",":person_frowning:",":person_with_blond_hair:",":person_with_pouting_face:",":point_down:",":point_left:",":point_right:",":point_up_2:",":point_up:",":poop:",":pouting_cat:",":pray:",":princess:",":punch:",":purple_heart:",":question:",":rage:",":rage1:",":rage2:",":rage3:",":rage4:",":raised_hand:",":raised_hands:",":relaxed:",":relieved:",":revolving_hearts:",":runner:",":running:",":satisfied:",":scream_cat:",":scream:",":see_no_evil:",":shit:",":skull:",":sleeping:",":sleepy:",":smile_cat:",":smile:",":smiley_cat:",":smiley:",":smiling_imp:",":smirk_cat:",":smirk:",":sob:",":sparkling_heart:",":sparkles:",":speak_no_evil:",":speech_balloon:",":star:",":star2:",":stuck_out_tongue_closed_eyes:",":stuck_out_tongue_winking_eye:",":stuck_out_tongue:",":sunglasses:",":suspect:",":sweat_drops:",":sweat_smile:",":sweat:",":thought_balloon:",":-1:",":thumbsdown:",":thumbsup:",":+1:",":tired_face:",":tongue:",":triumph:",":trollface:",":two_hearts:",":two_men_holding_hands:",":two_women_holding_hands:",":unamused:",":v:",":walking:",":wave:",":weary:",":wink2:",":wink:",":woman:",":worried:",":yellow_heart:",":yum:",":zzz:",":109:",":house:",":house_with_garden:",":school:",":office:",":post_office:",":hospital:",":bank:",":convenience_store:",":love_hotel:",":hotel:",":wedding:",":church:",":department_store:",":european_post_office:",":city_sunrise:",":city_sunset:",":japanese_castle:",":european_castle:",":tent:",":factory:",":tokyo_tower:",":japan:",":mount_fuji:",":sunrise_over_mountains:",":sunrise:",":stars:",":statue_of_liberty:",":bridge_at_night:",":carousel_horse:",":rainbow:",":ferris_wheel:",":fountain:",":roller_coaster:",":ship:",":speedboat:",":boat:",":sailboat:",":rowboat:",":anchor:",":rocket:",":airplane:",":helicopter:",":steam_locomotive:",":tram:",":mountain_railway:",":bike:",":aerial_tramway:",":suspension_railway:",":mountain_cableway:",":tractor:",":blue_car:",":oncoming_automobile:",":car:",":red_car:",":taxi:",":oncoming_taxi:",":articulated_lorry:",":bus:",":oncoming_bus:",":rotating_light:",":police_car:",":oncoming_police_car:",":fire_engine:",":ambulance:",":minibus:",":truck:",":train:",":station:",":train2:",":bullettrain_front:",":bullettrain_side:",":light_rail:",":monorail:",":railway_car:",":trolleybus:",":ticket:",":fuelpump:",":vertical_traffic_light:",":traffic_light:",":warning:",":construction:",":beginner:",":atm:",":slot_machine:",":busstop:",":barber:",":hotsprings:",":checkered_flag:",":crossed_flags:",":izakaya_lantern:",":moyai:",":circus_tent:",":performing_arts:",":round_pushpin:",":triangular_flag_on_post:",":jp:",":kr:",":cn:",":us:",":fr:",":es:",":it:",":ru:",":gb:",":uk:",":de:",":100:",":1234:",":one:",":two:",":three:",":four:",":five:",":six:",":seven:",":eight:",":nine:",":keycap_ten:",":zero:",":hash:",":symbols:",":arrow_backward:",":arrow_down:",":arrow_forward:",":arrow_left:",":capital_abcd:",":abcd:",":abc:",":arrow_lower_left:",":arrow_lower_right:",":arrow_right:",":arrow_up:",":arrow_upper_left:",":arrow_upper_right:",":arrow_double_down:",":arrow_double_up:",":arrow_down_small:",":arrow_heading_down:",":arrow_heading_up:",":leftwards_arrow_with_hook:",":arrow_right_hook:",":left_right_arrow:",":arrow_up_down:",":arrow_up_small:",":arrows_clockwise:",":arrows_counterclockwise:",":rewind:",":fast_forward:",":information_source:",":ok:",":twisted_rightwards_arrows:",":repeat:",":repeat_one:",":new:",":top:",":up:",":cool:",":free:",":ng:",":cinema:",":koko:",":signal_strength:",":u5272:",":u5408:",":u55b6:",":u6307:",":u6708:",":u6709:",":u6e80:",":u7121:",":u7533:",":u7a7a:",":u7981:",":sa:",":restroom:",":mens:",":womens:",":baby_symbol:",":no_smoking:",":parking:",":wheelchair:",":metro:",":baggage_claim:",":accept:",":wc:",":potable_water:",":put_litter_in_its_place:",":secret:",":congratulations:",":m:",":passport_control:",":left_luggage:",":customs:",":ideograph_advantage:",":cl:",":sos:",":id:",":no_entry_sign:",":underage:",":no_mobile_phones:",":do_not_litter:",":non-potable_water:",":no_bicycles:",":no_pedestrians:",":children_crossing:",":no_entry:",":eight_spoked_asterisk:",":eight_pointed_black_star:",":heart_decoration:",":vs:",":vibration_mode:",":mobile_phone_off:",":chart:",":currency_exchange:",":aries:",":taurus:",":gemini:",":cancer:",":leo:",":virgo:",":libra:",":scorpius:",":sagittarius:",":capricorn:",":aquarius:",":pisces:",":ophiuchus:",":six_pointed_star:",":negative_squared_cross_mark:",":a:",":b:",":ab:",":o2:",":diamond_shape_with_a_dot_inside:",":recycle:",":end:",":on:",":soon:",":clock1:",":clock130:",":clock10:",":clock1030:",":clock11:",":clock1130:",":clock12:",":clock1230:",":clock2:",":clock230:",":clock3:",":clock330:",":clock4:",":clock430:",":clock5:",":clock530:",":clock6:",":clock630:",":clock7:",":clock730:",":clock8:",":clock830:",":clock9:",":clock930:",":heavy_dollar_sign:",":copyright:",":registered:",":tm:",":x:",":heavy_exclamation_mark:",":bangbang:",":interrobang:",":o:",":heavy_multiplication_x:",":heavy_plus_sign:",":heavy_minus_sign:",":heavy_division_sign:",":white_flower:",":heavy_check_mark:",":ballot_box_with_check:",":radio_button:",":link:",":curly_loop:",":wavy_dash:",":part_alternation_mark:",":trident:",":black_square:",":white_square:",":white_check_mark:",":black_square_button:",":white_square_button:",":black_circle:",":white_circle:",":red_circle:",":large_blue_circle:",":large_blue_diamond:",":large_orange_diamond:",":small_blue_diamond:",":small_orange_diamond:",":small_red_triangle:",":small_red_triangle_down:",":shipit:"];
    var regrep  = ":.+$";
-   
+
    function widgetPosition(){
       var caretPosition = Measurement.caretPos($("textarea[name=body]"));
       return {
@@ -18,40 +18,40 @@ $(function() {
          top:  caretPosition.top + 20 + "px",
          width: "auto"
       };
-      
+
    }
-   
+
    function matchedEmoji(val){
       terms = val.split("\n");
       term  = terms[ terms.length - 1];
-      
+
       var matched = term.match(regrep);
-      
+
       if( matched == null ){
          return false;
-         
+
       }
-      
+
       return true;
-      
+
    }
-  
+
    function typedEmoji( term ) {
       var array = term.split(":");
       return array[ array.length - 1 ];
    }
-  
+
    $( "textarea[name=body]" )
       .bind( "keydown", function( event ) {
          if ( event.keyCode === $.ui.keyCode.TAB &&
             $( this ).data( "autocomplete" ).menu.active ) {
             event.preventDefault();
-            
+
          }
       })
       .autocomplete({
          delay: 500,
-         
+
          //filtering
          source: function( request, response ) {
             if(matchedEmoji(request.term)){
@@ -59,34 +59,34 @@ $(function() {
                   config.candidates, typedEmoji( request.term ) ) );
             }
          },
-         
+
          // prevent value inserted on focus
          focus: function() {
             return false;
          },
-         
+
          // replace textarea
          select: function( event, ui ) {
             // no match data ...
             if (ui.item.value == null){
                return false;
             }
-            
+
             var terms = this.value.split(":");
             // remove the current typed emoji
             terms.pop();
             // add the selected item
             terms.push( ui.item.value.replace(/:/g, "") );
             this.value = terms.join( ":" ) + ":";
-            
+
             return false;
          },
-         
-         // re-positioning supports excluding IE. 
+
+         // re-positioning supports excluding IE.
          open: function(){
             if (! document.uniqueID) {
                $(".ui-autocomplete").css(widgetPosition())
-               
+
             }
          }
 
@@ -95,36 +95,36 @@ $(function() {
    // customize autocomplate item
    $.ui.autocomplete.prototype._renderItem = function( ul, item ) {
       var icon_img = null;
-      
+
       if (item.value != null){
          png_basename = item.value.replace(/:/g, "");
-         
+
          if (png_basename == '+1'){ png_basename = 'plus1' }
-         
-         icon_img = $("<img>").attr('src', 'http://www.emoji-cheat-sheet.com/graphics/emojis/' + png_basename + '.png')
+
+         icon_img = $("<img>").attr('src', 'http://www.webpagefx.com/tools/emoji-cheat-sheet/graphics/emojis/' + png_basename + '.png')
          .css('width', '20').css('height', '20');
-         
+
       }
-      
+
       var label_a  = $("<a></a>")
          .append(icon_img)
          .append(item.label)
-      
+
       return $( "<li></li>" )
          .data( "item.autocomplete", item )
          .append(label_a)
          .appendTo( ul );
    };
-   
+
    // customize filter and result
    $.ui.autocomplete.filter = function(array, term) {
       var matcher = new RegExp( $.ui.autocomplete.escapeRegex(term), "i" );
-      
+
       var aryMatches = $.grep( array, function(value) {
          return matcher.test(value.label || value.value || value);
 
       });
-      
+
       if (aryMatches.length == 0){
          aryMatches.push({
             label: '<span class="info" style="font-style: italic;">no match found</span>',
@@ -132,8 +132,7 @@ $(function() {
          });
 
       }
-      
+
       return aryMatches;
    };
 });
-

data/lib/tdiary/cli.rb

@@ -103,11 +103,11 @@ module TDiary
 
 			if options[:cgi]
 				opts = {
-					:daemon => ENV['DAEMON'],
-					:bind   => options[:bind],
-					:port   => options[:port],
-					:logger => $stderr,
-					:access_log => options[:log] ? File.open(options[:log], 'a') : $stderr
+					daemon: ENV['DAEMON'],
+					bind: options[:bind],
+					port: options[:port],
+					logger: $stderr,
+					access_log: options[:log] ? File.open(options[:log], 'a') : $stderr
 				}
 				TDiary::Server.run( opts )
 			elsif
@@ -116,12 +116,12 @@ module TDiary
 				require 'webrick'
 				ARGV.shift
 				opts = {
-					:environment => ENV['RACK_ENV'] || "development",
-					:daemonize   => false,
-					:Host        => options[:bind],
-					:Port        => options[:port],
-					:pid         => File.expand_path("tdiary.pid"),
-					:config      => File.expand_path("config.ru")
+					environment: ENV['RACK_ENV'] || "development",
+					daemonize: false,
+					Host: options[:bind],
+					Port: options[:port],
+					pid: File.expand_path("tdiary.pid"),
+					config: File.expand_path("config.ru")
 				}
 				if options[:log]
 					opts[:AccessLog] = [[File.open(options[:log], 'a'), WEBrick::AccessLog::CLF]]

data/lib/tdiary/core_ext.rb

@@ -39,7 +39,7 @@ class String
 	def emojify
 		self.to_str.gsub(/:([a-zA-Z0-9_+-]+):/) do |match|
 			emoji_alias = $1.downcase
-			emoji_url = %Q[<img src='http://www.emoji-cheat-sheet.com/graphics/emojis/%s.png' width='20' height='20' title='%s' alt='%s' class='emoji' />]
+			emoji_url = %Q[<img src='http://www.webpagefx.com/tools/emoji-cheat-sheet/graphics/emojis/%s.png' width='20' height='20' title='%s' alt='%s' class='emoji' />]
 			if emoji_alias == 'plus1' or emoji_alias == '+1'
 				emoji_url % (['plus1']*3)
 			elsif Emot.unicode(emoji_alias)

data/lib/tdiary/dispatcher.rb

@@ -7,8 +7,8 @@ module TDiary
 		autoload :UpdateMain, 'tdiary/dispatcher/update_main'
 
 		TARGET = {
-			:index => IndexMain,
-			:update => UpdateMain
+			index: IndexMain,
+			update: UpdateMain
 		}
 
 		def initialize( target )

data/lib/tdiary/environment.rb

@@ -17,3 +17,19 @@ if defined?(Bundler)
   env = env.reject{|e| Bundler.settings.without.include? e }
   Bundler.require *env
 end
+
+# Bundler.require doesn't load gems specified in .gemspec
+# see: https://github.com/bundler/bundler/issues/1041
+#
+# load gems dependented by tdiary
+tdiary_spec = Bundler.definition.specs.find {|spec| spec.name == 'tdiary'}
+if tdiary_spec
+  tdiary_spec.dependent_specs.each {|dep_spec|
+    begin
+      require dep_spec.name
+    rescue LoadError => e
+      STDERR.puts "failed require '#{dep_spec.name}'"
+      STDERR.puts e
+    end
+  }
+end

data/lib/tdiary/plugin/00default.rb

@@ -331,14 +331,27 @@ def default_ogp
 		uri = @conf.index.dup
 		uri[0, 0] = base_url if %r|^https?://|i !~ @conf.index
 		uri.gsub!( %r|/\./|, '/' )
-		image = File.join(uri, "#{theme_url}/ogimage.png")
+		image = @conf.banner.nil? ? File.join(uri, "#{theme_url}/ogimage.png") : @conf.banner
+		ogp = {
+			'og:title' => title_tag.gsub(/<[^>]*>/, ""),
+			'og:image' => (h image),
+		}
+		ogp['fb:app_id'] = @conf['ogp.facebook.app_id']
+		ogp['fb:admins'] = @conf['ogp.facebook.admins']
 		if @mode == 'day' then
-			uri += anchor( @date.strftime( '%Y%m%d' ) )
+			ogp['og:type'] = 'article'
+			ogp['article:author'] = @conf.author_name
+			ogp['og:site_name'] = @conf.html_title
+			ogp['og:url'] = h(uri + anchor( @date.strftime( '%Y%m%d' ) ))
+		else
+			ogp['og:type'] = 'website'
+			ogp['og:description'] = h(@conf.description)
+			ogp['og:url'] = h(uri)
 		end
-		%Q[<meta content="#{title_tag.gsub(/<[^>]*>/, "")}" property="og:title">
-		<meta content="#{(@mode == 'day') ? 'article' : 'website'}" property="og:type">
-		<meta content="#{h image}" property="og:image">
-		<meta content="#{h uri}" property="og:url">]
+
+		ogp.map { |k, v|
+			%Q|<meta property="#{k}" content="#{v}">|
+		}.join("\n")
 	end
 end
 
@@ -714,7 +727,7 @@ def comment_mail_send
 		rmail = File::open( "#{TDiary::PATH}/../views/mail.rtxt" ){|f| f.read }
 	end
 	text = @conf.to_mail( ERB::new( rmail.untaint ).result( binding ) )
-	receivers.each { |i| i.untaint }
+	receivers.each(&:untaint)
 	comment_mail( text, receivers )
 end
 
@@ -771,8 +784,8 @@ end
 # header/footer (header)
 def saveconf_header
 	if @mode == 'saveconf' then
-		@conf.header = @conf.to_native( @cgi.params['header'][0] ).lines.map{|s| s.chomp}.join( "\n" ).sub( /\n+\z/, '' )
-		@conf.footer = @conf.to_native( @cgi.params['footer'][0] ).lines.map{|s| s.chomp}.join( "\n" ).sub( /\n+\z/, '' )
+		@conf.header = @conf.to_native( @cgi.params['header'][0] ).lines.map(&:chomp).join( "\n" ).sub( /\n+\z/, '' )
+		@conf.footer = @conf.to_native( @cgi.params['footer'][0] ).lines.map(&:chomp).join( "\n" ).sub( /\n+\z/, '' )
 	end
 end
 

data/lib/tdiary/plugin.rb

@@ -145,9 +145,7 @@ module TDiary
 		end
 
 		def update_proc
-			@update_procs.each do |proc|
-				proc.call
-			end
+			@update_procs.each(&:call)
 			''
 		end
 

data/lib/tdiary/server.rb

@@ -29,13 +29,13 @@ module TDiary
 
 		def initialize( opts )
 			@server = WEBrick::HTTPServer.new(
-				:Port => opts[:port], BindAddress: opts[:bind],
-				:DocumentRoot => TDiary.root,
-				:MimeTypes => tdiary_mime_types,
-				:Logger => webrick_logger_to( opts[:logger] ),
-				:AccessLog => webrick_access_log_to( opts[:access_log] ),
-				:ServerType => opts[:daemon] ? WEBrick::Daemon : nil,
-				:CGIInterpreter => WEBrick::HTTPServlet::CGIHandler::Ruby
+				Port: opts[:port], BindAddress: opts[:bind],
+				DocumentRoot: TDiary.root,
+				MimeTypes: tdiary_mime_types,
+				Logger: webrick_logger_to( opts[:logger] ),
+				AccessLog: webrick_access_log_to( opts[:access_log] ),
+				ServerType: opts[:daemon] ? WEBrick::Daemon : nil,
+				CGIInterpreter: WEBrick::HTTPServlet::CGIHandler::Ruby
 			)
 			@server.logger.level = WEBrick::Log::DEBUG
 			@server.mount("/", WEBrick::HTTPServlet::CGIHandler, TDiary.root + "/index.rb")

data/lib/tdiary/style/wiki.rb

@@ -84,11 +84,11 @@ module TDiary
 
 			def to_html( string )
 				html = HikiDoc::to_html( string,
-					:level => 3,
-					:empty_element_suffix => '>',
-					:use_wiki_name => false,
-					:allow_bracket_inline_image => false,
-					:plugin_syntax => method(:valid_plugin_syntax?) ).strip
+					level: 3,
+					empty_element_suffix: '>',
+					use_wiki_name: false,
+					allow_bracket_inline_image: false,
+					plugin_syntax: method(:valid_plugin_syntax?) ).strip
 				html.gsub!( %r!<span class="plugin">\{\{(.+?)\}\}</span>!m ) do
 					"<%=#{CGI.unescapeHTML($1)}\n%>"
 				end