datasift 2.0.2 → 2.0.3

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source "https://rubygems.org"
 gemspec

data/README.md

@@ -56,6 +56,12 @@ more details.
 Changelog
 ---------
 
+* v.2.0.3 Stability improvement and bug fix (2013-03-04)
+  
+  Removed references to deprecated Historic output field 'volume_info'.
+  Added 65s timeout on live streaming to handle 'silent' server disconnects.
+  Minor changes to ensure Ruby 2.0 compatibility.
+
 * v.2.0.2 Added missing Historic sample size into historic/prepare requests (2012-12-03)
 
 * v.2.0.1 Fixed a bug that was preventing streaming connections from being established (2012-09-03)

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.3

data/examples/consume-stream.rb

@@ -16,7 +16,7 @@ if ARGV.size == 0
 end
 
 # Include the DataSift library
-require File.dirname(__FILE__) + '/../lib/datasift'
+require './' + File.dirname(__FILE__) + '/../lib/datasift'
 
 # Include the configuration - put your username and API key in this file
 require 'yaml'

data/examples/deletes.rb

@@ -8,7 +8,7 @@
 #
 
 # Include the DataSift library
-require File.dirname(__FILE__) + '/../lib/datasift'
+require './' + File.dirname(__FILE__) + '/../lib/datasift'
 
 # Include the configuration - put your username and API key in this file
 require 'yaml'

data/examples/dpu.rb

@@ -13,7 +13,7 @@
 #
 
 # Include the DataSift library
-require File.dirname(__FILE__) + '/../lib/datasift'
+require './' + File.dirname(__FILE__) + '/../lib/datasift'
 
 # Function to format a number with commas
 def number_with_delimiter(number, delimiter=',')

data/examples/football-buffered.rb

@@ -10,7 +10,7 @@
 #
 
 # Include the DataSift library
-require File.dirname(__FILE__) + '/../lib/datasift'
+require './' + File.dirname(__FILE__) + '/../lib/datasift'
 
 # Include the configuration - put your username and API key in this file
 require 'yaml'

data/examples/football.rb

@@ -10,7 +10,7 @@
 #
 
 # Include the DataSift library
-require File.dirname(__FILE__) + '/../lib/datasift'
+require './' + File.dirname(__FILE__) + '/../lib/datasift'
 
 # Include the configuration - put your username and API key in this file
 require 'yaml'

data/examples/twitter-track.rb

@@ -18,7 +18,7 @@ if ARGV.size == 0
 end
 
 # Include the DataSift library
-require File.dirname(__FILE__) + '/../lib/datasift'
+require './' + File.dirname(__FILE__) + '/../lib/datasift'
 
 # Include the configuration - put your username and API key in this file
 require 'yaml'

data/lib/DataSift/apiclient.rb

@@ -7,19 +7,18 @@ module DataSift
 	class ApiClient
 		#Make a call to a DataSift API endpoint.
 		#=== Parameters
+		#* +user+ - The DataSift User object.
 		#* +endpoint+ - The endpoint of the API call.
 		#* +params+ - The parameters to be passed along with the request.
-		#* +username+ - The username for the Auth header
-		#* +api_key+ - The API key for the Auth header
 		#=== Returns
 		#A Hash contatining...
 		#* +response_code+ - The HTTP response code.
 		#* +data+ - A Hash containing the response data.
 		#* +rate_limit+ - The total API credits you get per hour.
 		#* +rate_limit_remaining+ - The number of API credits you have remaining for this hour.
-		def call(username, api_key, endpoint, params = {}, user_agent = 'DataSiftPHP/0.0')
+		def call(user, endpoint, params = {}, user_agent = User::USER_AGENT)
 			# Build the full endpoint URL
-			url = 'http://' + User::API_BASE_URL + endpoint
+			url = 'http' + (user.use_ssl ? 's' : '') + '://' + User::API_BASE_URL + endpoint
 
 			retval = {
 				'response_code' => 500,
@@ -30,10 +29,10 @@ module DataSift
 
 			begin
 				# Make the call
-				res = RestClient.post(url, params, { 'Auth' => username + ':' + api_key, 'User-Agent' => user_agent })
+				res = RestClient.post(url, params, { 'Auth' => user.username + ':' + user.api_key, 'User-Agent' => user_agent })
 
 				# Success
-				retval['response_code'] = 200
+				retval['response_code'] = res.code
 
 				# Parse the JSON response
 				retval['data'] = Yajl::Parser.parse(res)

data/lib/DataSift/historic.rb

@@ -58,8 +58,6 @@ module DataSift
 		attr_reader :sample
 		#The DPU cost of running this Historics query.
 		attr_reader :dpus
-		#The data availability for this Historics query.
-		attr_reader :volume_info
 		#True if this Historics query has been deleted.
 		attr_reader :is_deleted
 
@@ -109,7 +107,6 @@ module DataSift
 				@progress     = 0
 				@dpus         = false
 				@availability = {}
-				@volume_info  = {}
 				@is_deleted   = false
 			end
 		end
@@ -169,9 +166,6 @@ module DataSift
 			raise APIError, 'No sample in the response' unless data.has_key?('sample')
 			@sample = data['sample']
 
-			raise APIError, 'No volume info in the response' unless data.has_key?('volume_info')
-			@volume_info = data['volume_info']
-
 			@is_deleted = (@status == 'deleted')
 
 			return true

data/lib/DataSift/stream_consumer.rb

@@ -53,6 +53,7 @@ module DataSift
 			@auto_reconnect = true
 			@stop_reason = 'Unknown reason'
 			@state = STATE_STOPPED
+			@stream_timeout = 65
 
 			# Get the hash which will compile the CSDL if necessary
 			@definition.hash
@@ -124,7 +125,7 @@ module DataSift
 					elsif interaction['status'] == 'warning'
 						onWarning.call(interaction['message'])
 					else
-						# Tick
+						# Tick
 					end
 				else
 					if interaction.has_key?('deleted') and interaction['deleted']

data/lib/DataSift/stream_consumer_http.rb

@@ -22,7 +22,6 @@ module DataSift
 		def onStart(&block)
 			begin
 				reconnect() unless !@socket.nil? and !@socket.closed?
-
 				parser = Yajl::Parser.new
 				parser.on_parse_complete = block if block_given?
 				if @response_head[:headers]["Transfer-Encoding"] == 'chunked'
@@ -30,6 +29,15 @@ module DataSift
 						chunkLeft = 0
 						while !@socket.eof? && (line = @socket.gets) && @state == StreamConsumer::STATE_RUNNING
 							break if line.match /^0.*?\r\n/
+
+							begin
+								ready = IO.select([@socket], nil, [@socket], @stream_timeout)
+								unless ready
+									reconnect()
+									next
+								end
+							end
+
 							next if line == "\r\n"
 							size = line.hex
 							json = @socket.read(size)
@@ -82,7 +90,6 @@ module DataSift
 		end
 
   private
-
   	#Reconnect the stream socket.
 		def reconnect()
 			uri = URI.parse('http' + (@user.use_ssl ? 's' : '') + '://' + User::STREAM_BASE_URL + @definition.hash)

data/lib/DataSift/user.rb

@@ -234,7 +234,7 @@ module DataSift
 				@api_client = ApiClient.new()
 			end
 
-			res = @api_client.call(@username, @api_key, endpoint, params, getUserAgent())
+			res = @api_client.call(self, endpoint, params, getUserAgent())
 
 			# Set up the return value
 			retval = res['data']

data/test/helper.rb

@@ -14,12 +14,12 @@ class Test::Unit::TestCase
 		@testdata = YAML::load(File.open(File.join(File.dirname(__FILE__), 'testdata.yml')))
 
 		# Initialise the test data (parse the dates, etc).
-		@testdata['historic_start'] = DateTime.parse(@testdata['historic_start'])
-		@testdata['historic_end'] = DateTime.parse(@testdata['historic_end'])
-		@testdata['historic_created_at'] = DateTime.parse(@testdata['historic_created_at'])
-		@testdata['push_created_at'] = DateTime.parse(@testdata['push_created_at'])
-		@testdata['push_last_request'] = DateTime.parse(@testdata['push_last_request'])
-		@testdata['push_last_success'] = DateTime.parse(@testdata['push_last_success'])
+		@testdata['historic_start'] = DateTime.parse(@testdata['historic_start'].to_s)
+		@testdata['historic_end'] = DateTime.parse(@testdata['historic_end'].to_s)
+		@testdata['historic_created_at'] = DateTime.parse(@testdata['historic_created_at'].to_s)
+		@testdata['push_created_at'] = DateTime.parse(@testdata['push_created_at'].to_s)
+		@testdata['push_last_request'] = DateTime.parse(@testdata['push_last_request'].to_s)
+		@testdata['push_last_success'] = DateTime.parse(@testdata['push_last_success'].to_s)
 		@testdata['historic_sources'] = @testdata['historic_sources'].split(',')
 
 		@user = DataSift::User.new(@config['username'], @config['api_key'])
@@ -43,9 +43,6 @@ class Test::Unit::TestCase
 				'progress' => 0,
 				'sources' => @testdata['historic_sources'],
 				'sample' => @testdata['historic_sample'],
-				'volume_info' => {
-					'digg' => 9
-				},
 			}
 		@user.api_client.setResponse(200, data.merge(changes), 200, 150)
 	end

data/test/test_definition.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require './' + File.dirname(__FILE__) + '/helper'
 
 class TestDefinition < Test::Unit::TestCase
 	context "Given an empty Definition object" do

data/test/test_historics.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require './' + File.dirname(__FILE__) + '/helper'
 
 class TestHistorics < Test::Unit::TestCase
 	context "Given a new Historic object from a stream hash" do

data/test/test_pushdefinition.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require './' + File.dirname(__FILE__) + '/helper'
 
 class TestPushDefinition < Test::Unit::TestCase
 	context "Given a new PushDefinition object" do

data/test/test_pushsubscription.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require './' + File.dirname(__FILE__) + '/helper'
 
 class TestPushSubscription < Test::Unit::TestCase
 	context "Given a new PushSubsription object" do

data/test/test_user.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require './' + File.dirname(__FILE__) + '/helper'
 
 class TestUser < Test::Unit::TestCase
 	context "Given a new User object" do

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: datasift
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: 
+  prerelease: false
   segments: 
   - 2
   - 0
-  - 2
-  version: 2.0.2
+  - 3
+  version: 2.0.3
 platform: ruby
 authors: 
 - DataSift
@@ -15,17 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-14 00:00:00 Z
+date: 2013-03-04 00:00:00 +00:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 1
         - 6
@@ -37,11 +35,9 @@ dependencies:
   name: yajl-ruby
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -53,11 +49,9 @@ dependencies:
   name: rdoc
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">"
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -67,11 +61,9 @@ dependencies:
   name: shoulda
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 37
         segments: 
         - 2
         - 11
@@ -83,11 +75,9 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 2
         - 6
@@ -158,6 +148,7 @@ files:
 - test/test_pushsubscription.rb
 - test/test_user.rb
 - test/testdata.yml
+has_rdoc: true
 homepage: http://github.com/datasift/datasift-ruby
 licenses: []
 
@@ -167,20 +158,16 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3
@@ -189,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: DataSift is a simple wrapper for the DataSift API.