tdiary-contrib 4.0.4 → 4.0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d0b4cf97185a2825255b425b8a0f5841f7601a2
-  data.tar.gz: 9cc1611f61dca118aa7a16670b02825289b1a633
+  metadata.gz: 152afb1d5cad913952e857a30f345acf38bfd5ee
+  data.tar.gz: 0cf9cf19a1a702f1c8525590f758961f62f3b400
 SHA512:
-  metadata.gz: dd6c9ff62f892b3ca29d085cc9e885626c3a860a4341aa84af0b04cce89dc08a0343d60e11424b01d832c4b2ee765edb11c4d3a2607e6b2b9d5060f9bbe0ff57
-  data.tar.gz: d0fbea8bb274c4ebd6569462c2b87efe152ad432b47d77956f0a8c2ca09f1da6b74686fb62f42a1407d1f9ee158a2a35e433dbc78c728890205f50f7f32d1dcd
+  metadata.gz: 4f7694b823e7bab599e8589c7f09fcbe17003aef7c807876578cb78115fcda3e1944fc207b327a8783b6eeb5111f49487d9dc8fd7eb60c4e3a3d416f917f28f4
+  data.tar.gz: 61ae49ef6f1cb722271c4984e0baefaf61eeea0ea9086554560b5e59d490f79893130f11e0a9054a26d0eb17eb8bb1a257084f4827f79bb5dc0ea2339c55996b

data/.travis.yml

@@ -1,6 +1,8 @@
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1
+  - ruby-head
 
 cache: bundler
 
@@ -8,3 +10,7 @@ script: bundle exec rake spec
 
 notifications:
   irc: "irc.freenode.org#tdiary"
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/Gemfile

@@ -3,11 +3,5 @@ source 'https://rubygems.org'
 gem 'tdiary', '~> 4.0.2'
 
 gem 'rake'
-gem 'rspec', '~> 3.0.0.beta2'
-
-platforms :ruby_18 do
-  gem 'json'
-  gem 'rcov'
-end
-
-gem 'simplecov', :platforms => :ruby_19
+gem 'rspec'
+gem 'simplecov'

data/Gemfile.lock

@@ -2,29 +2,27 @@ GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.2.5)
-    docile (1.1.3)
-    json (1.8.1)
-    multi_json (1.9.2)
-    rake (10.2.2)
-    rcov (1.0.0)
-    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)
+    docile (1.1.5)
+    multi_json (1.10.1)
+    rake (10.3.2)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.3)
       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)
-    simplecov (0.8.2)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.3)
+    simplecov (0.9.0)
       docile (~> 1.1.0)
       multi_json
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    tdiary (4.0.3)
+    tdiary (4.0.4)
       bundler (~> 1.3)
       thor (~> 0.18)
     thor (0.19.1)
@@ -33,9 +31,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  json
   rake
-  rcov
-  rspec (~> 3.0.0.beta2)
+  rspec
   simplecov
   tdiary (~> 4.0.2)

data/README.en.md

@@ -5,7 +5,7 @@ See documents in each directories.
 
 See licenses and copyrights in each theme files. If no license
 or copyright, it can be distoributed by GPL2, and it has a
-copyright below: 
+copyright below:
 
 ```
 Copyright (c) 2005 TADA Tadashi <t@tdtds.jp>

data/filter/commentsize.rb

@@ -9,7 +9,7 @@ module TDiary
             return false if comment.body.size > @conf['comment.size']
             true
          end
-         
+
          def referer_filter( referer )
             true
          end

data/filter/iplookup.rb

@@ -1,55 +1,55 @@
-#
-# iplookup.rb: included TDiary::Filter::IplookupFilter class
-#
-#
-# Copyright (c) 2008 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
-# Distributed under the GPL2
-#
-
-require 'resolv'
-
-module TDiary
-   module Filter
-      class IplookupFilter < Filter
-         def iplookup_init
-            if @conf.options.include?('iplookup.ip.list')
-               @iplookup_ip_list = @conf.options['iplookup.ip.list']
-            else
-               @iplookup_ip_list = "bsb.spamlookup.net\nopm.blitzed.org\n" +
-                                   "niku.2ch.net\ndnsbl.spam-champuru.livedoor.com"
-            end
-         end
-         
-         def black_ip?( address )
-            chance = 2
-            ip = address.gsub(/^(\d+)\.(\d+)\.(\d+)\.(\d+)$/, '\4.\3.\2.\1')
-            @iplookup_ip_list.split(/\n+/).each do |dnsbl|
-               begin
-                  address = Resolv.getaddress( "#{ip}.#{dnsbl}" )
-                  return true
-                  rescue Resolv::ResolvTimeout
-                     if chance > 0
-                        chance -= 1
-                        retry
-                     end
-                  rescue Resolv::ResolvError
-                  rescue Exception
-               end
-            end
-            return false
-         end
-         
-         def comment_filter( diary, comment )
-            iplookup_init
-            return false if black_ip?( @cgi.remote_addr )
-            return true
-         end
-         
-         def referer_filter( referer )
-            iplookup_init
-            return false if black_ip?( @cgi.remote_addr )
-            return true
-         end
-      end
-   end
-end
+#
+# iplookup.rb: included TDiary::Filter::IplookupFilter class
+#
+#
+# Copyright (c) 2008 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
+# Distributed under the GPL2
+#
+
+require 'resolv'
+
+module TDiary
+   module Filter
+      class IplookupFilter < Filter
+         def iplookup_init
+            if @conf.options.include?('iplookup.ip.list')
+               @iplookup_ip_list = @conf.options['iplookup.ip.list']
+            else
+               @iplookup_ip_list = "bsb.spamlookup.net\nopm.blitzed.org\n" +
+                                   "niku.2ch.net\ndnsbl.spam-champuru.livedoor.com"
+            end
+         end
+
+         def black_ip?( address )
+            chance = 2
+            ip = address.gsub(/^(\d+)\.(\d+)\.(\d+)\.(\d+)$/, '\4.\3.\2.\1')
+            @iplookup_ip_list.split(/\n+/).each do |dnsbl|
+               begin
+                  address = Resolv.getaddress( "#{ip}.#{dnsbl}" )
+                  return true
+                  rescue Resolv::ResolvTimeout
+                     if chance > 0
+                        chance -= 1
+                        retry
+                     end
+                  rescue Resolv::ResolvError
+                  rescue Exception
+               end
+            end
+            return false
+         end
+
+         def comment_filter( diary, comment )
+            iplookup_init
+            return false if black_ip?( @cgi.remote_addr )
+            return true
+         end
+
+         def referer_filter( referer )
+            iplookup_init
+            return false if black_ip?( @cgi.remote_addr )
+            return true
+         end
+      end
+   end
+end

data/filter/plugin/commentsize.rb

@@ -3,7 +3,7 @@ add_conf_proc( 'comment_size' , @comment_size_conf, 'security') do
 		@conf['comment.size'] = @cgi.params['comment.size'][0]
 	end
 	@conf['comment.size'] = 0 unless @conf['comment.size']
-	
+
 	result = <<-HTML
 	<h3>#{@comment_size}</h3>
 	<p>#{@comment_size_desc}</p>

data/filter/plugin/en/spambayes.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2007, KURODA Hiraku <hiraku@hinet.mydns.jp>
-# You can redistribute it and/or modify it under GPL2. 
+# You can redistribute it and/or modify it under GPL2.
 
 class SpambayesConfig
 	module Res

data/filter/plugin/iplookup.rb

@@ -1,39 +1,39 @@
-# iplookup.rb
-#
-# Copyright (c) 2005 SHIBATA Hiroshi <h-sbt@nifty.com>
-# Distributed under the GPL
-#
-if TDIARY_VERSION >= '2.1.2.20050825' then
-   add_conf_proc( 'iplookup', @iplookup_label, 'security' ) do
-      iplookup_conf_proc
-   end
-else
-   add_conf_proc( 'iplookup', @iplookup_label ) do
-      iplookup_conf_proc
-   end
-end
-def iplookup_conf_proc
-	if @mode == 'saveconf' then
-      if @cgi.params['iplookup.ip.list'] && @cgi.params['iplookup.ip.list'][0]
-         @conf['iplookup.ip.list'] = @cgi.params['iplookup.ip.list'][0]
-      else
-         @conf['iplookup.ip.list'] = nil
-      end
-
-      if @cgi.params['iplookup.safe_ip.list'] && @cgi.params['iplookup.safe_ip.list'][0]
-         @conf['iplookup.safe_ip.list'] = @cgi.params['iplookup.safe_ip.list'][0]
-      else
-         @conf['iplookup.safe_ip.list'] = nil
-      end
-      
-	end
-   
-   # initialize DNSBL list
-   @conf['iplookup.ip.list'] = "bsb.spamlookup.net\nopm.blitzed.org\nniku.2ch.net" unless @conf['iplookup.ip.list']
-   
-	result = <<-HTML
-		<h3>#{@iplookup_ip_label}</h3>
-		<p>#{@iplookup_ip_label_desc}</p>
-		<p><textarea name="iplookup.ip.list" cols="70" rows="5">#{CGI::escapeHTML( @conf['iplookup.ip.list'] )}</textarea></p>
-	HTML
-end
+# iplookup.rb
+#
+# Copyright (c) 2005 SHIBATA Hiroshi <h-sbt@nifty.com>
+# Distributed under the GPL
+#
+if TDIARY_VERSION >= '2.1.2.20050825' then
+   add_conf_proc( 'iplookup', @iplookup_label, 'security' ) do
+      iplookup_conf_proc
+   end
+else
+   add_conf_proc( 'iplookup', @iplookup_label ) do
+      iplookup_conf_proc
+   end
+end
+def iplookup_conf_proc
+	if @mode == 'saveconf' then
+      if @cgi.params['iplookup.ip.list'] && @cgi.params['iplookup.ip.list'][0]
+         @conf['iplookup.ip.list'] = @cgi.params['iplookup.ip.list'][0]
+      else
+         @conf['iplookup.ip.list'] = nil
+      end
+
+      if @cgi.params['iplookup.safe_ip.list'] && @cgi.params['iplookup.safe_ip.list'][0]
+         @conf['iplookup.safe_ip.list'] = @cgi.params['iplookup.safe_ip.list'][0]
+      else
+         @conf['iplookup.safe_ip.list'] = nil
+      end
+
+	end
+
+   # initialize DNSBL list
+   @conf['iplookup.ip.list'] = "bsb.spamlookup.net\nopm.blitzed.org\nniku.2ch.net" unless @conf['iplookup.ip.list']
+
+	result = <<-HTML
+		<h3>#{@iplookup_ip_label}</h3>
+		<p>#{@iplookup_ip_label_desc}</p>
+		<p><textarea name="iplookup.ip.list" cols="70" rows="5">#{CGI::escapeHTML( @conf['iplookup.ip.list'] )}</textarea></p>
+	HTML
+end

data/filter/plugin/ja/antirefspam.rb

@@ -1,5 +1,5 @@
 #
-# antirefspam.rb 
+# antirefspam.rb
 #
 # Copyright (c) 2004-2005 T.Shimomura <redbug@netlife.gr.jp>
 # You can redistribute it and/or modify it under GPL2.

data/filter/plugin/ja/spambayes.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2007, KURODA Hiraku <hiraku@hinet.mydns.jp>
-# You can redistribute it and/or modify it under GPL2. 
+# You can redistribute it and/or modify it under GPL2.
 
 class SpambayesConfig
 	module Res

data/filter/plugin/spambayes.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2007, KURODA Hiraku <hiraku@hinet.mydns.jp>
-# You can redistribute it and/or modify it under GPL2. 
+# You can redistribute it and/or modify it under GPL2.
 
 require "bayes"
 

data/filter/spambayes.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2007, KURODA Hiraku <hiraku@hinet.mydns.jp>
-# You can redistribute it and/or modify it under GPL2. 
+# You can redistribute it and/or modify it under GPL2.
 
 require "bayes"
 

data/js/flickr.js

@@ -54,7 +54,7 @@ $(function() {
  * a Flickr API client for JavaScript
  */
 flickrClient = function(apiKey) {
-  this.baseUrl = 'http://api.flickr.com/services/rest/?';
+  this.baseUrl = 'https://api.flickr.com/services/rest/?';
   this.apiKey = apiKey;
 }
 

data/lib/bayes.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2007, KURODA Hiraku <hiraku@hinet.mydns.jp>
-# You can redistribute it and/or modify it under GPL2. 
+# You can redistribute it and/or modify it under GPL2.
 
 require "pstore"
 

data/lib/bayes/convert.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2008, KURODA Hiraku <hiraku@hinet.mydns.jp>
-# You can redistribute it and/or modify it under GPL2. 
+# You can redistribute it and/or modify it under GPL2.
 
 require "bayes"
 require "kconv"

data/lib/tdiary/contrib/version.rb

@@ -1,5 +1,5 @@
 module TDiary
   class Contrib
-    VERSION = "4.0.4"
+    VERSION = "4.0.5.1"
   end
 end

data/lib/wgs2tky.rb

@@ -1,93 +1,93 @@
-#
-# wgs2tky.rb
-#  -- GPS data converter
-#
-# kp<kp@mmho.no-ip.org>
-# Destributed under the GPL
-
-class Wgs2Tky
-
-  Pi = Math::PI
-  Rd = Pi/180
-
-  # WGS84
-  A = 6378137.0                # 赤道半径
-  F = 1/298.257223563          # 扁平率
-  E2 = F*2 - F*F               # 第一離心率
-
-  # Tokyo
-  A_ = 6378137.0 - 739.845     # 6377397.155
-  F_ = 1/298.257223563 - 0.000010037483
-                               # 1 / 299.152813
-  E2_ = F_*2 - F_*F_
-
-  Dx = +128
-  Dy = -481
-  Dz = -664	
-
-  def Wgs2Tky.conv!(lat,lon,h = 0)
-    b = lat[0].to_f + lat[1].to_f/60 + lat[2].to_f/3600
-    l = lon[0].to_f + lon[1].to_f/60 + lon[2].to_f/3600
-		
-    (x,y,z) = Wgs2Tky._llh2xyz(b,l,h,A,E2)
-		
-    x+=Dx
-    y+=Dy
-    z+=Dz
-
-    (b,l,h) = Wgs2Tky._xyz2llh(x,y,z,A_,E2_)
-
-    lat[0..2]=Wgs2Tky._deg2gdms(b)
-    lon[0..2]=Wgs2Tky._deg2gdms(l)
-  end
-	
-  private
-
-  include Math
-  extend Math
-
-  def Wgs2Tky._llh2xyz(b,l,h,a,e2)
-
-    b *= Rd
-    l *= Rd
-		
-    sb = sin(b)
-    cb = cos(b)
-
-    rn = a / Math.sqrt(1-e2*sb*sb)
-    
-    x = (rn+h)*cb*cos(l)
-    y = (rn+h)*cb*sin(l)
-    z = (rn*(1-e2)+h) * sb
-		
-    return x,y,z
-  end
-
-  def Wgs2Tky._xyz2llh(x,y,z,a,e2)
-
-    bda = sqrt(1-e2)
-	
-    po = sqrt(x*x+y*y)
-    t = atan2(z,po*bda)
-    st = sin(t)
-    ct = cos(t)
-    b = atan2(z+e2*a/bda*st*st*st,po-e2*a*ct*ct*ct)
-    l = atan2(y,x)
-
-    sb = sin(b)
-    rn = a / sqrt(1-e2*sb*sb)
-    h = po / cos(b) - rn
-		
-    return b/Rd,l/Rd,h
-  end
-
-  def Wgs2Tky._deg2gdms(deg)
-    sf = deg*3600
-    s = sf.to_i%60
-    m = (sf/60).to_i%60
-    d = (sf/3600).to_i
-    s += sf - sf.to_i	
-    return d,m,s
-  end
-end
-
+#
+# wgs2tky.rb
+#  -- GPS data converter
+#
+# kp<kp@mmho.no-ip.org>
+# Destributed under the GPL
+
+class Wgs2Tky
+
+  Pi = Math::PI
+  Rd = Pi/180
+
+  # WGS84
+  A = 6378137.0                # 赤道半径
+  F = 1/298.257223563          # 扁平率
+  E2 = F*2 - F*F               # 第一離心率
+
+  # Tokyo
+  A_ = 6378137.0 - 739.845     # 6377397.155
+  F_ = 1/298.257223563 - 0.000010037483
+                               # 1 / 299.152813
+  E2_ = F_*2 - F_*F_
+
+  Dx = +128
+  Dy = -481
+  Dz = -664
+
+  def Wgs2Tky.conv!(lat,lon,h = 0)
+    b = lat[0].to_f + lat[1].to_f/60 + lat[2].to_f/3600
+    l = lon[0].to_f + lon[1].to_f/60 + lon[2].to_f/3600
+
+    (x,y,z) = Wgs2Tky._llh2xyz(b,l,h,A,E2)
+
+    x+=Dx
+    y+=Dy
+    z+=Dz
+
+    (b,l,h) = Wgs2Tky._xyz2llh(x,y,z,A_,E2_)
+
+    lat[0..2]=Wgs2Tky._deg2gdms(b)
+    lon[0..2]=Wgs2Tky._deg2gdms(l)
+  end
+
+  private
+
+  include Math
+  extend Math
+
+  def Wgs2Tky._llh2xyz(b,l,h,a,e2)
+
+    b *= Rd
+    l *= Rd
+
+    sb = sin(b)
+    cb = cos(b)
+
+    rn = a / Math.sqrt(1-e2*sb*sb)
+
+    x = (rn+h)*cb*cos(l)
+    y = (rn+h)*cb*sin(l)
+    z = (rn*(1-e2)+h) * sb
+
+    return x,y,z
+  end
+
+  def Wgs2Tky._xyz2llh(x,y,z,a,e2)
+
+    bda = sqrt(1-e2)
+
+    po = sqrt(x*x+y*y)
+    t = atan2(z,po*bda)
+    st = sin(t)
+    ct = cos(t)
+    b = atan2(z+e2*a/bda*st*st*st,po-e2*a*ct*ct*ct)
+    l = atan2(y,x)
+
+    sb = sin(b)
+    rn = a / sqrt(1-e2*sb*sb)
+    h = po / cos(b) - rn
+
+    return b/Rd,l/Rd,h
+  end
+
+  def Wgs2Tky._deg2gdms(deg)
+    sf = deg*3600
+    s = sf.to_i%60
+    m = (sf/60).to_i%60
+    d = (sf/3600).to_i
+    s += sf - sf.to_i
+    return d,m,s
+  end
+end
+