tdiary-contrib 5.0.2 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df4146a150a383f7921897e986ff0f4290deff9e
-  data.tar.gz: 6f26f9bf9908f34579a6c21a36303ed74197105f
+  metadata.gz: 8b861b8e242e49d48b1bf2a4d221e45358aeac56
+  data.tar.gz: da7a57a662ae3892930d9b6854ed82070a0cc277
 SHA512:
-  metadata.gz: a55826575cd0c91657388f0ea94614bb87e14d83dfe4cdd1ed0ba52664665a9c51fe62a35e8081e79851aab081d0ee697405b76a3bfb4c71584bf5a2ab8f189a
-  data.tar.gz: 33f849299b5e56e2f9ea699cc10607c3f72a16465850750e94d4aece07891ae15f0d7b3183d34bd67e695b00f81a2e9aab963052934a48051a5cd3eb25196cd5
+  metadata.gz: a1a4b72e93928bac1131636987550e6f2ca4fa4a9bc5ce13fa8ef822ecbf4b04e9493f0d51595e542adf165f34976634bfb9d0827b819ed8ae5b0f78918f616a
+  data.tar.gz: ad99181c743a43a23eb42be2627130cc608d3634cce262509856858bc0b148c1146d7098abb9f9f8653691198edaa71fdbeac7874e07764fc38361710202d6b2

data/lib/tdiary/contrib/version.rb

@@ -1,5 +1,5 @@
 module TDiary
   class Contrib
-    VERSION = "5.0.2"
+    VERSION = "5.0.3"
   end
 end

data/plugin/flickr.rb

@@ -43,7 +43,7 @@ def flickr(photo_id, size = nil, place = 'flickr')
     return '[ERROR] flickr.rb: failed to get photo.'
   end
 
-  %Q|<a href="#{photo[:page]}" class="flickr"><img title="#{photo[:title]}" alt="#{photo[:title]}" src="#{photo[:src]}" class="#{place} photo"></a>|
+  %Q|<a href="#{photo[:page]}" class="flickr"><img title="#{photo[:title]}" alt="#{photo[:title]}" src="#{photo[:src]}" class="#{place} photo" height="#{photo[:height]}" width="#{photo[:width]}"></a>|
 end
 
 def flickr_left(photo_id, size = nil)

data/plugin/ogp.rb

@@ -7,31 +7,46 @@
 # @conf['ogp.facebook.app_id'] - your facebook application ID.
 # @conf['ogp.facebook.admins'] - your facebook ID.
 
-def ogp_description
-	section_index = @cgi.params['p'][0]
-	# section_index = "1"
-	if @mode == 'day' and section_index
-		diary = @diaries[@date.strftime('%Y%m%d')]
-		sections = diary.instance_variable_get(:@sections)
-		section = sections[section_index.to_i - 1].body_to_html
-		@conf.shorten(apply_plugin(section, true), 200)
+def ogp_description(html)
+	@conf.shorten(remove_tag(html), 200)
+end
+
+def ogp_image(html)
+	images = html.scan(/<img.*?src="(.*?)"/)
+	if !images.empty?
+		images.first[0]
 	else
-		@conf.description
+		@conf.banner
 	end
 end
 
 add_header_proc do
 	headers = {
-		# TODO: og:urlへ対応
 		'og:title' => title_tag.match(/>([^<]+)</).to_a[1],
 		'og:site_name' => @conf.html_title,
-		'og:description' => ogp_description,
-		'og:image' => @conf.banner,
-		'og:type' => (@mode == 'day') ? 'article' : 'blog',
 		'og:author' => @conf.author_name,
 		'fb:app_id' => @conf['ogp.facebook.app_id'],
 		'fb:admins' => @conf['ogp.facebook.admins']
 	}
+
+	if @mode == 'day'
+		diary = @diaries[@date.strftime('%Y%m%d')]
+		if diary
+			sections = diary.instance_variable_get(:@sections)
+			section_index = @cgi.params['p'][0] || sections.size
+			section = sections[section_index.to_i - 1].body_to_html
+			section_html = apply_plugin(section)
+
+			headers['og:description'] = ogp_description(section_html)
+			headers['og:image'] = ogp_image(section_html)
+			headers['og:type'] = 'article'
+		end
+	else
+		headers['og:description'] = @conf.description
+		headers['og:image'] = @conf.banner
+		headers['og:type'] = 'website'
+	end
+
 	headers.select {|key, val|
 		val && !val.empty?
 	}.map {|key, val|

data/plugin/playstore.rb

@@ -131,7 +131,7 @@ def playstore_text(app_id)
    when :notfound
       "<em>#{app_id} was not found</em>"
    else
-      %Q[<a href="#{app.market_url}">#{app.title}</a>]
+      %Q[<a href="#{app.store_url}">#{app.title}</a>]
    end
 end
 

data/spec/flicker_spec.rb

@@ -15,7 +15,7 @@ describe "flickr plugin" do
 		subject { plugin.flickr('5950109223', size = nil) }
 
 		it do
-			expect(subject).to eq %Q|<a href=\"https://www.flickr.com/photos/machu/5950109223/\" class=\"flickr\"><img title=\"RubyKaigi 2011\" alt=\"RubyKaigi 2011\" src=\"https://farm7.staticflickr.com/6006/5950109223_040097db92.jpg\" class=\"flickr photo\"></a>|
+			expect(subject).to eq %Q|<a href=\"https://www.flickr.com/photos/machu/5950109223/\" class=\"flickr\"><img title=\"RubyKaigi 2011\" alt=\"RubyKaigi 2011\" src=\"https://farm7.staticflickr.com/6006/5950109223_040097db92.jpg\" class=\"flickr photo\" height=\"375\" width=\"500\"></a>|
 		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-contrib
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.0.3
 platform: ruby
 authors:
 - tDiary contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-29 00:00:00.000000000 Z
+date: 2016-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tdiary
@@ -503,7 +503,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: tDiary contributions package