[DRE-commits] [tdiary-contrib] 02/12: Imported Upstream version 4.0.4

[Hideki Yamane]

This is an automated email from the git hooks/post-receive script.

henrich pushed a commit to branch master
in repository tdiary-contrib.

commit 49e486522790a67c0b1dc086e2a41b03c9cda201
Author: Hideki Yamane <henrich at debian.org>
Date:   Tue Jun 3 21:36:38 2014 +0900

    Imported Upstream version 4.0.4
---
 Gemfile                     |  2 +-
 Gemfile.lock                | 10 +++++-----
 plugin/facebook_comments.rb |  2 +-
 plugin/flickr.rb            |  9 ++++++---
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index 47f3158..421283d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'tdiary', '4.0.2'
+gem 'tdiary', '~> 4.0.2'
 
 gem 'rake'
 gem 'rspec', '~> 3.0.0.beta2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 07c7001..9eba8b6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,8 +4,8 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.3)
     json (1.8.1)
-    multi_json (1.8.4)
-    rake (10.1.1)
+    multi_json (1.9.2)
+    rake (10.2.2)
     rcov (1.0.0)
     rspec (3.0.0.beta2)
       rspec-core (= 3.0.0.beta2)
@@ -24,10 +24,10 @@ GEM
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    tdiary (4.0.2)
+    tdiary (4.0.3)
       bundler (~> 1.3)
       thor (~> 0.18)
-    thor (0.18.1)
+    thor (0.19.1)
 
 PLATFORMS
   ruby
@@ -38,4 +38,4 @@ DEPENDENCIES
   rcov
   rspec (~> 3.0.0.beta2)
   simplecov
-  tdiary (= 4.0.2)
+  tdiary (~> 4.0.2)
diff --git a/plugin/facebook_comments.rb b/plugin/facebook_comments.rb
index 43bb30a..0f8f508 100644
--- a/plugin/facebook_comments.rb
+++ b/plugin/facebook_comments.rb
@@ -4,7 +4,7 @@
 
 add_header_proc do
 <<-HTML
-<meta property="fb:admins" content="#{h @conf['facebook_comments.YOUR_FACEBOOK_USER_ID']}"/>
+<meta property="fb:admins" content="#{h @conf['facebook_comments.YOUR_FACEBOOK_USER_ID']}">
 <meta property="fb:app_id" content="#{h @conf['facebook_comments.YOUR_APPLICATION_ID']}">
 HTML
 end
diff --git a/plugin/flickr.rb b/plugin/flickr.rb
index 00da7da..40edd98 100644
--- a/plugin/flickr.rb
+++ b/plugin/flickr.rb
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # show photo image on Flickr.com
 #
 # usage:
@@ -18,7 +19,7 @@
 # Copyright (c) MATSUOKA Kohei <http://www.machu.jp/>
 # Distributed under the GPL
 #
-require 'net/http'
+require 'net/https'
 require 'digest/md5'
 require 'rexml/document'
 
@@ -180,8 +181,10 @@ module Flickr
 
     def open
       Net::HTTP.version_1_2
-      Net::HTTP.start('www.flickr.com') {|http|
-        response = http.get(query)
+      https = Net::HTTP.new('www.flickr.com', 443)
+      https.use_ssl = true
+      https.start {
+        response = https.get(query)
         response.body
       }
     end

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/tdiary-contrib.git