datasift 1.5.0 → 2.0.0

data/test/test_pushsubscription.rb

@@ -0,0 +1,17 @@
+require 'helper'
+
+class TestPushSubscription < Test::Unit::TestCase
+	context "Given a new PushSubsription object" do
+		setup do
+			init()
+			# Get a subscription from the API
+			setResponseToASingleSubscription()
+			@subscription = @user.getPushSubscription(@testdata['push_id'])
+		end
+
+		should "be of the right type" do
+			assert_not_nil @subscription
+			assert @subscription.kind_of?(DataSift::PushSubscription)
+		end
+	end
+end

data/test/test_user.rb

@@ -4,7 +4,6 @@ class TestUser < Test::Unit::TestCase
 	context "Given a new User object" do
 		setup do
 			init()
-			initUser()
 		end
 
 		should "have the correct username" do
@@ -43,7 +42,6 @@ class TestUser < Test::Unit::TestCase
 	context "Given an empty definition from the User factory" do
 		setup do
 			init()
-			initUser()
 			@definition = @user.createDefinition()
 		end
 
@@ -56,7 +54,6 @@ class TestUser < Test::Unit::TestCase
 	context "Given an new definition from the User factory" do
 		setup do
 			init()
-			initUser()
 			@definition = @user.createDefinition("   " + @testdata['definition'])
 		end
 
@@ -69,7 +66,6 @@ class TestUser < Test::Unit::TestCase
   context "#getBalance" do
     setup do
       init()
-      initUser()
       @user.api_client.setResponse(200, {
         'balance' => {
           'plan' => 'payg',
@@ -88,7 +84,6 @@ class TestUser < Test::Unit::TestCase
 	context "Given a call has been made to the API" do
 		setup do
 			init()
-			initUser()
 			@definition = @user.createDefinition(@testdata['definition'])
 			@user.api_client.setResponse(200, {
 				'hash'       => @testdata['definition_hash'],
@@ -110,7 +105,6 @@ class TestUser < Test::Unit::TestCase
 	context "The exception raised by the User.getUsage method" do
 		setup do
 			init()
-			initUser()
 		end
 
 		should "be APIError given a 400 response" do

data/test/testdata.yml

@@ -2,3 +2,29 @@ definition: interaction.content contains "twitter"
 definition_hash: b76b06db8a679d2b4319e5d06a8b6691
 
 invalid_definition: interactin.content contains "twitter"
+
+# Historic
+historic_playback_id: 93558e17de15072fa126370c37c5bd8f
+historic_start: 2012-06-01 00:00:00
+historic_end: 2012-06-01 23:59:59
+historic_created_at: 2012-08-01 12:00:00
+historic_sources: twitter
+historic_sample: 10.0
+historic_name: Historic for unit tests
+
+# PushSubscription
+push_id: b665761917bbcb7afd3102b4a645b41e
+push_name: Push subscription for unit tests
+push_created_at: 2012-07-20 00:00:00
+push_status: active
+push_hash_type: stream
+push_last_request: 2012-07-20 07:10:00
+push_last_success: 2012-07-20 07:00:00
+push_output_type: http
+push_output_params:
+  delivery_frequency: 60
+  max_size: 10240
+  url: http://www.example.com/push_endpoint
+  auth_type: basic
+  auth_username: myuser
+  auth_password: mypass

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: datasift
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
+  prerelease: false
   segments: 
-  - 1
-  - 5
+  - 2
+  - 0
   - 0
-  version: 1.5.0
+  version: 2.0.0
 platform: ruby
 authors: 
 - DataSift
@@ -15,17 +14,16 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-24 00:00:00 Z
+date: 2012-08-31 00:00:00 +01: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
@@ -118,20 +108,47 @@ files:
 - examples/dpu.rb
 - examples/football-buffered.rb
 - examples/football.rb
+- examples/historics.sh
+- examples/historics/create-from-csdl.rb
+- examples/historics/create-from-hash.rb
+- examples/historics/delete.rb
+- examples/historics/env.rb
+- examples/historics/list.rb
+- examples/historics/start.rb
+- examples/historics/stop.rb
+- examples/historics/view.rb
+- examples/push.sh
+- examples/push/delete.rb
+- examples/push/env.rb
+- examples/push/list.rb
+- examples/push/pause.rb
+- examples/push/push-from-hash.rb
+- examples/push/push-historic-from-csdl.rb
+- examples/push/push-stream-from-csdl.rb
+- examples/push/resume.rb
+- examples/push/stop.rb
+- examples/push/view-log.rb
+- examples/push/view.rb
 - examples/twitter-track.rb
 - lib/DataSift/apiclient.rb
 - lib/DataSift/definition.rb
 - lib/DataSift/exceptions.rb
+- lib/DataSift/historic.rb
 - lib/DataSift/mockapiclient.rb
+- lib/DataSift/push_definition.rb
+- lib/DataSift/push_subscription.rb
 - lib/DataSift/stream_consumer.rb
 - lib/DataSift/stream_consumer_http.rb
 - lib/DataSift/user.rb
 - lib/datasift.rb
 - test/helper.rb
 - test/test_definition.rb
-- test/test_live_api.rb
+- test/test_historics.rb
+- test/test_pushdefinition.rb
+- test/test_pushsubscription.rb
 - test/test_user.rb
 - test/testdata.yml
+has_rdoc: true
 homepage: http://github.com/datasift/datasift-ruby
 licenses: []
 
@@ -141,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
@@ -163,13 +176,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 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_historics.rb
+- test/test_pushdefinition.rb
+- test/test_pushsubscription.rb
 - test/test_user.rb
 - test/testdata.yml

data/test/test_live_api.rb

@@ -1,100 +0,0 @@
-require 'helper'
-
-class TestDefinitionLive < Test::Unit::TestCase
-	context "Given a Definition object with a valid CSDL" do
-		setup do
-			init()
-			initUser(false)
-			@user = DataSift::User.new(@config['username'], @config['api_key'])
-			@definition = @user.createDefinition(@testdata['definition'])
-		end
-
-		should "compile the definition successfully" do
-			begin
-				@definition.compile()
-			rescue InvalidDataError
-				assert false, "InvalidDataError"
-			rescue CompileFailedError
-				assert false, "CompileFailedError"
-			rescue APIError
-				assert false, "APIError"
-			end
-		end
-
-		should "have the correct hash" do
-			@definition.compile()
-			assert_equal @testdata['definition_hash'], @definition.hash
-		end
-
-		should "have a positive DPU" do
-			@definition.compile()
-			assert @definition.total_dpu > 0
-		end
-
-		should "have a valid created_at date" do
-			@definition.compile()
-			assert @definition.created_at
-		end
-	end
-
-	context "Given a Definition object with an invalid CSDL" do
-		setup do
-			init()
-			initUser(false)
-			@definition = @user.createDefinition(@testdata['invalid_definition'])
-		end
-
-		should "fail to compile the definition" do
-			assert_raise(DataSift::CompileFailedError) { @definition.compile() }
-		end
-
-		should "fail to get the hash" do
-			assert_raise(DataSift::CompileFailedError) { @definition.compile() }
-			assert_raise(DataSift::CompileFailedError) { @definition.hash }
-		end
-	end
-
-	context "The DPU returned from a valid Definition object" do
-		setup do
-			init()
-			initUser(false)
-			@definition = @user.createDefinition(@testdata['definition'])
-			@dpu = @definition.getDPUBreakdown()
-		end
-
-		should "contain valid DPU data" do
-			assert @dpu.has_key?('detail')
-			assert @dpu.has_key?('dpu')
-		end
-
-		should "have a positive total DPU" do
-			assert @dpu['dpu'] > 0
-		end
-	end
-
-	context "Buffered data returned by a valid Definition object" do
-		setup do
-			init()
-			initUser(false)
-			@definition = @user.createDefinition(@testdata['definition'])
-			@interactions = @definition.getBuffered()
-		end
-
-		should "be valid" do
-			assert @interactions
-		end
-	end
-
-	context "A StreamConsumer object returned by a valid Definition object" do
-		setup do
-			init()
-			initUser(false)
-			@definition = @user.createDefinition(@testdata['definition'])
-			@consumer = @definition.getConsumer()
-		end
-
-		should "be valid" do
-			assert @consumer.is_a? DataSift::StreamConsumer
-		end
-	end
-end