tdiary 4.0.2.20140201 → 4.0.3

data/spec/core/style/wiki_style_spec.rb

@@ -42,7 +42,7 @@ honbun
 </div>
 				EOF
 			end
-			it { @diary.to_html.should eq @html }
+			it { expect(@diary.to_html).to eq @html }
 		end
 
 		context 'CHTML' do
@@ -56,11 +56,11 @@ honbun
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 				EOF
 			end
-			it { @diary.to_html({}, :CHTML).should eq @html }
+			it { expect(@diary.to_html({}, :CHTML)).to eq @html }
 		end
 
 		context 'to_src' do
-			it { @diary.to_src.should eq @source }
+			it { expect(@diary.to_src).to eq @source }
 		end
 	end
 
@@ -97,7 +97,7 @@ replace
 </div>
 			EOF
 		end
-		it { @diary.to_html.should eq @html }
+		it { expect(@diary.to_html).to eq @html }
 	end
 
 	describe '#add_section' do
@@ -131,7 +131,7 @@ honbun
 </div>
 			EOF
 		end
-		it { @diary.to_html.should eq @html }
+		it { expect(@diary.to_html).to eq @html }
 	end
 
 	describe '#delete_section' do
@@ -157,7 +157,7 @@ honbun
 </div>
 			EOF
 		end
-		it { @diary.to_html.should eq @html }
+		it { expect(@diary.to_html).to eq @html }
 	end
 
 	describe 'test_wiki_style2' do
@@ -185,7 +185,7 @@ honbun
 </div>
 				EOF
 			end
-			it { @diary.to_html.should eq @html }
+			it { expect(@diary.to_html).to eq @html }
 		end
 
 		context 'CHTML' do
@@ -198,7 +198,7 @@ honbun
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 				EOF
 			end
-			it { @diary.to_html({}, :CHTML).should eq @html }
+			it { expect(@diary.to_html({}, :CHTML)).to eq @html }
 		end
 	end
 
@@ -237,7 +237,7 @@ honbun
 </div>
 				EOF
 			end
-			it { @diary.to_html.should eq @html }
+			it { expect(@diary.to_html).to eq @html }
 		end
 
 		context 'CHTML' do
@@ -254,7 +254,7 @@ honbun
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 				EOF
 			end
-			it { @diary.to_html({}, :CHTML).should eq @html }
+			it { expect(@diary.to_html({}, :CHTML)).to eq @html }
 		end
 	end
 
@@ -300,7 +300,7 @@ ge
 </div>
 				EOF
 			end
-			it { @diary.to_html.should eq @html }
+			it { expect(@diary.to_html).to eq @html }
 		end
 
 		context 'CHTML' do
@@ -324,7 +324,7 @@ ge
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 				EOF
 			end
-			it { @diary.to_html({}, :CHTML).should eq @html }
+			it { expect(@diary.to_html({}, :CHTML)).to eq @html }
 		end
 	end
 
@@ -372,7 +372,7 @@ http://ja.wikipedia.org/wiki/%E9%AF%96
 </div>
 				EOF
 			end
-			it { @diary.to_html.should eq @html }
+			it { expect(@diary.to_html).to eq @html }
 		end
 
 		context 'CHTML' do
@@ -392,7 +392,7 @@ http://ja.wikipedia.org/wiki/%E9%AF%96
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 				EOF
 			end
-			it { @diary.to_html({}, :CHTML).should eq @html }
+			it { expect(@diary.to_html({}, :CHTML)).to eq @html }
 		end
 	end
 
@@ -422,7 +422,7 @@ appended body
 </div>
 				EOF
 			end
-			it { @diary.to_html.should eq @html }
+			it { expect(@diary.to_html).to eq @html }
 		end
 
 		context 'CHTML' do
@@ -435,7 +435,7 @@ appended body
 <%=section_leave_proc( Time.at( 1041346800 ) )%>
 				EOF
 			end
-			it { @diary.to_html({}, :CHTML).should eq @html }
+			it { expect(@diary.to_html({}, :CHTML)).to eq @html }
 		end
 	end
 end

data/spec/plugin/bq_spec.rb

@@ -14,8 +14,8 @@ describe "bq plugin w/" do
 			@body_snippet = plugin.bq('foo')
 		end
 
-		it { @body_snippet.should == expected_html_body(
-				:src => 'foo') }
+		it { expect(@body_snippet).to eq(expected_html_body(
+				:src => 'foo')) }
 	end
 
 	def expected_html_body(options)

data/spec/spec_helper.rb

@@ -20,7 +20,9 @@ end
 require 'tdiary'
 
 RSpec.configure do |config|
-	config.treat_symbols_as_metadata_keys_with_true_values = true
+	config.expect_with :rspec do |c|
+		c.syntax = :expect
+	end
 end
 
 class DummyTDiary

data/tdiary/configuration.rb

@@ -71,10 +71,10 @@ module TDiary
 				str.force_encoding(charset || 'utf-8')
 			end
 			unless str.valid_encoding?
-				str.encode!('utf-16be', {:invalid => :replace, undef: :replace})
+				str.encode!('utf-16be', {invalid: :replace, undef: :replace})
 			end
 			unless str.encoding == Encoding::UTF_8
-				str.encode!('utf-8', {:invalid => :replace, undef: :replace})
+				str.encode!('utf-8', {invalid: :replace, undef: :replace})
 			end
 			str
 		end

data/tdiary/environment.rb

@@ -7,7 +7,7 @@ module TDiary::Cache; end
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 
 if defined?(Bundler)
   env = [:default]

data/tdiary/io/default.rb

@@ -99,7 +99,7 @@ module TDiary
 								fhr.truncate( 0 )
 								fhr.puts( TDiary::TDIARY_MAGIC )
 								fhr.puts( "Date: #{date}" )
-								fhr.puts 
+								fhr.puts
 								diary.each_referer( diary.count_referers ) do |count,ref|
 									fhr.puts( "#{count} #{ref}" )
 								end

data/tdiary/lang/ja.rb

@@ -23,11 +23,11 @@ def mobile_encoding
 end
 
 def to_mobile( str )
-	str.encode(mobile_encoding, {:invalid => :replace, undef: :replace})
+	str.encode(mobile_encoding, {invalid: :replace, undef: :replace})
 end
 
 def to_mail( str )
-	str.encode('iso-2022-jp', {:invalid => :replace, undef: :replace})
+	str.encode('iso-2022-jp', {invalid: :replace, undef: :replace})
 end
 
 def migrate_to_utf8( str )

data/tdiary/tasks/db.rake

@@ -47,9 +47,9 @@ namespace :db do
 							primary_key [:diary_id, :no]
 						end unless db.table_exists?(:comments)
 
-						diaries.each do |date, diary|
+						diaries.each do |d, diary|
 							no = 0
-							if /(\d\d\d\d)(\d\d)(\d\d)/ =~ date
+							if /(\d\d\d\d)(\d\d)(\d\d)/ =~ d
 								year  = $1
 								month = $2
 								day   = $3
@@ -57,7 +57,7 @@ namespace :db do
 							entry = db[:diaries].filter(:year => year,
 								:month => month,
 								:day => day,
-								:diary_id => date)
+								:diary_id => d)
 							if entry.count > 0
 								entry.update(:title => diary.title,
 									:last_modified => diary.last_modified.to_i,
@@ -68,7 +68,7 @@ namespace :db do
 								db[:diaries].insert(:year => year,
 									:month => month,
 									:day => day,
-									:diary_id => date,
+									:diary_id => d,
 									:title => diary.title,
 									:last_modified => diary.last_modified.to_i,
 									:style => diary.style,
@@ -78,7 +78,7 @@ namespace :db do
 
 							diary.each_comment(diary.count_comments(true)) do |com|
 								no += 1
-								comment = db[:comments].filter(:diary_id => date, :no => no)
+								comment = db[:comments].filter(:diary_id => d, :no => no)
 								if comment.count > 0
 									comment.update(:name => com.name, :mail => com.mail, :last_modified => com.date.to_i, :visible => com.visible?, :comment => com.body)
 								else

data/tdiary/version.rb

@@ -1,3 +1,3 @@
 module TDiary
-	VERSION = '4.0.2.20140201'
+	VERSION = '4.0.3'
 end

data/test/disp_referrer_test.rb

@@ -16,15 +16,15 @@ require 'uri'
 # top level. Therefore, we will spit required objects defined
 # in tdiary.rb to the top level.
 
-# Stab for @conf
-class StabConf
+# Stub for @conf
+class DispReferrerStubConf
 	def secure; false; end
 	def options; {}; end
 	def referer_table; []; end
 	def no_referer; []; end
 	def io_class; nil; end
 end
-@conf = StabConf.new
+@conf = DispReferrerStubConf.new
 
 # Required module and class structures
 module TDiary
@@ -45,7 +45,7 @@ require 'disp_referrer'
 
 class TestSearchEngines < Test::Unit::TestCase
 	def setup
-		@dr2_setup = DispRef2Setup.new(StabConf.new, nil, true, [], '')
+		@dr2_setup = DispRef2Setup.new(DispReferrerStubConf.new, nil, true, [], '')
 	end
 
 	def match(url, keyword, provider = nil)

data/test/my-sequel_test.rb

@@ -164,7 +164,7 @@ class TestMySequelConf < Test::Unit::TestCase
 				:title => 'Test to show text area',
 				:default => "a\nb\ncc",
 				:index => 4,
-				:textarea => {:rows => 2},
+				:textarea => {rows: 2},
 			}
 		}
 		@my_sequel_conf = MySequel::Conf.new(@defaults)

data/test/test_plugin_helper.rb

@@ -105,4 +105,51 @@ module TDiary
 			@conf = TDiary::ConfStub.new
 		end
 	end
+
+	class StubPlugin
+		def self.inherited(child)
+			super
+			child.module_eval(<<-EOS)
+				def context
+					binding
+				end
+			EOS
+		end
+
+		include TDiary::PluginTestStub
+
+		def StubPlugin::_load_plugin(plugin_relative_path, lang = 'en')
+			plugin_class = Class.new(StubPlugin)
+			plugin = plugin_class.new(lang)
+			plugin.load(plugin_relative_path)
+			return plugin_class, plugin
+		end
+
+		def StubPlugin::load_plugin(plugin_relative_path, lang = 'en')
+			return StubPlugin::_load_plugin(plugin_relative_path, lang = 'en')[1]
+		end
+
+		def StubPlugin::new_plugin(plugin_relative_path, lang = 'en')
+			return StubPlugin::_load_plugin(plugin_relative_path, lang = 'en')[0]
+		end
+
+		def initialize(lang = 'en')
+			@lang = lang
+			reset
+		end
+
+		def load(plugin_relative_path)
+			reset
+			ppath = TDiary::PluginTestHelper.absolute_path_of(plugin_relative_path)
+			pl10n = TDiary::PluginTestHelper.resource_absolute_path_of(plugin_relative_path, @lang)
+			File.open(pl10n){|f| eval(f.read, context, TDiary::PluginTestHelper.resource_relative_path_of(plugin_relative_path, @lang))}
+			File.open(ppath){|f| eval(f.read, context, plugin_relative_path)}
+		end
+
+		def reset
+			@options = {}
+			@conf_genre_label = {}
+			@conf = TDiary::ConfStub.new
+		end
+	end
 end

data/test/weather-ADDS-METARS-PHTO-140131.html

@@ -0,0 +1,109 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<HTML>
+<HEAD>
+<TITLE>ADDS - METARS form results</TITLE>
+<LINK REL="StyleSheet" type="text/css" HREF="/layout/awc/mystyle.css">
+</HEAD>
+<BODY BGCOLOR="#FFFFFF">
+  <TABLE SUMMARY="This table is used for formatting purposes only" BORDER=0 CELLPADDING=3 CELLSPACING=0>
+    <TR VALIGN="top">
+      <TD ALIGN="left" COLSPAN="2">
+        <H2>Aviation Digital Data Service (ADDS)</H2>
+        Output produced by METARs form (1550&#160;UTC&nbsp;31 January 2014)<BR>
+        found at <A HREF="http://www.aviationweather.gov/adds/metars/"> http://www.aviationweather.gov/adds/metars/</A><BR>&#160;<BR>
+      </TD>
+    </TR>
+    <TR VALIGN="top">
+      <TD ALIGN="left" COLSPAN="2">
+    <TR VALIGN="top">
+      <TD ALIGN="right">
+        <FONT COLOR="#9999CC"><STRONG>METAR text:</STRONG></FONT>
+      </TD>
+      <TD ALIGN="left" BGCOLOR="#CDCDCD">
+        <STRONG>PHTO 311453Z 00000KT 10SM FEW030 OVC110 18/17 A2989 RMK
+  AO2 SLP120 T01830167 56003</STRONG>
+      </TD>
+    </TR>
+    <TR VALIGN="top">
+      <TD ALIGN="right">
+        <FONT COLOR="#9999CC"><STRONG>Conditions at:</STRONG></FONT>
+      </TD>
+      <TD ALIGN="left">
+        PHTO
+ (HILO            , HI, US) observed 1453&#160;UTC&#160;31 January 2014
+      </TD>
+    </TR>
+    <TR VALIGN="top">
+      <TD ALIGN="right">
+        <FONT COLOR="#9999CC"><STRONG>Temperature:</STRONG></FONT>
+      </TD>
+      <TD ALIGN="left">
+        18&#46;3&deg;C (65&deg;F)
+      </TD>
+    </TR>
+    <TR VALIGN="top">
+      <TD ALIGN="right">
+        <FONT COLOR="#9999CC"><STRONG>Dewpoint:</STRONG></FONT>
+      </TD>
+      <TD ALIGN="left">
+        16&#46;7&deg;C (62&deg;F) [RH&#160;=&#160;90&#37;]
+      </TD>
+    </TR>
+    <TR VALIGN="top">
+      <TD ALIGN="right">
+        <FONT COLOR="#9999CC"><STRONG>Pressure (altimeter):</STRONG></FONT>
+      </TD>
+      <TD ALIGN="left">
+        29&#46;89&#160;inches&#160;Hg (1012&#46;3&#160;mb)<BR>[Sea&#45;level pressure:&#160;1012&#46;0&#160;mb]
+      </TD>
+    </TR>
+    <TR VALIGN="top">
+      <TD ALIGN="right">
+        <FONT COLOR="#9999CC"><STRONG>Winds:</STRONG></FONT>
+      </TD>
+      <TD ALIGN="left">
+        calm
+      </TD>
+    </TR>
+    <TR VALIGN="top">
+      <TD ALIGN="right">
+        <FONT COLOR="#9999CC"><STRONG>Visibility:</STRONG></FONT>
+      </TD>
+      <TD ALIGN="left">
+        10 or more miles (16+ km)
+      </TD>
+    </TR>
+    <TR VALIGN="top">
+      <TD ALIGN="right">
+        <FONT COLOR="#9999CC"><STRONG>Ceiling:</STRONG></FONT>
+      </TD>
+      <TD ALIGN="left">
+        11000 feet AGL
+      </TD>
+    </TR>
+    <TR VALIGN="top">
+      <TD ALIGN="right">
+        <FONT COLOR="#9999CC"><STRONG>Clouds:</STRONG></FONT>
+      </TD>
+      <TD ALIGN="left">
+         few clouds at 3000 feet AGL<BR>overcast cloud deck at 11000 feet AGL
+      </TD>
+    </TR>
+    <TR VALIGN="top">
+      <TD ALIGN="right">
+        <FONT COLOR="#9999CC"><STRONG>Weather:</STRONG></FONT>
+      </TD>
+      <TD ALIGN="left">
+        no significant weather observed at this time
+      </TD>
+    </TR>
+    <TR VALIGN="middle">
+      <TD ALIGN="left" COLSPAN="2">
+        <HR WIDTH="65%">
+      </TD>
+    </TR>
+      </TD>
+    </TR>
+  </TABLE>
+</BODY>
+</HTML>

data/test/weather-ADDS-METARS-RJAA-130131.html

@@ -0,0 +1,111 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<!-- http://aviationweather.gov/adds/metars/?station_ids=RJAA&std_trans=translated&chk_metars=on&hoursStr=most+recent+only&submitmet=Submit -->
+<html><head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<title>ADDS - METARS form results</title>
+<link rel="StyleSheet" type="text/css" href="ADDS-METARS-RJAA-130131_files/mystyle.css">
+</head>
+<body bgcolor="#FFFFFF">
+  <table summary="This table is used for formatting purposes only" border="0" cellpadding="3" cellspacing="0">
+    <tbody><tr valign="top">
+      <td colspan="2" align="left">
+        <h2>Aviation Digital Data Service (ADDS)</h2>
+        Output produced by METARs form (1304&nbsp;UTC&nbsp;31 January 2013)<br>
+        found at <a href="http://aviationweather.gov/adds/metars/"> http://aviationweather.gov/adds/metars/</a><br>&nbsp;<br>
+      </td>
+    </tr>
+    <tr valign="top">
+      <td colspan="2" align="left">
+    </td></tr><tr valign="top">
+      <td align="right">
+        <font color="#9999CC"><strong>METAR text:</strong></font>
+      </td>
+      <td align="left" bgcolor="#CDCDCD">
+        <strong>RJAA 311230Z 24002KT 9999 FEW030 M02/M04 Q1034 NOSIG RMK
+  1CU030 A3055</strong>
+      </td>
+    </tr>
+    <tr valign="top">
+      <td align="right">
+        <font color="#9999CC"><strong>Conditions at:</strong></font>
+      </td>
+      <td align="left">
+        RJAA
+ (NEW TOKYO INTL A, JP) observed 1230&nbsp;UTC&nbsp;31 January 2013
+      </td>
+    </tr>
+    <tr valign="top">
+      <td align="right">
+        <font color="#9999CC"><strong>Temperature:</strong></font>
+      </td>
+      <td align="left">
+        -2.0�C (28�F)
+      </td>
+    </tr>
+    <tr valign="top">
+      <td align="right">
+        <font color="#9999CC"><strong>Dewpoint:</strong></font>
+      </td>
+      <td align="left">
+        -4.0�C (25�F) [RH&nbsp;=&nbsp;86%]
+      </td>
+    </tr>
+    <tr valign="top">
+      <td align="right">
+        <font color="#9999CC"><strong>Pressure (altimeter):</strong></font>
+      </td>
+      <td align="left">
+        30.53&nbsp;inches&nbsp;Hg (1034.0&nbsp;mb)
+      </td>
+    </tr>
+    <tr valign="top">
+      <td align="right">
+        <font color="#9999CC"><strong>Winds:</strong></font>
+      </td>
+      <td align="left">
+        from the WSW (240&nbsp;degrees) at   2&nbsp;MPH (2&nbsp;knots;  1.0&nbsp;m/s)
+      </td>
+    </tr>
+    <tr valign="top">
+      <td align="right">
+        <font color="#9999CC"><strong>Visibility:</strong></font>
+      </td>
+      <td align="left">
+        6 or more miles (10+ km)
+      </td>
+    </tr>
+    <tr valign="top">
+      <td align="right">
+        <font color="#9999CC"><strong>Ceiling:</strong></font>
+      </td>
+      <td align="left">
+        at least 12,000 feet AGL
+      </td>
+    </tr>
+    <tr valign="top">
+      <td align="right">
+        <font color="#9999CC"><strong>Clouds:</strong></font>
+      </td>
+      <td align="left">
+         few clouds at 3000 feet AGL
+      </td>
+    </tr>
+    <tr valign="top">
+      <td align="right">
+        <font color="#9999CC"><strong>Weather:</strong></font>
+      </td>
+      <td align="left">
+        no significant weather observed at this time
+      </td>
+    </tr>
+    <tr valign="middle">
+      <td colspan="2" align="left">
+        <hr width="65%">
+      </td>
+    </tr>
+      
+    
+  </tbody></table>
+
+
+</body></html>

data/test/weather-ADDS-METARS-RJAA-130227.html

@@ -0,0 +1,111 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
+<html><head>
+<meta http-equiv="content-type" content="text/html; charset=ISO-8859-1">
+<title>ADDS - METARS form results</title>
+<link rel="StyleSheet" type="text/css" href="weather-ADDS-METARS-RJAA-130227_files/mystyle.css">
+</head>
+<body bgcolor="#FFFFFF">
+  <table summary="This table is used for formatting purposes only" border="0" cellpadding="3" cellspacing="0">
+    <tbody><tr valign="top">
+      <td colspan="2" align="left">
+        <h2>Aviation Digital Data Service (ADDS)</h2>
+        Output produced by METARs form (0253&nbsp;UTC&nbsp;27 February 2013)<br>
+        found at <a href="http://aviationweather.gov/adds/metars/"> http://aviationweather.gov/adds/metars/</a><br>&nbsp;<br>
+      </td>
+    </tr>
+    <tr valign="top">
+      <td colspan="2" align="left">
+    </td></tr><tr valign="top">
+      <td align="right">
+        <font color="#9999CC"><strong>METAR text:</strong></font>
+      </td>
+      <td align="left" bgcolor="#CDCDCD">
+        <strong>RJAA 270230Z 34011KT 0900 R34L/P1800N R34R/1700U -RA FG
+  FEW001 BKN002 BKN003 05/04 Q1011 NOSIG RMK 1ST001 5ST002
+  7ST003 A2987</strong>
+      </td>
+    </tr>
+    <tr valign="top">
+      <td align="right">
+        <font color="#9999CC"><strong>Conditions at:</strong></font>
+      </td>
+      <td align="left">
+        RJAA
+ (NEW TOKYO INTL A, JP) observed 0230&nbsp;UTC&nbsp;27 February 2013
+      </td>
+    </tr>
+    <tr valign="top">
+      <td align="right">
+        <font color="#9999CC"><strong>Temperature:</strong></font>
+      </td>
+      <td align="left">
+        5.0�C (41�F)
+      </td>
+    </tr>
+    <tr valign="top">
+      <td align="right">
+        <font color="#9999CC"><strong>Dewpoint:</strong></font>
+      </td>
+      <td align="left">
+        4.0�C (39�F) [RH&nbsp;=&nbsp;93%]
+      </td>
+    </tr>
+    <tr valign="top">
+      <td align="right">
+        <font color="#9999CC"><strong>Pressure (altimeter):</strong></font>
+      </td>
+      <td align="left">
+        29.85&nbsp;inches&nbsp;Hg (1011.0&nbsp;mb)
+      </td>
+    </tr>
+    <tr valign="top">
+      <td align="right">
+        <font color="#9999CC"><strong>Winds:</strong></font>
+      </td>
+      <td align="left">
+        from the NNW (340&nbsp;degrees) at  13&nbsp;MPH (11&nbsp;knots;  5.7&nbsp;m/s)
+      </td>
+    </tr>
+    <tr valign="top">
+      <td align="right">
+        <font color="#9999CC"><strong>Visibility:</strong></font>
+      </td>
+      <td align="left">
+        0.56&nbsp;miles (0.90&nbsp;km)
+      </td>
+    </tr>
+    <tr valign="top">
+      <td align="right">
+        <font color="#9999CC"><strong>Ceiling:</strong></font>
+      </td>
+      <td align="left">
+        200 feet AGL
+      </td>
+    </tr>
+    <tr valign="top">
+      <td align="right">
+        <font color="#9999CC"><strong>Clouds:</strong></font>
+      </td>
+      <td align="left">
+         few clouds at 100 feet AGL<br>broken clouds at 200 feet AGL<br>broken clouds at 300 feet AGL
+      </td>
+    </tr>
+    <tr valign="top">
+      <td align="right">
+        <font color="#9999CC"><strong>Weather:</strong></font>
+      </td>
+      <td align="left">
+        FG -RA&nbsp;&nbsp;(fog, light rain)
+      </td>
+    </tr>
+    <tr valign="middle">
+      <td colspan="2" align="left">
+        <hr width="65%">
+      </td>
+    </tr>
+      
+    
+  </tbody></table>
+
+
+</body></html>