tdiary 3.2.2.20130617 → 3.2.2.20130720

data/spec/core/compatible_spec.rb

@@ -1,48 +1,46 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-if defined?(Encoding)
-	require 'tdiary/compatible'
-	require 'fileutils'
+require 'tdiary/compatible'
+require 'fileutils'
 
-	describe PStore, "auto convert library" do
-		before do
-			# rake specで動かすと、comppatible.rb が既に読み込まれてしまっているため、
-			# このPStoreがASCII-8BITではなくUTF-8になってしまう。
-			# そのため、下記と同様の ascii8bit-pstore.db をテストフィクスチャとしている。
-			# PStore.new(@dbfile).transaction do |db|
-			# 	db["key1".to_8bit] = "val1".to_8bit
-			# 	db["key2".to_8bit] = 2
-			# 	db["key3".to_8bit] = [1, :sym, "string".to_8bit]
-			# end
-			dbfilename = '../fixtures/ascii8bit-pstore.db'
-			dbfile_orig = File.join(File.dirname(__FILE__), dbfilename)
-			@dbfile = File.join(File.dirname(__FILE__), "#{dbfilename}.work")
-			FileUtils.cp dbfile_orig, @dbfile
-		end
+describe PStore, "auto convert library" do
+	before do
+		# rake specで動かすと、comppatible.rb が既に読み込まれてしまっているため、
+		# このPStoreがASCII-8BITではなくUTF-8になってしまう。
+		# そのため、下記と同様の ascii8bit-pstore.db をテストフィクスチャとしている。
+		# PStore.new(@dbfile).transaction do |db|
+		# 	db["key1".to_8bit] = "val1".to_8bit
+		# 	db["key2".to_8bit] = 2
+		# 	db["key3".to_8bit] = [1, :sym, "string".to_8bit]
+		# end
+		dbfilename = '../fixtures/ascii8bit-pstore.db'
+		dbfile_orig = File.join(File.dirname(__FILE__), dbfilename)
+		@dbfile = File.join(File.dirname(__FILE__), "#{dbfilename}.work")
+		FileUtils.cp dbfile_orig, @dbfile
+	end
 
-		after do
-			FileUtils.rm @dbfile
-		end
+	after do
+		FileUtils.rm @dbfile
+	end
 
-		it "should convert an encoding to UTF-8 automatically" do
-			PStore.new(@dbfile).transaction do |db|
-				db["key1"].encoding.should == Encoding::UTF_8
-				db["key2"].should  == 2
-				db["key3"][2].encoding.should  == Encoding::UTF_8
-			end
+	it "should convert an encoding to UTF-8 automatically" do
+		PStore.new(@dbfile).transaction do |db|
+			db["key1"].encoding.should == Encoding::UTF_8
+			db["key2"].should  == 2
+			db["key3"][2].encoding.should  == Encoding::UTF_8
 		end
+	end
 
-		it "1回目のtransactionではMashal.loadが3回呼ばれる" do
-			Marshal.should_receive(:load).exactly(3).and_return({})
-			PStore.new(@dbfile).transaction {}
-		end
+	it "1回目のtransactionではMashal.loadが3回呼ばれる" do
+		Marshal.should_receive(:load).exactly(3).and_return({})
+		PStore.new(@dbfile).transaction {}
+	end
 
-		it "2回目のtransactionではMashal.loadが1回だけ呼ばれる" do
-			Marshal.should_receive(:load).exactly(4).and_return({})
-			PStore.new(@dbfile).transaction {}
-			PStore.new(@dbfile).transaction {}
-		end
+	it "2回目のtransactionではMashal.loadが1回だけ呼ばれる" do
+		Marshal.should_receive(:load).exactly(4).and_return({})
+		PStore.new(@dbfile).transaction {}
+		PStore.new(@dbfile).transaction {}
 	end
 end
 

data/spec/core/rack/assets/precompile_spec.rb

@@ -2,67 +2,66 @@
 require 'spec_helper'
 require 'rack/test'
 require 'fileutils'
+require 'sprockets'
 require 'tdiary/rack/assets/precompile'
 
-if defined?(Encoding)
-	describe TDiary::Rack::Assets::Precompile do
-		include Rack::Test::Methods
+describe TDiary::Rack::Assets::Precompile do
+	include Rack::Test::Methods
 
-		let(:app) do
-			TDiary::Rack::Assets::Precompile.new(lambda{|env| [200, {}, ['Awesome']]}, @environment)
-		end
-		let(:assets_path) {"#{TDiary::PATH}/tmp/assets"}
+	let(:app) do
+		TDiary::Rack::Assets::Precompile.new(lambda{|env| [200, {}, ['Awesome']]}, @environment)
+	end
+	let(:assets_path) {"#{TDiary::PATH}/tmp/assets"}
+
+	before do
+		FileUtils.mkdir_p assets_path
+		@environment = Sprockets::Environment.new
+		@environment.append_path assets_path
+	end
 
+	after do
+		FileUtils.rm_rf assets_path
+	end
+
+	context "JavaScript が無い場合" do
 		before do
-			FileUtils.mkdir_p assets_path
-			@environment = Sprockets::Environment.new
-			@environment.append_path assets_path
+			FileUtils.touch "#{assets_path}/foo.coffee"
+			get '/'
 		end
 
-		after do
-			FileUtils.rm_rf assets_path
+		it "JavaScript にコンパイルされる" do
+			FileTest.exist?("#{assets_path}/foo.js").should be_true
 		end
+	end
 
-		context "JavaScript が無い場合" do
+	context "JavaScript がある場合" do
+		context "CoffeeScript の方が新しい場合" do
 			before do
+				FileUtils.touch "#{assets_path}/foo.js"
+				sleep 1
 				FileUtils.touch "#{assets_path}/foo.coffee"
+				@jstime = File.mtime("#{assets_path}/foo.js").to_i
+
 				get '/'
 			end
 
-			it "JavaScript にコンパイルされる" do
-				FileTest.exist?("#{assets_path}/foo.js").should be_true
+			it "JavaScript が更新される" do
+				@jstime.should < File.mtime("#{assets_path}/foo.js").to_i
 			end
 		end
 
-		context "JavaScript がある場合" do
-			context "CoffeeScript の方が新しい場合" do
-				before do
-					FileUtils.touch "#{assets_path}/foo.js"
-					sleep 1
-					FileUtils.touch "#{assets_path}/foo.coffee"
-					@jstime = File.mtime("#{assets_path}/foo.js").to_i
-
-					get '/'
-				end
+		context "JavaScript の方が新しい場合" do
+			before do
+				FileUtils.touch "#{assets_path}/foo.coffee"
+				sleep 1
+				FileUtils.touch "#{assets_path}/foo.js"
+				@jstime = File.mtime("#{assets_path}/foo.js").to_i
 
-				it "JavaScript が更新される" do
-					@jstime.should < File.mtime("#{assets_path}/foo.js").to_i
-				end
+				get '/'
 			end
 
-			context "JavaScript の方が新しい場合" do
-				before do
-					FileUtils.touch "#{assets_path}/foo.coffee"
-					sleep 1
-					FileUtils.touch "#{assets_path}/foo.js"
-					@jstime = File.mtime("#{assets_path}/foo.js").to_i
-
-					get '/'
-				end
-
-				it "JavaScript は更新されない" do
-					@jstime.should == File.mtime("#{assets_path}/foo.js").to_i
-				end
+			it "JavaScript は更新されない" do
+				@jstime.should == File.mtime("#{assets_path}/foo.js").to_i
 			end
 		end
 	end

data/spec/core/style/gfm_style_spec.rb

@@ -130,6 +130,32 @@ http://www.google.com
 		it { @diary.to_html.should eq @html }
 	end
 
+  describe 'auto imagelink' do
+		before do
+			source = <<-EOF
+# subTitle
+
+![](http://www.google.com/logo.jpg)
+
+![google](http://www.google.com/logo.jpg)
+         EOF
+			@diary.append(source)
+			@html = <<-EOF
+<div class="section">
+<%=section_enter_proc( Time.at( 1041346800 ) )%>
+<h3><%= subtitle_proc( Time.at( 1041346800 ), "subTitle" ) %></h3>
+<p><img src="http://www.google.com/logo.jpg" alt=""></p>
+
+<p><img src="http://www.google.com/logo.jpg" alt="google"></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
 		before do
 			source = <<-'EOF'

data/spec/core/style/rd_style_spec.rb

@@ -172,6 +172,28 @@ aaa</p>
 		end
 	end
 
+	describe 'fn' do
+		context 'my' do
+			before do
+				source = <<-'EOF'
+((-((<20130714>))-))
+				EOF
+				@diary.append(source)
+			end
+
+			before do
+				@html = <<-'EOF'
+<div class="section">
+<%=section_enter_proc( Time::at( 1041346800 ))%>
+<p><%=fn apply_plugin( "<%=my \"20130714\",\"20130714\"%%>" ) %></p>
+<%=section_leave_proc( Time::at( 1041346800 ))%>
+</div>
+				EOF
+			end
+			it { @diary.to_html.should eq @html }
+		end
+	end
+
 	describe 'test_rd_on_error' do
 		context 'link' do
 			before do

data/{vendor/jasmine-jquery-1.4.2 → spec/javascripts/helpers}/jasmine-jquery.js

@@ -1,3 +1,31 @@
+/*!
+ Jasmine-jQuery: a set of jQuery helpers for Jasmine tests.
+
+ Version 1.5.3
+
+ https://github.com/velesin/jasmine-jquery
+
+ Copyright (c) 2010-2013 Wojciech Zawistowski, Travis Jeffery
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
 var readFixtures = function() {
   return jasmine.getFixtures().proxyCallTo_('read', arguments)
 }
@@ -114,27 +142,27 @@ jasmine.Fixtures.prototype.clearCache = function() {
 }
 
 jasmine.Fixtures.prototype.cleanUp = function() {
-  jQuery('#' + this.containerId).remove()
+  $('#' + this.containerId).remove()
 }
 
 jasmine.Fixtures.prototype.sandbox = function(attributes) {
   var attributesToSet = attributes || {}
-  return jQuery('<div id="sandbox" />').attr(attributesToSet)
+  return $('<div id="sandbox" />').attr(attributesToSet)
 }
 
 jasmine.Fixtures.prototype.createContainer_ = function(html) {
   var container
-  if(html instanceof jQuery) {
-    container = jQuery('<div id="' + this.containerId + '" />')
+  if(html instanceof $) {
+    container = $('<div id="' + this.containerId + '" />')
     container.html(html)
   } else {
     container = '<div id="' + this.containerId + '">' + html + '</div>'
   }
-  jQuery('body').append(container)
+  $(document.body).append(container)
 }
 
 jasmine.Fixtures.prototype.addToContainer_ = function(html){
-  var container = jQuery('body').find('#'+this.containerId).append(html)
+  var container = $(document.body).find('#'+this.containerId).append(html)
   if(!container.length){
     this.createContainer_(html)
   }
@@ -149,7 +177,7 @@ jasmine.Fixtures.prototype.getFixtureHtml_ = function(url) {
 
 jasmine.Fixtures.prototype.loadFixtureIntoCache_ = function(relativeUrl) {
   var url = this.makeFixtureUrl_(relativeUrl)
-  var request = jQuery.ajax({
+  var request = $.ajax({
     type: "GET",
     url: url + "?" + new Date().getTime(),
     async: false
@@ -201,11 +229,12 @@ jasmine.StyleFixtures.prototype.cleanUp = function() {
 }
 
 jasmine.StyleFixtures.prototype.createStyle_ = function(html) {
-  var style = jQuery('<style></style>').text(html)
+  var styleText = $('<div></div>').html(html).text(),
+    style = $('<style>' + styleText + '</style>')
 
   this.fixturesNodes_.push(style)
 
-  jQuery('head').append(style)
+  $('head').append(style)
 }
 
 jasmine.StyleFixtures.prototype.clearCache = jasmine.Fixtures.prototype.clearCache
@@ -220,8 +249,6 @@ jasmine.StyleFixtures.prototype.makeFixtureUrl_ = jasmine.Fixtures.prototype.mak
 
 jasmine.StyleFixtures.prototype.proxyCallTo_ = jasmine.Fixtures.prototype.proxyCallTo_
 
-/** jasmine json fixtures */
-
 jasmine.getJSONFixtures = function() {
   return jasmine.currentJSONFixtures_ = jasmine.currentJSONFixtures_ || new jasmine.JSONFixtures()
 }
@@ -248,7 +275,7 @@ jasmine.JSONFixtures.prototype.clearCache = function() {
   this.fixturesCache_ = {}
 }
 
-jasmine.JSONFixtures.prototype.getFixtureData_ = function(url) {  
+jasmine.JSONFixtures.prototype.getFixtureData_ = function(url) {
   this.loadFixtureIntoCache_(url)
   return this.fixturesCache_[url]
 }
@@ -256,13 +283,12 @@ jasmine.JSONFixtures.prototype.getFixtureData_ = function(url) {
 jasmine.JSONFixtures.prototype.loadFixtureIntoCache_ = function(relativeUrl) {
   var self = this
   var url = this.fixturesPath.match('/$') ? this.fixturesPath + relativeUrl : this.fixturesPath + '/' + relativeUrl
-  jQuery.ajax({
+  $.ajax({
     async: false, // must be synchronous to guarantee that no tests are run before fixture is loaded
     cache: false,
     dataType: 'json',
     url: url,
     success: function(data) {
-      console.log("Loading data into " + relativeUrl)
       self.fixturesCache_[relativeUrl] = data
     },
     error: function(jqXHR, status, errorThrown) {
@@ -278,13 +304,13 @@ jasmine.JSONFixtures.prototype.proxyCallTo_ = function(methodName, passedArgumen
 jasmine.JQuery = function() {}
 
 jasmine.JQuery.browserTagCaseIndependentHtml = function(html) {
-  return jQuery('<div/>').append(html).html()
+  return $('<div/>').append(html).html()
 }
 
 jasmine.JQuery.elementToString = function(element) {
   var domEl = $(element).get(0)
   if (domEl == undefined || domEl.cloneNode)
-    return jQuery('<div />').append($(element).clone()).html()
+    return $('<div />').append($(element).clone()).html()
   else
     return element.toString()
 }
@@ -300,9 +326,9 @@ jasmine.JQuery.matchersClass = {}
   namespace.events = {
     spyOn: function(selector, eventName) {
       var handler = function(e) {
-        data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)] = e
+        data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)] = jasmine.util.argsToArray(arguments)
       }
-      jQuery(selector).bind(eventName, handler)
+      $(selector).on(eventName, handler)
       data.handlers.push(handler)
       return {
         selector: selector,
@@ -314,12 +340,38 @@ jasmine.JQuery.matchersClass = {}
       }
     },
 
+    args: function(selector, eventName) {
+      var actualArgs = data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)];
+
+      if (!actualArgs) {
+        throw "There is no spy for " + eventName + " on " + selector.toString() + ". Make sure to create a spy using spyOnEvent.";
+      }
+
+      return actualArgs;
+    },
+
     wasTriggered: function(selector, eventName) {
       return !!(data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)])
     },
 
+    wasTriggeredWith: function(selector, eventName, expectedArgs, env) {
+      var actualArgs = jasmine.JQuery.events.args(selector, eventName).slice(1);
+      if (Object.prototype.toString.call(expectedArgs) !== '[object Array]') {
+        actualArgs = actualArgs[0];
+      }
+      return env.equals_(expectedArgs, actualArgs);
+    },
+
     wasPrevented: function(selector, eventName) {
-      return data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)].isDefaultPrevented()
+      var args = data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)],
+          e = args ? args[0] : undefined;
+      return e && e.isDefaultPrevented()
+    },
+
+    wasStopped: function(selector, eventName) {
+      var args = data.spiedEvents[jasmine.spiedEventsKey(selector, eventName)],
+          e = args ? args[0] : undefined;
+      return e && e.isPropagationStopped()
     },
 
     cleanUp: function() {
@@ -366,6 +418,10 @@ jasmine.JQuery.matchersClass = {}
       return $(document).find(this.actual).length
     },
 
+    toHaveLength: function(length) {
+      return this.actual.length === length
+    },
+
     toHaveAttr: function(attributeName, expectedAttributeValue) {
       return hasProperty(this.actual.attr(attributeName), expectedAttributeValue)
     },
@@ -390,15 +446,24 @@ jasmine.JQuery.matchersClass = {}
 
     toHaveText: function(text) {
       var trimmedText = $.trim(this.actual.text())
-      if (text && jQuery.isFunction(text.test)) {
+      if (text && $.isFunction(text.test)) {
         return text.test(trimmedText)
       } else {
         return trimmedText == text
       }
     },
 
+    toContainText: function(text) {
+      var trimmedText = $.trim(this.actual.text())
+      if (text && $.isFunction(text.test)) {
+        return text.test(trimmedText)
+      } else {
+        return trimmedText.indexOf(text) != -1;
+      }
+    },
+
     toHaveValue: function(value) {
-      return this.actual.val() == value
+      return this.actual.val() === value
     },
 
     toHaveData: function(key, expectedValue) {
@@ -418,7 +483,7 @@ jasmine.JQuery.matchersClass = {}
     },
 
     toBeFocused: function(selector) {
-      return this.actual.is(':focus')
+      return this.actual[0] === this.actual[0].ownerDocument.activeElement
     },
 
     toHandle: function(event) {
@@ -466,7 +531,7 @@ jasmine.JQuery.matchersClass = {}
 
     jasmine.JQuery.matchersClass[methodName] = function() {
       if (this.actual
-        && (this.actual instanceof jQuery
+        && (this.actual instanceof $
           || jasmine.isDomNode(this.actual))) {
             this.actual = $(this.actual)
             var result = jQueryMatchers[methodName].apply(this, arguments)
@@ -515,6 +580,28 @@ beforeEach(function() {
       return jasmine.JQuery.events.wasTriggered(selector, eventName)
      }
   })
+  this.addMatchers({
+    toHaveBeenTriggeredOnAndWith: function() {
+      var selector = arguments[0],
+          expectedArgs = arguments[1],
+          wasTriggered = jasmine.JQuery.events.wasTriggered(selector, this.actual);
+      this.message = function() {
+        if (wasTriggered) {
+          var actualArgs = jasmine.JQuery.events.args(selector, this.actual, expectedArgs)[1];
+          return [
+            "Expected event " + this.actual + " to have been triggered with " + jasmine.pp(expectedArgs) + "  but it was triggered with " + jasmine.pp(actualArgs),
+            "Expected event " + this.actual + " not to have been triggered with " + jasmine.pp(expectedArgs) + " but it was triggered with " + jasmine.pp(actualArgs)
+          ]
+        } else {
+          return [
+            "Expected event " + this.actual + " to have been triggered on " + selector,
+            "Expected event " + this.actual + " not to have been triggered on " + selector
+          ]
+        }
+      }
+      return wasTriggered && jasmine.JQuery.events.wasTriggeredWith(selector, this.actual, expectedArgs, this.env);
+    }
+  })
   this.addMatchers({
     toHaveBeenPreventedOn: function(selector) {
       this.message = function() {
@@ -539,6 +626,30 @@ beforeEach(function() {
       return jasmine.JQuery.events.wasPrevented(selector, eventName)
     }
   })
+  this.addMatchers({
+    toHaveBeenStoppedOn: function(selector) {
+      this.message = function() {
+        return [
+          "Expected event " + this.actual + " to have been stopped on " + selector,
+          "Expected event " + this.actual + " not to have been stopped on " + selector
+        ]
+      }
+      return jasmine.JQuery.events.wasStopped(selector, this.actual)
+    }
+  })
+  this.addMatchers({
+    toHaveBeenStopped: function() {
+      var eventName = this.actual.eventName,
+          selector = this.actual.selector
+      this.message = function() {
+        return [
+          "Expected event " + eventName + " to have been stopped on " + selector,
+          "Expected event " + eventName + " not to have been stopped on " + selector
+        ]
+      }
+      return jasmine.JQuery.events.wasStopped(selector, eventName)
+    }
+  })
 })
 
 afterEach(function() {