Resolve conflicts

Author: mokuzon

.github/workflows/publish.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
+      - uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
         with:
           bundler-cache: true
           ruby-version: 3.3

.github/workflows/pull_request.yml

@@ -23,7 +23,7 @@ jobs:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
       with:
         submodules: true
-    - uses: ruby/setup-ruby@eaecf785f6a34567a6d97f686bbb7bccc1ac1e5c # v1.237.0
+    - uses: ruby/setup-ruby@e34163cd15f4bb403dcd72d98e295997e6a55798 # v1.238.0
       with:
         ruby-version: ${{ matrix.ruby }}
     - uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1

Gemfile.lock

@@ -58,7 +58,7 @@ GEM
     prism (1.4.0)
     public_suffix (6.0.1)
     racc (1.8.1)
-    rack (3.1.13)
+    rack (3.1.14)
     rainbow (3.1.1)
     rake (13.2.1)
     rb-fsevent (0.11.2)
@@ -81,7 +81,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.2)
-    rubocop (1.75.4)
+    rubocop (1.75.5)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)

README.md

@@ -1,151 +1,57 @@
-# Overview
-**v1.30.0 is a transitional version for v2.0.0.**
+# LINE Messaging API SDK for Ruby
 
-- The previous code released up to v1.29.1 will be called "v1", 
-- The new code released as v2.0.0 and later versions will be called "v2".
+[![Gem-version](https://img.shields.io/gem/v/line-bot-api.svg)](https://rubygems.org/gems/line-bot-api)
 
-**v1.30.0 includes both the v1 and v2 codebases.**
 
-**v2 has significant breaking changes** because it's a completely new implementation with an entirely different interface.
-As a result, any implementation based on the previous codebase will no longer function.
+## Introduction
+The LINE Messaging API SDK for Ruby makes it easy to develop bots using LINE Messaging API, and you can create a sample bot within minutes.
 
-**New users should always use v2.**
-And **we strongly recommend migrating to v2.**
+## Documentation
 
-## Why you should use v2
-### Support All Messaging API Features
-**v2 now supports every API endpoints and Webhook event types that were previously unimplemented.**  
-Future API additions will be rapidly integrated, ensuring your application always stays up-to-date with the latest features by using `line-bot-api` gem.
+See the official API documentation for more information
 
-Because v2 is automatically generated from [https://github.com/line/line-openapi](https://github.com/line/line-openapi), same with SDKs provided for other programming languages.  
+- English: https://developers.line.biz/en/docs/messaging-api/overview/
+- Japanese: https://developers.line.biz/ja/docs/messaging-api/overview/
 
-### RBS Support for Enhanced Development Experience
-**v2 comes with [RBS (Ruby Signature)](https://github.com/ruby/rbs) support**, enabling you to leverage type checking and other type-based development features for a more robust coding experience.
+Also, generated documentation by YARD is available.
 
-# Migration Guide: From v1 to v2
+- https://rubydoc.info/gems/line-bot-api
 
-Users can perform the migration step at their own pace. Follow these steps:
+## Requirements
+This library requires Ruby 3.2 or later.
 
-1. Upgrade the `line-bot-api` gem to `1.30.0`.
-2. Migrate v1 code to v2 code. All v1 code issues deprecation warnings, so please migrate until they are gone. Since v1.30.0 includes all v1 and v2 code, you don't have to replace everything at once. You can switch gradually.
-3. Once all code is switched, upgrade `line-bot-api` to `2.0.0` or above.
+## Installation
 
-## Change all v1 implementations to v2 implementations in v1.30.0
-**v1.30.0 includes both the v1 and v2 codebases.**
+Add this line to your application's Gemfile:
 
-When you use the v1 code in v1.30.0, you will see deprecation warnings such as:
-
-```
-[DEPRECATION] Line::Bot::Client#push_message is deprecated. Please use Line::Bot::V2::MessagingApi::ApiClient#push_message instead.
+```ruby
+gem 'line-bot-api'
 ```
 
-These warnings indicate which methods to use in the new v2 code.
-
-Alternatively, the YARD documentation/comments also clearly indicate where to migrate.
-```rb
-# https://github.com/line/line-bot-sdk-ruby/blob/fb449ba19201a57c5f58dcd19ea67c5a53b0a0fe/lib/line/bot/v1/client.rb#L277-L288
-
-# @deprecated
-# This is deprecated.
-# Please use {Line::Bot::V2::MessagingApi::ApiClient#push_message} instead.
-#
-# Push messages to a user using user_id.
-#
-# @param user_id [String] User Id
-# @param messages [Hash, Array] Message Objects
-# @param headers [Hash] HTTP Headers
-# @param payload [Hash] Additional request body
-# @return [Net::HTTPResponse]
-def push_message(user_id, messages, headers: {}, payload: {})
-```
+And then execute:
 
-**Once v1 code usage is completely removed in v1.30.0, please switch to v2.0.0 >= version immediately.**  
-Starting with v2.0.0, v1 code is not included.
-
-## Suppress deprecation warnings
-You can suppress the deprecation warning by setting any value to `ENV['SUPRESS_V1_DEPRECATION_WARNINGS']`.
+```sh
+bundle
+```
 
+Or install it yourself as:
 
-However, it's not recommended to always use it as it could lead to migration errors.
+```sh
+gem install line-bot-api
+```
 
-## Migration examples
-Only typical examples are shown here.
-Please refer to Examples in the next chapter for more examples.
+## Synopsis
 
-### Calling API
-#### v1
-```rb
-client = Line::Bot::Client.new do |config|
-  config.channel_token = ENV.fetch("LINE_CHANNEL_ACCESS_TOKEN")
-end
+Usage:
 
-response = client.push_message(
-  'U1234567890abcdef1234567890abcdef',
-  [
-    {
-      type: 'text',
-      text: 'Hello, this is a test message!'
-    }
-  ]
-)
-
-puts response.class # => Net::HTTPResponse
-```
-#### v2 (without Hash)
-```rb
-client = Line::Bot::V2::MessagingApi::ApiClient.new(
-  channel_access_token: ENV.fetch("LINE_CHANNEL_ACCESS_TOKEN")
-)
-
-message = Line::Bot::V2::TextMessage.new( # No need to pass `type: "text"`
-  text: 'Hello, this is a test message!'
-)
-
-request = Line::Bot::V2::PushMessageRequest.new(
-  to: 'U1234567890abcdef1234567890abcdef',
-  messages: [
-    message
-  ]
-)
-
-response, status_code, response_headers = client.push_message_with_http_info(
-  push_message_request: request
-)
-
-puts response.class # => Line::Bot::V2::PushMessageResponse
-```
-#### v2 (with Hash)
-It's slightly convenient for migration, but the benefits of using the SDK are minimal. We recommend using the v2 code.
-
-```rb
-client = Line::Bot::V2::MessagingApi::ApiClient.new(
-  channel_access_token: ENV.fetch("LINE_CHANNEL_ACCESS_TOKEN")
-)
-
-request = Line::Bot::V2::PushMessageRequest.new(
-  to: 'U1234567890abcdef1234567890abcdef',
-  messages: [
-    {
-      type: 'text',
-      text: 'Hello, this is a test message!'
-    }
-  ]
-)
-
-response, status_code, response_headers = client.push_message_with_http_info(
-  push_message_request: request
-)
-
-puts response.class # => Line::Bot::V2::PushMessageResponse
-```
-### Handling Webhook
-#### v1
-```rb
-require 'sinatra' 
-require 'line/bot' 
+```ruby
+# app.rb
+require 'sinatra'
+require 'line/bot'
 
 def client
   @client ||= Line::Bot::Client.new { |config|
+    config.channel_id = ENV["LINE_CHANNEL_ID"]
     config.channel_secret = ENV["LINE_CHANNEL_SECRET"]
     config.channel_token = ENV["LINE_CHANNEL_TOKEN"]
   }
@@ -156,11 +62,10 @@ post '/callback' do
 
   signature = request.env['HTTP_X_LINE_SIGNATURE']
   unless client.validate_signature(body, signature)
-    halt 400, {'Content-Type' => 'text/plain'}, 'Bad Request'
+    error 400 do 'Bad Request' end
   end
 
   events = client.parse_events_from(body)
-
   events.each do |event|
     case event
     when Line::Bot::Event::Message
@@ -171,76 +76,45 @@ post '/callback' do
           text: event.message['text']
         }
         client.reply_message(event['replyToken'], message)
+      when Line::Bot::Event::MessageType::Image, Line::Bot::Event::MessageType::Video
+        response = client.get_message_content(event.message['id'])
+        tf = Tempfile.open("content")
+        tf.write(response.body)
       end
     end
   end
 
+  # Don't forget to return a successful response
   "OK"
 end
 ```
-#### v2
-```rb
-require 'sinatra'
-require 'line-bot-api'
 
-set :environment, :production
+## Help and media
+FAQ: https://developers.line.biz/en/faq/
 
-def client
-  @client ||= Line::Bot::V2::MessagingApi::ApiClient.new(
-    channel_access_token: ENV.fetch("LINE_CHANNEL_ACCESS_TOKEN")
-  )
-end
+News: https://developers.line.biz/en/news/
 
-def parser
-  @parser ||= Line::Bot::V2::WebhookParser.new(channel_secret: ENV.fetch("LINE_CHANNEL_SECRET"))
-end
+## Versioning
+This project respects semantic versioning.
 
-post '/callback' do
-  body = request.body.read
-  signature = request.env['HTTP_X_LINE_SIGNATURE']
+See https://semver.org/
 
-  begin
-    events = parser.parse(body: body, signature: signature)
-  rescue Line::Bot::V2::WebhookParser::InvalidSignatureError
-    halt 400, { 'Content-Type' => 'text/plain' }, 'Bad Request'
-  end
-
-  events.each do |event|
-    case event
-    when Line::Bot::V2::Webhook::MessageEvent
-      case event.message
-      when Line::Bot::V2::Webhook::TextMessageContent
-        message = event.message.text
-        request = Line::Bot::V2::MessagingApi::ReplyMessageRequest.new(
-          reply_token: event.reply_token,
-          messages: [
-            Line::Bot::V2::MessagingApi::TextMessage.new(text: message)
-          ]
-        )
-        client.reply_message(reply_message_request: request)
-      end
-    end
-  end
-
-  "OK"
-end
+## Contributing
+Please check [CONTRIBUTING](CONTRIBUTING.md) before making a contribution.
 
+## License
+```
+Copyright (C) 2016 LINE Corp.
+ 
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+ 
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 ```
-
-# Examples
-There are several examples available for v2 to assist you in your implementation.
-
-- Simple Echo Bot
-  - A straightforward example demonstrating an echo bot implementation.  
-  - [https://github.com/line/line-bot-sdk-ruby/tree/master/examples/v2/echobot](https://github.com/line/line-bot-sdk-ruby/tree/master/examples/v2/echobot)
-
-- Rich Menu
-  - An example for implementing and managing rich menus as described in the [Messaging API - Using Rich Menus](https://developers.line.biz/en/docs/messaging-api/using-rich-menus/).  
-  - [https://github.com/line/line-bot-sdk-ruby/tree/master/examples/v2/rich_menu](https://github.com/line/line-bot-sdk-ruby/tree/master/examples/v2/rich_menu)
-
-- Webhook Handling
-  - A comprehensive example covering Webhook handling and various API capabilities.  
-  - [https://github.com/line/line-bot-sdk-ruby/tree/master/examples/v2/kitchensink](https://github.com/line/line-bot-sdk-ruby/tree/master/examples/v2/kitchensink)
-
-# Feedbacks & Contributions
-We welcome [feedback](https://github.com/line/line-bot-sdk-ruby/issues) and [contributions](https://github.com/line/line-bot-sdk-ruby/blob/master/CONTRIBUTING.md).

examples/v2/audience/README.md

@@ -5,7 +5,7 @@
 ## Getting started
 Update User ID of `app.rb` and `audience.txt' to your own.
 
-```ruby
+```sh
 $ export LINE_CHANNEL_SECRET=YOUR_CHANNEL_SECRET
 $ export LINE_CHANNEL_ACCESS_TOKEN=YOUR_CHANNEL_ACCESS_TOKEN
 $ bundle install

examples/v2/channel_access_token/README.md

@@ -4,7 +4,7 @@
 
 ## Getting started
 
-```ruby
+```sh
 $ export LINE_CHANNEL_ID=YOUR_CHANNEL_ID
 $ export LINE_CHANNEL_SECRET=YOUR_CHANNEL_SECRET
 $ bundle install

examples/v2/echobot/Gemfile.lock

@@ -2,7 +2,8 @@ PATH
   remote: ../../..
   specs:
     line-bot-api (0.0.1.pre.test)
-      multipart-post (~> 2.4.1)
+      base64 (~> 0.2)
+      multipart-post (~> 2.4)
 
 GEM
   remote: https://rubygems.org/

examples/v2/echobot/README.md

@@ -2,13 +2,13 @@
 An example LINE bot just to echo messages
 
 ## Getting started
-```ruby
+This projects tries to set `${APP_BASE_URL}/callback` as webhook URL automatically on starting app.
+
+```sh
 $ export LINE_CHANNEL_SECRET=YOUR_CHANNEL_SECRET
 $ export LINE_CHANNEL_ACCESS_TOKEN=YOUR_CHANNEL_ACCESS_TOKEN
 $ bundle install
+$ export APP_BASE_URL="https://your.base.url:4567"
 $ bundle exec ruby app.rb
 ```
 
-```
-https://127.0.0.1:4567/callback
-```