okay 11.0.0 → 12.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 644512c8f6e9711f699eb2dcc1b140afb21942035549aaf78c6324205d17ca42
-  data.tar.gz: 5401ca57ba69b8a35b3e37acbf52645cb9571aa0fa0a3608be07b160952550db
+  metadata.gz: d440392d2c9d86cd93c694b618d46f18935339c70897e5b6869a8b556ed17953
+  data.tar.gz: 63cb6c74cacfa7985707ae8bae9213b680ec5b097c184d588199ed7b7f5d6a21
 SHA512:
-  metadata.gz: 6f41a2ede17a3af2d5c8dae9e3f26747c3c3739a3be23f619d934247eac3a8a2600125561224d9b263d23f49c633afc40dfc588ff9307ce273edf6221472b9f9
-  data.tar.gz: d9b54ddcd04277369c0aa0ea80c23a1157c84d9f8c3555314446f1a981abf0eba2245968dc5ed16cfb4cd36b220be5c7c140f5fb08ff9edfbe70f8cb743f685c
+  metadata.gz: f45cc9fe3188a53c2492459b1e4c614ab0d7400a0b891a5b1324304b0d34c5650e9a6f048c71427c770bc7205fd283f167e537244efd31df299454445ddfb477
+  data.tar.gz: e6d44d3186e410d8e9f95050534c4e1f13f7c86a53d6b0e4eb6197d0e3e053ba7184251166d21495b537b86bde07ea757fc37d0f246950f4027a734a103467c8

data/.cirrus.yml

@@ -0,0 +1,23 @@
+# Allow compute credits usage by collaborators and bors.
+use_compute_credits: $CIRRUS_USER_COLLABORATOR == 'true' || $CIRRUS_BRANCH == 'master' || $CIRRUS_BRANCH == 'staging' || $CIRRUS_BRANCH == 'trying'
+
+Linux_task:
+  container:
+    matrix:
+      - image: ruby:2.6-slim
+      - image: ruby:2.7-slim
+      - image: ruby:3.0-slim
+  install_script:
+    # git is installed since the gemspec uses it.
+    - apt-get update && apt-get install -y git
+    - gem install bundler
+    - bundle install
+  script:
+    - ruby --version
+    - bundle exec rake spec
+
+task:
+  name: CI Success
+  container: {image: "busybox"}
+  depends_on:
+    - Linux

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/Gemfile

@@ -2,5 +2,14 @@
 
 source "https://rubygems.org"
 
+# Okay only supports Ruby versions under "normal maintenance".
+# This number should be updated when a Ruby version goes into security
+# maintenance.
+#
+# Ruby maintenance info: https://www.ruby-lang.org/en/downloads/branches/
+#
+# NOTE: Update how_is.gemspec when this is updated!
+ruby ">= 2.6"
+
 # Specify your gem's dependencies in okay.gemspec
 gemspec

data/Gemfile.lock

@@ -0,0 +1,40 @@
+PATH
+  remote: .
+  specs:
+    okay (11.0.0)
+      cacert
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    cacert (0.6.0)
+    diff-lcs (1.4.4)
+    rake (12.3.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+
+PLATFORMS
+  x86_64-freebsd-13
+
+DEPENDENCIES
+  bundler (~> 2.0)
+  okay!
+  rake (~> 12.3)
+  rspec (~> 3.8)
+
+RUBY VERSION
+   ruby 3.0.1p64
+
+BUNDLED WITH
+   2.2.15

data/README.md

@@ -43,7 +43,7 @@ Or install it yourself as:
 ### HTTP
 
 * `GET` and `POST` requests supported.
-* TLS is supported, using [`openssl/better_defaults`](https://github.com/duckinator/openssl-better_defaults/) to improve security on old Ruby versions.
+* TLS is used automatically for HTTPS URLs.
 * Does not handle HTTP 307 redirects correctly. (Because it changes it to a GET
   request.)
 

data/bin/httpbin

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker run -p 80:80 kennethreitz/httpbin

data/bors.toml

@@ -0,0 +1,5 @@
+status = ["CI Success"]
+
+# Uncomment this to use a two hour timeout.
+# The default is one hour.
+#timeout_sec = 7200

data/lib/okay/graphql.rb

@@ -17,7 +17,9 @@ module Okay
   #             login
   #         }
   #     }
-  #     response = request.submit!(:github, {bearer_token: ENV["DEMO_GITHUB_TOKEN"]})
+  #
+  #     token = ENV["DEMO_GITHUB_TOKEN"]
+  #     response = request.submit!(:github, {bearer_token: token})
   #     pp JSON.parse(response.body)
   class GraphQL
     Container = Struct.new(:value) do
@@ -36,6 +38,7 @@ module Okay
         instance_exec(&query)
       end
 
+      # rubocop:disable Metrics/AbcSize
       def method_missing(name, *args, **kwargs, &block)
         query_part = @indent_str + name.to_s
         if !args.empty? || !kwargs.empty?
@@ -59,6 +62,7 @@ module Okay
 
         @query += "#{query_part}\n"
       end
+      # rubocop:enable Metrics/AbcSize
 
       def to_s
         @query

data/lib/okay/http.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "okay/version"
-require "openssl/better_defaults"
 require "net/https"
 require "cacert"
 
@@ -66,7 +65,8 @@ module Okay
     #   were a form.
     def self.post(url, data: nil, form_data: nil, headers: {})
       if !data.nil? && !form_data.nil?
-        raise ArgumentError, "cannot specify data and form_data arguments simultaneously."
+        raise ArgumentError,
+              "cannot specify data and form_data arguments simultaneously."
       end
 
       if form_data.nil?
@@ -78,6 +78,8 @@ module Okay
       send_request(:Post, url, nil, body, headers)
     end
 
+    # rubocop:disable Metrics/AbcSize
+
     # Helper method for actually creating a request.
     #
     # @param http_method [Symbol] A symbol representing the class name for
@@ -86,7 +88,8 @@ module Okay
     # @param parameters [Hash, nil] Request parameters (for the query string).
     # @param body [String, nil] Request body.
     # @param redirect_limit [Numeric] The maximum number of redirects allowed.
-    def self.send_request(http_method, url, parameters, body, headers, redirect_limit = DEFAULT_REDIRECT_LIMIT)
+    def self.send_request(http_method, url, parameters, body, headers,
+                          redirect_limit = DEFAULT_REDIRECT_LIMIT)
       if redirect_limit <= 0
         raise RedirectLimitError, "request exceeded redirect limit"
       end
@@ -95,7 +98,9 @@ module Okay
       uri = URI.parse(url)
 
       # Set the query string for the request.
-      uri.query = URI.encode_www_form(parameters) unless parameters.nil?
+      unless parameters.nil? || parameters.empty?
+        uri.query = URI.encode_www_form(parameters)
+      end
 
       options = {
         # If the URI starts with "https://", enable SSL/TLS.
@@ -127,13 +132,26 @@ module Okay
           # Follow a redirect.
           # Decrements +redirect_limit+ while doing so, to avoid redirect loops.
           # NOTE: Does not handle HTTP 307. https://httpstatuses.com/307
-          send_request(:Get, response["location"], parameters, body, headers, redirect_limit - 1)
+          new_url = response["location"]
+          if new_url.start_with?("/")
+            new_uri = uri.dup
+            new_uri.path = response["location"]
+            new_url = new_uri.to_s
+          elsif new_url.start_with?(".")
+            new_uri = uri.dup
+            new_uri.path += "/" + response["location"]
+            new_url = new_uri.to_s
+          end
+          send_request(:Get, new_url, parameters, body, headers,
+                       redirect_limit - 1)
         else
           response
         end
       end
     end
 
+    # rubocop:enable Metrics/AbcSize
+
     # Make +send_request+ a private method.
     private_class_method :send_request
   end

data/lib/okay/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Okay
-  VERSION = "11.0.0"
+  VERSION = "12.0.0"
 end

data/okay.gemspec

@@ -23,11 +23,18 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "openssl-better_defaults"
+  # Okay only supports Ruby versions under "normal maintenance".
+  # This number should be updated when a Ruby version goes into security
+  # maintenance.
+  #
+  # Ruby maintenance info: https://www.ruby-lang.org/en/downloads/branches/
+  #
+  # NOTE: Update Gemfile when this is updated!
+  spec.required_ruby_version = ">= 2.6"
+
   spec.add_runtime_dependency "cacert"
 
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "rspec", "~> 3.8"
-  spec.add_development_dependency "rubocop", "~> 0.49.1"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: okay
 version: !ruby/object:Gem::Version
-  version: 11.0.0
+  version: 12.0.0
 platform: ruby
 authors:
 - Ellen Marie Dash
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-02-02 00:00:00.000000000 Z
+date: 2021-08-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: openssl-better_defaults
-  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: cacert
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.8'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.49.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.49.1
 description: Okay, minimalist implementations of common utilities in Ruby. E.g., HTTP
   fetchers.
 email:
@@ -102,18 +74,19 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github_changelog_generator"
+- ".cirrus.yml"
 - ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
+- bin/httpbin
 - bin/setup
+- bors.toml
 - examples/github-graphql-example.rb
 - examples/github-graphql-intentional-failure-example.rb
 - lib/okay.rb
@@ -129,7 +102,7 @@ homepage: https://github.com/duckinator/okay
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -137,15 +110,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Okay, minimalist implementations of common utilities.
 test_files: []

data/.github_changelog_generator

@@ -1,2 +0,0 @@
-user=how-is
-project=how_is

data/.rubocop.yml

@@ -1,223 +0,0 @@
-AllCops:
-  DisplayCopNames: true
-  DisplayStyleGuide: true
-  TargetRubyVersion: 2.4
-  Exclude:
-    - 'okay.gemspec'
-    - 'bin/*'
-    - 'examples/*'
-    - '**/*~'
-    - 'spec/capture_warnings.rb'
-
-# Exceptions should inherit from StandardError.
-# (RuboCop default is to inherit from RuntimeError.)
-Lint/InheritException:
-  EnforcedStyle: standard_error
-
-Metrics/AbcSize:
-  Max: 17
-
-Metrics/BlockLength:
-  Exclude:
-    - 'spec/**/*_spec.rb'
-
-
-# Getting this back to the default of 100 would be nice,
-# but the few cases that exceed it don't seem overly concerning.
-Metrics/ClassLength:
-  Max: 120
-
-# Still try for 80, but we'll allow 110 because there's a not-insignificant
-# number of cases where we have long lines.
-#
-# It may be worth revisiting this in the future and refactoring those lines.
-Metrics/LineLength:
-  Max: 120
-  AllowHeredoc: true
-
-# Too short methods lead to extraction of single-use methods, which can make
-# the code easier to read (by naming things), but can also clutter the class
-Metrics/MethodLength:
-  Max: 25
-
-Metrics/ParameterLists:
-  Max: 6
-
-Style/Alias:
-  EnforcedStyle: prefer_alias_method
-
-# Most readable form.
-Layout/AlignHash:
-  EnforcedHashRocketStyle: table
-  EnforcedColonStyle: table
-  # Disable because it wound up conflicting with a lot of things like:
-  # foo('bar',
-  #   baz: 'asdf',
-  #   beep: 'boop')
-  #
-  # I suspect these'll disappear when overarching architectural issues are
-  # addressed.
-  Enabled: false
-
-Layout/AlignParameters:
-  # See Style/AlignedHash.
-  Enabled: false
-
-# This codebase may be English, but some English words contain diacritics.
-Style/AsciiComments:
-  Enabled: false
-
-# Despite the fact that some English words contain diacritics, we want all
-# method names to be writable by people who don't have an easy way to type
-# words with diacritics.
-Style/AsciiIdentifiers:
-  Enabled: true
-
-# { ... } for multi-line blocks is okay, follow Weirichs rule instead:
-# https://web.archive.org/web/20140221124509/http://onestepback.org/index.cgi/Tech/Ruby/BraceVsDoEnd.rdoc
-Style/BlockDelimiters:
-  Enabled: false
-
-# There's more nuance around this than RuboCop seems capable of.
-Style/BracesAroundHashParameters:
-  Enabled: false
-
-# Don't force use of Time or Date; DateTime is okay.
-Style/DateTime:
-  Enabled: false
-
-# Unicode is good, mkay?
-Style/Encoding:
-  Enabled: true
-
-Style/RedundantSelf:
-  Enabled: false
-
-# Force Unix line endings.
-Layout/EndOfLine:
-  Enabled: true
-  EnforcedStyle: lf
-
-# A lot of the approaches I use for making things readable makes this angry.
-# E.g., formatting multiple consecutive assignments so that the equal signs
-# and values line up.
-#
-# foobar = 'blah'
-# baz    = 'asdf'
-# beep   = 'boop'
-Layout/ExtraSpacing:
-  Enabled: false
-
-#   # bad
-#
-#   format('%<greeting>s', greeting: 'Hello')
-#   format('%s', 'Hello')
-#
-#   # good
-#
-#   format('%{greeting}', greeting: 'Hello')
-Style/FormatStringToken:
-  EnforcedStyle: template
-
-# Freeze string literals to future-proof the code.
-Style/FrozenStringLiteralComment:
-  Enabled: true
-  EnforcedStyle: always
-
-# Mixing hash styles just looks silly.
-# http://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Style/HashSyntax
-Style/HashSyntax:
-  EnforcedStyle: no_mixed_keys
-
-Layout/IndentHash:
-  Enabled: true
-  EnforcedStyle: consistent
-
-Layout/IndentArray:
-  Enabled: true
-  EnforcedStyle: consistent
-
-Style/ConditionalAssignment:
-  Enabled: false
-
-# I deplore assignments in conditions and never want them in any codebase
-# I have direct control over.
-Style/ParenthesesAroundCondition:
-  AllowSafeAssignment: false
-Lint/AssignmentInCondition:
-  AllowSafeAssignment: false
-
-# Use [] for `%`-literal delimiters (e.g. for %q[]) that RuboCop doesn't define
-# anything for. (E.g., %q[].)
-#
-# The reason I prefer [] instead of () is that most of the time I use
-# `%`-literals is inside of function calls, and using () makes it blend in too
-# much.
-Style/PercentLiteralDelimiters:
-  Enabled: true
-  PreferredDelimiters:
-    default: "[]"
-    '%w': '[]'
-    '%W': '[]'
-
-# `has_key?` and `has_value?` are clearer than `key?` and `value?`.
-Style/PreferredHashMethods:
-  Enabled: true
-  EnforcedStyle: verbose
-
-# do / end blocks should be used for side effects,
-# methods that run a block for side effects and have
-# a useful return value are rare, assign the return
-# value to a local variable for those cases.
-Style/MethodCalledOnDoEndBlock:
-  Enabled: true
-
-# Indent method calls relative to the receiver, e.g.:
-#   foo \
-#     .bar \
-#     .baz \
-#     .asdf
-Layout/MultilineMethodCallIndentation:
-  EnforcedStyle: indented_relative_to_receiver
-
-# Indenting the chained dots beneath each other is not supported by this cop,
-# see https://github.com/bbatsov/rubocop/issues/1633
-Layout/MultilineOperationIndentation:
-  Enabled: false
-
-# {'foo' => 'bar'} not { 'foo' => 'bar' }
-Layout/SpaceInsideHashLiteralBraces:
-  Enabled: true
-  EnforcedStyle: no_space
-
-# I find "foo > 0" more readable than "foo.positive?" personally.
-Style/NumericPredicate:
-  Enabled: false
-
-# https://www.rubydoc.info/gems/rubocop/RuboCop/Cop/Style/RegexpLiteral
-Style/RegexpLiteral:
-  Enabled: false
-
-# Use double quotes everywhere by default.
-Style/StringLiterals:
-  EnforcedStyle: double_quotes
-
-# Prefer [:foo, :bar] over %i[foo bar].
-Style/SymbolArray:
-  Enabled: true
-  EnforcedStyle: brackets
-
-# Prefer ["foo", "bar"] over %w[foo bar].
-Style/WordArray:
-  Enabled: true
-  EnforcedStyle: brackets
-
-# Require parentheses around complex ternary conditions.
-Style/TernaryParentheses:
-  Enabled: true
-  EnforcedStyle: require_parentheses_when_complex
-
-# Require a comma after the last item in an array or hash if each item is on
-# its own line.
-Style/TrailingCommaInLiteral:
-  EnforcedStyleForMultiline: comma

data/.travis.yml

@@ -1,25 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.4
-  - 2.5
-  - 2.6
-  - ruby-head
-
-matrix:
-  allow_failures:
-    - rvm:
-      - ruby-head
-
-before_install:
-  - gem install bundler
-
-# See https://bors.tech/documentation/getting-started/
-branches:
-  only:
-    # This is where pull requests from "bors r+" are built.
-    - staging
-    # This is where pull requests from "bors try" are built.
-    - trying
-    # Build pull requests.
-    - master