datasift 1.0.0 → 1.1.0

data/README.md

@@ -10,6 +10,13 @@ Install Instructions
 
 sudo gem install datasift
 
+Dependencies
+------------
+
+If you're using the source you'll need to install the dependencies.
+
+sudo gem install yajl-ruby json rest-client
+
 Simple example
 --------------
 
@@ -33,6 +40,6 @@ See the DataSift documentation for full details of the data contained within eac
 License
 -------
 
-All code contained in this repository is Copyright 2011 MediaSift Ltd.
+All code contained in this repository is Copyright 2011-2012 MediaSift Ltd.
 
 This code is released under the BSD license. Please see the LICENSE file for more details.

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/datasift.gemspec

@@ -2,27 +2,27 @@
 $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
-	s.name				= 'datasift'
-	s.version			= File.open('VERSION').first
+	s.name			= 'datasift'
+	s.version		= File.open('VERSION').first
 
-	s.authors			= ['MediaSift']
-	s.email				= ['support@datasift.net']
-	s.description = %q{The official Ruby library for accessing the DataSift API. See http://datasift.net/ for full details and to sign up for an account.}
-	s.summary			= %q{DataSit is a simple wrapper for the DataSift API.}
-	s.homepage		= 'http://github.com/mediasift/datasift-ruby'
+	s.authors		= ['DataSift']
+	s.email			= ['support@datasift.net']
+	s.description	= %q{The official Ruby library for accessing the DataSift API. See http://datasift.com/ for full details and to sign up for an account.}
+	s.summary		= %q{DataSift is a simple wrapper for the DataSift API.}
+	s.homepage		= 'http://github.com/datasift/datasift-ruby'
 
-	s.platform									= Gem::Platform::RUBY
-	s.rubygems_version					= %q{1.3.6}
-	s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
+	s.platform					= Gem::Platform::RUBY
+	s.rubygems_version			= %q{1.3.6}
+	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('crack', '~> 0')
+	s.add_runtime_dependency('json', '~> 1')
 	s.add_runtime_dependency('yajl-ruby', '~> 0.8.2')
 	s.add_development_dependency('rdoc', '~> 0')
 	s.add_development_dependency('shoulda', '~> 2.11.3')
 	s.add_development_dependency('rspec', '~> 2.6.0')
 
-	s.files	        = `git ls-files`.split("\n")
-	s.test_files		= `git ls-files -- {test,spec,features}/*`.split("\n")
+	s.files			= `git ls-files`.split("\n")
+	s.test_files	= `git ls-files -- {test,spec,features}/*`.split("\n")
 	s.require_paths = ["lib"]
 end

data/examples/consume-stream.rb

@@ -19,6 +19,7 @@ end
 require File.dirname(__FILE__) + '/../lib/datasift'
 
 # Include the configuration - put your username and API key in this file
+require 'yaml'
 config = YAML::load(File.open(File.join(File.dirname(__FILE__), '..', 'config.yml')))
 
 # Authenticate

data/examples/dpu.rb

@@ -21,6 +21,7 @@ def number_with_delimiter(number, delimiter=',')
 end
 
 # Include the configuration - put your username and API key in this file
+require 'yaml'
 config = YAML::load(File.open(File.join(File.dirname(__FILE__), '..', 'config.yml')))
 
 # Get the CSDL from the command line or STDIN

data/examples/football-buffered.rb

@@ -13,6 +13,7 @@
 require File.dirname(__FILE__) + '/../lib/datasift'
 
 # Include the configuration - put your username and API key in this file
+require 'yaml'
 config = YAML::load(File.open(File.join(File.dirname(__FILE__), '..', 'config.yml')))
 
 # Authenticate

data/examples/football.rb

@@ -13,6 +13,7 @@
 require File.dirname(__FILE__) + '/../lib/datasift'
 
 # Include the configuration - put your username and API key in this file
+require 'yaml'
 config = YAML::load(File.open(File.join(File.dirname(__FILE__), '..', 'config.yml')))
 
 # Authenticate

data/examples/twitter-track.rb

@@ -21,6 +21,7 @@ end
 require File.dirname(__FILE__) + '/../lib/datasift'
 
 # Include the configuration - put your username and API key in this file
+require 'yaml'
 config = YAML::load(File.open(File.join(File.dirname(__FILE__), '..', 'config.yml')))
 
 # Authenticate

data/lib/DataSift/apiclient.rb

@@ -9,7 +9,7 @@
 # DataSift API.
 
 require 'rest_client'
-require 'crack'
+require 'json'
 
 module DataSift
 	# ApiCLient class.
@@ -46,7 +46,7 @@ module DataSift
 				retval['response_code'] = 200
 
 				# Parse the JSON response
-				retval['data'] = Crack::JSON.parse(res)
+				retval['data'] = JSON.parse(res)
 
 				# Rate limit headers
 				if (res.headers[:x_ratelimit_limit])
@@ -61,7 +61,7 @@ module DataSift
 				retval['response_code'] = err.http_code
 
 				# And set the data
-				retval['data'] = Crack::JSON.parse(err.response)
+				retval['data'] = JSON.parse(err.response)
 			end
 
 			retval

data/lib/DataSift/definition.rb

@@ -109,7 +109,7 @@ module DataSift
 				when 400
 					raise CompileFailedError, err
 				else
-					raise CompileFailedError, 'Unexpected APIError code: ' + err.http_code.to_s + ' [' + err + ']'
+					raise CompileFailedError, 'Unexpected APIError code: ' + err.http_code.to_s + ' [' + err.inspect + ']'
 				end
 			end
 		end

data/lib/DataSift/stream_consumer_http.rb

@@ -12,6 +12,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../')
 require 'uri'
 require 'socket'
 require 'yajl'
+require 'cgi'
 
 module DataSift
 
@@ -31,7 +32,7 @@ module DataSift
 				if @response_head[:headers]["Transfer-Encoding"] == 'chunked'
 					if block_given?
 						chunkLeft = 0
-						while !@socket.eof? && (line = @socket.gets)
+						while !@socket.eof? && (line = @socket.gets) && @state == StreamConsumer::STATE_RUNNING
 							break if line.match /^0.*?\r\n/
 							next if line == "\r\n"
 							size = line.hex

data/lib/DataSift/user.rb

@@ -9,9 +9,6 @@
 # API interactions by creating an instance of this class. Once initialised it
 # provides factory methods for all of the functionality in the API.
 
-require 'rest_client'
-require 'crack'
-
 module DataSift
 	# User class.
 	#
@@ -22,7 +19,7 @@ module DataSift
 	# provides factory methods for all of the functionality in the API.
 	#
 	class User
-		USER_AGENT = 'DataSiftRuby/0.3.0';
+		USER_AGENT = 'DataSiftRuby/1.1.0';
 		API_BASE_URL = 'api.datasift.com/';
 		STREAM_BASE_URL = 'stream.datasift.com/';
 

metadata

@@ -1,90 +1,112 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: datasift
-version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 0
+  version: 1.1.0
 platform: ruby
-authors:
-- MediaSift
+authors: 
+- DataSift
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-21 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-02-24 00:00:00 +00:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rest-client
-  requirement: &8779460 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 6
+        - 3
         version: 1.6.3
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json
   prerelease: false
-  version_requirements: *8779460
-- !ruby/object:Gem::Dependency
-  name: crack
-  requirement: &8778640 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        version: "1"
   type: :runtime
-  prerelease: false
-  version_requirements: *8778640
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: yajl-ruby
-  requirement: &8777980 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 8
+        - 2
         version: 0.8.2
   type: :runtime
-  prerelease: false
-  version_requirements: *8777980
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &8777260 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *8777260
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: shoulda
-  requirement: &8776460 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 11
+        - 3
         version: 2.11.3
   type: :development
-  prerelease: false
-  version_requirements: *8776460
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &8775820 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 6
+        - 0
         version: 2.6.0
   type: :development
-  prerelease: false
-  version_requirements: *8775820
-description: The official Ruby library for accessing the DataSift API. See http://datasift.net/
-  for full details and to sign up for an account.
-email:
+  version_requirements: *id006
+description: The official Ruby library for accessing the DataSift API. See http://datasift.com/ for full details and to sign up for an account.
+email: 
 - support@datasift.net
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - LICENSE
 - README.md
 - Rakefile
@@ -109,28 +131,41 @@ files:
 - test/test_live_api.rb
 - test/test_user.rb
 - test/testdata.yml
-homepage: http://github.com/mediasift/datasift-ruby
+has_rdoc: true
+homepage: http://github.com/datasift/datasift-ruby
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: DataSit is a simple wrapper for the DataSift API.
-test_files: []
+summary: DataSift is a simple wrapper for the DataSift API.
+test_files: 
+- test/helper.rb
+- test/test_definition.rb
+- test/test_live_api.rb
+- test/test_user.rb
+- test/testdata.yml