Merge pull request #13 from fishbrain/fix-ruby-3-compatibility

Fix Ruby 3 compatibility

Author: alexceder

.github/workflows/ci.yml

@@ -1,25 +1,19 @@
 name: CI
 
-on:
-  pull_request:
-    branches: [ master ]
+on: [pull_request]
 
 jobs:
   ci:
-
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.5', '2.6', '2.7']
-
+        ruby: ['2.7', '3.0', '3.1', 'head']
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
-      uses: ruby/setup-ruby@473e4d8fe5dd94ee328fdfca9f8c9c7afc9dae5e
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: ${{ matrix.ruby-version }}
+        ruby-version: ${{ matrix.ruby }}
         bundler-cache: true # runs 'bundle install' and caches installed gems automatically
-    - name: Run RSpec
-      run: bundle exec rspec
-    - name: Run Rubocop
-      run: bundle exec rubocop
+    - run: bundle exec rake
+    - run: bundle exec rubocop

.gitignore

@@ -12,3 +12,5 @@
 
 .rake_t_cache
 *.gem
+
+Gemfile.lock

.rubocop.yml

@@ -1,5 +1,6 @@
 AllCops:
-  TargetRubyVersion: 2.6
+  NewCops: enable
+  TargetRubyVersion: 2.7
 
 Layout/LineLength:
   Max: 120

Gemfile.lock

@@ -17,8 +17,8 @@ def active
         @entitlements.select(&:active?)
       end
 
-      def each
-        @entitlements.each { |e| yield e }
+      def each(&block)
+        @entitlements.each(&block)
       end
     end
   end

lib/tarpon/entity/entitlement_list.rb

@@ -12,12 +12,12 @@ class Offerings
       def initialize(current_offering_id:, offerings:, **)
         @current_offering_id = current_offering_id
         @offerings = offerings.each_with_object({}) do |offering, map|
-          map[offering[:identifier].to_sym] = Tarpon::Entity::Offering.new(offering)
+          map[offering[:identifier].to_sym] = Tarpon::Entity::Offering.new(**offering)
         end
       end
 
-      def each
-        @offerings.each { |o| yield o }
+      def each(&block)
+        @offerings.each(&block)
       end
 
       def [](identifier)

lib/tarpon/entity/offerings.rb

@@ -18,7 +18,7 @@ def perform(method:, path:, key:, headers: {}, body: nil)
           .auth("Bearer #{api_key(key)}")
           .headers(headers.merge(DEFAULT_HEADERS))
           .send(method, "#{Client.base_uri}#{path}", json: body&.compact)
-          .yield_self { |http_response| handle_response(http_response) }
+          .then { |http_response| handle_response(http_response) }
       rescue HTTP::TimeoutError => e
         raise Tarpon::TimeoutError, e
       end

lib/tarpon/request/base.rb

@@ -4,14 +4,13 @@ module Tarpon
   module Request
     class Subscriber < Base
       def initialize(app_user_id:)
+        super()
         @app_user_id = app_user_id
       end
 
-      # rubocop:disable Naming/AccessorMethodName
-      def get_or_create
+      def get_or_create # rubocop:disable Naming/AccessorMethodName
         perform(method: :get, path: path, key: :public)
       end
-      # rubocop:enable Naming/AccessorMethodName
 
       def delete
         perform(method: :delete, path: path, key: :secret)

lib/tarpon/request/subscriber.rb

@@ -5,6 +5,7 @@ module Request
     class Subscriber
       class Entitlement < Base
         def initialize(subscriber_path:, entitlement_identifier:)
+          super()
           @subscriber_path = subscriber_path
           @entitlement_identifier = entitlement_identifier
         end

lib/tarpon/request/subscriber/entitlement.rb

@@ -7,14 +7,15 @@ module Request
     class Subscriber
       class Offering < Base
         def initialize(subscriber_path:)
+          super()
           @subscriber_path = subscriber_path
         end
 
         def list(platform)
           response = perform(method: :get, path: path.to_s, headers: { 'x-platform': platform.to_s }, key: :public)
           return response unless response.success?
 
-          Tarpon::Entity::Offerings.new(response.raw)
+          Tarpon::Entity::Offerings.new(**response.raw)
         end
 
         private