simple_tweet 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6ce5d4a7a448770b21c18cc4b68f25adc7f21d8814a02970864efc4c487d071
-  data.tar.gz: 6dfec2f42eff6f04cd8e0dc59571b31bc558b027fc20efdc87c59dd8402a47a1
+  metadata.gz: eda2472eda06f1ddc2348a30e194c498e0cd9998036e7dabdbdee4850e1098dc
+  data.tar.gz: 50c944ffd64e0f687f968d254389bd2fab8b521b959c5433fbe2aecfe772507e
 SHA512:
-  metadata.gz: bef5b277879212fc6c8a6c542ed70d71fd35e5c8e12ab0ab9119d50c3969e271b99b95f812b990eb4bb5ef93c9bc6b9726cb6e71fcf974112789e20da94e0b6f
-  data.tar.gz: '09771d8edada2fba52358e1f897410a620703d91fe87a6f1b602ec846c56e9771b4a3289908d4bcded74da60c396a235d074ae3388e61917da067422852346f5'
+  metadata.gz: a24c2848c3164782c1e424ac6fa6504fb4c1df5b1d720e92323cea4c8298d9327d1878fc49e1b13091c1a043bd612efd06a409ad2bc218c82cb650b962222f3c
+  data.tar.gz: e03a4050dc75280addf7a86cad0faa1cc9541c39abbe2f9d1adca6a6fd4cb4898712ff68d7411b0c382de6d85bb6aab4c29f13ae305bd33fce31afd61662a108

data/.rubocop.yml

@@ -9,6 +9,9 @@ Style/StringLiteralsInInterpolation:
   Enabled: true
   EnforcedStyle: double_quotes
 
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
 Layout/LineLength:
   Max: 120
 
@@ -21,5 +24,6 @@ Metrics/MethodLength:
 Metrics/AbcSize:
   Max: 30
 
-Style/FrozenStringLiteralComment:
-  Enabled: false
+Metrics/BlockLength:
+  Exclude:
+    - 'spec/**/*'

data/Gemfile

@@ -9,3 +9,4 @@ gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 gem "rubocop", "~> 1.56"
 gem "steep"
+gem "webmock"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_tweet (3.0.1)
+    simple_tweet (3.1.0)
       multipart-post (>= 2.2.3)
       oauth (~> 1.1.0)
 
@@ -13,13 +13,18 @@ GEM
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
+    addressable (2.8.5)
+      public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     base64 (0.1.1)
     concurrent-ruby (1.2.2)
+    crack (0.4.5)
+      rexml
     csv (3.2.7)
     diff-lcs (1.5.0)
     ffi (1.15.5)
     fileutils (1.7.1)
+    hashdiff (1.0.1)
     hashie (5.0.0)
     i18n (1.14.1)
       concurrent-ruby (~> 1.0)
@@ -41,6 +46,7 @@ GEM
     parser (3.2.2.3)
       ast (~> 2.4.1)
       racc
+    public_suffix (5.0.3)
     racc (1.7.1)
     rainbow (3.1.1)
     rake (13.0.6)
@@ -104,6 +110,10 @@ GEM
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.4.2)
     version_gem (1.1.3)
+    webmock (3.19.1)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
 
 PLATFORMS
   arm64-darwin-21
@@ -115,6 +125,7 @@ DEPENDENCIES
   rubocop (~> 1.56)
   simple_tweet!
   steep
+  webmock
 
 BUNDLED WITH
    2.3.24

data/lib/simple_tweet/v2_client.rb

@@ -66,6 +66,21 @@ module SimpleTweet
         end
       end
 
+      def request_with_retry(req:, expected_status_code:, error_kind_message:, retry_count: 3)
+        res = request(req)
+        return res if expected_status_code === res.code # rubocop:disable Style/CaseEquality
+        raise UploadMediaError.new(error_kind_message, response: res) unless retry_count.positive?
+
+        @client = nil # reset client
+        sleep 1 << (3 - retry_count)
+        request_with_retry(
+          req: req,
+          expected_status_code: expected_status_code,
+          error_kind_message: error_kind_message,
+          retry_count: retry_count - 1
+        )
+      end
+
       # https://developer.twitter.com/en/docs/twitter-api/v1/media/upload-media/api-reference/post-media-upload
       ## maybe todo: multiple image
       # ここはv1のAPIを叩いている。
@@ -88,55 +103,46 @@ module SimpleTweet
           total_bytes: video.size,
           media_type: "video/mp4"
         )
-        init_res = request(init_req)
-        raise UploadMediaError.new("init failed", response: init_res) unless init_res.code == "202"
-
+        init_res = request_with_retry(req: init_req, expected_status_code: "202", error_kind_message: "init failed")
         ::JSON.parse(init_res.body)
       end
 
-      def append(video:, media_id:, index:, retry_count: 0)
-        append_req = ::Net::HTTP::Post::Multipart.new(
+      def append(video:, media_id:, index:)
+        req = ::Net::HTTP::Post::Multipart.new(
           TW_MEDIA_UPLOAD_PATH,
           command: "APPEND",
           media_id: media_id,
           media: video.read(APPEND_PER),
           segment_index: index
         )
-        res = request(append_req)
-        return if res.code == "204"
-        raise UploadMediaError.new("append failed", response: res) unless retry_count <= @max_append_retry_
-
-        append(video: video, media_id: media_id, index: index, retry_count: retry_count + 1)
+        request_with_retry(req: req, expected_status_code: "204", error_kind_message: "append failed")
       end
 
       def finalize(media_id:)
-        finalize_req = ::Net::HTTP::Post::Multipart.new(
+        req = ::Net::HTTP::Post::Multipart.new(
           TW_MEDIA_UPLOAD_PATH,
           command: "FINALIZE",
           media_id: media_id
         )
-        finalize_res = request(finalize_req)
-        raise UploadMediaError.new("finalize failed", response: finalize_res) unless finalize_res.code == "201"
-
-        ::JSON.parse(finalize_res.body)
+        # finalizeは201が帰ってきてても、processing_infoにretry_afterが入っている場合がある(upload_video中で処理)。
+        res = request_with_retry(req: req, expected_status_code: /^20\d$/, error_kind_message: "finalize failed")
+        ::JSON.parse(res.body)
       end
 
       def status(media_id:)
-        status_req = ::Net::HTTP::Post::Multipart.new(
-          TW_MEDIA_UPLOAD_PATH,
-          command: "STATUS",
-          media_id: media_id
-        )
-        status_res = request(status_req)
-        raise UploadMediaError.new("status failed", response: status_res) unless status_res.code == "200"
-
-        ::JSON.parse(status_res.body)
+        # https://developer.twitter.com/en/docs/twitter-api/v1/media/upload-media/api-reference/get-media-upload-status
+        # これはGET
+        uri = ::URI.parse(TW_UPLOAD_ORIGIN + TW_MEDIA_UPLOAD_PATH)
+        uri.query = ::URI.encode_www_form(command: "STATUS", media_id: media_id)
+        req = ::Net::HTTP::Get.new(uri)
+        res = request_with_retry(req: req, expected_status_code: "200", error_kind_message: "status failed")
+        ::JSON.parse(res.body)
       end
 
       # https://developer.twitter.com/en/docs/twitter-api/v1/media/upload-media/api-reference/post-media-upload-init
       def upload_video(video:)
         init_res = init(video: video)
-        media_id = init_res["media_id_string"]
+        media_id = init_res["media_id_string"] # : String
 
         chunks_needed = (video.size - 1) / APPEND_PER + 1
         chunks_needed.times do |i|
@@ -171,10 +177,7 @@ module SimpleTweet
         header = { "content-type" => "application/json; charset=UTF-8" } # : ::Hash[::String, ::String]
         req = ::Net::HTTP::Post.new(TW_METADATA_CREATE_PATH, header)
         req.body = { media_id: media_id, alt_text: { text: alt_text } }.to_json
-        res = request(req)
-        raise UploadMediaError.new("create_media_metadata failed", response: res) if res.code != "200"
-
-        res
+        request_with_retry(req: req, expected_status_code: "200", error_kind_message: "create_media_metadata failed")
       end
     end
   end

data/lib/simple_tweet/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SimpleTweet
-  VERSION = "3.0.1"
+  VERSION = "3.1.0"
 end

data/sig/simple_tweet.rbs

@@ -12,8 +12,8 @@ module SimpleTweet
       APPEND_PER: Integer
 
       def initialize: (consumer_key: String, consumer_secret: String, access_token: String, access_token_secret: String, ?max_append_retry: Integer) -> void
-      def tweet: (message: String, ?media_ids: Array[String]) -> untyped
-      def tweet_with_media: (message: String, media_type: String, media: untyped, ?alt_text: String?) -> untyped
+      def tweet: (message: String, ?media_ids: Array[String]) -> Net::HTTPResponse
+      def tweet_with_media: (message: String, media_type: String, media: untyped, ?alt_text: String?) -> Net::HTTPResponse
 
       @consumer_key_: String
       @consumer_secret_: String
@@ -24,14 +24,15 @@ module SimpleTweet
 
       private
       def access_token: (?site: String) -> untyped
-      def request: (untyped req) -> untyped
-      def upload_media: (media_type: untyped, media: untyped) -> [untyped]
-      def init: (video: untyped) -> untyped
-      def append: (video: untyped, media_id: untyped, index: untyped, ?retry_count: Integer) -> nil
-      def finalize: (media_id: untyped) -> untyped
-      def status: (media_id: untyped) -> untyped
-      def upload_video: (video: untyped) -> [untyped]
-      def create_media_metadata: (media_id: String, alt_text: String?) -> untyped
+      def request: (Net::HTTPRequest req) -> Net::HTTPResponse
+      def request_with_retry: (req: Net::HTTPRequest, expected_status_code: String | Regexp, error_kind_message: String, ?retry_count: Integer) -> Net::HTTPResponse
+      def upload_media: (media_type: String, media: untyped) -> [String]
+      def init: (video: untyped) -> Hash[String, untyped]
+      def append: (video: untyped, media_id: String, index: untyped) -> Net::HTTPResponse
+      def finalize: (media_id: String) -> Hash[String, untyped]
+      def status: (media_id: String) -> Hash[String, untyped]
+      def upload_video: (video: untyped) -> [String]
+      def create_media_metadata: (media_id: String, alt_text: String?) -> Net::HTTPResponse
     end
   end
 
@@ -39,7 +40,7 @@ module SimpleTweet
   end
 
   class UploadMediaError < Error
-    attr_reader response: nil
-    def initialize: (?String? message, ?response: nil) -> void
+    attr_reader response: Net::HTTPResponse?
+    def initialize: (?String? message, ?response: Net::HTTPResponse?) -> void
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_tweet
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Kugayama Nana
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-13 00:00:00.000000000 Z
+date: 2023-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post