datasift 1.3.1 → 1.4.0

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/README.md

@@ -18,6 +18,10 @@ If you're using the source you'll need to install the dependencies.
 
 sudo gem install yajl-ruby rest-client
 
+The library will use SSL connections by default. While we recommend using SSL
+you may disable it if required by passing false as the third parameter when
+creating a user, or by calling user.enableSSL(false) on the user object.
+
 Simple example
 --------------
 
@@ -52,6 +56,12 @@ more details.
 Changelog
 ---------
 
+* v.1.4.0 Added SSL support (2012-05-15)
+
+  This is enabled by default and can be disabled by passing false as the third
+  parameter to the User constructor, or calling enableSSL(false) on the User
+  object.
+
 * v.1.3.1 Exposed compile failures when getting the stream hash (2012-04-20)
 
 * v.1.3.0 Improved error handling (2012-03-08)

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.4.0

data/config.yml

@@ -1,2 +1,2 @@
-username: 3ft9
-api_key: 01af49102292e7cb67fef7eee30b81c2
+username: YOUR_USERNAME_HERE
+api_key: YOUR_API_KEY_HERE

data/datasift.gemspec

@@ -16,7 +16,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.3')
-	s.add_runtime_dependency('yajl-ruby', '~> 0.8.2')
+	s.add_runtime_dependency('yajl-ruby', '~> 1.1.0')
 	s.add_development_dependency('rdoc', '~> 0')
 	s.add_development_dependency('shoulda', '~> 2.11.3')
 	s.add_development_dependency('rspec', '~> 2.6.0')

data/lib/DataSift/apiclient.rb

@@ -27,9 +27,9 @@ module DataSift
 		# * +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
-		def call(username, api_key, endpoint, params = {}, user_agent = 'DataSiftPHP/0.0')
+		def call(username, api_key, endpoint, params = {}, user_agent = 'DataSiftPHP/0.0', ssl = true)
 			# Build the full endpoint URL
-			url = 'http://' + User::API_BASE_URL + endpoint
+			url = 'http' + (ssl ? 's' : '') + '://' + User::API_BASE_URL + endpoint
 
 			retval = {
 				'response_code' => 500,
@@ -47,6 +47,7 @@ module DataSift
 
 				# Parse the JSON response
 				retval['data'] = Yajl::Parser.parse(res)
+
 				# Rate limit headers
 				if (res.headers[:x_ratelimit_limit])
 					retval['rate_limit'] = res.headers[:x_ratelimit_limit]

data/lib/DataSift/mockapiclient.rb

@@ -45,7 +45,7 @@ module DataSift
 		# * +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
-		def call(username, api_key, endpoint, params = {}, user_agent = 'DataSiftPHP/0.0')
+		def call(username, api_key, endpoint, params = {}, user_agent = 'DataSiftPHP/0.0', use_ssl = true)
 			if !@response
 				raise StandardError, 'Expected response not set in mock object'
 			end

data/lib/DataSift/stream_consumer_http.rb

@@ -85,9 +85,10 @@ module DataSift
 			onStop(@stop_reason)
 		end
 
+	  private
+
 		def reconnect()
-			uri = URI.parse('http://' + User::STREAM_BASE_URL + @definition.hash +
-											'?username=' + CGI.escape(@user.username) + '&api_key=' + CGI.escape(@user.api_key))
+			uri = URI.parse('http' + (@user.use_ssl ? 's' : '') + '://' + User::STREAM_BASE_URL + @definition.hash)
 
 			user_agent = @user.getUserAgent()
 
@@ -95,6 +96,7 @@ module DataSift
 			request << "Host: #{uri.host}\r\n"
 			request << "User-Agent: #{user_agent}\r\n"
 			request << "Accept: */*\r\n"
+			request << "Auth: #{@user.username}:#{@user.api_key}\r\n"
 			request << "\r\n"
 
 			connection_delay = 0
@@ -107,7 +109,13 @@ module DataSift
 				sleep(connection_delay) if connection_delay > 0
 
 				begin
-					@socket = TCPSocket.new(uri.host, uri.port)
+					@raw_socket = TCPSocket.new(uri.host, uri.port)
+					if @user.use_ssl
+						@socket = OpenSSL::SSL::SSLSocket.new(@raw_socket)
+						@socket.connect
+					else
+						@socket = @raw_socket
+					end
 
 					@socket.write(request)
 					@response_head = {}
@@ -130,10 +138,12 @@ module DataSift
 						end
 					end
 
-					if @response_head[:code] == 200
+					if @response_head[:code].nil?
+						raise StreamError, 'Socket connection refused'
+					elsif @response_head[:code] == 200
 						# Success!
 						@state = StreamConsumer::STATE_RUNNING
-					elsif @response_head[:code] >= 400 && @response_head[:code] < 500 && @response_head[:code] != 420
+					elsif @response_head[:code] >= 399 && @response_head[:code] < 500 && @response_head[:code] != 420
 						line = ''
 						while !@socket.eof? && line.length < 10
 							line = @socket.gets
@@ -153,20 +163,21 @@ module DataSift
 							raise StreamError, 'Connection refused: ' + @response_head[:code] + ' ' + @response_head[:msg]
 						end
 					end
-				#rescue
-				#	if connection_delay == 0
-				#		connection_delay = 1
-				#	elsif connection_delay <= 16
-				#		connection_delay += 1
-				#	else
-				#		raise StreamError, 'Connection failed due to a network error'
-				#	end
+				rescue
+					if connection_delay == 0
+						connection_delay = 1
+					elsif connection_delay <= 16
+						connection_delay += 1
+					else
+						raise StreamError, 'Connection failed due to a network error'
+					end
 				end
 			end while @state != StreamConsumer::STATE_RUNNING
 		end
 
 		def disconnect()
 			@socket.close if !@socket.nil? and !@socket.closed?
+			@raw_socket.close if !@raw_socket.nil? and !@raw_socket.closed?
 		end
 
 	end

data/lib/DataSift/user.rb

@@ -19,11 +19,11 @@ module DataSift
 	# provides factory methods for all of the functionality in the API.
 	#
 	class User
-		USER_AGENT = 'DataSiftRuby/1.1.0';
+		USER_AGENT = 'DataSiftRuby/' + File.open(File.dirname(File.dirname(File.dirname(__FILE__))) + '/VERSION').first;
 		API_BASE_URL = 'api.datasift.com/';
 		STREAM_BASE_URL = 'stream.datasift.com/';
 
-		attr_reader :username, :api_key, :rate_limit, :rate_limit_remaining, :api_client
+		attr_reader :username, :api_key, :rate_limit, :rate_limit_remaining, :api_client, :use_ssl
 
 		# Constructor. A username and API key are required when constructing an
 		# instance of this class.
@@ -31,7 +31,7 @@ module DataSift
 		#
 		# * +username+ - The user's username
 		# * +api_key+ - The user's API key
-		def initialize(username, api_key)
+		def initialize(username, api_key, use_ssl = true)
 			username.strip!
 			api_key.strip!
 
@@ -41,6 +41,7 @@ module DataSift
 			@api_key = api_key
 			@rate_limit = -1;
 			@rate_limit_remaining = -1
+			@use_ssl = use_ssl
 		end
 
 		# Creates and returns a definition object.
@@ -87,6 +88,11 @@ module DataSift
 			@api_client = client
 		end
 
+		# Sets whether to use SSL for API and stream communication
+		def enableSSL(use_ssl = true)
+			@use_ssl = use_ssl
+		end
+
 		# Make a call to a DataSift API endpoint.
 		# === Parameters
 		#
@@ -97,7 +103,7 @@ module DataSift
 				@api_client = ApiClient.new()
 			end
 
-			res = @api_client.call(@username, @api_key, endpoint, params)
+			res = @api_client.call(@username, @api_key, endpoint, params, getUserAgent(), @use_ssl)
 
 			# Set up the return value
 			retval = res['data']

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: datasift
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
-  - 1
-  version: 1.3.1
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - DataSift
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-20 00:00:00 Z
+date: 2012-05-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client
@@ -41,12 +41,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 19
         segments: 
+        - 1
+        - 1
         - 0
-        - 8
-        - 2
-        version: 0.8.2
+        version: 1.1.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -106,6 +106,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- Gemfile
 - LICENSE
 - README.md
 - Rakefile