xmpp4r 0.5 → 0.5.5

data/test/roster/tc_helper.rb

@@ -241,14 +241,13 @@ class Roster::HelperTest < Test::Unit::TestCase
     assert_equal(true, h['a@b.c'].online?)
     presences = 0
     h['a@b.c'].each_presence { presences += 1 }
-    assert_equal(2, presences)
+    assert_equal(1, presences)
 
     send("<presence from='a@b.c/r2'/>")
     presence_waiter.wait
 
     assert_kind_of(Roster::Helper::RosterItem, cb_item)
-    assert_kind_of(Presence, cb_op)
-    assert_equal(:unavailable, cb_op.type)
+    assert_nil(cb_op)
     assert_kind_of(Presence, cb_p)
     assert_nil(cb_p.type)
     assert_equal(true, h['a@b.c'].online?)

data/test/tc_message.rb

@@ -47,7 +47,7 @@ class MessageTest < Test::Unit::TestCase
     assert_equal(nil, x.type)
   end
 
-  def test_body
+  def test_should_update_body
     x = Message.new()
     assert_equal(nil, x.body)
     assert_equal(x, x.set_body("trezrze ezfrezr ezr zer ezr ezrezrez ezr z"))
@@ -56,6 +56,57 @@ class MessageTest < Test::Unit::TestCase
     assert_equal("2", x.body)
   end
 
+  def test_should_update_xhtml_body
+    x = Message.new()
+    assert_equal(nil, x.xhtml_body)
+    assert_equal(x, x.set_xhtml_body("check this <a href='domain.com'>link</a> out"))
+    assert_equal("check this <a href='domain.com'>link</a> out", x.xhtml_body)
+    x.xhtml_body = "2"
+    assert_equal("2", x.xhtml_body)
+  end
+
+  def test_should_get_bodies
+    x = Message.new()
+
+    x.set_body("check this link <domain.com> out")
+    assert_equal("check this link <domain.com> out", x.body)
+    
+    x.set_xhtml_body("<span style='font-weight: bold'>check <i>this</i> <a href='domain.com'>link</a> out</span>")
+    assert_equal("<span style='font-weight: bold'>check <i>this</i> <a href='domain.com'>link</a> out</span>", x.xhtml_body)
+    
+    x.first_element("html").remove
+    assert_equal(nil, x.xhtml_body)
+    
+    # Some clients send markupped body without <html/> wrapper,
+    # and we need to be able to deal with this also
+    el = REXML::Element.new("body")
+    el.add_namespace("http://www.w3.org/1999/xhtml")
+    el.add_text("xhtml body without wrapper")
+    x.add_element(el)
+    assert_equal("xhtml body without wrapper", x.xhtml_body)
+  end
+  
+  def test_should_get_xhtml_body_of_new_message
+    x = Message.new()
+    
+    x.set_xhtml_body("check <i>this</i> <a href='domain.com'>link</a> out")
+    assert_equal("check <i>this</i> <a href='domain.com'>link</a> out", x.xhtml_body)
+    
+    doc = REXML::Document.new x.to_s
+    x2 = Message.new.import doc.root
+    
+    assert_equal(x.to_s, x2.to_s)
+    assert_equal("check <i>this</i> <a href='domain.com'>link</a> out", x2.xhtml_body)
+  end
+  
+  def test_should_raise_exception_with_invalid_xhtml_body
+    x = Message.new()
+    
+    assert_raise Jabber::ArgumentError do 
+      x.set_xhtml_body("check <i>this <a href='domain.com'>link</a> out")
+    end
+  end
+  
   def test_subject
     x = Message.new
     assert_equal(nil, x.subject)

data/test/tc_stream.rb

@@ -18,7 +18,7 @@ class StreamTest < Test::Unit::TestCase
 
   def busywait(&block)
     n = 0
-    while not block.yield and n < 1000
+    while not block.call and n < 10000
       Thread::pass
       n += 1
     end
@@ -92,7 +92,7 @@ class StreamTest < Test::Unit::TestCase
         @server.send(Iq.new(:result).set_id('3').delete_namespace)
       else
         p e
-       end
+      end
     end
 
     called_outer = 0

data/test/tc_streamComponent.rb

@@ -44,7 +44,17 @@ class StreamComponentTest < Test::Unit::TestCase
   end
 
   def teardown
-    @stream.close
+    n = 0
+    while @stream.processing > 0 and n < 1000
+      Thread::pass
+      n += 1
+    end
+    n = 0
+    while @server.processing > 0 and n < 1000
+      Thread::pass
+      n += 1
+    end
+    #@stream.close
     @server.close
   end
 

data/test/ts_xmpp4r.rb

@@ -13,7 +13,16 @@ require 'find'
 
 # List files' basenames, not full path!
 # EXCLUDED_FILES = [ 'tc_muc_simplemucclient.rb' ]
-EXCLUDED_FILES = []
+EXCLUDED_FILES = %w[
+  tc_disconnect_cleanup.rb
+  ./pubsub/tc_helper.rb
+  ./muc/tc_muc_mucclient.rb
+  ./reliable/tc_reliable_connection.rb
+  ./reliable/tc_disconnect_exception.rb
+  ./reliable/tc_listener_mocked_test.rb
+  ./reliable/tc_reliable_connection.rb
+  ./bytestreams/tc_socks5bytestreams.rb
+].map {|f| f.gsub(%r[^\.], File.dirname(__FILE__)) }
 
 tc_files = []
 tc_subdirs = []
@@ -39,6 +48,6 @@ tc_subdirs.each do |dir|
 end
 
 tc_files.each do |f|
-  next if EXCLUDED_FILES.include?(File::basename(f))
+  next if EXCLUDED_FILES.include?(File::basename(f)) or EXCLUDED_FILES.include?(f)
   require f
 end

data/xmpp4r.gemspec

@@ -2,10 +2,11 @@
 # RUN : 'rake gem:update_gemspec'
 
 Gem::Specification.new do |s|
-  s.authors = ["Lucas Nussbaum", "Stephan Maka", "Glenn Rempe"]
+  s.activated = false
+  s.authors = ["Lucas Nussbaum", "Stephan Maka", "Glenn Rempe", "Kaoru Maeda", "Harisankar P S"]
   s.bindir = "bin"
-  s.description = "XMPP4R is an XMPP/Jabber library for Ruby."
-  s.email = "xmpp4r-devel@gna.org"
+  s.description = "XMPP/Jabber library for ruby"
+  s.email = "mailme@hsps.in"
   s.extra_rdoc_files = ["CHANGELOG", "COPYING", "LICENSE", "README.rdoc", "README_ruby19.txt"]
   s.files = ["CHANGELOG",
  "COPYING",
@@ -90,6 +91,9 @@ Gem::Specification.new do |s|
  "lib/xmpp4r/discovery/helper/responder.rb",
  "lib/xmpp4r/discovery/iq/discoinfo.rb",
  "lib/xmpp4r/discovery/iq/discoitems.rb",
+ "lib/xmpp4r/entity_time.rb",
+ "lib/xmpp4r/entity_time/iq.rb",
+ "lib/xmpp4r/entity_time/responder.rb",
  "lib/xmpp4r/errors.rb",
  "lib/xmpp4r/feature_negotiation.rb",
  "lib/xmpp4r/feature_negotiation/iq/feature.rb",
@@ -118,6 +122,13 @@ Gem::Specification.new do |s|
  "lib/xmpp4r/muc/x/muc.rb",
  "lib/xmpp4r/muc/x/mucuserinvite.rb",
  "lib/xmpp4r/muc/x/mucuseritem.rb",
+ "lib/xmpp4r/observable.rb",
+ "lib/xmpp4r/observable/contact.rb",
+ "lib/xmpp4r/observable/helper.rb",
+ "lib/xmpp4r/observable/observable_thing.rb",
+ "lib/xmpp4r/observable/pubsub.rb",
+ "lib/xmpp4r/observable/subscription.rb",
+ "lib/xmpp4r/observable/thread_store.rb",
  "lib/xmpp4r/presence.rb",
  "lib/xmpp4r/pubsub.rb",
  "lib/xmpp4r/pubsub/children/configuration.rb",
@@ -175,6 +186,7 @@ Gem::Specification.new do |s|
  "test/dataforms/tc_data.rb",
  "test/delay/tc_xdelay.rb",
  "test/discovery/tc_responder.rb",
+ "test/entity_time/tc_responder.rb",
  "test/last/tc_helper.rb",
  "test/lib/assert_equal_xml.rb",
  "test/lib/clienttester.rb",
@@ -222,17 +234,16 @@ Gem::Specification.new do |s|
  "tools/xmpp4r-gemspec-test.rb",
  "xmpp4r.gemspec"]
   s.has_rdoc = true
-  s.homepage = "http://home.gna.org/xmpp4r/"
-  s.loaded = false
+  s.homepage = "https://xmpp4r.github.io"
   s.name = "xmpp4r"
   s.platform = "ruby"
-  s.rdoc_options = ["--quiet", "--title", "XMPP4R is an XMPP/Jabber library for Ruby.", "--opname", "index.html", "--main", "lib/xmpp4r.rb", "--line-numbers", "--inline-source"]
+  s.rdoc_options = ["--quiet", "--title", "XMPP/Jabber library for ruby", "--opname", "index.html", "--main", "lib/xmpp4r.rb", "--line-numbers", "--inline-source"]
   s.require_paths = ["lib"]
   s.required_ruby_version = ">= 1.8.4"
   s.required_rubygems_version = ">= 0"
   s.rubyforge_project = "xmpp4r"
-  s.rubygems_version = "1.3.4"
+  s.rubygems_version = "1.8.23"
   s.specification_version = 3
-  s.summary = "XMPP4R is an XMPP/Jabber library for Ruby."
-  s.version = "0.5"
+  s.summary = "XMPP/Jabber library for ruby"
+  s.version = "0.5.5"
 end

metadata

@@ -1,33 +1,31 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: xmpp4r
-version: !ruby/object:Gem::Version 
-  version: "0.5"
+version: !ruby/object:Gem::Version
+  version: 0.5.5
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Lucas Nussbaum
 - Stephan Maka
 - Glenn Rempe
+- Kaoru Maeda
+- Harisankar P S
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-07-15 00:00:00 -04:00
-default_executable: 
+date: 2013-10-06 00:00:00.000000000 Z
 dependencies: []
-
-description: XMPP4R is an XMPP/Jabber library for Ruby.
-email: xmpp4r-devel@gna.org
+description: XMPP/Jabber library for ruby
+email: mailme@hsps.in
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - CHANGELOG
 - COPYING
 - LICENSE
 - README.rdoc
 - README_ruby19.txt
-files: 
+files:
 - CHANGELOG
 - COPYING
 - LICENSE
@@ -111,6 +109,9 @@ files:
 - lib/xmpp4r/discovery/helper/responder.rb
 - lib/xmpp4r/discovery/iq/discoinfo.rb
 - lib/xmpp4r/discovery/iq/discoitems.rb
+- lib/xmpp4r/entity_time.rb
+- lib/xmpp4r/entity_time/iq.rb
+- lib/xmpp4r/entity_time/responder.rb
 - lib/xmpp4r/errors.rb
 - lib/xmpp4r/feature_negotiation.rb
 - lib/xmpp4r/feature_negotiation/iq/feature.rb
@@ -139,6 +140,13 @@ files:
 - lib/xmpp4r/muc/x/muc.rb
 - lib/xmpp4r/muc/x/mucuserinvite.rb
 - lib/xmpp4r/muc/x/mucuseritem.rb
+- lib/xmpp4r/observable.rb
+- lib/xmpp4r/observable/contact.rb
+- lib/xmpp4r/observable/helper.rb
+- lib/xmpp4r/observable/observable_thing.rb
+- lib/xmpp4r/observable/pubsub.rb
+- lib/xmpp4r/observable/subscription.rb
+- lib/xmpp4r/observable/thread_store.rb
 - lib/xmpp4r/presence.rb
 - lib/xmpp4r/pubsub.rb
 - lib/xmpp4r/pubsub/children/configuration.rb
@@ -196,6 +204,7 @@ files:
 - test/dataforms/tc_data.rb
 - test/delay/tc_xdelay.rb
 - test/discovery/tc_responder.rb
+- test/entity_time/tc_responder.rb
 - test/last/tc_helper.rb
 - test/lib/assert_equal_xml.rb
 - test/lib/clienttester.rb
@@ -242,41 +251,38 @@ files:
 - tools/gen_requires.bash
 - tools/xmpp4r-gemspec-test.rb
 - xmpp4r.gemspec
-has_rdoc: true
-homepage: http://home.gna.org/xmpp4r/
+homepage: https://xmpp4r.github.io
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --quiet
 - --title
-- XMPP4R is an XMPP/Jabber library for Ruby.
+- XMPP/Jabber library for ruby
 - --opname
 - index.html
 - --main
 - lib/xmpp4r.rb
 - --line-numbers
 - --inline-source
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.8.4
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: xmpp4r
-rubygems_version: 1.3.4
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: XMPP4R is an XMPP/Jabber library for Ruby.
+summary: XMPP/Jabber library for ruby
 test_files: []
-
+has_rdoc: true