birdsong 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91cec2f940312e308a14a0f84049908d0a38cc9ef53548c0ef9907c5c46bffeb
-  data.tar.gz: a7871d2629fa2eec4bb9ee73b635bf974f1ec5f7c0606070e446b6937c60fe9d
+  metadata.gz: 82bf946c745782199f6ec1dc9e1dd21bcf2b15584e69152ffebd1b5b8b452873
+  data.tar.gz: 82dc7534653c03bd75b7f24ac588fa6c9d0fa689552f4b67e4739c296df90692
 SHA512:
-  metadata.gz: 72b073c5546b6a4b22184809d4b1e8381bdd18b07f577f49d6c096ecded7e8b08ff546730a913cb8f41945036f9372bfb503b655eda24bdcff9ba924f9e7b81a
-  data.tar.gz: fa6f487b45dc2b284773d4dbccefefeacb74200b2b0f14341a187d899bc82e2048a65e50524e9577e05e0cd9f1a4f0d7f0b8bbdc37d3075a643e143aa7dc9064
+  metadata.gz: 0207ae04fb995778f6fe447f55c78f962aac6c0d7418912d9dc4bf5fd575742915ba9912360811e7921655b824a3bf9ef6739a67981ec209698e112e57c9aee4
+  data.tar.gz: a8c301f6805c88ac99ef3b5306ef0c3df9ea6f710498a3d4b970c813519606e7c7cbc70b4250c8cde148f3ff50e912c7b0fad0b2dccecd0006f313bd04e299df

data/.ruby-version

@@ -1 +1 @@
-3.1.4
+3.0.5

data/Gemfile.lock

@@ -1,8 +1,13 @@
 PATH
   remote: .
   specs:
-    birdsong (0.1.0)
+    birdsong (0.2.5)
+      capybara (~> 3.40)
+      curb (~> 1.0, >= 1.0.5)
       oauth (~> 0.5.6)
+      oj (~> 3.16, >= 3.16.3)
+      selenium-devtools
+      selenium-webdriver (~> 4.21, >= 4.21.1)
       typhoeus (~> 1.4.0)
 
 GEM
@@ -26,22 +31,38 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
+    addressable (2.8.6)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
+    base64 (0.2.0)
+    bigdecimal (3.1.7)
     builder (3.2.4)
     byebug (11.1.3)
+    capybara (3.40.0)
+      addressable
+      matrix
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.11)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      regexp_parser (>= 1.5, < 3.0)
+      xpath (~> 3.2)
     concurrent-ruby (1.1.9)
     crass (1.0.6)
+    curb (1.0.5)
     dotenv (2.7.6)
     erubi (1.10.0)
-    ethon (0.15.0)
+    ethon (0.16.0)
       ffi (>= 1.15.0)
-    ffi (1.15.5)
+    ffi (1.16.3)
     i18n (1.9.1)
       concurrent-ruby (~> 1.0)
     loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
+    matrix (0.4.2)
     method_source (1.0.0)
+    mini_mime (1.1.5)
     minitest (5.15.0)
     nokogiri (1.13.1-arm64-darwin)
       racc (~> 1.4)
@@ -49,10 +70,13 @@ GEM
       racc (~> 1.4)
     nokogiri (1.13.1-x86_64-linux)
       racc (~> 1.4)
-    oauth (0.5.8)
+    oauth (0.5.14)
+    oj (3.16.3)
+      bigdecimal (>= 3.0)
     parallel (1.21.0)
     parser (3.1.0.0)
       ast (~> 2.4.1)
+    public_suffix (5.0.5)
     racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
@@ -104,17 +128,29 @@ GEM
       rubocop-performance (~> 1.11)
       rubocop-rails (~> 2.0)
     ruby-progressbar (1.11.0)
+    rubyzip (2.3.2)
+    selenium-devtools (0.125.0)
+      selenium-webdriver (~> 4.2)
+    selenium-webdriver (4.21.1)
+      base64 (~> 0.2)
+      rexml (~> 3.2, >= 3.2.5)
+      rubyzip (>= 1.2.2, < 3.0)
+      websocket (~> 1.0)
     thor (1.2.1)
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.1.0)
+    websocket (1.2.10)
+    xpath (3.2.0)
+      nokogiri (~> 1.8)
     zeitwerk (2.5.4)
 
 PLATFORMS
   arm64-darwin-21
   arm64-darwin-22
+  arm64-darwin-23
   x86_64-darwin-20
   x86_64-linux
 
@@ -130,4 +166,4 @@ DEPENDENCIES
   rubocop-rails_config
 
 BUNDLED WITH
-   2.3.3
+   2.3.26

data/birdsong.gemspec

@@ -32,6 +32,11 @@ Gem::Specification.new do |spec|
   # Prod dependencies
   spec.add_dependency "typhoeus", "~> 1.4.0"
   spec.add_dependency "oauth", "~> 0.5.6"
+  spec.add_dependency "oj", "~> 3.16", ">= 3.16.3"
+  spec.add_dependency "capybara", "~> 3.40"
+  spec.add_dependency "selenium-webdriver", "~> 4.21", ">= 4.21.1"
+  spec.add_dependency "curb", "~> 1.0", ">= 1.0.5"
+  spec.add_dependency "selenium-devtools"
 
   # Dev dependencies
   spec.add_development_dependency "byebug"

data/lib/birdsong/monkeypatch.rb

@@ -41,7 +41,7 @@ module SeleniumMonkeypatch
       data[:sessionId] = @session_id if @session_id
       message = @ws.send_cmd(**data)
       if message.nil? == false && message["error"] && (method != "Fetch.continueRequest")
-        raise Birdsong::Error::WebDriverError, error_message(message["error"])
+        raise Selenium::WebDriver::Error::WebDriverError, error_message(message["error"])
       end
 
       message

data/lib/birdsong/scrapers/scraper.rb

@@ -7,7 +7,7 @@ require "selenium-webdriver"
 require "logger"
 require "securerandom"
 require "selenium/webdriver/remote/http/curb"
-require "debug"
+# require "debug"
 
 # 2022-06-07 14:15:23 WARN Selenium [DEPRECATION] [:browser_options] :options as a parameter for driver initialization is deprecated. Use :capabilities with an Array of value capabilities/options if necessary instead.
 
@@ -94,6 +94,7 @@ module Birdsong
         end
       rescue Selenium::WebDriver::Error::WebDriverError
         # Eat them
+      rescue Birdsong::WebDriverError
       end
 
       # Now that the intercept is set up, we visit the page we want
@@ -111,6 +112,7 @@ module Birdsong
 
       raise Birdsong::NoTweetFoundError if response_body.nil?
       Oj.load(response_body)
+    rescue Birdsong::WebDriverError
     end
 
   private

data/lib/birdsong/user.rb

@@ -30,7 +30,7 @@ module Birdsong
     def parse(user_object)
       @id = user_object[:id]
       @name = user_object[:name]
-      @username = user_object[:screen_name]
+      @username = user_object[:username]
       @created_at = DateTime.parse(user_object[:sign_up_date])
       @location = user_object[:location]
 
@@ -42,8 +42,8 @@ module Birdsong
       @url = "https://www.twitter.com/#{@username}" if @url.nil?
 
       @followers_count = user_object[:followers_count]
-      @following_count = user_object[:friends_count]
-      @tweet_count = user_object[:statuses_count]
+      @following_count = user_object[:following_count]
+      @tweet_count = user_object[:tweet_count]
       @listed_count = user_object[:listed_count]
       @verified = user_object[:verified] # this will always be `false` but we're keeping it here for compatibility
       @profile_image_file_name = Birdsong.retrieve_media(@profile_image_url)

data/lib/birdsong/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Birdsong
-  VERSION = "0.2.4"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: birdsong
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Christopher Guess
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-04 00:00:00.000000000 Z
+date: 2024-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus
@@ -38,6 +38,94 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.6
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.16.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.16'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.16.3
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.40'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.40'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.21'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.21.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.21'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.21.1
+- !ruby/object:Gem::Dependency
+  name: curb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+- !ruby/object:Gem::Dependency
+  name: selenium-devtools
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -200,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: A gem to interface with Twitter's API V2