tdiary-contrib 4.0.2 → 4.0.2.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTA2NTZkMTYzYjk5MTczYTJmMzQ4NTMzNzY5ZjZlNzdhNzhhM2Y4NQ==
-  data.tar.gz: !binary |-
-    ZjMyYzVhZjljMTgwYjcyODk2MTY3NGUyYTA4YThlMjY1OTJhNjMzMQ==
+SHA1:
+  metadata.gz: 85cf1d5815f8a25ac6c6d5c5ba9cb4fc92203dfa
+  data.tar.gz: 24e64b73452bf435e9241af42a403f3d16ec9a1f
 SHA512:
-  metadata.gz: !binary |-
-    N2Y0ZTVmZDNhYzdmNzEzOWY0OTdkZWM1NmEyNTFjMDExMTI4ZTFiY2Y5ZTJi
-    MjAzNjk4NGIzYmJmYWI5Y2JiMmIxYmNjOTg4NmU0YjE5ZjAzNWM5Zjk0YWNh
-    OGUzZjE0MjNhNzlmODhlMmRjYTk0NDAzYjQ2ZmY0ODQxYzVjYjk=
-  data.tar.gz: !binary |-
-    NWU1MzJlODJmMDI1ZWE2MzJmNmRlZGE2ODMxY2EzM2VhOTg0OGQ2Mjk0NDhj
-    YjYyM2JkMGNiMGNjNDI5ZTU1NmYzNjVkMmFiM2YzNzg0MzIxNjYwODYwNGIw
-    MzRhNDc3MDU1YWUwMzIyYjYyM2RkZWUzMTdlZWQ2MDE3ZDY1YjE=
+  metadata.gz: be8344e9e8a190022cc3f5e514357e85e9638174ffe93a9bb09028734bea7e5e2a59ec75484099b5b89ddad3297dacc32f122081640947214ebc23429e2b1877
+  data.tar.gz: aa811bccb9496a12411a6f0ac0966f73574687184a544acde2a08136b42c3ab09704f4a6b5f74199fee565489966dbe29ccef222b1714b2aa2a09f4c67d26c91

data/.gitignore

@@ -1 +1,2 @@
-coverage
+coverage
+pkg

data/.travis.yml

@@ -2,4 +2,9 @@ rvm:
   - 1.9.3
   - 2.0.0
 
+cache: bundler
+
 script: bundle exec rake spec
+
+notifications:
+  irc: "irc.freenode.org#tdiary"

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'tdiary'
+gem 'tdiary', '4.0.2'
 
 gem 'rake'
 gem 'rspec'

data/Gemfile.lock

@@ -20,7 +20,7 @@ GEM
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    tdiary (4.0.1.20131102)
+    tdiary (4.0.2)
       bundler (~> 1.3)
       thor (~> 0.18)
     thor (0.18.1)
@@ -34,4 +34,4 @@ DEPENDENCIES
   rcov
   rspec
   simplecov
-  tdiary
+  tdiary (= 4.0.2)

data/lib/tdiary/contrib/version.rb

@@ -0,0 +1,5 @@
+module TDiary
+  module Contrib
+    VERSION = "4.0.2.1"
+  end
+end

data/plugin/ohmsha_estore.rb

@@ -24,6 +24,9 @@ rescue
 	nil
 end
 
+require 'open-uri'
+autoload :REXML,    'rexml/document'
+autoload :StringIO, 'stringio'
 def ohmsha_estore( id, doc = nil )
 	if !@conf.secure and !(result = ohmsha_estore_cache_get(id)).nil?
 		return result
@@ -32,9 +35,7 @@ def ohmsha_estore( id, doc = nil )
 	domain = "http://estore.ohmsha.co.jp"
 	image = "#{domain}/images/covers/#{id}.gif"
 	link = "#{domain}/titles/#{id}"
-	require 'open-uri'
-	doc ||= open(link)
-	require 'rexml/document'
+	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,
@@ -47,16 +48,16 @@ def ohmsha_estore( id, doc = nil )
 		first.text
 
 	result = <<-EOS
-	<a class="amazon-detail" href="#{h link}"><div class="amazon-detail">
+	<a class="amazon-detail" href="#{h link}"><span class="amazon-detail">
 		<img class="amazon-detail left" src="#{h image}"
 		height="150" width="100"
 		alt="#{h title}">
-		<div class="amazon-detail-desc">
+		<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>
-		</div><br style="clear: left">
-	</div></a>
+		</span><br style="clear: left">
+	</span></a>
 EOS
 
 	ohmsha_estore_cache_set( id, result ) unless @conf.secure

data/plugin/search-default.rb

@@ -99,8 +99,13 @@ module DefaultIOSearch
 	def diary_class(style)
 		c = DIARY_CLASS_CACHE[style]
 		return c if c
-		require "tdiary/style/#{style.downcase}_style.rb"
-		c = TDiary.const_defined?('Style') ? eval("TDiary::Style::#{style.capitalize}Diary") : eval("TDiary::#{style.capitalize}Diary")
+		if TDiary.const_defined?('Style')
+			require "tdiary/style/#{style.downcase}.rb"
+			c = eval("TDiary::Style::#{style.capitalize}Diary")
+		else
+			require "tdiary/style/#{style.downcase}_style.rb"
+			c = eval("TDiary::#{style.capitalize}Diary")
+		end
 		c.__send__(:include, DiaryClassDelta)
 		DIARY_CLASS_CACHE[style] = c
 		c
@@ -227,7 +232,7 @@ def search_input_form( q )
 end
 
 def search_result
-	unless @conf.io_class == TDiary::DefaultIO
+	unless @conf.io_class == (TDiary.const_defined?('DefaultIO') ? TDiary::DefaultIO : TDiary::IO::Default)
 		return %Q|<p class="message">could not use this plugin under #{@conf.io_class}.</p>| 
 	end
 

data/tdiary-contrib.gemspec

@@ -1,11 +1,12 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'tdiary/contrib/version'
 require 'tdiary/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "tdiary-contrib"
-  spec.version       = TDiary::VERSION
+  spec.version       = TDiary::Contrib::VERSION
   spec.authors       = ["tDiary contributors"]
   spec.email         = ["support@tdiary.org"]
   spec.summary       = %q{tDiary contributions package}

data/util/image-gallery/misc/plugin/recent_image.rb

@@ -1,6 +1,6 @@
-# recent_image.rb  $Revision: 2.0.2 $
+# recent_image.rb  $Revision: 2.0.3 $
 #
-# Copyright (c) 2005-2010 N.KASHIJUKU <n-kashi[at]whi.m-net.ne.jp>
+# Copyright (c) 2005-2013 N.KASHIJUKU <n-kashi[at]whi.m-net.ne.jp>
 # You can redistribute it and/or modify it under GPL2.
 #
 #  http://www1.whi.m-net.ne.jp/n-kashi/recent_image.htm
@@ -115,7 +115,7 @@ def image_info_rcimg( filename )
         break
       else
         if data.size < data_size
-          f.seek(data_size - data.size, IO::SEEK_CUR)
+          f.seek(data_size - data.size, File::IO::SEEK_CUR)
           data = ''
         else
           data = data[data_size .. -1]

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: tdiary-contrib
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.0.2.1
 platform: ruby
 authors:
 - tDiary contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2013-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tdiary
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: tDiary contributions package that includes plugins, styles, utilities,
@@ -60,8 +60,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.en.md
@@ -155,6 +155,7 @@ files:
 - lib/bayes/convert.rb
 - lib/exifparser/README
 - lib/tdiary-contrib.rb
+- lib/tdiary/contrib/version.rb
 - lib/wgs2tky.rb
 - misc/section_footer2/buzzurl.yaml
 - misc/section_footer2/fc2.yaml
@@ -443,12 +444,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []