tdiary-contrib 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0261647cb0391bb468ccc2df77df87cf5b6cf65
-  data.tar.gz: 6b51bbbe6917310a9027da41d4a04dbd122bf15a
+  metadata.gz: 2b963a36e85ed48eeaf351c67e1daaaa10b798d4
+  data.tar.gz: 2f4633b77caadcaa50960a8e1350680818ba2087
 SHA512:
-  metadata.gz: da4972ac0fadf204dc2f4f1da359a16ae57ae32762acf35e46eba06a3495f7c3d376b341d43d52a46a6d066811e10aeea6bc8c3e4f86441d0ff8ac7215468892
-  data.tar.gz: 9b5e50c6d5ca78ad1d19948f0b17af6f981e774c11b70e7e5fc7ed5dbcc85d4163a3bd826efb75ab58cdf798d755b800617e5bf36a2dc9ca5456271f215ea670
+  metadata.gz: 1755119971bbadaab70bcb37536111a1c89617aae4ef2b6dde6731f5821a8288051c9e1fce2b50671df31381387512c577c969e3f2fa08fc4af5171566435084
+  data.tar.gz: eddddefe6eba29289006b8e19dc5b48fd548d7e4493b03be73048151f01b67dc31071ebd91132b81e097d38df527f75e90e8725f84bd4ccb97b347e9540f82c2

data/js/preview.js

@@ -0,0 +1,50 @@
+/*
+ * preview.js: view preview automatically
+ *
+ * Copyright (c) MATSUOKA Kohei <http://www.machu.jp/>
+ * Distributed under the GPL2 or any later version.
+ */
+$(function() {
+
+var previewButton = $('input[name="appendpreview"]');
+
+$tDiary.plugin.preview = function() {
+  previewButton.prop("disabled", true);
+  $.post(
+    'update.rb',
+    $('form.update').serialize() + "&appendpreview=1",
+    function(data) {
+      var beforeOffset = $('div.update').offset();
+      $('div.autopagerize_page_element').replaceWith(
+        $(data).find('div.autopagerize_page_element')
+      )
+      var afterOffset = $('div.update').offset();
+      // 自動更新時にスクロール位置を自動調整してみたがカクカクする
+      // window.scrollTo($(window).scrollLeft(),
+      //   $(window).scrollTop() + afterOffset.top - beforeOffset.top);
+      setTimeout($tDiary.plugin.preview, 10000);
+    },
+    'html'
+  )
+  .always(function() {
+    previewButton.prop("disabled", false);
+  });
+}
+
+if ($('div.autopagerize_page_element').length == 0) {
+  $('div.update').before(
+    $('<div class="autopagerize_page_element"></div>')
+  );
+}
+
+// プレビューボタンを押した時もajaxで更新するよう設定
+previewButton.click(
+  function(event) {
+    event.preventDefault();
+    $tDiary.plugin.preview();
+  }
+);
+
+setTimeout($tDiary.plugin.preview, 10000);
+
+});

data/lib/tdiary/contrib/version.rb

@@ -1,5 +1,5 @@
 module TDiary
   class Contrib
-    VERSION = "4.2.0"
+    VERSION = "4.2.1"
   end
 end

data/plugin/category-lite.rb

@@ -0,0 +1,235 @@
+#
+# category-lite.rb : tDiary plugin for show category pages (light edition)
+#
+# Copyright (C) 2015 TADA Tadashi
+# Distributed under the GPL2 or any later version.
+#
+
+
+# read cache here so that you can use category with secure mode.
+@conf['category.header1'] = ''
+@conf['category.header2'] = '<%= category_dropdown_list %>'
+@category_icon = {}
+@categories = transaction('category'){|db|db.keys}.sort_by{|c|c.downcase}
+
+module Category
+	class Info
+		def initialize(cgi, _, conf)
+			@cgi, @conf = cgi, conf
+		end
+
+		def category
+			@name || (@name = @conf.to_native(@cgi.params['category'][0], @conf.encoding_old))
+		end
+	end
+end
+
+def category_title
+	info = Category::Info.new(@cgi, nil, @conf)
+	"[#{info.category}]"
+end
+
+def category_anchor(category)
+	%Q|[<a href="#{h @index}?category=#{u category}" title="#{h category}">#{h category}</a>]|
+end
+
+def category_dropdown_list(label = nil, _ = nil)
+	label ||= 'show category list'
+
+	info = Category::Info.new(@cgi, _, @conf)
+	category = info.category
+	category = [] if category.empty?
+
+	options = ''
+	@categories.each do |c|
+		options << %Q|<option value="#{h c}"#{" selected" if category.include?(c)}>#{h c}</option>\n|
+	end
+
+	<<-HTML
+		<form method="get" action="#{h @index}"><div>
+			<select name="category">
+		#{options}
+			</select>
+			<input type="submit" value="#{label}">
+		</div></form>
+	HTML
+end
+
+def category_transaction(categories)
+	transaction('category') do |db|
+		(categories || db.keys).each do |category|
+			Hash[*JSON.load(db.get(category) || '{}').sort_by{|d,_|d}.flatten(1)].each do |ymd, diaries|
+				yield db, category, ymd, diaries
+			end
+		end
+	end
+end
+
+def category_list_sections
+	info = Category::Info.new(@cgi, nil, @conf)
+
+	r = ''
+	r << <<-HTML
+		<div class="category day">
+			<h2>
+				<span class="title">
+					<a href="#{h @conf.index}?category=#{u info.category}">#{h info.category}</a>
+				</span>
+			</h2>
+			<div class="body">
+				<ul class="category">
+	HTML
+	category_transaction([info.category]) do |db, category, ymd, diaries|
+		date = Time.local(*ymd.scan(/(.{4})(..)(..)/)[0]).strftime(@conf.date_format)
+		diaries.sort_by{|i|i[0]}.each do |idx, title, excerpt|
+			r << <<-HTML
+				<li>
+					<a href="#{h @index}#{anchor "#{ymd}#p#{'%02d' % idx}"}" title="#{h excerpt}">
+						#{date}#p#{'%02d' % idx}
+					</a>
+					#{apply_plugin(title)}
+				</li>
+			HTML
+		end
+	end
+	r << <<-HTML
+				</ul>
+			</div>
+		</div>
+	HTML
+	return r
+end
+
+def category_serialize(diary)
+	data = {}
+	ymd = diary.date.strftime('%Y%m%d')
+
+	idx = 1
+	diary.each_section do |s|
+		s.categories.each do |c|
+			data[c] ||= {}
+			data[c][ymd] ||= []
+			body = <<-EVAL.gsub(/^\t+/, '')
+				text = apply_plugin(<<'BODY', true)
+				#{s.body_to_html}
+				BODY
+			EVAL
+			shorten = begin
+				@conf.shorten(eval(body.untaint))
+			rescue NameError
+				""
+			end
+			data[c][ymd] << [idx, s.stripped_subtitle_to_html, shorten]
+		end
+		idx +=1
+	end
+	data
+end
+
+def category_rebuild(years)
+	transaction('category') do |db|
+		cache = Hash.new{{}}
+		@years.each do |y, ms|
+			ms.each do |m|
+				m = DiaryContainer::find_by_month(@conf, "#{y}#{m}")
+				m.diaries.each do |ymd, diary|
+					next if !diary.visible? or !diary.categorizable?
+					serialize = category_serialize(diary)
+					serialize.keys.each do |category|
+						cache[category] = cache[category].merge!(serialize[category])
+					end
+				end
+			end
+		end
+		db.keys.each {|key| db.delete(key)}
+		cache.each do |category, diaries|
+			db.set(category, diaries.to_json)
+		end
+	end
+end
+
+add_update_proc do
+	if /^(append|replace)$/ =~ @mode
+		ymd = @date.strftime('%Y%m%d')
+		diary = @diaries[ymd]
+		serialize = category_serialize(diary)
+
+		transaction('category') do |db|
+			(db.keys + serialize.keys).uniq.each do |category|
+				data = JSON.load(db.get(category) || '{}')
+				if diary.visible? and serialize[category]
+					data.update(serialize[category])
+					db.set(category, data.to_json)
+				else
+					data.delete(ymd)
+					if data.empty?
+						db.delete(category)
+					else
+						db.set(category, data.to_json)
+					end
+				end
+			end
+		end
+	end
+end
+
+#
+# edit support: insert category to editing diary using JavaScript
+#
+def category_edit_support_flatlist(categories)
+	ret = ''
+	ret << '<div class="field title">'
+	ret << "#{@category_conf_label}:\n"
+	categories.each do |c|
+		ret << %Q!| <span class="category-item">#{h c}</span>\n!
+	end
+	ret << "|\n</div>\n<br>\n"
+	ret
+end
+
+def category_edit_support_dropdown(categories)
+	ret = ''
+	ret << '<div class="field title">'
+	ret << %Q|#{@category_conf_label}: <select id="category-candidate" name="category-candidate">\n|
+	categories.each do |c|
+		ret << %Q!<option>#{h c}</option>\n!
+	end
+	ret << "|\n</select>\n</div>\n<br>\n"
+	ret
+end
+
+if @mode =~ /^(form|edit)$/ and @conf['category.edit_support'] != 0
+	enable_js( 'category.js' )
+	add_edit_proc do |date|
+		ret = ''
+		transaction('category') do |db|
+			categories = db.keys
+			unless categories.size == 0 then
+				if @conf['category.edit_support'] == 2 then
+					ret << category_edit_support_dropdown(categories)
+				else
+					ret << category_edit_support_flatlist(categories)
+				end
+			end
+		end
+		ret
+	end
+end
+
+if @mode == 'conf' || @mode == 'saveconf'
+	add_conf_proc('category', @category_conf_label, 'basic') do
+		if @mode == 'saveconf'
+			category_rebuild(@years) if @cgi.valid?('category_initialize')
+			@conf['category.edit_support'] = (@cgi.params['category.edit_support'][0] || '1').to_i
+		end
+		category_conf_html
+	end
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:
+# vim: ts=3

data/plugin/code-prettify.rb

@@ -4,14 +4,7 @@
 
 add_header_proc do
   <<-EOS
-<link href="js/prettify/prettify.css" type="text/css" rel="stylesheet" />
-<script type="text/javascript" src="js/prettify/prettify.js"></script>
-<script type="text/javascript"><!--
-jQuery.event.add(window, "load", function(){
-  prettyPrint();
-});
-//-->
-</script>
+<script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js"></script>
 EOS
 end
 

data/plugin/en/category-lite.rb

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+#
+# en/category-lite.rb : tDiary plugin for show category pages (light edition)
+#
+# Copyright (C) 2015 TADA Tadashi
+# Distributed under the GPL2 or any later version.
+#
+
+@category_conf_label = 'Category'
+
+def category_conf_html
+	r = <<-HTML
+		<h3 class="subtitle">Build category index</h3>
+		<p>
+		To use the category feature, you should build category index.
+		Check the box below and press OK to build category index.
+		</p>
+		<p><label for="category_initialize">
+		<input type="checkbox" id="category_initialize" name="category_initialize" value="1">Build category index
+		</label></p>
+		<p>
+		It takes several or several tens of second to create it. But your diaries are many or the server has low spec, it will be timeout. Rebuild index on off-line again.
+		</p>
+
+		<h3 class="subtitle">Edit Support</h3>
+		<p>
+		Category names can be shown under the 'Article' form.
+		</p>
+		<p>
+		<select name="category.edit_support">
+		<option value="1"#{" selected" if @conf['category.edit_support'] == 1}>Flat List</option>
+		<option value="2"#{" selected" if @conf['category.edit_support'] == 2}>Dropdown List/option>
+		<option value="0"#{" selected" if @conf['category.edit_support'] == 0}>Hide</option>
+		</select>
+		</p>
+	HTML
+	r
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:
+# vim: ts=3

data/plugin/flickr.rb

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

data/plugin/google_analytics.rb

@@ -13,15 +13,14 @@ end
 def google_analytics_insert_code
 	return '' unless @conf['google_analytics.profile']
 	<<-HTML
-	<script type="text/javascript"><!--
-	var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-	document.write(unescape('%3Cscript src="' + gaJsHost + 'google-analytics.com/ga.js" type="text/javascript"%3E%3C/script%3E'));
-	// --></script>
-	<script type="text/javascript"><!--
-	try {
-		var pageTracker = _gat._getTracker("UA-#{h @conf['google_analytics.profile']}");
-		pageTracker._trackPageview();
-	} catch (err) {}
+	<script>
+		(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+		ga('create', 'UA-#{@conf['google_analytics.profile']}', 'auto');
+		ga('send', 'pageview');
 	// --></script>
 	HTML
 end

data/plugin/image_gps.rb

@@ -43,14 +43,24 @@ def image( id, alt = 'image', thumbnail = nil, size = nil, place = 'photo' )
     image = image_list( @image_date )[id.to_i]
     image_t = image_list( @image_date )[thumbnail.to_i] if thumbnail
   end
-  if size then
+
+  if size
     if size.kind_of?(Array)
-      size = %Q[ width="#{size[0]}" height="#{size[1]}"]
+      if size.length > 1
+        size = %Q| width="#{h size[0]}" height="#{h size[1]}"|
+      elsif size.length > 0
+        size = %Q| width="#{h size[0]}"|
+      end
     else
-      size = %Q[ width="#{size.to_i}"]
+      size = %Q| width="#{size.to_i}"|
+    end
+  elsif @image_maxwidth and not @conf.secure then
+    _, w, _ = image_info( "#{@image_dir}/#{image}".untaint )
+    if w > @image_maxwidth then
+      size = %Q[ width="#{h @image_maxwidth}"]
+    else
+      size = ""
     end
-  else
-    size = ""
   end
 
   show_exif_info = @conf['image_gps.show_exif_info']

data/plugin/instagr.rb

@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 #
 # instagr.rb - plugin to insert images on instagr.am
+#              !! integrated into the instagram.rb.
+#              !! Please use the instagram.rb
 #
-# Copyright (C) 2011, tamoot <tamoot+tdiary@gmail.com>
+# Copyright (C) 2011-2015, tamoot <tamoot+tdiary@gmail.com>
 # You can redistribute it and/or modify it under GPL2.
 #
 # usage:
@@ -14,46 +16,13 @@
 #  :medium => 306x306 pixel (default)
 #  :large  => 612x612 pixel
 
-require 'cgi'
-require 'json'
-require 'net/http'
-
 def instagr( short_url, size = :medium)
-	return %Q|<p>Argument is empty.. #{short_url}</p>| if !short_url or short_url.empty?
-	option = option.nil? ? {} : option
-
-	# img size
-	size = size.to_sym if size != :medium
-	maxwidth_data = {:medium => 320, :large => 612}
-	maxwidth = maxwidth_data[ size ] ? maxwidth_data[ size ] : maxwidth_data[:medium]
-
-	# proxy
-	px_host, px_port = (@conf['proxy'] || '').split( /:/ )
-	px_port = 80 if px_host and !px_port
-
-	# query
-	query = "?url=#{CGI::escape(short_url)}&maxwidth=#{maxwidth}"
-
-	begin
-		Net::HTTP.version_1_2
-		res = Net::HTTP::Proxy(px_host, px_port).get('instagram.com', "/api/v1/oembed/#{query}")
-		json_data = JSON::parse( res, &:read )
-		width  = option[:width]  ? option[:width]  : json_data["width"]
-		height = option[:height] ? option[:height] : json_data["height"]
-
-		return <<-INSTAGR_DOM
-			<div class="instagr">
-				<a class="instagr" href="#{h short_url}" title="#{h @conf.to_native(json_data["title"])}">
-					<img src="#{h json_data["thumbnail_url"]}" width="#{h width}" height="#{h height}" alt="#{h @conf.to_native(json_data["title"])}">
-				</a>
-				<p>#{h json_data["author_name"]}'s photo.</p>
-			</div>
-		INSTAGR_DOM
-	rescue
-		return %Q|<p>Failed Open URL.. #{short_url}<br>#{h $!}</p>|
-	end
+   if respond_to?(:instagram)
+      instagram( short_url, size )
+   else
+      return %Q|instagr.rb was integrated into instagram.rb. Please use the instagram.rb|
+   end
 end
-alias :instagram :instagr
 
 
 # Local Variables:

data/plugin/instagram.rb

@@ -1,10 +1,67 @@
+# -*- coding: utf-8 -*-
+#
 # instagram.rb - embed your photo/videos in instagram to a diary
 #
 # Author: Tatsuya Sato
 # License: GPL
+require 'cgi'
+require 'json'
+require 'uri'
+require 'net/http'
+require 'open-uri'
+
+
+def instagram(*args)
+   uri = URI::parse(args[0])
+   return instagram_iframe(*args) if uri.scheme.nil?
+   return instagram_serverside(*args)
+end
 
-def instagram(code, width=612, height=700)
-  <<-BODY
+def instagram_iframe(code, width=612, height=700)
+  return <<-BODY
 <iframe src="//instagram.com/p/#{code}/embed/" width="#{width}" height="#{height}" frameborder="0" scrolling="no" allowtransparency="true"></iframe>
   BODY
 end
+
+def instagram_serverside( short_url, size = :medium)
+   return %Q|<p>Argument is empty.. #{short_url}</p>| if !short_url or short_url.empty?
+   option = option.nil? ? {} : option
+
+   # img size
+   size = size.to_sym if size != :medium
+   maxwidth_data = {:medium => 320, :large => 612}
+   maxwidth = maxwidth_data[ size ] ? maxwidth_data[ size ] : maxwidth_data[:medium]
+
+   # proxy
+   px_host, px_port = (@conf['proxy'] || '').split( /:/ )
+   px_port = 80 if px_host and !px_port
+
+   # query
+   query = "?url=#{CGI::escape(short_url)}&maxwidth=#{maxwidth}"
+
+   begin
+      Net::HTTP.version_1_2
+      res = Net::HTTP::Proxy(px_host, px_port).get('instagram.com', "/api/v1/oembed/#{query}")
+      json_data = JSON::parse( res, &:read )
+      width  = option[:width]  ? option[:width]  : json_data["width"]
+      height = option[:height] ? option[:height] : json_data["height"]
+      return <<-INSTAGR_DOM
+         <div class="instagr">
+            <a class="instagr" href="#{h short_url}" title="#{h @conf.to_native(json_data["title"])}">
+               <img src="#{h json_data["thumbnail_url"]}" width="#{h width}" height="#{h height}" alt="#{h @conf.to_native(json_data["title"])}">
+            </a>
+            <p>#{h json_data["author_name"]}'s photo.</p>
+         </div>
+      INSTAGR_DOM
+   rescue
+      return %Q|<p>Failed Open URL.. #{short_url}<br>#{h $!}</p>|
+   end
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:
+# vim: ts=3

data/plugin/ja/category-lite.rb

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+#
+# ja/category-lite.rb : tDiary plugin for show category pages (light edition)
+#
+# Copyright (C) 2015 TADA Tadashi
+# Distributed under the GPL2 or any later version.
+#
+
+@category_conf_label = 'カテゴリ'
+
+def category_conf_html
+	r = <<-HTML
+		<h3 class="subtitle">カテゴリインデックスの作成</h3>
+		<p>
+		カテゴリの機能を利用するにはカテゴリインデックスをあらかじめ作成しておく必要があります。
+		カテゴリインデックスを作成するには
+		以下のチェックを入れてからOKボタンを押してください。
+		</p>
+		<p><label for="category_initialize">
+		<input type="checkbox" id="category_initialize" name="category_initialize" value="1">カテゴリインデックスの作成
+		</label></p>
+		<p>
+		数秒から数十秒でインデックスの作成は終了しますが、日記の量が多い場合やサーバの性能が低い場合はタイムアウトしてしまう場合があります。この場合はオフラインで作成して下さい。
+		</p>
+
+		<h3 class="subtitle">日記編集サポート</h3>
+		<p>
+		日記編集画面の「本文」の下にカテゴリ名を一覧表示することができます。
+		カテゴリ名をクリックすると「本文」にそのカテゴリ名が挿入されます(要JavaScript)。
+		</p>
+		<p>
+			<select name="category.edit_support">
+				<option value="1"#{" selected" if @conf['category.edit_support'] == 1}>一覧表示</option>
+				<option value="2"#{" selected" if @conf['category.edit_support'] == 2}>ドロップダウンリスト</option>
+				<option value="0"#{" selected" if @conf['category.edit_support'] == 0}>表示しない</option>
+			</select>
+		</p>
+	HTML
+	r
+end
+
+# Local Variables:
+# mode: ruby
+# indent-tabs-mode: t
+# tab-width: 3
+# ruby-indent-level: 3
+# End:
+# vim: ts=3

data/plugin/ohmsha_estore.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # You can redistribute it and/or modify it under the same license as tDiary.
 #
-# display book info in http://estore.ohmsha.co.jp/ like amazon.rb
+# display book info in https://estore.ohmsha.co.jp/ like amazon.rb
 # USAGE: {{ohmsha_estore '978427406694P'}}
 
 def ohmsha_estore_cache_dir
@@ -25,37 +25,24 @@ rescue
 end
 
 require 'open-uri'
-autoload :REXML,    'rexml/document'
-autoload :StringIO, 'stringio'
+require 'json'
 def ohmsha_estore( id, doc = nil )
 	if !@conf.secure and !(result = ohmsha_estore_cache_get(id)).nil?
 		return result
 	end
 
-	domain = "http://estore.ohmsha.co.jp"
-	image = "#{domain}/images/covers/#{id}.gif"
-	link = "#{domain}/titles/#{id}"
-	doc ||= StringIO.new(open(link, &:read).gsub(%r|</?fb:.*?>|, ''))
-	xml = REXML::Document.new( doc )
-	biblio = "//html/body/div/div[2]/div/div/div/div[2]"
-	title = REXML::XPath.match( xml,
-		"#{biblio}/h2").first.text
-	author = REXML::XPath.match( xml,
-		"#{biblio}/div" ).first.text
-
-	description =
-		REXML::XPath.match( xml, '//html/body/div/div[2]/div/div/div[2]' ).
-		first.text
+	html = open("https://estore.ohmsha.co.jp#{domain}/titles/#{id}", &:read)
+	info = JSON.parse(html.scan(%r|<script type='application/ld\+json'>(.*?)</script>|m).flatten[0])
 
 	result = <<-EOS
 	<a class="amazon-detail" href="#{h link}"><span class="amazon-detail">
-		<img class="amazon-detail left" src="#{h image}"
+		<img class="amazon-detail left" src="#{h info['image']}"
 		height="150" width="100"
-		alt="#{h title}">
+		alt="#{h info['name']}">
 		<span class="amazon-detail-desc">
-			<span class="amazon-title">#{h title}</span><br>
-			<span class="amazon-author">#{h author}</span><br>
-			<span class="amazon-label">#{h description}</span><br>
+			<span class="amazon-title">#{h info['name']}</span><br>
+			<span class="amazon-label">#{h info['description'].split.first}</span><br>
+			<span class="amazon-price">#{h info['offers']['price'].to_f.to_i}円</span>
 		</span><br style="clear: left">
 	</span></a>
 EOS