gnip-client 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c00b958351fc744e8b4c1784a75149efbbdc471
-  data.tar.gz: '0619daee59e0e23ebe2effca3b803bc901a05bba'
+  metadata.gz: 10d62de62aef3c39ccb8e252fdc2a96475eccd6b
+  data.tar.gz: ce806b0202a126ea6d6a1ee8fda9783c4f56e909
 SHA512:
-  metadata.gz: 5af9a3ab2012c761c7af1d3f9f676746504fd7404c6f3c8d3f3497077a96f6e2b2c255aa1dfba479fcf40de9dece4aac2a1e0996678a84b21491e1450551562e
-  data.tar.gz: e98a1441eb81a7dffe40f55711aa58ecaa450f2bc366259e406ace0e81321483554223373bec64e2eb56d468581333ac481833ca68bf06ed275349e2dd5c1570
+  metadata.gz: 2ba8c066c65f17053cdd5b3272c68f10f6f33b3c0f34ee9fe3d6a84f3f9a12df7f36050a776f93dbe55d11bbb3445b7d661912c9c9578f4b27f49b28e08fa9ad
+  data.tar.gz: 3101f09f806928ee1b7ba400494885590bb071b7f84a6979dbfc46a6185d16e8e72ada65322c10255f6a74c46b125d38897ec8da4f4d979ee899f1ad75f01af3

data/lib/gnip/gnip-full-archive/full_archive.rb

@@ -1,21 +1,21 @@
 module Gnip
   module GnipFullArchive
     class FullArchive
-    
+
       class InvalidRequestException < StandardError; end
-      
+
       include HTTParty
-      
+
       attr_reader :search_url, :counts_url
-    
+
       #alias :total :total_entries
-      
+
       def initialize(client)
         @search_url = "https://data-api.twitter.com/search/fullarchive/accounts/#{client.account}/#{client.label}.json"
         @counts_url = "https://data-api.twitter.com/search/fullarchive/accounts/#{client.account}/#{client.label}/counts.json"
         @auth = { username: client.username, password: client.password }
       end
-          
+
       # Search using the full-archive search endpoint return an hash containing up to 500 results and the cursor to the next page
       # options[:query] query to twitter
       # options[:per_page] default is 500
@@ -28,7 +28,7 @@ module Gnip
         search_options[:maxResults]  = options[:per_page]||500
         search_options[:fromDate]    = Gnip.format_date(options[:date_from]) if options[:date_from]
         search_options[:toDate]      = Gnip.format_date(options[:date_to]) if options[:date_to]
-        search_options[:next]         = options[:next_cursor] if options[:next_cursor]  
+        search_options[:next]         = options[:next_cursor] if options[:next_cursor]
         url = [self.search_url, search_options.to_query].join('?')
         begin
           gnip_call = self.class.get(url, basic_auth: @auth)
@@ -46,7 +46,7 @@ module Gnip
         end
         return response
       end
-    
+
       # full aarchive search endpoints return total contents by day, minute, hour paginated
       # so to get totals across time period passed may need to run more than one call, the stop condition is cursor nil
       # bucket: must be one of [minute, hour, day]
@@ -60,7 +60,7 @@ module Gnip
         search_options[:next]     = options[:next_cursor] if options[:next_cursor]
 
         url = [self.counts_url, search_options.to_query].join('?')
-      
+
         begin
           gnip_call = self.class.get(url, basic_auth: @auth)
 
@@ -72,7 +72,7 @@ module Gnip
           if parsed_response[:error].present?
             response = { results: [], next: nil, error: parsed_response[:error][:message], code: gnip_call.response.code.to_i, calls: (response[:calls]||0) + 1 }
           else
-            parsed_response[:results].each_with_index do |item, i| 
+            parsed_response[:results].each_with_index do |item, i|
               parsed_response[:results][i] = item.merge(timePeriod: DateTime.parse(item[:timePeriod]).to_s)
             end
             response = { results: (response[:results]||[]) + parsed_response[:results], next: parsed_response[:next], code: gnip_call.response.code.to_i, calls: (response[:calls]||0) + 1 }
@@ -80,7 +80,9 @@ module Gnip
         rescue Exception => e
           response = { results: [], next: nil, error: e.message, code: 500 }
         end
-        return response if !parsed_response[:next].to_s.present?
+        # If the next cursor is not present we fetched all the data
+        # It happens that twitter returns the same cursor, in that case we stop
+        return response if !parsed_response[:next].to_s.present? || (parsed_response[:next].to_s.present? && parsed_response[:next] == search_options[:next])
 
         total_by_time_period(query: search_options[:query],
                              date_from: search_options[:fromDate],
@@ -89,7 +91,7 @@ module Gnip
                              next_cursor: parsed_response[:next],
                              response: response)
       end
-  
+
       # return total contents in a specific date interval with a passed query
       def total(options={})
         extra = {}
@@ -97,8 +99,8 @@ module Gnip
         extra = { error: response[:error] } if response[:error].present?
         return  { query: options[:query], total: response[:results].map{|item| item[:count]}.reduce(:+) }.merge!(extra)
       end
-    
+
     end
-  
+
   end
 end

data/lib/gnip/version.rb

@@ -1,3 +1,3 @@
 module Gnip
-  VERSION = '0.2.7'
+  VERSION = '0.2.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gnip-client
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Duccio Giovannelli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-24 00:00:00.000000000 Z
+date: 2018-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler