blather 0.5.3 → 0.5.4

data/.gitignore

@@ -14,5 +14,5 @@ rdoc
 notes
 .yardoc
 *.rbc
-lib/.DS_Store
 vendor
+.rvmrc

data/.travis.yml

@@ -0,0 +1,13 @@
+rvm:
+  - 1.9.2
+  - rbx
+  - rbx-2.0
+  - jruby
+  - 1.8.7
+  - ree
+  - ruby-head
+
+branches:
+  only:
+    - master
+    - develop

data/CHANGELOG

@@ -1,3 +1,9 @@
+v0.5.4
+  Bugfix(fyafighter): Regression related to earlier refactoring: https://github.com/sprsquish/blather/issues/53
+  Feature(fyafighter): Make it much easier to allow private network addresses
+  Bugfix(benlangfeld): Fix the Nokogiri dependency to the 1.4.x series, due to a bug in 1.5.x
+  Bugfix(zlu): Replace class_inheritable_attribute with class_attribute because it is deprecated in ActiveSupport 3.1
+
 v0.5.3
   Feature(benlangfeld): Add XMPP Ping (XEP-0199) support
 

data/Rakefile

@@ -6,7 +6,7 @@ Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'spec'
+  test.libs << 'spec'
   test.pattern = 'spec/**/*_spec.rb'
   test.verbose = true
 end

data/blather.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = %w{LICENSE README.md}
 
   s.add_dependency("eventmachine", ["~> 0.12.6"])
-  s.add_dependency("nokogiri", [">= 1.4.0"])
+  s.add_dependency("nokogiri", ["~> 1.4.0"])
   s.add_dependency("niceogiri", [">= 0.0.4"])
   s.add_dependency("minitest", [">= 1.7.1"])
   s.add_dependency("activesupport", [">= 3.0.7"])

data/lib/blather.rb

@@ -8,7 +8,7 @@
   digest/sha1
   logger
 
-  active_support/core_ext/class/inheritable_attributes
+  active_support/core_ext/class/attribute
   active_support/core_ext/object/blank
 
   blather/core_ext/eventmachine

data/lib/blather/errors.rb

@@ -4,7 +4,7 @@ module Blather
   #
   # @handler :error
   class BlatherError < StandardError
-    class_inheritable_array :handler_hierarchy
+    class_attribute :handler_hierarchy
     self.handler_hierarchy ||= []
 
     # @private
@@ -15,7 +15,7 @@ module Blather
     # @param [Symbol] handler the handler name
     def self.register(handler)
       @@handler_list << handler
-      self.handler_hierarchy.unshift handler
+      self.handler_hierarchy = [handler] + self.handler_hierarchy
     end
 
     # The list of registered handlers

data/lib/blather/errors/sasl_error.rb

@@ -8,7 +8,7 @@ class SASLError < BlatherError
   # @private
   SASL_ERR_NS = 'urn:ietf:params:xml:ns:xmpp-sasl'
 
-  class_inheritable_accessor :err_name
+  class_attribute :err_name
   # @private
   @@registrations = {}
 

data/lib/blather/file_transfer.rb

@@ -9,6 +9,9 @@ module Blather
     # Set this to false if you don't want to use SOCKS5 Bytestreams
     attr_accessor :allow_s5b
 
+    # Set this to true if you want SOCKS5 Bytestreams to attempt to use private network addresses
+    attr_accessor :allow_private_ips
+    
     # Create a new FileTransfer
     #
     # @param [Blather::Stream] stream the stream the file transfer should use
@@ -37,6 +40,7 @@ module Blather
         @stream.register_handler :s5b_open, :from => @iq.from do |iq|
           transfer = Blather::FileTransfer::S5b.new(@stream, iq)
           transfer.allow_ibb_fallback = true if @allow_ibb
+          transfer.allow_private_ips = true if @allow_private_ips
           transfer.accept(handler, *params)
           true
         end

data/lib/blather/file_transfer/s5b.rb

@@ -97,7 +97,10 @@ module Blather
 
         def post_init
           self.succeed
-          (class << self; self; end).include(@@handler)
+          
+          class << self
+            include @@handler
+          end
           send(:initialize, *@params)
           post_init
         end

data/lib/blather/stanza.rb

@@ -12,7 +12,7 @@ module Blather
     # @private
     @@handler_list = []
 
-    class_inheritable_array :handler_hierarchy
+    class_attribute :handler_hierarchy
 
     # Registers a callback onto the callback stack
     #
@@ -24,7 +24,7 @@ module Blather
     def self.register(handler, name = nil, ns = nil)
       @@handler_list << handler
       self.handler_hierarchy ||= [:stanza]
-      self.handler_hierarchy.unshift handler
+      self.handler_hierarchy = [handler] + self.handler_hierarchy
 
       name = name || self.registered_name || handler
       super name, ns

data/lib/blather/version.rb

@@ -1,4 +1,4 @@
 module Blather
   # Blather version number
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

data/lib/blather/xmpp_node.rb

@@ -9,7 +9,7 @@ module Blather
     # @private
     @@registrations = {}
 
-    class_inheritable_accessor :registered_ns, :registered_name
+    class_attribute :registered_ns, :registered_name
 
     # Register a new stanza class to a name and/or namespace
     #

data/spec/blather/file_transfer_spec.rb

@@ -8,6 +8,8 @@ module MockFileReceiver
   end
   def unbind
   end
+  def send(data, params)
+  end
 end
 
 def si_xml
@@ -68,6 +70,21 @@ describe Blather::FileTransfer do
     transfer.allow_ibb = false
     transfer.accept(MockFileReceiver)
   end
+  
+  it 'can allow s5b private ips' do
+    iq = Blather::XMPPNode.import(parse_stanza(si_xml).root)
+
+    @client.stubs(:write).with do |answer|
+      answer.si.feature.x.field('stream-method').value.must_equal Blather::Stanza::Iq::S5b::NS_S5B
+      true
+    end
+
+    transfer = Blather::FileTransfer.new(@client, iq)
+    transfer.allow_s5b = true
+    transfer.allow_private_ips = true
+    transfer.allow_ibb = false
+    transfer.accept(MockFileReceiver)
+  end
 
   it 'can response no-valid-streams' do
     iq = Blather::XMPPNode.import(parse_stanza(si_xml).root)
@@ -97,4 +114,24 @@ describe Blather::FileTransfer do
     transfer = Blather::FileTransfer.new(@client, iq)
     transfer.decline
   end
+  
+  it 'can s5b post_init include the handler' do
+    class TestS5B < Blather::FileTransfer::S5b::SocketConnection
+      def initialize()
+        super("0.0.0.0", 1, MockFileReceiver, nil)
+        restore_methods
+        self.post_init()
+      end
+
+      def self.new(*args)
+        allocate.instance_eval do
+          initialize(*args)
+          self
+        end
+      end
+    end
+    assert_nothing_raised do
+      TestS5B.new()
+    end
+  end
 end

metadata

@@ -1,213 +1,161 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: blather
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 3
-  version: 0.5.3
+version: !ruby/object:Gem::Version
+  version: 0.5.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jeff Smick
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-26 00:00:00 +01:00
+date: 2011-08-11 00:00:00.000000000 +01:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153050540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 12
-        - 6
+      - !ruby/object:Gem::Version
         version: 0.12.6
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153050540
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &2156390300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 0
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: niceogiri
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2156390300
+- !ruby/object:Gem::Dependency
+  name: niceogiri
+  requirement: &2156389820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2156389820
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &2156389340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 7
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.7.1
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2156389340
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &2156388860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.7
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2156388860
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &2156388380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 7
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.7.1
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2156388380
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: &2156387900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 12
+      - !ruby/object:Gem::Version
         version: 0.9.12
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2156387900
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2156387420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2156387420
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &2156386940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 9
+      - !ruby/object:Gem::Version
         version: 0.9.9
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2156386940
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2156386460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.6.1
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: bluecloth
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *2156386460
+- !ruby/object:Gem::Dependency
+  name: bluecloth
+  requirement: &2156385980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.1.0
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *2156385980
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2156385600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id012
+  prerelease: false
+  version_requirements: *2156385600
 description: An XMPP DSL for Ruby written on top of EventMachine and Nokogiri
 email: sprsquish@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
 - .autotest
 - .gemtest
 - .gitignore
+- .travis.yml
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -222,7 +170,6 @@ files:
 - examples/rosterprint.rb
 - examples/stream_only.rb
 - examples/xmpp4r/echo.rb
-- lib/.DS_Store
 - lib/blather.rb
 - lib/blather/client.rb
 - lib/blather/client/client.rb
@@ -341,36 +288,30 @@ files:
 has_rdoc: true
 homepage: http://github.com/sprsquish/blather
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simpler XMPP built for speed
-test_files: 
+test_files:
 - spec/blather/client/client_spec.rb
 - spec/blather/client/dsl/pubsub_spec.rb
 - spec/blather/client/dsl_spec.rb