tdiary 3.2.2.20130722 → 3.2.2.20130727

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b6e3a0840f82ea88b49793172e7dd026fca46b3
-  data.tar.gz: 1f7c778358ad00817f22edf54c8758803ff8ca35
+  metadata.gz: f663a79e15c1f3d077bce193bc0042754f39bac5
+  data.tar.gz: b19672a1aa5c7bf5ec2ef99762b0a7999dd8793f
 SHA512:
-  metadata.gz: 736b942cf60416e2c544e6f8b79893ae7589543b944da0d741c183e0a16846163bddccf6679935c5aa7390f664bb1bea86f6092179cbb22db398d62c3c161a64
-  data.tar.gz: 693c426918012327fd6450e19a3611bd0433a4e1c305f8d85adea0f26447fcc0bf1fb469fc3e447bd6f3e9fc540e9b0fd8fbc76a273a9a7d3dabacdbf7c52f62
+  metadata.gz: 15411cc572a6a8f2c24062cb7618d1bf5d3d67334aa71940b6be88ad25acacacb45bb52707793065fcf05f238ae06276d9f11b0125bfd9feee0ff7addf8c840d
+  data.tar.gz: 0e45ac4f3f0705ebd61e7d6dfb4c2c3dc28561b2a66d39e9c4b492dfd239279023e58836bceecd5daffe8091cc4ecc232c2f6e28fa08787a73f44ebd35523584

data/Gemfile

@@ -16,6 +16,12 @@ end
 # use edge tDiary contrib
 # gem 'tdiary-contrib', :git => 'git@github.com:tdiary/tdiary-contrib.git'
 
+gem 'rack'
+gem 'sprockets'
+gem 'hikidoc'
+gem 'rdtool'
+gem 'fastimage'
+
 group :coffee do
   gem 'coffee-script'
   gem 'therubyracer'
@@ -49,6 +55,7 @@ end
 group :development do
   gem 'pit', :require => false
   gem 'racksh', :require => false
+  gem 'rake'
 
   group :test do
     gem 'pry'

data/Gemfile.lock

@@ -1,14 +1,8 @@
 PATH
   remote: .
   specs:
-    tdiary (3.2.2.20130722)
+    tdiary (3.2.2.20130727)
       bundler (~> 1.3)
-      fastimage
-      hikidoc (>= 0.0.6)
-      rack (>= 1.0.0)
-      rake (>= 10.0.0)
-      rdtool (>= 0.6.0)
-      sprockets (>= 2.10)
       thor (~> 0.18)
 
 GEM
@@ -88,7 +82,7 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.3)
+    rspec-core (2.14.4)
     rspec-expectations (2.14.0)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.1)
@@ -103,7 +97,7 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    slop (3.4.5)
+    slop (3.4.6)
     sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -140,12 +134,17 @@ DEPENDENCIES
   coffee-script
   coveralls
   dalli
+  fastimage
+  hikidoc
   jasmine
   launchy
   pit
   pry
   pygments.rb
+  rack
   racksh
+  rake
+  rdtool
   redcarpet
   redis
   redis-namespace
@@ -153,6 +152,7 @@ DEPENDENCIES
   selenium-webdriver
   sequel
   simplecov
+  sprockets
   sqlite3
   tapp
   tdiary!

data/doc/INSTALL-cgi.md

@@ -29,13 +29,12 @@ tDiaryのダウンロードサイトから、配布アーカイブを取得し
 次に、gitコマンドでtDiaryのソースコードを取得した後に、 `bundle install` コマンドを実行して外部ライブラリをインストールします。
 
 ```
-% git clone git://github.com/tdiary/tdiary-core.git
-% mv tdiary-core tdiary
+% git clone git://github.com/tdiary/tdiary-core.git tdiary
 % cd tdiary
-% bundle install --without coffee:memcached:redis:gfm:server:development
+% bundle install --without coffee:memcached:redis:gfm:server:development:test
 ```
 
-上記の例では tDiary を動作させるのに最低限必要なライブラリのみインストールしています。もし、memcached に伽種を保存したり、GFM スタイルを使用する場合は --without オプションから該当ライブラリの文字列を削除して実行してください。
+上記の例では tDiary を動作させるのに最低限必要なライブラリのみインストールしています。もし、memcached にキャッシュを保存したり、GFM スタイルを使用する場合は --without オプションから該当ライブラリの文字列を削除して実行してください。
 
 ## CGIスクリプトの設定
 

data/misc/plugin/image.rb

@@ -180,7 +180,7 @@ if /^formplugin$/ =~ @mode then
 		images = image_list( date )
 	   if @cgi.params['plugin_image_addimage'][0]
 			@cgi.params['plugin_image_file'].each do |file|
-				extension, = image_info( file.path )
+				extension, = image_info( file )
 				file.rewind
 
 				if extension =~ /\A(#{image_ext})\z/i

data/misc/style/gfm/gfm_style.rb

@@ -96,7 +96,9 @@ module TDiary
 
 			# ignore duplicate autolink
 			if r =~ /<a href="<a href="/
-				r.gsub!(/<a href="<a href=".*?" rel="nofollow">(.*?)<\/a>">(.*?)<\/a>/){ "<a href=\"#{$1}\" rel=\"nofollow\">#{$2}</a>" }
+				r.gsub!(/<a href="<a href=".*?" rel="nofollow">(.*?)<\/a>"(.*?)>(.*?)<\/a>/) do
+          "<a href=\"#{$1}\" rel=\"nofollow\"#{$2}>#{$3}</a>"
+        end
 			end
       # ignore auto imagelink
 			if r =~ /<img src="<a href="/

data/spec/core/style/gfm_style_spec.rb

@@ -154,6 +154,28 @@ http://www.google.com
 
 		it { @diary.to_html.should eq @html }
 
+  end
+
+  describe 'auto imagelink' do
+		before do
+			source = <<-EOF
+# subTitle
+
+<a href="http://www.exaple.com" target="_blank">Anchor</a>
+         EOF
+			@diary.append(source)
+			@html = <<-EOF
+<div class="section">
+<%=section_enter_proc( Time.at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
+<p><a href="http://www.exaple.com" rel="nofollow" target="_blank">Anchor</a></p>
+<%=section_leave_proc( Time.at( 1041346800 ) )%>
+</div>
+         EOF
+		end
+
+		it { @diary.to_html.should eq @html }
+
   end
 
 	describe 'url syntax with code blocks' do

data/tdiary.gemspec

@@ -20,13 +20,6 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 1.9.2'
 
-  spec.add_dependency 'rack', '>= 1.0.0'
-  spec.add_dependency 'sprockets', '>= 2.10'
-  spec.add_dependency 'rake', '>= 10.0.0'
-  spec.add_dependency 'hikidoc', '>= 0.0.6'
-  spec.add_dependency 'rdtool', '>= 0.6.0'
-  spec.add_dependency 'fastimage'
-
   spec.add_dependency 'thor', '~> 0.18'
   spec.add_dependency "bundler", "~> 1.3"
 end

data/tdiary/tasks/release.rake

@@ -34,7 +34,7 @@ def make_tarball( repo, version = nil )
 			sh "chmod +x index.rb index.fcgi update.rb update.fcgi"
 			sh 'rake doc'
 			Bundler.with_clean_env do
-				sh 'bundle --path .bundle --without coffee:memcached:redis:gfm:server:development'
+				sh 'bundle --path .bundle --without coffee:memcached:redis:gfm:server:development:test'
 			end
 			Dir.chdir 'misc/lib' do
 				sh 'gem unpack bundler'

data/tdiary/version.rb

@@ -1,3 +1,3 @@
 module TDiary
-	VERSION = '3.2.2.20130722'
+	VERSION = '3.2.2.20130727'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tdiary
 version: !ruby/object:Gem::Version
-  version: 3.2.2.20130722
+  version: 3.2.2.20130727
 platform: ruby
 authors:
 - TADA Tadashi
@@ -10,92 +10,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-22 00:00:00.000000000 Z
+date: 2013-07-27 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: sprockets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '2.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '2.10'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 10.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 10.0.0
-- !ruby/object:Gem::Dependency
-  name: hikidoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.6
-- !ruby/object:Gem::Dependency
-  name: rdtool
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: fastimage
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -538,7 +454,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.1.0
 signing_key: 
 specification_version: 4
 summary: a TSUKKOMI-able Web-log