tdiary 4.1.0.20141126 → 4.1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0e0cdcd3df43f6f079f1900ed1409dc22e3b57c4
+  data.tar.gz: 0e11be7ab4835fa702e74c8ade5fe3daf720cee2
+SHA512:
+  metadata.gz: c65ab2e34e364888e6ea2499ed53d28ba47dd40643b8dd48ffe75a95f1d68e32a7b3cce899f2ee8b918d674b78a938941653d95fc17f83332045921cbd5d987d
+  data.tar.gz: 2eb47c944e874938e9e5144eba1e539e7042514ec37520c1932df1abe8d0cfa45d8fcf605c40c1ffd989df4488b1873efdbbb22456744a18fdb93464860c396d

data/ChangeLog

@@ -1,3 +1,17 @@
+2014-12-27  MATSUOKA Kohei <kohei@machu.jp>
+	* lib/tdiary/application.rb: fix #442: call extensions setup before the core setup
+	* lib/tdiary/application/extensions/omniauth.rb: fix error with base_dir 
+	* lib/tdiary/rack/auth/omniauth.rb: remove github authentication
+
+2014-12-22  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
+	* lib/tdiary.rb: fixed load path of additional gems
+
+2014-12-16  TADA Tadashi <t@tdtds.jp>
+	* plugin/category.rb: fix error on update running on ruby 1.9.3
+
+2014-11-29  TADA Tadashi <t@tdtds.jp>
+	* release 4.1.0
+
 2014-11-26  TADA Tadashi <t@tdtds.jp>
 	* misc/plugin/category.rb: support plugin storage
 	* misc/plugin/disp_referrer.rb: unsupport nora library

data/Gemfile

@@ -13,7 +13,6 @@ end
 
 group :server do
   platforms :mri do
-    gem 'eventmachine', github: 'eventmachine/eventmachine'
     gem 'thin'
   end
 

data/Gemfile.lock

@@ -1,9 +1,3 @@
-GIT
-  remote: git://github.com/eventmachine/eventmachine.git
-  revision: 4d53154a9ea420cdc65bf8985b9156ad4c3730c9
-  specs:
-    eventmachine (1.0.3)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -25,7 +19,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.8.0)
-    columnize (0.8.9)
+    columnize (0.9.0)
     coveralls (0.7.2)
       multi_json (~> 1.3)
       rest-client (= 1.6.7)
@@ -36,8 +30,9 @@ GEM
     debugger-linecache (1.2.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
+    eventmachine (1.0.4)
     execjs (2.2.2)
-    fastimage (1.6.4)
+    fastimage (1.6.6)
       addressable (~> 2.3, >= 2.3.5)
     ffi (1.9.6)
     gemoji (2.1.0)
@@ -48,7 +43,7 @@ GEM
       phantomjs
       rack (>= 1.2.1)
       rake
-    jasmine-core (2.1.2)
+    jasmine-core (2.1.3)
     launchy (2.4.3)
       addressable (~> 2.3)
     libv8 (3.16.14.7)
@@ -56,11 +51,11 @@ GEM
     mime-types (2.4.3)
     mini_portile (0.6.1)
     multi_json (1.10.1)
-    nokogiri (1.6.4.1)
+    nokogiri (1.6.5)
       mini_portile (~> 0.6.0)
     phantomjs (1.9.7.1)
     pit (0.0.7)
-    power_assert (0.2.1)
+    power_assert (0.2.2)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -68,14 +63,14 @@ GEM
     pry-byebug (2.0.0)
       byebug (~> 3.4)
       pry (~> 0.10)
-    rack (1.5.2)
+    rack (1.6.0)
     rack-test (0.6.2)
       rack (>= 1.0)
     racksh (1.0.0)
       rack (>= 1.0)
       rack-test (>= 0.5)
-    rake (10.3.2)
-    redcarpet (3.2.0)
+    rake (10.4.2)
+    redcarpet (3.2.2)
     ref (1.0.5)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -97,7 +92,7 @@ GEM
       multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    sequel (4.16.0)
+    sequel (4.17.0)
     simplecov (0.9.1)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
@@ -112,7 +107,7 @@ GEM
     sqlite3 (1.3.10)
     term-ansicolor (1.2.2)
       tins (~> 0.8)
-    test-unit (3.0.7)
+    test-unit (3.0.8)
       power_assert
     therubyracer (0.12.1)
       libv8 (~> 3.16.14.0)
@@ -135,7 +130,6 @@ DEPENDENCIES
   capybara
   coffee-script
   coveralls
-  eventmachine!
   fastimage
   gemoji
   hikidoc

data/lib/tdiary/application/extensions/omniauth.rb

@@ -8,7 +8,6 @@ TDiary::Application.configure do
 		use OmniAuth::Builder do
 			configure {|conf| conf.path_prefix = "/auth" }
 			provider :twitter, ENV['TWITTER_KEY'], ENV['TWITTER_SECRET']
-			provider :github, ENV['GITHUB_KEY'], ENV['GITHUB_SECRET']
 		end
 
 		map('/auth') do
@@ -18,6 +17,6 @@ TDiary::Application.configure do
 
 	config.authenticate TDiary::Rack::Auth::OmniAuth, :twitter do |auth|
 		# TODO: an user can setting
-		auth.info.nickname == ENV['TWITTER_NAME'] || ENV['GITHUB_NAME']
+		auth.info.nickname == ENV['TWITTER_NAME']
 	end
 end

data/lib/tdiary/application.rb

@@ -29,7 +29,8 @@ module TDiary
 		def initialize( base_dir = '/' )
 			@app = ::Rack::Builder.app {
 				map base_dir do
-					Application.config.builder_procs.each do |builder_proc|
+					# call extensions setup before the core setup (fixed #442)
+					Application.config.builder_procs.reverse.each do |builder_proc|
 						instance_eval &builder_proc
 					end
 				end

data/lib/tdiary/configuration.rb

@@ -19,7 +19,7 @@ module TDiary
 			result = ERB.new(File.read("#{File.dirname(__FILE__)}/../../views/tdiary.rconf").untaint).result(binding)
 			result.untaint unless @secure
 			Safe::safe( @secure ? 4 : 1 ) do
-				eval( result, binding, "(TDiary::Config#save)", 1 )
+				eval( result, binding, "(TDiary::Configuration#save)", 1 )
 			end
 			@io_class.save_cgi_conf(self, result)
 		end
@@ -118,7 +118,7 @@ module TDiary
 			eval( def_vars1, b )
 			Safe::safe( @secure ? 4 : 1 ) do
 				begin
-					eval( cgi_conf, b, "(TDiary::Config#load_cgi_conf)", 1 )
+					eval( cgi_conf, b, "(TDiary::Configuration#load_cgi_conf)", 1 )
 				rescue SyntaxError
 					enc = case @lang
 							when 'en'

data/lib/tdiary/dispatcher/index_main.rb

@@ -11,7 +11,7 @@ module TDiary
 			def initialize( request, cgi )
 				@request = request
 				@cgi = cgi
-				@conf = TDiary::Config::new( cgi, request )
+				@conf = TDiary::Configuration::new( cgi, request )
 				@params = request.params
 			end
 

data/lib/tdiary/dispatcher/update_main.rb

@@ -11,7 +11,7 @@ module TDiary
 			def initialize( request, cgi )
 				@request = request
 				@cgi = cgi
-				@conf = TDiary::Config::new( cgi, request )
+				@conf = TDiary::Configuration::new( cgi, request )
 				@params = request.params
 			end
 

data/lib/tdiary/io/base.rb

@@ -47,7 +47,7 @@ module TDiary
 				end
 				TDiary::Style.constants(false).each do |name|
 					prefix = name.slice(/\A(.*)Diary\z/, 1)
-					if prefix && /\A(Base|Categorizable)\z/ !~ prefix
+					if prefix && /\A(Base|Categorizable|Uncategorizable)\z/ !~ prefix
 						klass = TDiary::Style.const_get(name)
 						klass.send(:include, TDiary::Style::BaseDiary)
 						klass.send(:include, TDiary::Style::CategorizableDiary)

data/lib/tdiary/plugin.rb

@@ -4,7 +4,6 @@
 #  plugin management class
 #
 require 'erb'
-require 'pathname'
 
 module TDiary
 	class Plugin

data/lib/tdiary/rack/auth/omniauth.rb

@@ -21,7 +21,7 @@ module TDiary
 				def login(env)
 					env['rack.session']['tdiary.auth.redirect'] =
 						"#{env['REQUEST_PATH']}?#{env['QUERY_STRING']}"
-					redirect = "#{::OmniAuth.config.path_prefix}/#{@provider}"
+					redirect = File.join(File.dirname(env['REQUEST_PATH']), "#{::OmniAuth.config.path_prefix}/#{@provider}")
 					[302, {'Content-Type' => 'text/plain', 'Location' => redirect}, []]
 				end
 

data/lib/tdiary/version.rb

@@ -1,3 +1,3 @@
 module TDiary
-	VERSION = '4.1.0.20141126'
+	VERSION = '4.1.1'
 end

data/lib/tdiary/view.rb

@@ -169,6 +169,13 @@ module TDiary
 		end
 	end
 
+	#
+	# class TDiaryDayWithoutFilter
+	#
+	class TDiaryDayWithoutFilter < TDiaryDay
+		def referer_filter(referer); end
+	end
+
 	#
 	# class TDiaryComment
 	#  save a comment

data/lib/tdiary.rb

@@ -14,7 +14,7 @@ TDIARY_VERSION = TDiary::VERSION
 
 $:.unshift File.join(File::dirname(__FILE__), '../misc/lib').untaint
 ['../misc/lib/*/lib', '../vendor/*/lib'].each do |path|
-	Dir["#{File::dirname(__FILE__) + path}"].each {|dir| $:.unshift dir.untaint }
+	Dir[File.join(File.dirname(__FILE__), path)].each {|dir| $:.unshift dir.untaint }
 end
 
 require 'cgi'
@@ -76,6 +76,7 @@ module TDiary
 	autoload :TDiaryShowComment,        'tdiary/admin'
 	autoload :TDiaryView,               'tdiary/view'
 	autoload :TDiaryDay,                'tdiary/view'
+	autoload :TDiaryDayWithoutFilter,   'tdiary/view'
 	autoload :TDiaryComment,            'tdiary/view'
 	autoload :TDiaryMonthBase,          'tdiary/view'
 	autoload :TDiaryMonth,              'tdiary/view'

data/misc/plugin/category.rb

@@ -423,7 +423,7 @@ class Cache
 	end
 
 	def get(db, cat)
-		JSON.load(db.get(cat))
+		JSON.load(db.get(cat) || '{}')
 	end
 
 	def set(db, cat, data)
@@ -497,7 +497,7 @@ class Cache
 				ms.each do |m|
 					ym = "#{y}#{m}"
 					cgi.params['date'] = [ym]
-					m = TDiaryMonth.new(cgi, '', @conf)
+					m = TDiaryMonthWithoutFilter.new(cgi, '', @conf)
 					m.diaries.each do |ymd, diary|
 						next if !diary.visible? or !diary.categorizable?
 						categorized = categorize_diary(diary)

data/misc/plugin/ja/disp_referrer.rb

@@ -451,7 +451,6 @@ DispReferrer2_Engines = {
 		[%r{\Ahttp://(?:image-search\.yahoo\.co\.jp/(?:search|detail)|images\.search\.yahoo\.co\.jp/bin/(?:search|query))}, '".co.jpのYahoo!画像検索"', ['p'], DispReferrer2_Google_cache],
 		[%r{\Ahttp://images\.search\.yahoo\.(:?com|co\.jp)/search/images(?:/view)?}, '".comのYahoo!画像検索"', ['p'], DispReferrer2_Google_cache],
 	],
-	'yahoofs' => [[%r{\Ahttp://cache\.yahoofs\.jp/}i, '"Yahoo!検索"', ['w'], DispReferrer2_Yahoofs]],
 	'netscape' => [[%r{\Ahttp://[^/]+\.netscape\.([^/]+)/}i, '".#{$1}のNetscape検索"', ['search', 'query'], DispReferrer2_Google_cache]],
 	'msn' => [[%r{\Ahttp://[^/]+\.MSN\.([^/]+)/}i, '".#{$1}のMSNサーチ"', ['q', 'MT'], nil ]],
 	'bing' => [[%r{\Ahttp://(www|jp)\.bing\.com/}i, '"Bing検索"', ['q'], nil ]],
@@ -480,7 +479,6 @@ DispReferrer2_Engines = {
 		[%r{\Ahttp://srchnavi\.nifty\.com/}i, '"@niftyのリダイレクタ"', ['title'], nil ],
 		[%r{\Ahttp://azby\.search\.nifty\.com/}i, '"AzbyClub"', ['Text'], nil ],
 	],
-	'eniro' => [[%r{\Ahttp://[^/]+\.eniro\.se/}i, '"Eniro"', ['q'], DispReferrer2_Google_cache]],
 	'excite' => [[%r{\Ahttp://[^/]+\.excite\.([^/]+)/}i, '".#{$1}のExcite"', ['search', 's', 'query', 'qkw'], nil ]],
 	'biglobe' => [
 		[%r{\Ahttp://(?:[^/]+\.)?search\.biglobe\.ne\.jp/}i, '"BIGLOBEサーチ"', ['q'], nil ],

data/misc/plugin/makerss.rb

@@ -585,11 +585,11 @@ def replace_entities( text )
 			'ý' => 'ý',
 			'þ' => 'þ',
 			'ÿ' => 'ÿ',
-			'œ' => 'Œ',
+			'Œ' => 'Œ',
 			'œ' => 'œ',
-			'š' => 'Š',
+			'Š' => 'Š',
 			'š' => 'š',
-			'ÿ' => 'Ÿ',
+			'Ÿ' => 'Ÿ',
 			'ˆ' => 'ˆ',
 			'˜' => '˜',
 			' ' => ' ',
@@ -669,7 +669,7 @@ def replace_entities( text )
 			'•' => '•',
 			'…' => '…',
 			'′' => '′',
-			'′' => '″',
+			'″' => '″',
 			'‾' => '‾',
 			'⁄' => '⁄',
 			'℘' => '℘',

data/misc/plugin/recent_comment3.rb

@@ -10,6 +10,7 @@
 require 'pstore'
 require 'fileutils'
 require 'time'
+require 'pathname'
 
 def recent_comment3_format(format, *args)
 	format.gsub(/\$(\d)/) {|s| args[$1.to_i - 1]}
@@ -100,7 +101,7 @@ def recent_comment3(ob_max = 'OBSOLUTE' ,sep = 'OBSOLUTE',ob_date_format = 'OBSO
 			tree_order.each do |entry_date|
 				a_entry = @index + anchor(entry_date)
 				cgi.params['date'] = [entry_date]
-				diary = TDiaryDay::new(cgi, '', @conf)
+				diary = TDiaryDayWithoutFilter::new(cgi, '', @conf)
 				title = diary.diaries[entry_date].title.gsub( /<[^>]*>/, '' ) if diary
 
 				if title.nil? || title.length == 0 || title.strip.delete('　').delete(' ').length == 0 then

data/spec/core/tdiary_spec.rb

@@ -11,5 +11,21 @@ describe TDiary do
     it "include misc path into load path" do
       expect(@loaded_paths).to be_include @root_path + '/misc/lib'
     end
+
+    context 'append gem' do
+      before do
+        FileUtils.mkdir_p @root_path + '/misc/lib/foo-0.0.1/lib'
+        load @root_path + '/lib/tdiary.rb'
+        @loaded_paths = $LOAD_PATH.map{|path| File.expand_path(path)}
+      end
+
+      it "include append gem path into load path" do
+        expect(@loaded_paths).to be_include @root_path + '/misc/lib/foo-0.0.1/lib'
+      end
+
+      after do
+        FileUtils.rm_rf @root_path + '/misc/lib/foo-0.0.1'
+      end
+    end
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdiary
 version: !ruby/object:Gem::Version
-  version: 4.1.0.20141126
-  prerelease: 
+  version: 4.1.1
 platform: ruby
 authors:
 - TADA Tadashi
@@ -11,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-22 00:00:00.000000000 Z
+date: 2014-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -24,7 +22,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -32,7 +29,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -40,7 +36,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
@@ -437,30 +432,26 @@ files:
 homepage: http://www.tdiary.org/
 licenses:
 - GPL2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 4014152882961253422
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.29
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: a TSUKKOMI-able Web-log
 test_files:
 - spec/acceptance/append_comment_spec.rb