blather 1.1.1 → 1.1.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +3 -0
- data/lib/blather/client/dsl.rb +3 -2
- data/lib/blather/version.rb +1 -1
- data/spec/blather/client/dsl_spec.rb +5 -5
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: cf4e672c7124d23a581e31cb8325a33443b962b7
|
4
|
+
data.tar.gz: 829cc4e5c688b856d54c1c0d6aea5ee82689cf11
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: e177fba5160c9aa3e1640c1ae3f881aa2bb03b0ad00323c2b633a5b23ea99bf11d3d61e535b2db191fafc67c9fdb936cb1101ed1396cfec6db8f56c5c5dbdedd
|
7
|
+
data.tar.gz: f8f62e1682c627cfc168aab246c3944b29c7ff4a3e3dd77be2a45c159d4aad42290f6639f5b137ec387a5936befc865000c484e84c18171aefe85e6f8c250a2e
|
data/CHANGELOG.md
CHANGED
@@ -1,5 +1,8 @@
|
|
1
1
|
# [develop](https://github.com/adhearsion/blather/compare/master...develop)
|
2
2
|
|
3
|
+
# [v1.1.2](https://github.com/adhearsion/blather/compare/v1.1.1...v1.1.2) - [2015-06-12](https://rubygems.org/gems/blather/versions/1.1.2)
|
4
|
+
* Bugfix: Expose alternative authentication ID in DSL
|
5
|
+
|
3
6
|
# [v1.1.1](https://github.com/adhearsion/blather/compare/v1.1.0...v1.1.1) - [2015-06-12](https://rubygems.org/gems/blather/versions/1.1.1)
|
4
7
|
* Bugfix: Expose alternative authentication ID when setting up a client
|
5
8
|
|
data/lib/blather/client/dsl.rb
CHANGED
@@ -140,8 +140,9 @@ module Blather
|
|
140
140
|
# this is `nil` the domain on the JID will be used
|
141
141
|
# @param [Fixnum, String] (optional) port the port to connect on
|
142
142
|
# @param [Fixnum] (optional) connection_timeout the time to wait for connection to succeed before timing out
|
143
|
-
|
144
|
-
|
143
|
+
# @param [Hash] (optional) options
|
144
|
+
def setup(jid, password, host = nil, port = nil, certs = nil, connection_timeout = nil, options = nil)
|
145
|
+
client.setup(jid, password, host, port, certs, connection_timeout, options)
|
145
146
|
end
|
146
147
|
|
147
148
|
# Connect to the server. Must be run in the EventMachine reactor
|
data/lib/blather/version.rb
CHANGED
@@ -19,30 +19,30 @@ describe Blather::DSL do
|
|
19
19
|
|
20
20
|
it 'allows host to be nil in setup' do
|
21
21
|
args = ['jid', 'pass']
|
22
|
-
@client.expects(:setup).with *(args + [nil, nil, nil, nil])
|
22
|
+
@client.expects(:setup).with *(args + [nil, nil, nil, nil, nil])
|
23
23
|
@dsl.setup *args
|
24
24
|
end
|
25
25
|
|
26
26
|
it 'allows port to be nil in setup' do
|
27
27
|
args = ['jid', 'pass', 'host']
|
28
|
-
@client.expects(:setup).with *(args + [nil, nil, nil])
|
28
|
+
@client.expects(:setup).with *(args + [nil, nil, nil, nil])
|
29
29
|
@dsl.setup *args
|
30
30
|
end
|
31
31
|
|
32
32
|
it 'allows certs to be nil in setup' do
|
33
33
|
args = ['jid', 'pass', 'host', 'port']
|
34
|
-
@client.expects(:setup).with *(args + [nil, nil])
|
34
|
+
@client.expects(:setup).with *(args + [nil, nil, nil])
|
35
35
|
@dsl.setup *args
|
36
36
|
end
|
37
37
|
|
38
38
|
it 'accepts certs in setup' do
|
39
39
|
args = ['jid', 'pass', 'host', 'port', 'certs']
|
40
|
-
@client.expects(:setup).with *(args + [nil])
|
40
|
+
@client.expects(:setup).with *(args + [nil, nil])
|
41
41
|
@dsl.setup *args
|
42
42
|
end
|
43
43
|
|
44
44
|
it 'accepts connection timeout in setup' do
|
45
|
-
args = ['jid', 'pass', 'host', 'port', 'certs', 30]
|
45
|
+
args = ['jid', 'pass', 'host', 'port', 'certs', 30, nil]
|
46
46
|
@client.expects(:setup).with *args
|
47
47
|
@dsl.setup *args
|
48
48
|
end
|