datasift 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9641d5c63c65ea33e57315b99af6a9c590d40cb
-  data.tar.gz: 8337c158f42385c7b64d02c647497973340c4cbc
+  metadata.gz: 0eee7436a56aaedecada56c0fe536f159fcd2d10
+  data.tar.gz: f5df616662250c8ffbe52828e517650cdc3df25b
 SHA512:
-  metadata.gz: 6ca8d240d18faf58308dbc04a47f5088207684e536bf627c0fbd59cb70bd84110c7b19f8561a8ec0b58b4c55e93f48ee84dad23422ba69fc351993252a66027b
-  data.tar.gz: 0e5b55c4c145be0835e37ba33feb438cffd5f308a5c6be857f506ade9aeaa63ed324f796b6e03a5e66375d6288ed0a8cc9829df27c415ffa0b5b3bbecf2da5d2
+  metadata.gz: efc65b0038b8e12dfa98e03bda3296a4ca3b4f28643a04e7aedeb6564a7c1e2ae0d18964961c590d415e28e14168f9fa6edda9dbf33c2f9ff6bf6b66c4eeb3aa
+  data.tar.gz: 018f6305640bd21c2f8594f515988975f07dc7cae7b71fbf2ca17bd07fdd75b036a5fa97b4350246134837cea5ea0ba169ee6752175de533b9d19dc8b8f147c2

data/.travis.yml

@@ -2,4 +2,4 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.2
+  - 2.1

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 CHANGELOG
 ================================
 
+v.3.1.3 (2014-12-02)
+--------------------
+####Fixes
+* Resolves #57; ensures config is not overridden when initializing LiveStream
+* Relaxed version dependency on multi_json to resolve #67
+
 v.3.1.2 (2014-08-28)
 --------------------
 

data/README.md

@@ -8,8 +8,17 @@ DataSift
 [travis]: https://travis-ci.org/datasift/datasift-ruby
 
 
-The official Ruby library for accessing the DataSift API. See
-[datasift.com](http://datasift.com/) for full details and to sign up for an account.
+The official Ruby library for accessing the DataSift API. 
+
+Getting Started
+---------------
+
+**Read our [Ruby Getting Started Guide](http://dev.datasift.com/quickstart/ruby) to get started with the DataSift platform.** The guide will take you through creating a [DataSift](http://datasift.com) account, and activating data sources which you will need to do before using the DataSift API.
+
+Many of the examples and API endpoints used in this library require you have enabled certain data sources before you can receive any data (you should do this at [datasift.com/source](https://datasift.com/source)). Certain API features, such as [Historics](http://datasift.com/platform/historics/) and [Managed Sources](http://datasift.com/platform/datasources/) will require you have signed up to a monthly subscription before you can access them.
+
+If you are interested in using these features, or would like more information about DataSift, please [get in touch](http://datasift.com/contact-us/)!
+
 
 Install Instructions
 --------------------
@@ -31,13 +40,6 @@ The library will use SSL connections by default. While we recommend using SSL
 you may disable it if required by passing ':enable_ssl => false' as the third
 parameter when creating your @config object.
 
-Getting Started
----------------
-Before you can begin using this library, you will need to have an active [DataSift](http://datasift.com) account - you can sign up for a new account at [datasift.com/get-started](http://datasift.com/get-started/).
-
-Many of the examples and API endpoints used in this library require you have enabled certain data sources before you can receive any data (you should do this at [datasift.com/source](https://datasift.com/source)). Certain API features, such as [Historics](http://datasift.com/platform/historics/) and [Managed Sources](http://datasift.com/platform/datasources/) will require you have signed up to a monthly subscription before you can access them.
-
-If you are interested in using these features, or would like more information about DataSift, please [get in touch](http://datasift.com/contact-us/)!
 
 Simple example
 --------------

data/VERSION

@@ -1 +1 @@
-3.1.2
+3.1.3

data/datasift.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
 
   s.add_runtime_dependency('rest-client', '~> 1.6')
-  s.add_runtime_dependency('multi_json', '~> 1.8')
+  s.add_runtime_dependency('multi_json', '>= 1.7')
   s.add_runtime_dependency('websocket-td', '~> 0.0.4')
 
   s.add_development_dependency('rdoc', '>= 0')

data/examples/live_stream_eg.rb

@@ -20,6 +20,7 @@ class StreamingApi < DataSiftExample
       on_delete = lambda { |stream, m| puts 'We must delete this to be compliant ==> ' + m }
 
       on_error = lambda do |stream, e|
+        # This is called when an error occurs on your connection; you should probably log this event
         puts 'A serious error has occurred'
         puts e.message
       end
@@ -57,6 +58,7 @@ class StreamingApi < DataSiftExample
       end
 
       on_close = lambda do |stream,msg|
+        # This is called when a connection is closed; you should probably log this event
         puts msg
       end
 

data/lib/api/api_resource.rb

@@ -10,6 +10,7 @@ module DataSift
       config[:enable_ssl] = false unless config.has_key?(:enable_ssl)
       # max 320 seconds retry - http://dev.datasift.com/docs/streaming-api/reconnecting
       config[:max_retry_time] = 320 unless config.has_key?(:max_retry_time)
+      config[:retry_timeout] = 0 unless config.has_key?(:retry_timeout)
     end
 
     def requires params

data/lib/datasift.rb

@@ -156,7 +156,7 @@ module DataSift
       :timeout      => timeout,
       :payload      => payload,
       :url          => url,
-      :ssl_version => 'TLSv1'
+      :ssl_version  => OpenSSL::SSL::SSLContext::DEFAULT_PARAMS[:ssl_version]
     )
 
     begin
@@ -323,6 +323,7 @@ module DataSift
   def self.retry_connect(config, connection, on_delete, on_error, on_open, on_close, message = '', use_closed = false)
     config[:retry_timeout]   = config[:retry_timeout] == 0 || config[:retry_timeout] == nil ? 10 : config[:retry_timeout] * 2
     connection.retry_timeout = config[:retry_timeout]
+
     if config[:retry_timeout] > config[:max_retry_time]
       if use_closed && on_close != nil
         on_close.call(connection, message)

data/lib/live_stream.rb

@@ -5,7 +5,7 @@ module DataSift
     @on_datasift_message = lambda {}
 
     def initialize (config, stream)
-      @config        = config
+      super(config)
       @stream        = stream
       @retry_timeout = 0
       @subscriptions = {}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datasift
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - DataSift
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-28 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -28,16 +28,16 @@ dependencies:
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: websocket-td
   requirement: !ruby/object:Gem::Requirement
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: DataSift is a simple wrapper for the DataSift API.