swiftiply 0.6.1.1 → 1.0.0

data/src/swiftcore/types.rb

@@ -1022,13 +1022,23 @@ application/vnd.mozilla.xul+xml @xul 'IANA,[McDaniel]
 application/vnd.ms-artgalry @cil 'IANA,[Slawson]
 application/vnd.ms-asf @asf 'IANA,[Fleischman]
 application/vnd.ms-cab-compressed @cab 'IANA,[Scarborough]
-application/vnd.ms-excel @xls,xlt :base64 'IANA,[Gill]
+application/vnd.ms-excel @xls,xlt,xla :base64 'IANA,[Gill]
+application/vnd.ms-excel.sheet.binary.macroEnabled.12 @xlsb 'IANA,[Chris_Rae]
+application/vnd.ms-excel.addin.macroEnabled.12 @xlam 'IANA,[Chris_Rae]
+application/vnd.ms-excel.sheet.macroEnabled.12 @xlsm 'IANA,[Chris_Rae]
+application/vnd.ms-excel.template.macroEnabled.12 @xltm 'IANA,[Chris_Rae]
 application/vnd.ms-fontobject 'IANA,[Scarborough]
 application/vnd.ms-ims 'IANA,[Ledoux]
 application/vnd.ms-lrm @lrm 'IANA,[Ledoux]
-application/vnd.ms-powerpoint @ppt,pps,pot :base64 'IANA,[Gill]
+application/vnd.ms-powerpoint @ppt,pps,pot,ppa :base64 'IANA,[Gill]
+application/vnd.ms-powerpoint.addin.macroEnabled.12 @ppam 'IANA,[Chris_Rae]
+application/vnd.ms-powerpoint.presentation.macroEnabled.12 @pptm 'IANA,[Chris_Rae]
+application/vnd.ms-powerpoint.slideshow.macroEnabled.12 @ppsm 'IANA,[Chris_Rae]
+application/vnd.ms-powerpoint.template.macroEnabled.12 @potm 'IANA,[Chris_Rae]
 application/vnd.ms-project @mpp :base64 'IANA,[Gill]
 application/vnd.ms-tnef :base64 'IANA,[Gill]
+application/vnd.ms-word.document.macroEnabled.12 @docm 'IANA,[Chris_Rae]
+application/vnd.ms-word.template.macroEnabled.12 @dotm 'IANA,[Chris_Rae]
 application/vnd.ms-works :base64 'IANA,[Gill]
 application/vnd.ms-wpl @wpl :base64 'IANA,[Plastina]
 application/vnd.mseq @mseq 'IANA,[Le Bodic]
@@ -1052,6 +1062,13 @@ application/vnd.obn 'IANA,[Hessling]
 application/vnd.omads-email+xml 'IANA,[OMA Data Synchronization Working Group]
 application/vnd.omads-file+xml 'IANA,[OMA Data Synchronization Working Group]
 application/vnd.omads-folder+xml 'IANA,[OMA Data Synchronization Working Group]
+application/vnd.openxmlformats-officedocument.presentationml.presentation @pptx 'IANA,[Makoto_Murata]
+application/vnd.openxmlformats-officedocument.presentationml.slideshow @ppsx 'IANA,[Makoto_Murata]
+application/vnd.openxmlformats-officedocument.presentationml.template @potx 'IANA,[Makoto_Murata]
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet @xlsx 'IANA,[Makoto_Murata]
+application/vnd.openxmlformats-officedocument.spreadsheetml.template @xltx 'IANA,[Makoto_Murata]
+application/vnd.openxmlformats-officedocument.wordprocessingml.document @docx 'IANA,[Makoto_Murata]
+application/vnd.openxmlformats-officedocument.wordprocessingml.template @dotx 'IANA,[Makoto_Murata]
 application/vnd.osa.netdeploy 'IANA,[Klos]
 application/vnd.osgi.dp 'IANA,[Kriens]
 application/vnd.palm @prc,pdb,pqa,oprc :base64 'IANA,[Peacock]
@@ -1552,7 +1569,7 @@ _re = %r{
   $
 }x
 
-data_mime_type.each do |i|
+data_mime_type.each_line do |i|
   item = i.chomp.strip.gsub(%r{#.*}o, '')
   next if item.empty?
 

data/swiftiply.gemspec

@@ -1,26 +1,32 @@
 #####
-# Swiftcore Analogger
-#   http://analogger.swiftcore.org
-#   Copyright 2007 Kirk Haines
+# Swiftcore Swiftiply
+#   http://swiftiply.swiftcore.org
+#   Copyright 2007-2017 Kirk Haines
+#   wyhaines@gmail.com
 #
 #   Licensed under the Ruby License.  See the README for details.
 #
 #####
+lib = File.expand_path('../src', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'swiftcore/Swiftiply/version'
 
 spec = Gem::Specification.new do |s|
   s.name              = 'swiftiply'
   s.author            = %q(Kirk Haines)
   s.email             = %q(wyhaines@gmail.com)
-  s.version           = '0.6.1.1'
+  s.version           = Swiftcore::Swiftiply::VERSION
   s.summary           = %q(A fast clustering proxy for web applications.)
   s.platform          = Gem::Platform::RUBY
 
   s.has_rdoc          = true
-  s.rdoc_options      = %w(--title Swiftcore::Swiftiply --main README --line-numbers)
-  s.extra_rdoc_files  = %w(README)
+  s.rdoc_options      = %w(--title Swiftcore::Swiftiply --main README.md --line-numbers)
+  s.extra_rdoc_files  = %w(README.md)
   s.extensions        << 'ext/fastfilereader/extconf.rb'
+	s.extensions        << 'ext/deque/extconf.rb'
+	s.extensions        << 'ext/splaytree/extconf.rb'
   s.files             = Dir['**/*']
-	s.executables = %w(swiftiply mongrel_rails swiftiply_mongrel_rails)
+	s.executables = %w(swiftiply swiftiplied_mongrel_rails evented_mongrel_rails swiftiply_mongrel_rails)
 	s.require_paths = %w(src)
 
 	s.requirements      << "Eventmachine 0.8.1 or higher."
@@ -30,7 +36,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = %q(swiftiply)
   s.homepage          = %q(http://swiftiply.swiftcore.org/)
   description         = []
-  File.open("README") do |file|
+  File.open("README.md") do |file|
     file.each do |line|
       line.chomp!
       break if line.empty?

data/test/TC_Deque.rb

@@ -0,0 +1,152 @@
+require 'minitest/autorun'
+require 'external/test_support'
+SwiftcoreTestSupport.set_src_dir
+require 'rbconfig'
+require 'swiftcore/deque'
+
+class TC_Deque < Minitest::Test
+	@@testdir = SwiftcoreTestSupport.test_dir(__FILE__)
+
+	def setup
+		Dir.chdir(@@testdir)
+		SwiftcoreTestSupport.announce(:proxybag,"ProxyBag")
+	end
+
+	def teardown
+		GC.start
+	end
+
+	def test_a_new
+		dq = nil
+		dq = Swiftcore::Deque.new
+		assert_kind_of(Swiftcore::Deque,dq)
+	end
+
+	def test_b_unshift
+		dq = Swiftcore::Deque.new
+
+		dq.unshift "a"
+		dq.unshift "b"
+		dq.unshift "c"
+
+		assert_equal('["c","b","a"]',dq.inspect)
+	end
+
+	def test_c_shift
+		dq = Swiftcore::Deque.new
+		dq.unshift "a"
+		dq.unshift "b"
+		dq.unshift "c"
+		assert_equal("c",dq.shift)
+		assert_equal("b",dq.shift)
+		assert_equal("a",dq.shift)
+		assert_equal(nil,dq.shift)
+	end
+
+	def test_d_push
+		dq = Swiftcore::Deque.new
+		dq.push "a"
+		dq.push "b"
+		dq.push "c"
+
+		assert_equal('["a","b","c"]',dq.inspect)
+	end
+
+	def test_e_pop
+		dq = Swiftcore::Deque.new
+		dq.push "a"
+		dq.push "b"
+		dq.push "c"
+		assert_equal("c",dq.pop)
+		assert_equal("b",dq.pop)
+		assert_equal("a",dq.pop)
+		assert_equal(nil,dq.pop)
+	end
+
+	def test_f_size
+		dq = Swiftcore::Deque.new
+		dq.push "a"
+		dq.push "b"
+		dq.push "c"
+		assert_equal(3,dq.size)
+	end
+
+	def test_g_max_size
+		dq = Swiftcore::Deque.new
+		dq.max_size
+	end
+
+	def test_h_clear
+		dq = Swiftcore::Deque.new
+		dq.push "a"
+		dq.push "b"
+		dq.push "c"
+			dq.clear
+		assert_equal(0,dq.size)
+		assert_equal("[]",dq.inspect)
+	end
+
+	def test_i_empty
+		dq = Swiftcore::Deque.new
+		dq.push "a"
+		assert(!dq.empty?)
+		dq.clear
+		assert(dq.empty?)
+	end
+
+	def test_j_to_s
+		dq = Swiftcore::Deque.new
+		dq.push "a"
+		dq.push "b"
+		dq.push "c"
+		assert_equal("abc",dq.to_s)
+	end
+
+	def test_k_to_a
+		dq = Swiftcore::Deque.new
+		dq.push "a"
+		dq.push "b"
+		dq.push "c"
+		assert_equal(["a","b","c"],dq.to_a)
+	end
+
+	def test_l_first
+		dq = Swiftcore::Deque.new
+		dq.push "a"
+		dq.push "b"
+		dq.push "c"
+		assert_equal("a",dq.first)
+	end
+
+	def test_m_last
+		dq = Swiftcore::Deque.new
+		dq.push "a"
+		dq.push "b"
+		dq.push "c"
+		assert_equal("c",dq.last)
+	end
+
+	def test_n_at
+		dq = Swiftcore::Deque.new
+		dq.push "a"
+		dq.push "b"
+		dq.push "c"
+		assert_equal("a",dq.at(0))
+		assert_equal("a",dq[0])
+		assert_equal("b",dq.at(1))
+		assert_equal("b",dq[1])
+		assert_equal("c",dq.at(2))
+		assert_equal("c",dq[2])
+	end
+
+	def test_o_index
+		dq = Swiftcore::Deque.new
+		dq.push "a"
+		dq.push :b
+		dq.push 37
+		assert_equal(0,dq.index("a"))
+		assert_equal(1,dq.index(:b))
+		assert_equal(2,dq.index(37))
+	end
+
+end

data/test/TC_ProxyBag.rb

@@ -1,4 +1,4 @@
-require 'test/unit'
+require 'minitest/autorun'
 require 'external/test_support'
 SwiftcoreTestSupport.set_src_dir
 require 'rbconfig'
@@ -6,14 +6,14 @@ require 'net/http'
 require 'swiftcore/Swiftiply'
 require 'yaml'
 
-class TC_ProxyBag < Test::Unit::TestCase
-	@@testdir = SwiftcoreTestSupport.test_dir(__FILE__)
-	Ruby = File.join(::Config::CONFIG['bindir'],::Config::CONFIG['ruby_install_name']) << ::Config::CONFIG['EXEEXT']
-	
-	DeleteQueue = []
-	KillQueue = []
-	
-	ConfBase = YAML.load(<<ECONF)
+class TC_ProxyBag < Minitest::Test
+  @@testdir = SwiftcoreTestSupport.test_dir(__FILE__)
+  Ruby = File.join(::RbConfig::CONFIG['bindir'],::RbConfig::CONFIG['ruby_install_name']) << ::RbConfig::CONFIG['EXEEXT']
+
+  DeleteQueue = []
+  KillQueue = []
+
+  ConfBase = YAML.load(<<ECONF)
 cluster_address: 127.0.0.1
 cluster_port: 29998
 daemonize: false
@@ -25,161 +25,142 @@ map:
     default: true
     redeployable: false
 ECONF
-	
-	def get_url(hostname,port,url)
-		Net::HTTP.start(hostname,port) {|http| http.get(url)}
-	end
-	
-	def post_url(hostname,port,url,data = nil)
-		Net::HTTP.start(hostname,port) {|http| http.post(url,data)}
-	end
-
-	def delete_url(hostname,port,url)
-		Net::HTTP.start(hostname,port) {|http| http.delete(url)}
-	end
-	
-	def setup
-		Dir.chdir(@@testdir)
-		SwiftcoreTestSupport.announce(:proxybag,"ProxyBag")
-	end
-
-	def teardown
-		while f = DeleteQueue.pop do
-			 File.delete f if f
-		end
-		 
-		while p = KillQueue.pop do
-			Process.kill("SIGKILL",p) if p
-			Process.wait p if p
-		end
-	end
-	
-	def test_update_ctime
-		pb = Swiftcore::Swiftiply::ProxyBag
-		t = pb.update_ctime
-		assert_instance_of(Time,t)
-	end
-	
-	def test_now
-		pb = Swiftcore::Swiftiply::ProxyBag
-		n = pb.update_ctime
-		assert_instance_of(Time,pb.now)
-		assert_equal(n,pb.now)
-	end
-	
-	def test_set_key
-		pb = Swiftcore::Swiftiply::ProxyBag
-		assert_nothing_raised do
-			pb.set_key(:a,'abc')
-		end
-		assert_equal('abc',pb.instance_variable_get('@keys')[:a])
-	end
-	
-	def test_get_key
-		pb = Swiftcore::Swiftiply::ProxyBag
-		assert_nothing_raised do
-			pb.set_key(:b,'def')
-		end
-		assert_equal('def',pb.get_key(:b))
-	end
-	
-	def test_add_id
-		pb = Swiftcore::Swiftiply::ProxyBag
-		assert_nothing_raised do
-			pb.add_id(:abcdef,12345)
-		end
-		assert_equal(12345,pb.instance_variable_get('@id_map')[:abcdef])
-		assert_equal(:abcdef,pb.instance_variable_get('@reverse_id_map')[12345])
-	end
-	
-	def test_remove_id
-		pb = Swiftcore::Swiftiply::ProxyBag
-		assert_nothing_raised do
-			pb.remove_id(:abcdef)
-		end
-		assert_nil(pb.instance_variable_get('@id_map')[:abcdef])
-		assert_nil(pb.instance_variable_get('@reverse_id_map')[12345])
-	end
-	
-	def test_add_incoming_mapping
-		pb = Swiftcore::Swiftiply::ProxyBag
-		assert_nothing_raised do
-			pb.add_incoming_mapping(:abcdef,12345)
-		end
-		assert_equal(:abcdef,pb.instance_variable_get('@incoming_map')[12345])
-	end
-	
-	def test_remove_incoming_mapping
-		pb = Swiftcore::Swiftiply::ProxyBag
-		assert_nothing_raised do
-			pb.remove_incoming_mapping(12345)
-		end
-		assert_nil(pb.instance_variable_get('@incoming_map')[12345])
-	end
-	
-	def test_add_incoming_docroot
-		pb = Swiftcore::Swiftiply::ProxyBag
-		assert_nothing_raised do
-			pb.add_incoming_docroot('/abc/123',:abcdef)
-		end
-		assert_equal('/abc/123',pb.instance_variable_get('@docroot_map')[:abcdef])		
-	end
-	
-	def test_remove_incoming_docroot
-		pb = Swiftcore::Swiftiply::ProxyBag
-		assert_nothing_raised do
-			pb.remove_incoming_docroot(:abcdef)
-		end
-		assert_nil(pb.instance_variable_get('@docroot_map')[:abcdef])
-	end
-	
-	def test_add_incoming_redeployable
-		pb = Swiftcore::Swiftiply::ProxyBag
-		assert_nothing_raised do
-			pb.add_incoming_redeployable(16384,:abcdef)
-		end
-		assert_equal(16384,pb.instance_variable_get('@redeployable_map')[:abcdef])		
-	end
-	
-	def test_remove_incoming_redeployable
-		pb = Swiftcore::Swiftiply::ProxyBag
-		assert_nothing_raised do
-			pb.remove_incoming_redeployable(:abcdef)
-		end
-		assert_nil(pb.instance_variable_get('@redeployable_map')[:abcdef])
-	end
-	
-	def test_add_log
-		pb = Swiftcore::Swiftiply::ProxyBag
-		assert_nothing_raised do
-			pb.add_log('/foo/bar',:abcdef)
-		end
-		assert_equal('/foo/bar',pb.instance_variable_get('@log_map')[:abcdef])
-	end
-	
-	def test_default_name
-		pb = Swiftcore::Swiftiply::ProxyBag
-		assert_nothing_raised do
-			pb.default_name = 'test'
-		end
-		assert_equal('test',pb.instance_variable_get('@default_name'))
-	end
-	
-	def test_server_unavailable_timeout
-		pb = Swiftcore::Swiftiply::ProxyBag
-		assert_nothing_raised do
-			pb.server_unavailable_timeout = 3
-		end
-		assert_equal(3,pb.instance_variable_get('@server_unavailable_timeout'))
-	end
-	
-	def test_find_static_file
-		dr = Dir.pwd
-		path_info = "testfile#{Time.now.to_i}"
-		File.open(path_info,'w') {|fh| fh.puts "alfalfa leafcutter bee"}
-		assert_equal(File.join(dr,path_info),Swiftcore::Swiftiply::ProxyBag.find_static_file(dr,path_info,'foo'))
-		assert_nil(Swiftcore::Swiftiply::ProxyBag.find_static_file(dr,'xyzzy','foo'))
-		File.delete(path_info)
-	end
-	
+
+  def get_url(hostname,port,url)
+    Net::HTTP.start(hostname,port) {|http| http.get(url)}
+  end
+
+  def post_url(hostname,port,url,data = nil)
+    Net::HTTP.start(hostname,port) {|http| http.post(url,data)}
+  end
+
+  def delete_url(hostname,port,url)
+    Net::HTTP.start(hostname,port) {|http| http.delete(url)}
+  end
+
+  def setup
+    Dir.chdir(@@testdir)
+    SwiftcoreTestSupport.announce(:proxybag,"ProxyBag")
+  end
+
+  def teardown
+    while f = DeleteQueue.pop do
+       File.delete f if f
+    end
+
+    while p = KillQueue.pop do
+      Process.kill("SIGKILL",p) if p
+      Process.wait p if p
+    end
+  end
+
+  def test_update_ctime
+    pb = Swiftcore::Swiftiply::ProxyBag
+    t = pb.update_ctime
+    assert_instance_of(String,t)
+    pt = nil
+    pt = Time.parse(t)
+    assert_instance_of(Time,pt)
+    if Time === pt
+      delta = Time.now - pt
+      assert(delta < 2)
+    end
+  end
+
+  def test_now
+    pb = Swiftcore::Swiftiply::ProxyBag
+    n = pb.update_ctime
+    assert_instance_of(Time,pb.now)
+    #assert_equal(Time.parse(n).asctime,pb.now.asctime)
+  end
+
+  def test_set_key
+    pb = Swiftcore::Swiftiply::ProxyBag
+    pb.set_key(:a,'abc')
+    assert_equal('abc',pb.instance_variable_get('@keys')[:a])
+  end
+
+  def test_get_key
+    pb = Swiftcore::Swiftiply::ProxyBag
+    pb.set_key(:b,'def')
+    assert_equal('def',pb.get_key(:b))
+  end
+
+  def test_add_id
+    pb = Swiftcore::Swiftiply::ProxyBag
+    pb.add_id(:abcdef,12345)
+    assert_equal(12345,pb.instance_variable_get('@id_map')[:abcdef])
+    assert_equal(:abcdef,pb.instance_variable_get('@reverse_id_map')[12345])
+  end
+
+  def test_remove_id
+    pb = Swiftcore::Swiftiply::ProxyBag
+    pb.remove_id(:abcdef)
+    assert_nil(pb.instance_variable_get('@id_map')[:abcdef])
+    assert_nil(pb.instance_variable_get('@reverse_id_map')[12345])
+  end
+
+  def test_add_incoming_mapping
+    pb = Swiftcore::Swiftiply::ProxyBag
+    pb.add_incoming_mapping(:abcdef,12345)
+    assert_equal(:abcdef,pb.instance_variable_get('@incoming_map')[12345])
+  end
+
+  def test_remove_incoming_mapping
+    pb = Swiftcore::Swiftiply::ProxyBag
+    pb.remove_incoming_mapping(12345)
+    assert_nil(pb.instance_variable_get('@incoming_map')[12345])
+  end
+
+  def test_add_incoming_docroot
+    pb = Swiftcore::Swiftiply::ProxyBag
+    pb.add_docroot('/abc/123',:abcdef)
+    assert_equal('/abc/123',pb.instance_variable_get('@docroot_map')[:abcdef])
+  end
+
+  def test_remove_incoming_docroot
+    pb = Swiftcore::Swiftiply::ProxyBag
+    pb.remove_docroot(:abcdef)
+    assert_nil(pb.instance_variable_get('@docroot_map')[:abcdef])
+  end
+
+  def test_add_incoming_redeployable
+    pb = Swiftcore::Swiftiply::ProxyBag
+    pb.add_redeployable(16384,:abcdef)
+    assert_equal(16384,pb.instance_variable_get('@redeployable_map')[:abcdef])
+  end
+
+  def test_remove_incoming_redeployable
+    pb = Swiftcore::Swiftiply::ProxyBag
+    pb.remove_redeployable(:abcdef)
+    assert_nil(pb.instance_variable_get('@redeployable_map')[:abcdef])
+  end
+
+  def test_add_log
+    pb = Swiftcore::Swiftiply::ProxyBag
+    pb.add_log('/foo/bar',:abcdef)
+    assert_equal(['/foo/bar',1],pb.instance_variable_get('@log_map')[:abcdef])
+  end
+
+  def test_default_name
+    pb = Swiftcore::Swiftiply::ProxyBag
+    pb.default_name = 'test'
+    assert_equal('test',pb.instance_variable_get('@default_name'))
+  end
+
+  def test_server_unavailable_timeout
+    pb = Swiftcore::Swiftiply::ProxyBag
+    pb.server_unavailable_timeout = 3
+    assert_equal(3,pb.instance_variable_get('@server_unavailable_timeout'))
+  end
+
+  def test_find_static_file
+    dr = Dir.pwd
+    path_info = "testfile#{Time.now.to_i}"
+    File.open(path_info,'w') {|fh| fh.puts "alfalfa leafcutter bee"}
+    assert_equal(File.join(dr,path_info),Swiftcore::Swiftiply::ProxyBag.find_static_file(dr,path_info,'foo'))
+    assert_equal(nil,Swiftcore::Swiftiply::ProxyBag.find_static_file(dr,'xyzzy','foo'))
+    File.delete(path_info)
+  end
+
 end