tdiary 4.0.2.20140201 → 4.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c52de43dc119883d82cc39f570b3b2f5999b96d
-  data.tar.gz: 517e13ad91be78f16ae61c3d4fd678d9d29e327c
+  metadata.gz: 1d869ad134fbca02c213d4e7215bd0a7b64c7942
+  data.tar.gz: 87819fd2b48635c9bbc45749a189502b3465ebed
 SHA512:
-  metadata.gz: 857ecaf2c9a4466f323710df41d0341dbb19bb02332c96ede67ec6f5966d20e25de11215ac3d7dbea86df89e6f6ffce2c3dc1fc2f0fd6569f36efd483833e897
-  data.tar.gz: f60cfac1eec83552533d86cf30b4ce6468470eb54d2009570afd70903c51807b259fc386cf77e78a89b78dbab5ae45ad0d503fc1509145afd0ca01a913939b4d
+  metadata.gz: 33d153483c71348da5ea2851095924aeb621cacf1df7727ef3e6e27b357a7fda6b5ee4aa7498f58beb9073ab45e801addf5164cc1ac214d87d2c2911452d7a51
+  data.tar.gz: 79b0620deeed57f18daf7869ace39f952e27ace3fc87ba3192a973b9bff19f156c4fd20029e526f5e3c808971c13bf7bf12b2d0edbf9bc19c4c15c5acff2322b

data/.travis.yml

@@ -5,6 +5,8 @@ services: memcache
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1
+  - ruby-head
 
 cache: bundler
 
@@ -32,5 +34,7 @@ notifications:
 
 matrix:
   allow_failures:
+    # eventmachine cann't build with rb_thread_blocking_region
+    - rvm: ruby-head
     # webrick mode is unstable results...
     - env: TEST_MODE=webrick

data/ChangeLog

@@ -1,3 +1,6 @@
+2014-02-21  TADA Tadashi <t@tdtds.jp>
+	* add theme_online plugin #291
+
 2013-03-20  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
 	* misc/style/gfm/gfm_style.rb: bugfix #268, #269. fixed broken rule of autolink replacements.
 

data/Gemfile

@@ -24,14 +24,14 @@ group :development do
   gem 'pit', require: false
   gem 'racksh', require: false
   gem 'rake'
+  gem 'octorelease'
   gem 'redcarpet'
 
   group :test do
     gem 'pry'
-    gem 'tapp'
-    gem 'test-unit', require: 'test/unit'
-    gem 'rspec'
-    gem 'capybara', require: 'capybara/rspec'
+    gem 'test-unit'
+    gem 'rspec', '~> 3.0.0.beta2'
+    gem 'capybara', require: 'capybara/rspec', github: 'jnicklas/capybara'
     gem 'selenium-webdriver'
     gem 'launchy'
     gem 'sequel'
@@ -44,7 +44,7 @@ end
 
 # https://github.com/redmine/redmine/blob/master/Gemfile#L89
 local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")
-if File.exists?(local_gemfile)
+if File.exist?(local_gemfile)
   puts "Loading Gemfile.local ..." if $DEBUG # `ruby -d` or `bundle -v`
   instance_eval File.read(local_gemfile)
 end

data/Gemfile.lock

@@ -1,14 +1,19 @@
-GEM
-  remote: https://rubygems.org/
+GIT
+  remote: git://github.com/jnicklas/capybara.git
+  revision: 595cd4a89bc5c7873e74a3b05761d27c30cc198a
   specs:
-    addressable (2.3.5)
-    capybara (2.2.1)
+    capybara (2.2.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.4.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.3.5)
+    childprocess (0.5.1)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.0)
     coffee-script (2.2.0)
@@ -23,14 +28,17 @@ GEM
       thor
     daemons (1.1.9)
     diff-lcs (1.2.5)
-    docile (1.1.2)
+    docile (1.1.3)
     eventmachine (1.0.3)
     execjs (2.0.2)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
     fastimage (1.6.0)
       addressable (~> 2.3, >= 2.3.5)
     ffi (1.9.3)
     hike (1.2.3)
     hikidoc (0.0.6)
+    hub (1.11.2)
     jasmine (1.3.2)
       jasmine-core (~> 1.3.1)
       rack (~> 1.0)
@@ -44,8 +52,14 @@ GEM
     mime-types (2.1)
     mini_portile (0.5.2)
     multi_json (1.8.4)
+    multipart-post (2.0.0)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
+    octokit (2.7.1)
+      sawyer (~> 0.5.2)
+    octorelease (0.0.4)
+      hub
+      octokit
     pit (0.0.7)
     pry (0.9.12.6)
       coderay (~> 1.0)
@@ -58,43 +72,48 @@ GEM
       rack (>= 1.0)
       rack-test (>= 0.5)
     rake (10.1.1)
-    redcarpet (3.0.0)
+    redcarpet (3.1.1)
     ref (1.0.5)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
+    rspec (3.0.0.beta2)
+      rspec-core (= 3.0.0.beta2)
+      rspec-expectations (= 3.0.0.beta2)
+      rspec-mocks (= 3.0.0.beta2)
+    rspec-core (3.0.0.beta2)
+      rspec-support (= 3.0.0.beta2)
+    rspec-expectations (3.0.0.beta2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (= 3.0.0.beta2)
+    rspec-mocks (3.0.0.beta2)
+      rspec-support (= 3.0.0.beta2)
+    rspec-support (3.0.0.beta2)
     rubyzip (1.1.0)
-    selenium-webdriver (2.39.0)
-      childprocess (>= 0.2.5)
+    sawyer (0.5.3)
+      addressable (~> 2.3.5)
+      faraday (~> 0.8, < 0.10)
+    selenium-webdriver (2.40.0)
+      childprocess (>= 0.5.0)
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0.4)
-    sequel (4.6.0)
+    sequel (4.7.0)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
     slop (3.4.7)
-    sprockets (2.10.1)
+    sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.8)
-    tapp (1.4.0)
-      thor
-    term-ansicolor (1.2.2)
-      tins (~> 0.8)
+    sqlite3 (1.3.9)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
     test-unit (2.5.5)
-    therubyracer (0.12.0)
+    therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
       ref
     thin (1.6.1)
@@ -103,7 +122,7 @@ GEM
       rack (>= 1.0.0)
     thor (0.18.1)
     tilt (1.4.1)
-    tins (0.13.1)
+    tins (1.0.0)
     websocket (1.0.7)
     xpath (2.0.0)
       nokogiri (~> 1.3)
@@ -112,26 +131,26 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara
+  capybara!
   coffee-script
   coveralls
   fastimage
   hikidoc
   jasmine (~> 1.3)
   launchy
+  octorelease
   pit
   pry
   rack
   racksh
   rake
   redcarpet
-  rspec
+  rspec (~> 3.0.0.beta2)
   selenium-webdriver
   sequel
   simplecov
   sprockets
   sqlite3
-  tapp
   test-unit
   therubyracer
   thin

data/README.md

@@ -1,6 +1,6 @@
 # tDiary
 
-[![Build Status](https://secure.travis-ci.org/tdiary/tdiary-core.png)](https://travis-ci.org/tdiary/tdiary-core) [![Coverage Status](https://coveralls.io/repos/tdiary/tdiary-core/badge.png?branch=master)](https://coveralls.io/r/tdiary/tdiary-core) [![Dependency Status](https://gemnasium.com/tdiary/tdiary-core.png)](https://gemnasium.com/tdiary/tdiary-core) [![Code Climate](https://codeclimate.com/github/tdiary/tdiary-core.png)](https://codeclimate.com/github/tdiary/tdiary-core)
+[![Gem Version](https://badge.fury.io/rb/tdiary.png)](https://rubygems.org/gems/tdiary) [![Build Status](https://secure.travis-ci.org/tdiary/tdiary-core.png)](https://travis-ci.org/tdiary/tdiary-core) [![Coverage Status](https://coveralls.io/repos/tdiary/tdiary-core/badge.png?branch=master)](https://coveralls.io/r/tdiary/tdiary-core) [![Dependency Status](https://gemnasium.com/tdiary/tdiary-core.png)](https://gemnasium.com/tdiary/tdiary-core) [![Code Climate](https://codeclimate.com/github/tdiary/tdiary-core.png)](https://codeclimate.com/github/tdiary/tdiary-core)
 
 ## tDiary, The TSUKKOMI-able Weblog.
 

data/Rakefile

@@ -7,7 +7,7 @@ require 'tdiary/tasks'
 
 require 'rake'
 require 'rake/clean'
-require 'bundler/gem_tasks' if File.exists?('tdiary.gemspec')
+require 'bundler/gem_tasks' if File.exist?('tdiary.gemspec')
 
 CLEAN.include(
 	"tmp",

data/index.rb

@@ -18,13 +18,13 @@ begin
 	require 'tdiary'
 
 	encoding_error = {}
-	cgi = CGI::new(:accept_charset => "UTF-8") do |name, value|
+	cgi = CGI::new(accept_charset: "UTF-8") do |name, value|
 		encoding_error[name] = value
 	end
 	if encoding_error.empty?
 		@cgi = cgi
 	else
-		@cgi = CGI::new(:accept_charset => 'shift_jis')
+		@cgi = CGI::new(accept_charset: 'shift_jis')
 		@cgi.params = cgi.params
 	end
 

data/js/01conf.js

@@ -40,6 +40,22 @@ $(function(){
 		return false;
 	});
 
+	/*
+	 * theme thumbnail changer
+	 */
+	$(document).on('change', '#theme_selection',function(){
+		var list = $(this);
+		var image = $('#theme_thumbnail');
+
+		var theme = '';
+		if ( list.selectedIndex == 0 ) {
+			theme = 'nowprinting';
+		} else {
+			theme = list.val().replace(/^.*\//, '');
+		}
+		image.attr('src', 'http://www.tdiary.org/theme.image/' + theme + '.jpg');
+	});
+
 	/*
 	 * old ruby alert
 	 */

data/misc/convert2.rb

@@ -90,7 +90,7 @@ module TDiary
 						@diaries = diaries
 						false
 					end
-	
+
 					require 'tdiary/io/default'
 					IO::Default::new( self ).transaction( date ) do |diaries|
 						diaries.update( @diaries )
@@ -100,12 +100,12 @@ module TDiary
 				end
 			end
 		end
-	
+
 	protected
 		def cookie_name
 			''
 		end
-	
+
 		def cookie_mail
 			''
 		end

data/misc/filter/limitdays.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8; -*-
 #
-# limitdays.rb: 
+# limitdays.rb:
 #
 # Copyright (C) SHIBATA Hiroshi <shibata.hiroshi@gmail.com> 2008.
 # Distributed under GPL2.
@@ -16,7 +16,7 @@ module TDiary::Filter
 			else
 				@date_limit = nil
 			end
-			
+
 			if @date_limit
 				now = Time.now
 				today = Time.local(now.year, now.month, now.day)

data/misc/filter/linkcheck.rb

@@ -27,7 +27,7 @@ module TDiary::Filter
 				debug( "No linkcheck to TrackBacks.", DEBUG_FULL )
 				return true
 			end
-		
+
 			# check only TrackBack
 			return true unless comment.name == 'TrackBack'
 
@@ -64,7 +64,7 @@ module TDiary::Filter
 				debug( "TrackBack source was no response." )
 				comment.show = false
 				return @filter_mode
-			rescue 
+			rescue
 				debug( "Cannot access to TrackBack source (#{$!})." )
 				comment.show = false
 				return @filter_mode

data/misc/lib/fcgi_patch.rb

@@ -16,7 +16,7 @@ Patch written by:
 class FCGI
   def self::each_cgi(*args)
     require 'cgi'
-    
+
     eval(<<-EOS,TOPLEVEL_BINDING)
     class CGI
       public :env_table
@@ -63,7 +63,7 @@ class FCGI
       end # FCGI::CGI class
     end # FCGI class
     EOS
-    
+
     if FCGI::is_cgi?
       yield ::CGI.new(*args)
     else
@@ -72,7 +72,7 @@ class FCGI
         $stdout, $stderr = request.out, request.err
 
         yield CGI.new(request, *args)
-        
+
         request.finish
       }
     end

data/misc/paas/cloudfoundry/Gemfile.lock

@@ -1,75 +1,78 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    cf-runtime (0.1.1)
+    cf-runtime (0.2.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.3.3)
+    coffee-script-source (1.7.0)
     daemons (1.1.9)
-    dalli (2.6.3)
-    eventmachine (1.0.0)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    faraday (0.8.4)
-      multipart-post (~> 1.1)
-    hashie (1.2.0)
-    hike (1.2.1)
-    httpauth (0.2.0)
-    jwt (0.1.5)
-      multi_json (>= 1.0)
-    libv8 (3.3.10.4)
-    multi_json (1.3.6)
-    multipart-post (1.1.5)
+    dalli (2.7.0)
+    eventmachine (1.0.3)
+    execjs (2.0.2)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    hashie (2.0.5)
+    hike (1.2.3)
+    jwt (0.1.11)
+      multi_json (>= 1.5)
+    libv8 (3.16.14.3)
+    multi_json (1.8.4)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
     oauth (0.4.7)
-    oauth2 (0.8.0)
-      faraday (~> 0.8)
-      httpauth (~> 0.1)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
       rack (~> 1.2)
-    omniauth (1.1.1)
-      hashie (~> 1.2)
-      rack
-    omniauth-github (1.0.3)
+    omniauth (1.2.1)
+      hashie (>= 1.2, < 3)
+      rack (~> 1.0)
+    omniauth-github (1.1.1)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.1)
     omniauth-oauth (1.0.1)
       oauth
       omniauth (~> 1.0)
-    omniauth-oauth2 (1.1.1)
-      oauth2 (~> 0.8.0)
-      omniauth (~> 1.0)
-    omniauth-twitter (0.0.13)
+    omniauth-oauth2 (1.1.2)
+      faraday (>= 0.8, < 0.10)
+      multi_json (~> 1.3)
+      oauth2 (~> 0.9.3)
+      omniauth (~> 1.2)
+    omniauth-twitter (1.0.1)
       multi_json (~> 1.3)
       omniauth-oauth (~> 1.0)
-    pg (0.14.1)
-    posix-spawn (0.3.6)
-    pygments.rb (0.3.1)
+    pg (0.17.1)
+    posix-spawn (0.3.8)
+    pygments.rb (0.5.4)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
-    rack (1.4.1)
-    rake (0.9.2.2)
-    redcarpet (2.1.1)
-    redis (3.0.4)
-    redis-namespace (1.3.0)
-      redis (~> 3.0.0)
-    sequel (3.40.0)
-    sprockets (2.6.0)
+    rack (1.5.2)
+    rake (10.1.1)
+    redcarpet (3.1.1)
+    redis (3.0.7)
+    redis-namespace (1.4.1)
+      redis (~> 3.0.4)
+    ref (1.0.5)
+    sequel (4.7.0)
+    sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    therubyracer (0.10.2)
-      libv8 (~> 3.3.10)
-    thin (1.5.0)
+    therubyracer (0.12.1)
+      libv8 (~> 3.16.14.0)
+      ref
+    thin (1.6.1)
       daemons (>= 1.0.9)
-      eventmachine (>= 0.12.6)
+      eventmachine (>= 1.0.0)
       rack (>= 1.0.0)
-    tilt (1.3.3)
-    twitter-text (1.6.1)
-      unf (~> 0.0.5)
-    unf (0.0.5)
+    tilt (1.4.1)
+    twitter-text (1.8.0)
+      unf (~> 0.1.0)
+    unf (0.1.3)
       unf_ext
     unf_ext (0.0.6)
     yajl-ruby (1.1.0)

data/misc/paas/heroku/Gemfile.lock

@@ -4,45 +4,47 @@ GEM
     addressable (2.3.5)
     daemons (1.1.9)
     eventmachine (1.0.3)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    fastimage (1.5.4)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    fastimage (1.6.0)
       addressable (~> 2.3, >= 2.3.5)
     hashie (2.0.5)
     hike (1.2.3)
     hikidoc (0.0.6)
-    httpauth (0.2.0)
-    jwt (0.1.8)
+    jwt (0.1.11)
       multi_json (>= 1.5)
-    multi_json (1.8.2)
-    multipart-post (1.2.0)
+    multi_json (1.8.4)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
     oauth (0.4.7)
-    oauth2 (0.8.1)
-      faraday (~> 0.8)
-      httpauth (~> 0.1)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
       rack (~> 1.2)
-    omniauth (1.1.4)
+    omniauth (1.2.1)
       hashie (>= 1.2, < 3)
-      rack
+      rack (~> 1.0)
     omniauth-github (1.1.1)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.1)
     omniauth-oauth (1.0.1)
       oauth
       omniauth (~> 1.0)
-    omniauth-oauth2 (1.1.1)
-      oauth2 (~> 0.8.0)
-      omniauth (~> 1.0)
+    omniauth-oauth2 (1.1.2)
+      faraday (>= 0.8, < 0.10)
+      multi_json (~> 1.3)
+      oauth2 (~> 0.9.3)
+      omniauth (~> 1.2)
     omniauth-twitter (1.0.1)
       multi_json (~> 1.3)
       omniauth-oauth (~> 1.0)
-    pg (0.17.0)
+    pg (0.17.1)
     rack (1.5.2)
-    rake (10.1.0)
-    sequel (4.4.0)
-    sprockets (2.10.1)
+    rake (10.1.1)
+    sequel (4.7.0)
+    sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)

data/misc/paas/sqale/Gemfile.lock

@@ -4,45 +4,47 @@ GEM
     addressable (2.3.5)
     daemons (1.1.9)
     eventmachine (1.0.3)
-    faraday (0.8.8)
-      multipart-post (~> 1.2.0)
-    fastimage (1.5.4)
+    faraday (0.9.0)
+      multipart-post (>= 1.2, < 3)
+    fastimage (1.6.0)
       addressable (~> 2.3, >= 2.3.5)
     hashie (2.0.5)
     hike (1.2.3)
     hikidoc (0.0.6)
-    httpauth (0.2.0)
-    jwt (0.1.8)
+    jwt (0.1.11)
       multi_json (>= 1.5)
-    multi_json (1.8.2)
-    multipart-post (1.2.0)
-    mysql2 (0.3.14)
+    multi_json (1.8.4)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    mysql2 (0.3.15)
     oauth (0.4.7)
-    oauth2 (0.8.1)
-      faraday (~> 0.8)
-      httpauth (~> 0.1)
-      jwt (~> 0.1.4)
-      multi_json (~> 1.0)
+    oauth2 (0.9.3)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 0.1.8)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
       rack (~> 1.2)
-    omniauth (1.1.4)
+    omniauth (1.2.1)
       hashie (>= 1.2, < 3)
-      rack
+      rack (~> 1.0)
     omniauth-github (1.1.1)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.1)
     omniauth-oauth (1.0.1)
       oauth
       omniauth (~> 1.0)
-    omniauth-oauth2 (1.1.1)
-      oauth2 (~> 0.8.0)
-      omniauth (~> 1.0)
+    omniauth-oauth2 (1.1.2)
+      faraday (>= 0.8, < 0.10)
+      multi_json (~> 1.3)
+      oauth2 (~> 0.9.3)
+      omniauth (~> 1.2)
     omniauth-twitter (1.0.1)
       multi_json (~> 1.3)
       omniauth-oauth (~> 1.0)
     rack (1.5.2)
-    rake (10.1.0)
-    sequel (4.4.0)
-    sprockets (2.10.1)
+    rake (10.1.1)
+    sequel (4.7.0)
+    sprockets (2.11.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)

data/misc/plugin/a.rb

@@ -9,13 +9,13 @@
 #   a "http://www.hoge.com/diary/", "Hoge Diary"
 #
 # a(key, option_or_name = "", name = nil)
-#   Use dictionary file. You need to create the dictionary 
+#   Use dictionary file. You need to create the dictionary
 #   file with a CGI.
 #   a "home"
 #   a "home", "20020329.html", "Here"
 #
 # a("name|key:option")
-#   Use dictionary file. You need to create the dictionary 
+#   Use dictionary file. You need to create the dictionary
 #   file with a CGI.
 #
 #   a "key"
@@ -29,8 +29,8 @@
 #
 # 3. Documents
 # See URLs below for more details.
-#   http://ponx.s5.xrea.com/hiki/a.rb.html (English) 
-#   http://ponx.s5.xrea.com/hiki/ja/a.rb.html (Japanese) 
+#   http://ponx.s5.xrea.com/hiki/a.rb.html (English)
+#   http://ponx.s5.xrea.com/hiki/ja/a.rb.html (Japanese)
 #
 # Copyright (c) 2002-2004 MUTOH Masao <mutoh@highway.ne.jp>
 # You can redistribute it and/or modify it under GPL2.