datasift 2.1.0.beta → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA512: 
-  metadata.gz: 02bf11099c9d26f748777eb250a2012e6ca492f03ea6463f15f0dacae1f6881452254ddd7b7e6328c8d4118b0f5ea6c4cf29d72db1d0cca83c6f373ff4248f2e
-  data.tar.gz: a81b1b1f678cf752e7178954d805f8389e4ffd022cb080abc34c3d448ab6290e38493800265a809b9a75355f60d1812ff9d5b4e17ecabc5350fc73614c7df762
-SHA1: 
-  metadata.gz: bf41f27515af94fb037c2525301e1a731c5e2416
-  data.tar.gz: 98567da3573cccd91e78618ef0ad65744c871016
+---
+SHA1:
+  metadata.gz: 92e4872a74f6f245bb7d0e9f900d246901746555
+  data.tar.gz: 6eb965a516cee414a520efcdabc3f91d8fab1bd0
+SHA512:
+  metadata.gz: 9c1b83f22e600973684d2dd5066c140c78c8157e3c78ad3323286917a27b771140624e37f889c45d593a7ac409e5210e3c2743567eacc589b0c6727a6f47ad1a
+  data.tar.gz: 8347b926ec9f2b6045578bd69c0b9eaa844459de7a59d635ceefc83d4932d254de7907358dd2c4e83640cc23b36ae8251c7e37a768f53b98f8abb3e85b7ef9c9

data/README.md

@@ -55,12 +55,21 @@ more details.
 
 Changelog
 ---------
+* v.2.1.0 Final fixes for v.2.1.0  (2013-09-13)
+
+  - Adds /source/log call
+  - Updated /source/create call to comply with latest version of the API
+  - Removed JSON gem - now dependant on Yajl-Ruby for JSON parsing
+  - Added license info to gemspec
+  - Fixed edge case when passing refresh token to authentication with G+ API
+  - Fixed /source/get call
+
 * v.2.1.0.beta Adding Managed Sources support. Thanks to [giovannelli](https://github.com/giovannelli) for the contribution (2013-08-05)
 
 * v.2.0.4 Bug fix to handle HTTP 202 response codes (2013-03-18)
 
 * 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.
@@ -77,7 +86,7 @@ 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
+  - 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.
 
@@ -85,18 +94,18 @@ Changelog
 
 * v.1.3.0 Improved error handling (2012-03-08)
 
-  Added onError and onWarning events - see examples/consume-stream.rb for an
+  - Added onError and onWarning events - see examples/consume-stream.rb for an
   example.
 
-  Stopped the HTTP consumer from attempting to reconnect when it receives a
+  - Stopped the HTTP consumer from attempting to reconnect when it receives a
   4xx response from the server.
 
 * v.1.2.0 Twitter Compliance (2012-02-28)
 
-  The consumer now has an onDeleted method to which you can assign a block
+  - The consumer now has an onDeleted method to which you can assign a block
   that will be called to handle DELETE requests from Twitter. See delete.rb
   in the examples folder for a sample implementation.
   (@see http://dev.datasift.com/docs/twitter-deletes)
 
-  NB: if you are storing tweets you must implement this method in your code
+  - NB: if you are storing tweets you must implement this method in your code
   and take appropriate action to maintain compliance with the Twitter license.

data/VERSION

@@ -1 +1 @@
-2.1.0.beta
+2.1.0

data/datasift.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |s|
 	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.license     = 'BSD'
 
 	s.platform                  = Gem::Platform::RUBY
 	s.rubygems_version          = %q{1.3.6}
@@ -17,7 +18,6 @@ Gem::Specification.new do |s|
 
 	s.add_runtime_dependency('rest-client', '~> 1.6.3')
 	s.add_runtime_dependency('yajl-ruby', '~> 1.1.0')
-	s.add_runtime_dependency('json', '~> 1.5.4')
 	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/historic.rb

@@ -93,7 +93,7 @@ module DataSift
 
 				# Convert and validate the parameters as required
 				hash = hash.hash if hash.is_a? DataSift::Definition
-				start_date = DateTime.strftime(start_date, '%s') unless start_date.is_a? Date
+				start_date = DateTime.strptime(start_date, '%s') unless start_date.is_a? Date
 				end_date = DateTime.strptime(end_date, '%s') unless end_date.is_a? Date
 				raise InvalidDataError, 'Please supply an array of sources' unless sources.kind_of?(Array)
 

data/lib/DataSift/managed_source.rb

@@ -1,4 +1,4 @@
-require 'json'
+require 'yajl/json_gem'
 ### Usage ###
 # user = DataSift::User.new(config['username'], config['api_key'])
 # user.createManagedSource(:token => "CAAIUKbXn8xsBAILlxGCZADEZAM87tRqJXo9OqWskCs6jej3wfQ1LRRZAgHJQEZCHU0ABBXDwiq9o7D4uytC5LpsAcx7oiDusagsJiKtmPaZBeMkuGh4jYt1zsXo4EQuZCWPcZAIdQQLZBtjTpQlbbAZCTuJ4SSrlmOPQZD", :source_type => "facebook_page", :name => "test", :parameters=> {:likes => true, :posts_by_others =>  true, :comments => true}, :resources => [{ :url =>  "http://www.facebook.com/theguardian", :title =>  "The Guardian", :id => 10513336322 } ] )
@@ -28,7 +28,7 @@ module DataSift
     attr_reader :auth
     #Api raw response
     attr_reader :raw_attributes
-    
+
     #Constructor. Pass all parameters to create a new Managed Source, or provide a User object and a managed_source_id to load an existing Managed Source from the API.
     #=== Parameters
     #* +user+ - The DataSift::User object.
@@ -44,9 +44,9 @@ module DataSift
         else
           @source_type = hash[:source_type]
           @name = hash[:name]
-          @token = hash[:token]
           @parameters = hash[:parameters]
           @resources = hash[:resources]
+          @auth = hash[:auth]
         end
       else
         # Fetching from the API
@@ -54,7 +54,7 @@ module DataSift
         reloadData()
       end
     end
-    
+
     #Get a single Managed Source by ID.
     #=== Parameters
     #* +id+ - The Managed Source ID.
@@ -63,13 +63,14 @@ module DataSift
     def self.get(user, managed_source_id)
       return new(user, user.callAPI('source/get', { 'id' => managed_source_id }))
     end
-    
-    def self.list(user, page = 1, per_page = 20)
+
+    def self.list(user, page = 1, per_page = 20, source_type = '')
       begin
         res = user.callAPI(
         'source/get', {
           'page' => page,
-          'max' => per_page
+          'per_page' => per_page,
+          'source_type' => source_type
           })
           retval = { 'count' => res['count'], 'managed_sources' => [] }
           for source in res['sources']
@@ -86,7 +87,7 @@ module DataSift
           end
         end
     end
-    
+
     #Call the DataSift API to create the Managed Source
     def create()
       raise InvalidDataError, 'This Managed Source has already been created' unless not @managed_source_id
@@ -98,7 +99,7 @@ module DataSift
           'name' => @name,
           'parameters' => @parameters.to_json,
           'resources' => @resources.to_json,
-          'auth' => [ 'parameters' => { 'value' => @token } ].to_json
+          'auth' => @auth.to_json
         })
         raise InvalidDataError, 'Prepared successfully but no managed_source_id ID in the response' unless res.has_key?('id')
         @managed_source_id = res['id']
@@ -132,7 +133,7 @@ module DataSift
         end
       end
     end
-     
+
     #Initialise this object from the data in a Hash.
  		#=== Parameters
     #* +data+ - The Hash containing the data.
@@ -158,15 +159,15 @@ module DataSift
 
       raise APIError, 'No parameters in the response' unless data.has_key?('parameters')
       @parameters = data['parameters']
-      
+
       raise APIError, 'No resources in the response' unless data.has_key?('resources')
       @resources = data['resources']
-      
+
       @raw_attributes = data
-      
+
       return true
     end
-     
+
     #Start this Managed Source query.
     def start()
       raise InvalidDataError, 'Cannot start a Managed souce query that hasn\'t been created' unless @managed_source_id
@@ -227,5 +228,36 @@ module DataSift
       end
     end
 
+    #Page through recent Managed Sources log entries
+    #=== Parameters
+    #* +page+ - The page number to get.
+    #* +per_page+ - The number of items per page.
+    #=== Returns
+    #A Hash containing...
+    #* +count+ - The total number of matching log entries.
+    #* +log_entries+ - An array of Hashes where each Hash is a log entry.
+    def getLogs(page = 1, per_page = 20)
+      begin
+        raise InvalidDataError, 'The specified page number is invalid' unless page >= 1
+        raise InvalidDataError, 'The specified per_page value is invalid' unless per_page >= 1
+
+        params = {
+          'id'        => @managed_source_id,
+          'page'      => page,
+          'per_page'  => per_page
+        }
+
+        return @user.callAPI('source/log', params)
+      rescue APIError => err
+        case err.http_code
+        when 400
+          # Missing or invalid parameters
+          raise InvalidDataError, err
+        else
+          raise APIError.new(err.http_code), 'Unexpected APIError code: ' + err.http_code.to_s + ' [' + err.message + ']'
+        end
+      end
+    end
+
   end
 end

data/lib/DataSift/user.rb

@@ -117,8 +117,19 @@ module DataSift
     #A Hash containing...
     #* +count+ - The total number of Managed Sources in your account.
     #* +managed_sources+ - An array of Hashes where each Hash is a managed source.
-    def listManagedSources(page = 1, per_page = 20)
-      return ManagedSource::list(self, page, per_page)
+    def listManagedSources(page = 1, per_page = 20, source_type = '')
+      return ManagedSource::list(self, page, per_page, source_type)
+    end
+
+    #Get the log entries for all Managed Sources or the given Managed Source.
+    #=== Parameters
+    #* +managed_source_id+ - Optional Managed Source ID.
+    #=== Returns
+    #A Hash containing...
+    #* +count+ - The total number of matching log entries.
+    #* +log_entries+ - An array of Hashes where each Hash is a log entry.
+    def getManagedSourcesLog(managed_source_id, page = 1, per_page = 20)
+      return getManagedSource(managed_source_id).getLogs(page = 1, per_page = 20)
     end
 
     #Create a new PushDefinition object for this user.

metadata

@@ -1,86 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: datasift
-version: !ruby/object:Gem::Version 
-  version: 2.1.0.beta
+version: !ruby/object:Gem::Version
+  version: 2.1.0
 platform: ruby
-authors: 
+authors:
 - DataSift
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-08-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-09-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rest-client
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.6.3
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.3
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.5.4
-  type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
   name: rdoc
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>'
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>'
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.11.3
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.3
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  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: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+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.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -136,33 +143,30 @@ files:
 - test/test_user.rb
 - test/testdata.yml
 homepage: http://github.com/datasift/datasift-ruby
-licenses: []
-
+licenses:
+- BSD
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.1.2
 signing_key: 
 specification_version: 4
 summary: DataSift is a simple wrapper for the DataSift API.
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_definition.rb
 - test/test_historics.rb