pocket-ruby 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d5d9cc7d714e363b5d185ab6c83f9c60c7650dca3bb80942d490342c1b296f1
-  data.tar.gz: 895f07cc0c151ab089fbd02a41776894ce94a4a87f5e35e2f3597f3321d531ab
+  metadata.gz: 057ba75ac285a0e803b059403d9764f9d48061b0ac6d6a9a48a75c8ccc153f79
+  data.tar.gz: 6a0d5403bb970db84cf080bec236abde25c557bd210b14a13cc61116c290dc96
 SHA512:
-  metadata.gz: 17946cffbd9fdab7faac7e635e2611f0715525f5ad17aa731e0c03c2449bb5f8c1f7bea9d59803bfa81369b55df271cd580106a7aad04ad5cee7d52c0b657e08
-  data.tar.gz: 5fcd4d7e3bede834b735ec8efe4e3a024576f358c599f2028e325acf1bd3dc986b1bb60ea42a4c72a886c872c6ff13571fbed792d60326ff28c5495334cae121
+  metadata.gz: 993aa6c25064d7cfb6cbca90fc0952a5572162e7f5b481373ead76f321490e9a960f7d5c277dcc18606c9758f2151a57846484c87ad7827dfaf4351366b6305f
+  data.tar.gz: 9f4331eba655b118ff0a8ea8ca55adf18f6e63193f4e7ca484829eb25972d9ec74fc0da24da9dc56c5f09a0e96a1655c18fed3127fa86004fad969a3c2cee08d

data/.github/workflows/tests.yml

@@ -3,14 +3,25 @@ name: Ruby
 on: [push,pull_request]
 
 jobs:
-  build:
+  build-matrix:
     runs-on: ubuntu-latest
+    steps: # https://michaelheap.com/dynamic-matrix-generation-github-actions/
+    - id: set-matrix
+      run: echo "::set-output name=version_matrix::$(curl https://endoflife.date/api/ruby.json | jq -c '[.[] | select(.eol > (now | strftime("%Y-%m-%d"))) | .cycle]')"
+    outputs:
+      version_matrix: ${{ steps.set-matrix.outputs.version_matrix }}
+  ci:
+    needs: build-matrix
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        version: ${{ fromJson(needs.build-matrix.outputs.version_matrix) }}
     steps:
     - uses: actions/checkout@v2
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6.6
+        ruby-version: ${{ matrix.version }}
         bundler-cache: true
     - name: Run the default task
       run: bundle exec rake

data/.gitignore

@@ -15,3 +15,4 @@ tmp
 .yardoc
 _yardoc
 doc/
+.DS_Store

data/.ruby-version

@@ -0,0 +1 @@
+3.3.5

data/CHANGELOG.md

@@ -1,5 +1,16 @@
+## [0.6.0] - 2024-10-07
+- Upgrade Ruby to Version 3.3.5
+- Upgrade Faraday to Version 2
+- Removes faraday_middleware as it is no longer supported
+- Updates the Connection builder to not use the calls specific to faraday_middleware
+- Upgrade activesupport to 7.2
+- Upgrade Sinatra to version 3
+
 ## [Unreleased]
 
+- Ownership transferred to `@andyw8` ([#108](https://github.com/turadg/pocket-ruby/pull/108))
+- Set Faraday version constraint ([#104](https://github.com/turadg/pocket-ruby/pull/104))
+
 ## [0.5.0] - 2021-05-15
 
 - Use Sinatra 2. ([#92](https://github.com/turadg/pocket-ruby/pull/92))

data/Gemfile

@@ -1,3 +1,3 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec

data/Gemfile.lock

@@ -1,104 +1,143 @@
 PATH
   remote: .
   specs:
-    pocket-ruby (0.5.0)
-      faraday (>= 1.0)
-      faraday_middleware
-      multi_json (~> 1.0, >= 1.0.3)
+    pocket-ruby (0.6.0)
+      faraday
+      multi_json (>= 1.15.0)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 5.0)
+    activesupport (7.2.1)
+      base64
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
     ast (2.4.2)
-    crack (0.4.5)
+    base64 (0.2.0)
+    bigdecimal (3.1.8)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
+    crack (1.0.0)
+      bigdecimal
       rexml
-    docile (1.3.5)
-    faraday (1.4.1)
-      faraday-excon (~> 1.1)
-      faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
-      multipart-post (>= 1.2, < 3)
-      ruby2_keywords (>= 0.0.4)
-    faraday-excon (1.1.0)
-    faraday-net_http (1.0.1)
-    faraday-net_http_persistent (1.1.0)
-    faraday_middleware (1.0.0)
-      faraday (~> 1.0)
-    hashdiff (1.0.1)
+    docile (1.4.1)
+    drb (2.2.1)
+    faraday (2.12.0)
+      faraday-net_http (>= 2.0, < 3.4)
+      json
+      logger
+    faraday-net_http (3.3.0)
+      net-http
+    hashdiff (1.1.1)
+    i18n (1.14.6)
+      concurrent-ruby (~> 1.0)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    lint_roller (1.1.0)
+    logger (1.6.1)
+    minitest (5.25.1)
     multi_json (1.15.0)
-    multi_xml (0.6.0)
-    multipart-post (2.1.1)
-    mustermann (1.1.1)
+    multi_xml (0.7.1)
+      bigdecimal (~> 3.1)
+    mustermann (3.0.3)
       ruby2_keywords (~> 0.0.1)
-    parallel (1.20.1)
-    parser (3.0.0.0)
+    net-http (0.4.1)
+      uri
+    parallel (1.26.3)
+    parser (3.3.5.0)
       ast (~> 2.4.1)
-    power_assert (2.0.0)
-    public_suffix (4.0.6)
-    rack (2.2.3)
-    rack-protection (2.1.0)
-      rack
-    rainbow (3.0.0)
-    rake (13.0.3)
-    regexp_parser (2.1.1)
-    rexml (3.2.5)
-    rubocop (1.11.0)
+      racc
+    public_suffix (6.0.1)
+    racc (1.8.1)
+    rack (2.2.9)
+    rack-protection (3.2.0)
+      base64 (>= 0.1.0)
+      rack (~> 2.2, >= 2.2.4)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    regexp_parser (2.9.2)
+    rexml (3.3.7)
+    rubocop (1.65.1)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-performance (1.10.1)
-      rubocop (>= 0.90.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
-    ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
-    simplecov (0.21.2)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.32.3)
+      parser (>= 3.3.1.0)
+    rubocop-performance (1.21.1)
+      rubocop (>= 1.48.1, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    ruby-progressbar (1.13.0)
+    ruby2_keywords (0.0.5)
+    securerandom (0.3.1)
+    simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
-    simplecov_json_formatter (0.1.2)
-    sinatra (2.1.0)
-      mustermann (~> 1.0)
-      rack (~> 2.2)
-      rack-protection (= 2.1.0)
+    simplecov-html (0.13.1)
+    simplecov_json_formatter (0.1.4)
+    sinatra (3.2.0)
+      mustermann (~> 3.0)
+      rack (~> 2.2, >= 2.2.4)
+      rack-protection (= 3.2.0)
       tilt (~> 2.0)
-    standard (1.0.4)
-      rubocop (= 1.11.0)
-      rubocop-performance (= 1.10.1)
-    test-unit (3.4.0)
-      power_assert
-    tilt (2.0.10)
-    unicode-display_width (2.0.0)
-    webmock (3.12.1)
-      addressable (>= 2.3.6)
+    standard (1.40.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.65.0)
+      standard-custom (~> 1.0.0)
+      standard-performance (~> 1.4)
+    standard-custom (1.0.2)
+      lint_roller (~> 1.0)
+      rubocop (~> 1.50)
+    standard-performance (1.4.0)
+      lint_roller (~> 1.1)
+      rubocop-performance (~> 1.21.0)
+    tilt (2.4.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.6.0)
+    uri (0.13.1)
+    webmock (3.23.1)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    yard (0.9.26)
+    yard (0.9.37)
 
 PLATFORMS
+  arm64-darwin-22
+  arm64-darwin-23
+  ruby
+  universal-darwin-21
   x86_64-darwin-19
   x86_64-darwin-20
   x86_64-linux
 
 DEPENDENCIES
+  activesupport (>= 7)
   multi_xml
   pocket-ruby!
   rake
   simplecov
-  sinatra (~> 2)
+  sinatra (~> 3)
   standard
-  test-unit
   webmock
   yard
 
 BUNDLED WITH
-   2.2.8
+   2.5.21

data/README.md

@@ -5,22 +5,24 @@ pocket-ruby
 
 Ruby API for v3 of the [Pocket API](http://getpocket.com/developer/docs/overview) (formerly Read It Later)
 
+Written by and previously maintained by [@turadg](https://github.com/turadg).
+
 # Usage
 
-Just clone the repo here and refer to the demo-server.rb file for examples on how to interact with the Pocket API.
+Clone the repo and refer to `demo-server.rb` for examples on how to interact with the Pocket API.
 
 ```sh
-	git clone
-	cd pocket-ruby
-	bundle install
-	ruby demo-server.rb
+git clone
+cd pocket-ruby
+bundle install
+ruby demo-server.rb
 ```
 
 *Note:* Changes to the `demo-server.rb` will require a restart to take effect (or you can use [rerun](https://github.com/alexch/rerun)).
 
 Pocket-Ruby can be installed via the gem, ```gem install pocket-ruby```
 
-Or via bundler, ```gem 'pocket-ruby'```
+Or via bundler, `gem 'pocket-ruby'`
 
 ## Pocket API Notes
 

data/lib/faraday/raise_pocket_error.rb

@@ -10,7 +10,7 @@ module Faraday
   # 50X 199 Pocket server issue.
   #
   # @see http://getpocket.com/developer/docs/authentication
-  class Response::RaisePocketError < Response::Middleware
+  class Response::RaisePocketError < Faraday::Response
     CLIENT_ERROR_STATUSES = 400...600
 
     def on_complete(env)

data/lib/pocket/api.rb

@@ -5,13 +5,20 @@ module Pocket
   # @private
   class API
     # @private
-    attr_accessor(*Configuration::VALID_OPTIONS_KEYS)
+    attr_accessor :adapter,
+      :consumer_key,
+      :access_token,
+      :endpoint,
+      :redirect_uri,
+      :format,
+      :user_agent,
+      :proxy
 
     # Creates a new API
     def initialize(options = {})
       options = Pocket.options.merge(options)
       Configuration::VALID_OPTIONS_KEYS.each do |key|
-        send("#{key}=", options[key])
+        send(:"#{key}=", options[key])
       end
     end
 

data/lib/pocket/configuration.rb

@@ -54,7 +54,14 @@ module Pocket
     DEFAULT_USER_AGENT = "Pocket Ruby Gem #{Pocket::VERSION}".freeze
 
     # @private
-    attr_accessor(*VALID_OPTIONS_KEYS)
+    attr_accessor :adapter,
+      :consumer_key,
+      :access_token,
+      :endpoint,
+      :redirect_uri,
+      :format,
+      :user_agent,
+      :proxy
 
     # When this module is extended, set all configuration options to their default values
     def self.extended(base)

data/lib/pocket/connection.rb

@@ -1,29 +1,32 @@
-require "faraday_middleware"
-Dir[File.expand_path("../../faraday/*.rb", __FILE__)].sort.each { |f| require f }
+# frozen_string_literal: true
+
+require "faraday"
+Dir[File.expand_path("faraday/*.rb", __dir__)].sort.each { |f| require f }
 
 module Pocket
   # @private
   module Connection
     private
 
-    def connection(raw = false)
-      options = {
-        headers: {"User-Agent" => user_agent},
-        proxy: proxy,
-        ssl: {verify: false},
-        url: endpoint
-      }
-
-      Faraday::Connection.new(options) do |conn|
-        conn.use FaradayMiddleware::PocketOAuth, consumer_key, access_token
-        conn.use Faraday::Response::RaisePocketError
+    def connection(_raw: false)
+      Faraday::Connection.new(configure_options) do |conn|
+        conn.use(FaradayMiddleware::PocketOAuth, consumer_key, access_token)
 
         conn.request :json
+        conn.response :json
 
-        conn.response :json, content_type: /\bjson$/
-
+        conn.use(Faraday::Response::RaiseError)
         conn.adapter Faraday.default_adapter
       end
     end
+
+    def configure_options
+      {
+        headers: {"User-Agent" => user_agent, "Content-Type" => "application/json"},
+        proxy: proxy,
+        ssl: {verify: false},
+        url: endpoint
+      }
+    end
   end
 end

data/lib/pocket/oauth.rb

@@ -13,24 +13,24 @@ module Pocket
     # Return a Pocket code
     def get_code(options = {})
       params = access_token_params.merge(options)
-      response = connection.post "oauth/request", params
-      results = Hash[URI.decode_www_form(response.body)]
+      response = connection.post("oauth/request", params)
+      results = URI.decode_www_form(response.body).to_h
       results["code"]
     end
 
     # Return an access token from authorization
     def get_access_token(code, options = {})
       params = access_token_params.merge(code: code).merge(options)
-      response = connection.post "oauth/authorize", params
-      results = Hash[URI.decode_www_form(response.body)]
+      response = connection.post("oauth/authorize", params)
+      results = URI.decode_www_form(response.body).to_h
       results["access_token"]
     end
 
     # Return result from authorization
     def get_result(code, options = {})
       params = access_token_params.merge(code: code).merge(options)
-      response = connection.post "oauth/authorize", params
-      Hash[URI.decode_www_form(response.body)]
+      response = connection.post("oauth/authorize", params)
+      URI.decode_www_form(response.body).to_h
     end
 
     private

data/lib/pocket/version.rb

@@ -1,3 +1,3 @@
 module Pocket
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/pocket-ruby.rb

@@ -1,3 +1,5 @@
+require File.expand_path("../faraday/pocket_oauth", __FILE__)
+
 require File.expand_path("../pocket/error", __FILE__)
 require File.expand_path("../pocket/configuration", __FILE__)
 require File.expand_path("../pocket/api", __FILE__)

data/pocket-ruby.gemspec

@@ -1,29 +1,28 @@
 require File.expand_path("../lib/pocket/version", __FILE__)
 
 Gem::Specification.new do |s|
-  s.add_development_dependency("sinatra", "~> 2")
+  s.add_development_dependency("sinatra", "~> 3")
   s.add_development_dependency("multi_xml")
   s.add_development_dependency("rake")
   s.add_development_dependency("standard")
-  s.add_development_dependency("test-unit")
+  s.add_development_dependency("activesupport", ">= 7")
   s.add_development_dependency("simplecov")
   s.add_development_dependency("webmock")
   s.add_development_dependency("yard")
-  s.add_runtime_dependency("faraday", ">= 1.0")
-  s.add_runtime_dependency("faraday_middleware")
-  s.add_runtime_dependency("multi_json", ">= 1.0.3", "~> 1.0")
+
+  s.add_runtime_dependency("faraday")
+  s.add_runtime_dependency("multi_json", ">= 1.15.0")
+
   s.authors = ["Turadg Aleahmad", "Jason Ng PT", "Andy Waite"]
   s.description = "A Ruby wrapper for the Pocket API v3 (Add, Modify and Retrieve)"
   s.email = ["turadg@aleahmad.net", "me@jasonngpt.com"]
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.files = `git ls-files`.split("\n")
-  s.homepage = "https://github.com/turadg/pocket-ruby"
+  s.homepage = "https://github.com/andyw8/pocket-ruby"
   s.name = "pocket-ruby"
   s.platform = Gem::Platform::RUBY
   s.require_paths = ["lib"]
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.3.6") if s.respond_to? :required_rubygems_version=
-  s.rubyforge_project = s.name
+  s.required_rubygems_version = Gem::Requirement.new(">= 2.5.21") if s.respond_to? :required_rubygems_version=
   s.summary = "Ruby wrapper for the Pocket API v3"
-  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.version = Pocket::VERSION
 end

data/test/pocket/article_test.rb

@@ -1,7 +1,7 @@
 require "test_helper"
 
 module Pocket
-  class ArticleTest < Test::Unit::TestCase
+  class ArticleTest < ActiveSupport::TestCase
     setup do
       @article = Pocket::Article.new(parsed_response)
     end
@@ -51,7 +51,7 @@ module Pocket
     end
 
     test "excerpt" do
-      assert_include @article.excerpt, "list of things"
+      assert_includes @article.excerpt, "list of things"
     end
 
     test "excerpt is nil if field not present" do

data/test/pocket/client_test.rb

@@ -1,7 +1,7 @@
 require "test_helper"
-require "webmock/test_unit"
+require "webmock/minitest"
 
-class ClientTest < Test::Unit::TestCase
+class ClientTest < ActiveSupport::TestCase
   test "retrieve" do
     stub_request(:post, "https://getpocket.com/v3/get")
       .with(

data/test/pocket/version_test.rb

@@ -1,7 +1,7 @@
 require "test_helper"
 
 module Pocket
-  class VersionTest < Test::Unit::TestCase
+  class VersionTest < ActiveSupport::TestCase
     def test_specifies_a_version
       assert Pocket::VERSION
     end

data/test/test_helper.rb

@@ -8,4 +8,6 @@ end
 $LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 require "pocket-ruby"
 
-require "test-unit"
+require "active_support"
+require "active_support/test_case"
+require "minitest/autorun"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pocket-ruby
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Turadg Aleahmad
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-15 00:00:00.000000000 Z
+date: 2024-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
@@ -69,19 +69,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test-unit
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -126,20 +126,6 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -158,20 +144,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.3
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 1.15.0
 description: A Ruby wrapper for the Pocket API v3 (Add, Modify and Retrieve)
 email:
 - turadg@aleahmad.net
@@ -183,6 +163,7 @@ files:
 - ".github/workflows/changelog-checker.yml"
 - ".github/workflows/tests.yml"
 - ".gitignore"
+- ".ruby-version"
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
@@ -211,7 +192,7 @@ files:
 - test/pocket/client_test.rb
 - test/pocket/version_test.rb
 - test/test_helper.rb
-homepage: https://github.com/turadg/pocket-ruby
+homepage: https://github.com/andyw8/pocket-ruby
 licenses: []
 metadata: {}
 post_install_message:
@@ -227,15 +208,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 2.5.21
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Ruby wrapper for the Pocket API v3
-test_files:
-- test/fixtures/retreive.json
-- test/pocket/article_test.rb
-- test/pocket/client_test.rb
-- test/pocket/version_test.rb
-- test/test_helper.rb
+test_files: []