gnip-client 0.2.8 → 0.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 10d62de62aef3c39ccb8e252fdc2a96475eccd6b
-  data.tar.gz: ce806b0202a126ea6d6a1ee8fda9783c4f56e909
+SHA256:
+  metadata.gz: 9532acf9b31580567a9a5f08a890c69f3257fbe857c8ddcad47d3756f424ce35
+  data.tar.gz: cdb63f1eb9928c4a9629fd464875d2117aadb38823d5cc1bcd5d467dfb87c748
 SHA512:
-  metadata.gz: 2ba8c066c65f17053cdd5b3272c68f10f6f33b3c0f34ee9fe3d6a84f3f9a12df7f36050a776f93dbe55d11bbb3445b7d661912c9c9578f4b27f49b28e08fa9ad
-  data.tar.gz: 3101f09f806928ee1b7ba400494885590bb071b7f84a6979dbfc46a6185d16e8e72ada65322c10255f6a74c46b125d38897ec8da4f4d979ee899f1ad75f01af3
+  metadata.gz: 8f42e308a70a49c6068e3f7184be2366f8d0cb5b790020b24895a836d748404195745ae22cff2546379eebc142a44392f747bb44d50b98c96832560cb00515ab
+  data.tar.gz: 567b32506f5df10732acfe0694bba4ecd222a37a08e42ec8be20693510fa3057208cb7b9920a6e817a4cdfbaf97ca48bc31b3affe6ad10a423d838b50cde1286

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 .idea/
+TAGS

data/.ruby-version

@@ -1 +1 @@
-2.3.3
+2.6.1

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
-  - 2.2.1
-  - 2.2.2
-  - 2.3.3
+  - 2.6.1
+script:
+  - bundle exec rspec spec
+cache: bundler

data/gnip.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'gnip/version'
 
@@ -9,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ['Duccio Giovannelli']
   spec.email         = ['giovannelli@extendi.it']
 
-  spec.summary       = %q{A Ruby library for accessing the Gnip API. See https://gnip.com/ for full details and to sign up for an account.}
+  spec.summary       = 'A Ruby library for accessing the Gnip API. See https://gnip.com/ for full details and to sign up for an account.'
   spec.homepage      = 'https://github.com/giovannelli/gnip-client'
   spec.license       = 'MIT'
 
@@ -19,11 +20,11 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler', '~> 1.9'
-  spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'pry', '~> 0'
-  spec.add_development_dependency 'rspec', '~> 0'
-  
-  spec.add_dependency 'httparty', '~> 0'
-  spec.add_dependency 'em-http-request', '~> 1'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3'
+
   spec.add_dependency 'activesupport', '>= 4.2'
+  spec.add_dependency 'em-http-request', '~> 1'
+  spec.add_dependency 'httparty', '~> 0.16.4'
 end

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

@@ -1,14 +1,15 @@
+# frozen_string_literal: true
+
 module Gnip
   module GnipFullArchive
     class FullArchive
-
       class InvalidRequestException < StandardError; end
 
       include HTTParty
 
       attr_reader :search_url, :counts_url
 
-      #alias :total :total_entries
+      # alias :total :total_entries
 
       def initialize(client)
         @search_url = "https://data-api.twitter.com/search/fullarchive/accounts/#{client.account}/#{client.label}.json"
@@ -24,61 +25,75 @@ module Gnip
       # options[:cursor_next] cursor to the next page
       def search(options = {})
         search_options = {}
-        search_options[:query] = options[:query]||''
-        search_options[:maxResults]  = options[:per_page]||500
+        search_options[:query] = options[:query] || ''
+        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]
-        url = [self.search_url, search_options.to_query].join('?')
+        search_options[:next] = options[:next_cursor] if options[:next_cursor]
+        url = [search_url, search_options.to_query].join('?')
         begin
           gnip_call = self.class.get(url, basic_auth: @auth)
           response = gnip_call.response
           parsed_response = gnip_call.parsed_response
-          parsed_response = (parsed_response||{}).with_indifferent_access
-          raise response.message if !parsed_response.present?
+          parsed_response = (parsed_response || {}).with_indifferent_access
+          raise response.message unless parsed_response.present?
+
           if parsed_response[:error].present?
-            response = { results: [], next: nil, error: parsed_response[:error][:message], code: response.code.to_i }
+            response = { results: [],
+                         next: nil,
+                         url: url,
+                         error: parsed_response[:error][:message],
+                         code: response.code.to_i }
           else
-            response = { results: parsed_response[:results], next: parsed_response[:next], code: response.code.to_i }
+            response = { results: parsed_response[:results],
+                         url: url,
+                         next: parsed_response[:next],
+                         code: response.code.to_i }
           end
-        rescue Exception => e
-          response = { results: [], next: nil, error: e.message, code: 500 }
+        rescue StandardError => e
+          response = { results: [],
+                       url: url,
+                       next: nil,
+                       error: e.message,
+                       code: 500 }
         end
-        return response
+        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]
-      def total_by_time_period(options={})
-        response = options[:response]||{}
+      def total_by_time_period(options = {})
+        response = options[:response] || {}
         search_options = {}
-        search_options[:query]    = options[:query]||''
-        search_options[:bucket]   = options[:bucket]||'day'
+        search_options[:query]    = options[:query] || ''
+        search_options[:bucket]   = options[:bucket] || 'day'
         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]
 
-        url = [self.counts_url, search_options.to_query].join('?')
+        url = [counts_url, search_options.to_query].join('?')
+        call_done = 0
 
         begin
           gnip_call = self.class.get(url, basic_auth: @auth)
 
           parsed_response = gnip_call.parsed_response
-          parsed_response = (parsed_response||{}).with_indifferent_access
+          parsed_response = (parsed_response || {}).with_indifferent_access
 
-          raise gnip_call.response.message if !parsed_response.present?
+          raise gnip_call.response.message unless parsed_response.present?
 
           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 }
+            response = { results: [], next: nil, error: parsed_response[:error][:message], code: gnip_call.response.code.to_i, calls: (response[:calls] || 0) + 1 }
           else
+            call_done = 1 # we have received a valid response
             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 }
+            response = { results: (response[:results] || []) + parsed_response[:results], next: parsed_response[:next], code: gnip_call.response.code.to_i, calls: (response[:calls] || 0) + 1 }
           end
-        rescue Exception => e
-          response = { results: [], next: nil, error: e.message, code: 500 }
+        rescue StandardError => e
+          response = { results: [], next: nil, error: e.message, code: 500, calls: (response[:calls] || 0) + call_done }
         end
         # 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
@@ -93,14 +108,12 @@ module Gnip
       end
 
       # return total contents in a specific date interval with a passed query
-      def total(options={})
+      def total(options = {})
         extra = {}
         response = total_by_time_period(options)
         extra = { error: response[:error] } if response[:error].present?
-        return  { query: options[:query], total: response[:results].map{|item| item[:count]}.reduce(:+) }.merge!(extra)
+        { query: options[:query], total: response[:results].map { |item| item[:count] }.reduce(:+), calls: response[:calls] }.merge!(extra)
       end
-
     end
-
   end
 end

data/lib/gnip/gnip-rules/rules.rb

@@ -1,16 +1,17 @@
+# frozen_string_literal: true
+
 module Gnip
   module GnipRules
     class Rules
-      
       include HTTParty
-      
+
       attr_reader :rules_url, :version
-      
-      def initialize(client, replay=false)
+
+      def initialize(client, replay = false)
         @version = client.power_track_version
-        case self.version
+        case version
         when '1.0'
-          @rules_url = "https://api.gnip.com:443/accounts/#{client.account}/publishers/#{client.publisher}/#{replay ? "replay" : "streams"}/track/#{client.label}/rules.json"
+          @rules_url = "https://api.gnip.com:443/accounts/#{client.account}/publishers/#{client.publisher}/#{replay ? 'replay' : 'streams'}/track/#{client.label}/rules.json"
         when '2.0'
           if replay
             @rules_url = "https://gnip-api.twitter.com/rules/powertrack-replay/accounts/#{client.account}/publishers/#{client.publisher}/#{client.replay_label}.json"
@@ -18,111 +19,99 @@ module Gnip
             @rules_url = "https://gnip-api.twitter.com/rules/powertrack/accounts/#{client.account}/publishers/#{client.publisher}/#{client.label}.json"
           end
         else
-          raise Exception.new("version #{self.version} is not supported from this gem.")
+          raise Exception, "version #{version} is not supported from this gem."
         end
         @auth = { username: client.username, password: client.password }
       end
-      
-      #Add rules to PowerTrack rules
-      #rules should be an hash in the format {"rules": [{"value": "rule1", "tag": "tag1"}, {"value":"rule2"}]}"
+
+      # Add rules to PowerTrack rules
+      # rules should be an hash in the format {"rules": [{"value": "rule1", "tag": "tag1"}, {"value":"rule2"}]}"
       def add(rules)
-        begin
-          response = self.class.post( self.rules_url, basic_auth: @auth, body: rules.to_json, headers: { 'Content-Type' => 'application/json', 'Accept' => 'application/json' }, type: :json )
-          parsed_response = safe_parsed_response(response.parsed_response)
-          if parsed_response.present? && parsed_response["error"].present?
-            { status: :error, code: response.response.code, error: parsed_response["error"]["message"] }
-          else
-            { status: :success, code: 200, response: parsed_response }
-          end
-        rescue Exception => e
-          { status: :error, code: 500, error: e.message }
+        response = self.class.post(rules_url, basic_auth: @auth, body: rules.to_json, headers: { 'Content-Type' => 'application/json', 'Accept' => 'application/json' }, type: :json)
+        parsed_response = safe_parsed_response(response.parsed_response)
+        if parsed_response.present? && parsed_response['error'].present?
+          { status: :error, code: response.response.code, error: parsed_response['error']['message'] }
+        else
+          { status: :success, code: 200, response: parsed_response }
         end
-
+      rescue Exception => e
+        { status: :error, code: 500, error: e.message }
       end
-      
-      #Remove rules from PowerTrack rules
-      #rules should be an hash in the format {"rules": [{"value": "rule1", "tag": "tag1"}, {"value":"rule2"}]}"
+
+      # Remove rules from PowerTrack rules
+      # rules should be an hash in the format {"rules": [{"value": "rule1", "tag": "tag1"}, {"value":"rule2"}]}"
       def remove(rules)
-        begin
-          response = self.class.post(self.rules_url, query: { _method: 'delete'}, basic_auth: @auth, body: rules.to_json)
-          parsed_response = safe_parsed_response(response.parsed_response)
-          if parsed_response.present? && parsed_response["error"].present?
-            { status: :error, code: response.response.code, error: parsed_response["error"]["message"] }
-          else
-            { status: :success, code: 200, response: parsed_response }
-          end
-        rescue Exception => e
-          { status: :error, code: 500, error: e.message }
+        response = self.class.post(rules_url, query: { _method: 'delete' }, basic_auth: @auth, body: rules.to_json)
+        parsed_response = safe_parsed_response(response.parsed_response)
+        if parsed_response.present? && parsed_response['error'].present?
+          { status: :error, code: response.response.code, error: parsed_response['error']['message'] }
+        else
+          { status: :success, code: 200, response: parsed_response }
         end
-
+      rescue Exception => e
+        { status: :error, code: 500, error: e.message }
       end
-      
-      #Get the full list of rules
+
+      # Get the full list of rules
       def list
-        begin
-          response = self.class.get(self.rules_url, basic_auth: @auth, headers: { 'Content-Type' => 'application/json', 'Accept' => 'application/json' }, type: :json )
-          parsed_response = safe_parsed_response(response.parsed_response)
-          if parsed_response.present? && parsed_response["error"].present?
-            { status: :error, code: response.response.code, error: parsed_response["error"]["message"] }
-          else
-            { status: :success, code: 200, rules: parsed_response["rules"] }
-          end
-        rescue Exception => e
-          { status: :error, code: 500, error: e.message }
+        response = self.class.get(rules_url, basic_auth: @auth, headers: { 'Content-Type' => 'application/json', 'Accept' => 'application/json' }, type: :json)
+        parsed_response = safe_parsed_response(response.parsed_response)
+        if parsed_response.present? && parsed_response['error'].present?
+          { status: :error, code: response.response.code, error: parsed_response['error']['message'] }
+        else
+          { status: :success, code: 200, rules: parsed_response['rules'] }
         end
+      rescue Exception => e
+        { status: :error, code: 500, error: e.message }
       end
-      
-      #Get the full list of rules by tag
+
+      # Get the full list of rules by tag
       def list_by_tag(tag)
-        begin
-          response = self.class.get(self.rules_url, basic_auth: @auth)
-          parsed_response = safe_parsed_response(response.parsed_response)
-          if parsed_response.present? && parsed_response["error"].present?
-            { status: :error, code: response.response.code, error: parsed_response["error"]["message"] }
-          else
-            rules = parsed_response["rules"]
-            { status: :success, code: 200, rules: rules.select{ |rule| rule["tag"] == tag } }
-          end
-        rescue Exception => e
-          { status: :error, code: 500, error: e.message }
+        response = self.class.get(rules_url, basic_auth: @auth)
+        parsed_response = safe_parsed_response(response.parsed_response)
+        if parsed_response.present? && parsed_response['error'].present?
+          { status: :error, code: response.response.code, error: parsed_response['error']['message'] }
+        else
+          rules = parsed_response['rules']
+          { status: :success, code: 200, rules: rules.select { |rule| rule['tag'] == tag } }
         end
-        
+      rescue Exception => e
+        { status: :error, code: 500, error: e.message }
       end
-      
-      #delete all rules from PowerTrack
-      #http://support.gnip.com/apis/powertrack/api_reference.html#DeleteRules
-      #Request Body Size Limit 1 MB (~5000 rules)
+
+      # delete all rules from PowerTrack
+      # http://support.gnip.com/apis/powertrack/api_reference.html#DeleteRules
+      # Request Body Size Limit 1 MB (~5000 rules)
       def delete_all!
         retry_times = 0
         begin
-          rules_list = self.list
-          (rules_list[:rules]||[]).in_groups_of(2, false).each do |group_of_rules|
-            self.remove({ "rules": group_of_rules })
+          rules_list = list
+          (rules_list[:rules] || []).in_groups_of(2, false).each do |group_of_rules|
+            remove("rules": group_of_rules)
           end
           sleep 0.05
-          rules_list = self.list
-          if !(rules_list[:rules]||[]).size.zero?
-            self.delete_all!
+          rules_list = list
+          if !(rules_list[:rules] || []).size.zero?
+            delete_all!
           else
-            return { status: :success, code: 200, rules: []}
+            return { status: :success, code: 200, rules: [] }
           end
         rescue Exception => e
           retry_times += 1
           if retry_times <= 3
             retry
           else
-             { status: :error, code: 500, error: e.message}
-          end 
+            { status: :error, code: 500, error: e.message }
+          end
         end
-
       end
-      
+
       private
+
       def safe_parsed_response(parsed_response)
         ret = parsed_response.present? ? (parsed_response.is_a?(String) ? JSON.parse(parsed_response).with_indifferent_access : parsed_response) : nil
         ret
       end
-      
     end
   end
 end

data/lib/gnip/gnip-stream/error_reconnect.rb

@@ -1,8 +1,8 @@
+# frozen_string_literal: true
+
 module Gnip
   module GnipStream
-    
     class ErrorReconnect
-    
       def initialize(source_class, method_name)
         @source_class = source_class
         @method_name = method_name
@@ -12,7 +12,7 @@ module Gnip
       def attempt_to_reconnect(error_message)
         @error_message = error_message
         if @reconnect_attempts < 5
-          @reconnect_attempts +=1
+          @reconnect_attempts += 1
           sleep(2)
           @source_class.send(@method_name)
         else
@@ -23,7 +23,6 @@ module Gnip
       def reconnect_failed_raise_error
         raise @error_message
       end
-
     end
   end
-end
+end

data/lib/gnip/gnip-stream/json_data_bufffer.rb

@@ -1,13 +1,12 @@
 module Gnip
   module GnipStream
-    class JsonDataBuffer 
-    
+    class JsonDataBuffer
       attr_accessor :split_pattern, :check_pattern
-    
+
       def initialize(split_pattern, check_pattern)
         @split_pattern = split_pattern
         @check_pattern = check_pattern
-        @buffer = ""
+        @buffer = ''
       end
 
       def process(chunk)
@@ -21,11 +20,10 @@ module Gnip
           activities = @buffer.split(split_pattern)
           entries << activities.shift
           @buffer = activities.join(split_pattern)
-          @buffer = @buffer + "\r\n" if @buffer.size > 0 && new_line
+          @buffer += "\r\n" if !@buffer.empty? && new_line
         end
-        entries.select{ |entry| entry.size > 0 }
+        entries.reject(&:empty?)
       end
     end
-    
   end
-end
+end

data/lib/gnip/power_track_client.rb

@@ -1,27 +1,27 @@
+# frozen_string_literal: true
+
 module Gnip
   class PowerTrackClient
-      
     attr_accessor :publisher, :label, :account,
                   :username, :password,
                   :backfill_client, :replay_label
-      
+
     attr_reader :rules, :replay_rules, :full_archive, :stream, :replay, :power_track_version
-      
+
     def initialize(options = {})
       @account             = options[:account]
-      @publisher           = options[:publisher]||"twitter"
-      @label               = options[:label]||"dev"
-      @replay_label        = options[:replay_label]||@label
+      @publisher           = options[:publisher] || 'twitter'
+      @label               = options[:label] || 'dev'
+      @replay_label        = options[:replay_label] || @label
       @username            = options[:username]
       @password            = options[:password]
-      @backfill_client     = options[:backfill_client]||nil
-      @power_track_version = options[:power_track_version]||'2.0'
+      @backfill_client     = options[:backfill_client] || nil
+      @power_track_version = options[:power_track_version] || '2.0'
       @rules               = Gnip::GnipRules::Rules.new(self)
       @replay_rules        = Gnip::GnipRules::Rules.new(self, true)
       @full_archive        = Gnip::GnipFullArchive::FullArchive.new(self)
       @stream              = Gnip::GnipStream::Stream.new(self)
       @replay              = Gnip::GnipStream::Replay.new(self)
     end
-      
   end
 end

data/lib/gnip/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Gnip
-  VERSION = '0.2.8'
-end
+  VERSION = '0.2.10'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gnip-client
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.10
 platform: ruby
 authors:
 - Duccio Giovannelli
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-09 00:00:00.000000000 Z
+date: 2019-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -25,61 +25,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: em-http-request
   requirement: !ruby/object:Gem::Requirement
@@ -95,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 0.16.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 0.16.4
 description: 
 email:
 - giovannelli@extendi.it
@@ -155,8 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A Ruby library for accessing the Gnip API. See https://gnip.com/ for full