datasift 2.0.1 → 2.0.2

data/README.md

@@ -19,7 +19,7 @@ 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 r§equired by passing false as the third parameter when
+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
@@ -56,6 +56,8 @@ more details.
 Changelog
 ---------
 
+* 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)
 
 * v.2.0.0 Added support for Historics queries and Push delivery (2012-08-31)

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.0.2

data/examples/historics/create-from-csdl.rb

@@ -11,18 +11,18 @@ def usage(message = '', end_of_story = true)
 	puts message + '\n' unless message.length() == 0
 	puts
 	puts 'Usage: create-from-csdl <username> <api_key> \\'
-	puts '            <csdl_filename> <start> <end> <sources> <name> <sample>'
+	puts '            <csdl_filename> <start> <end> <sources> <sample> <name>'
 	puts
 	puts 'Where: csdl_filename = the stream hash the query should run'
 	puts '       start         = the start date for the query (YYYYMMDDHHMMSS)'
 	puts '       end           = the end date for the query (YYYYMMDDHHMMSS)'
 	puts '       sources       = comma separated list of data sources (e.g. twitter)'
-	puts '       name          = a friendly name for the query'
 	puts '       sample        = the sample rate'
+	puts '       name          = a friendly name for the query'
 	puts
 	puts 'Example'
 	puts '       create-from-csdl csdl.txt 20120101000000 20120101235959 \\'
-	puts '                      twitter HistoricsQuery123 100'
+	puts '                      twitter 100 HistoricsQuery123'
 	puts
 	exit 1 unless not end_of_story
 end
@@ -42,8 +42,8 @@ csdl_filename = env.args[0]
 start_date    = env.args[1]
 end_date      = env.args[2]
 sources       = env.args[3].split(',')
-name          = env.args[4]
-sample        = env.args[5]
+sample        = env.args[4]
+name          = env.args[5]
 
 # Parse the dates
 start_date = DateTime.strptime(start_date, '%Y%m%d%H%M%S')
@@ -57,7 +57,7 @@ begin
 	definition = env.user.createDefinition(csdl)
 
 	# Create the Historics query
-	historic = definition.createHistoric(start_date, end_date, sources, name, sample)
+	historic = definition.createHistoric(start_date, end_date, sources, sample, name)
 
 	# Prepare the query
 	historic.prepare()

data/examples/historics/create-from-hash.rb

@@ -11,18 +11,18 @@ def usage(message = '', end_of_story = true)
 	puts message + '\n' unless message.length() == 0
 	puts
 	puts 'Usage: create-from-hash \\'
-	puts '            <username> <api_key> <hash> <start> <end> <sources> <name> <sample>'
+	puts '            <username> <api_key> <hash> <start> <end> <sources> <sample> <name>'
 	puts
 	puts 'Where: hash    = the stream hash the query should run'
 	puts '       start   = the start date for the query (YYYYMMDDHHMMSS)'
 	puts '       end     = the end date for the query (YYYYMMDDHHMMSS)'
 	puts '       sources = comma separated list of data sources (e.g. twitter)'
-	puts '       name    = a friendly name for the query'
 	puts '       sample  = the sample rate'
+	puts '       name    = a friendly name for the query'
 	puts
 	puts 'Example'
 	puts '       create-from-hash <hash> 20120101000000 20120101235959 \\'
-	puts '                      twitter HistoricsQuery123 100'
+	puts '                      twitter 100 HistoricsQuery123'
 	puts
 	exit 1 unless not end_of_story
 end
@@ -42,8 +42,8 @@ stream_hash = env.args[0]
 start_date  = env.args[1]
 end_date    = env.args[2]
 sources     = env.args[3].split(',')
-name        = env.args[4]
-sample      = env.args[5]
+sample      = env.args[4]
+name        = env.args[5]
 
 # Parse the dates
 start_date = DateTime.strptime(start_date, '%Y%m%d%H%M%S')
@@ -51,7 +51,7 @@ end_date   = DateTime.strptime(end_date,   '%Y%m%d%H%M%S')
 
 begin
 	# Create the Historics query
-	historic = env.user.createHistoric(stream_hash, start_date, end_date, sources, name, sample)
+	historic = env.user.createHistoric(stream_hash, start_date, end_date, sources, sample, name)
 
 	# Prepare the query
 	historic.prepare()

data/examples/push/push-stream-from-csdl.rb

@@ -14,7 +14,7 @@ require File.dirname(__FILE__) + '/env'
 def usage(message = '', end_of_story = true)
 	puts message + '\n' unless message.length() == 0
 	puts
-	puts 'Usage: push-stream-from-csdl.py <username> <api_key> \\'
+	puts 'Usage: push-stream-from-csdl.rb <username> <api_key> \\'
 	puts '              <csdl_filename> <output_type> <name> ...'
 	puts
 	puts 'Where: csdl_filename = a file containing the CSDL'
@@ -23,7 +23,7 @@ def usage(message = '', end_of_story = true)
 	puts '       key=val       = output_type-specific arguments'
 	puts
 	puts 'Example'
-	puts '       push-stream-from-csdl.py csdl.txt http PushName delivery_frequency=10 \\'
+	puts '       push-stream-from-csdl.rb csdl.txt http PushName delivery_frequency=10 \\'
 	puts '             url=http://www.example.com/push_endpoint auth.type=none'
 	puts
 	exit 1 unless not end_of_story

data/lib/DataSift/historic.rb

@@ -212,7 +212,8 @@ module DataSift
 						'start' => Integer(@start_date.strftime('%s')),
 						'end' => Integer(@end_date.strftime('%s')),
 						'name' => @name,
-						'sources' => @sources.join(',')
+						'sources' => @sources.join(','),
+						'sample' => @sample
 					})
 
 				raise InvalidDataError, 'Prepared successfully but no playback ID in the response' unless res.has_key?('id')

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: datasift
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - DataSift
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-03 00:00:00 Z
+date: 2012-12-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rest-client