lhc 13.1.0 → 13.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98300a9c64d910094f32a96b4428c71aa4d1d8927e1dc9e4b939c1119e28333c
-  data.tar.gz: 7cb93bf8911d06c5fbd015b36b2ccc62c3ff211a1e70a2aa10dfd8fe447be878
+  metadata.gz: b7e042d800751c9fceb6d4f3e01513a1a849a3e00fb8bf7e0987bf1df73b5a45
+  data.tar.gz: 6fa4a578f6003a9ef46ca27ed81766ef2c4dbd07ad231d4201624274b7255153
 SHA512:
-  metadata.gz: 24d10469629a7bb4942bd2a77fabc74910a98179e5998fef6e502fa88e25d583274becd33897f4f509ed97e3e9a3ed2d246145ac9a0908ae3b367d4d0f00ca9d
-  data.tar.gz: c22f9044dbc3a2052c3487eb014f04e86791017da1b3d438d6c9e48e63d30bf4bf5e19663854f3b1a2ba675ad240da84e3c528a0ca25037759a3576109275657
+  metadata.gz: 80b0d65063c77912df0cf07bc8f25acbb083af34186248689131283cb07e90f9bc2677973b96170d0eeba788b7bcde19ce0f3efddefe349501e33b3825f39b53
+  data.tar.gz: 2f0b273133f8fe5311eeaa4c46d11170430c58099c8599f855e303659f299fbab0ababbc5091999a0fc7c433a7eccdd80fbc343e5cac267aeae3aab7595bbdcb

data/.github/workflows/rubocop.yml

@@ -0,0 +1,27 @@
+name: Rubocop
+
+on: push
+
+jobs:
+  rubocop:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.7.2
+      - name: Cache Ruby Gems
+        uses: actions/cache@v2
+        with:
+          path: /.tmp/vendor/bundle
+          key: ${{ runner.os }}-gems-latest-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-latest-
+      - name: Bundle Install
+        run: |
+          bundle config path /.tmp/vendor/bundle
+          bundle install --jobs 4 --retry 3
+      - name: Run Rubocop
+        run: |
+          bundle exec rubocop

data/.github/workflows/test.yml

@@ -0,0 +1,27 @@
+name: Test
+
+on: push
+
+jobs:
+  rspec:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-ruby@v1
+        with:
+          ruby-version: 2.7.2
+      - name: Cache Ruby Gems
+        uses: actions/cache@v2
+        with:
+          path: /.tmp/vendor/bundle
+          key: ${{ runner.os }}-gems-latest-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-latest-
+      - name: Bundle Install
+        run: |
+          bundle config path /.tmp/vendor/bundle
+          bundle install --jobs 4 --retry 3
+      - name: Run Tests
+        run: |
+          bundle exec rspec

data/.rubocop.yml

@@ -5,6 +5,9 @@ inherit_from:
 
 AllCops:
   TargetRubyVersion: 2.3
+  Exclude:
+    - vendor/**
+    - vendor/**/.*
 
 Lint/IneffectiveAccessModifier:
   Enabled: false

data/.ruby-version

@@ -1 +1 @@
-ruby-2.6.5
+ruby-2.7.2

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError
@@ -17,9 +19,7 @@ end
 begin
   require 'rspec/core/rake_task'
   RSpec::Core::RakeTask.new(:spec)
-  task :default => :spec
-rescue LoadError
-  # no rspec available
+  task default: :spec
 end
 
 Bundler::GemHelper.install_tasks

data/lib/lhc/request.rb

@@ -91,7 +91,7 @@ class LHC::Request
 
   def encode_url(url)
     return url if url.nil?
-    URI.escape(url)
+    Addressable::URI.escape(url)
   end
 
   def typhoeusize(options)

data/lib/lhc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LHC
-  VERSION ||= '13.1.0'
+  VERSION ||= '13.2.0'
 end

data/spec/formats/multipart_spec.rb

@@ -6,7 +6,7 @@ describe LHC do
   include ActionDispatch::TestProcess
 
   context 'multipart' do
-    let(:file) { fixture_file_upload(Tempfile.new, 'image/jpeg') }
+    let(:file) { Rack::Test::UploadedFile.new(Tempfile.new) }
     let(:body) { { size: 2231 }.to_json }
     let(:location) { 'http://local.ch/uploads/image.jpg' }
 

data/spec/formats/plain_spec.rb

@@ -6,7 +6,7 @@ describe LHC do
   include ActionDispatch::TestProcess
 
   context 'plain' do
-    let(:file) { fixture_file_upload(Tempfile.new, 'image/jpeg') }
+    let(:file) { Rack::Test::UploadedFile.new(Tempfile.new) }
 
     it 'leaves plains requests unformatted' do
       stub_request(:post, 'http://local.ch/')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhc
 version: !ruby/object:Gem::Version
-  version: 13.1.0
+  version: 13.2.0
 platform: ruby
 authors:
 - https://github.com/local-ch/lhc/contributors
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-01 00:00:00.000000000 Z
+date: 2021-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -202,6 +202,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/rubocop.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.localch.yml"
 - ".rubocop.yml"
@@ -212,17 +214,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- cider-ci.yml
-- cider-ci/bin/bundle
-- cider-ci/bin/ruby_install
-- cider-ci/bin/ruby_version
-- cider-ci/jobs/rspec-activesupport-5.yml
-- cider-ci/jobs/rspec-activesupport-6.yml
-- cider-ci/jobs/rubocop.yml
-- cider-ci/task_components/bundle.yml
-- cider-ci/task_components/rspec.yml
-- cider-ci/task_components/rubocop.yml
-- cider-ci/task_components/ruby.yml
 - friday.yml
 - lhc.gemspec
 - lib/core_ext/hash/deep_transform_values.rb
@@ -403,7 +394,7 @@ homepage: https://github.com/local-ch/lhc
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -419,8 +410,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - Ruby >= 2.0.0
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Advanced HTTP Client for Ruby, fueled with interceptors
 test_files:

data/cider-ci.yml

@@ -1,5 +0,0 @@
-jobs:
-  include:
-    - cider-ci/jobs/rspec-activesupport-5.yml
-    - cider-ci/jobs/rspec-activesupport-6.yml
-    - cider-ci/jobs/rubocop.yml

data/cider-ci/bin/bundle

@@ -1,51 +0,0 @@
-#!/usr/bin/env bash
-set -eux
-
-export PATH=~/.rubies/$RUBY/bin:$PATH
-rm -f .bundle/config
-
-if [ ! -f ~/.rubies/$RUBY/bin/bundle ]; then
-  gem install bundler
-fi
-
-# install bundler v. 1.17.3 in order to be able to run the tests with
-# ACTIVESUPPORT=4 because rails (= 4.2.0) depends on bundler (< 2.0, >= 1.3.0)
-gem install bundler:1.17.3
-
-sed "s/^source 'https:\/\/rubygems\.intra\.local\.ch'*/source 'http\:\/\/52.29.7.59:9292'/g" Gemfile > Gemfile.tmp
-mv Gemfile.tmp Gemfile
-
-DIGEST=$(git ls-tree HEAD --\
-  cider-ci.yml cider-ci Gemfile.lock \
-  | openssl dgst -sha1 | cut -d ' ' -f 2)
-
-if [ ! -z ${ACTIVESUPPORT:-} ]; then
-  DIGEST=$(echo "$DIGEST $ACTIVESUPPORT")
-fi
-
-DIGEST=$(echo "$DIGEST $PATH" \
- | openssl dgst -sha1 | cut -d ' ' -f 2)
-
-echo "DIGEST"
-echo "${DIGEST}"
-
-CACHE_SIGNATURE_FILE="/tmp/bundle_cache_signature_${DIGEST}"
-
-if [ ! -f  $CACHE_SIGNATURE_FILE ] ; then
-  if [ ! -z ${ACTIVESUPPORT:-} ]; then
-    if [ ! -z ${BUNDLER:-} ]; then
-      echo "BUNDLE_GEMFILE=Gemfile.activesupport$ACTIVESUPPORT bundle $BUNDLER install"
-      BUNDLE_GEMFILE=Gemfile.activesupport$ACTIVESUPPORT bundle $BUNDLER install
-    else
-      echo "BUNDLE_GEMFILE=Gemfile.activesupport$ACTIVESUPPORT bundle install"
-      BUNDLE_GEMFILE=Gemfile.activesupport$ACTIVESUPPORT bundle install
-    fi
-  else
-    echo "bundle install"
-    bundle $BUNDLER install
-  fi
-  touch $CACHE_SIGNATURE_FILE
-fi
-
-echo "bundle install"
-bundle $BUNDLER install

data/cider-ci/bin/ruby_install

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -eux
-
-export PATH=~/.rubies/$RUBY/bin:$PATH
-
-if [ ! -d ~/.rubies/$RUBY ]; then
-  ruby-install --no-install-deps $RUBY
-fi

data/cider-ci/bin/ruby_version

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-set -eux
-
-if [ -f ./.ruby-version ]; then
- echo ".ruby-version file found"
-fi
-
-if [ ! -f ./.ruby-version ]; then
-  echo ".ruby-version file not found" 
-  exit 1
-fi 
-
-IFS='-' read -ra EXPLODED_RUBY <<< "$RUBY"
-
-if [ "${#EXPLODED_RUBY[@]}" == "1" ]; then
-  echo 'No engine/version separator "-" found in .ruby-version file.'
-  exit 1
-fi
-
-if [ "${#EXPLODED_RUBY[@]}" != "1" ] && [ "${#EXPLODED_RUBY[@]}" != "2" ]; then
-  echo "Unknown format of .ruby-version file"
-  exit 1
-fi
-
-echo $RUBY

data/cider-ci/jobs/rspec-activesupport-5.yml

@@ -1,27 +0,0 @@
-rspec-active-support-v5:
-  name: 'rspec with ActiveSupport v5'
-
-  run_when:
-    'some HEAD has been updated':
-      type: branch
-      include_match: ^.*$
-
-  context:
-
-    script_defaults:
-      template_environment_variables: true
-
-    task_defaults:
-      environment_variables:
-        ACTIVESUPPORT: '5'
-
-      max_trials: 2
-      dispatch_storm_delay_duration: 1 Seconds
-      include:
-        - cider-ci/task_components/ruby.yml
-        - cider-ci/task_components/bundle.yml
-        - cider-ci/task_components/rspec.yml
-
-    tasks:
-      all-rspec:
-        name: All rspec tests, using ActiveSupport v5

data/cider-ci/jobs/rspec-activesupport-6.yml

@@ -1,28 +0,0 @@
-rspec-active-support-v6:
-  name: 'rspec with ActiveSupport v6'
-
-  run_when:
-    'some HEAD has been updated':
-      type: branch
-      include_match: ^.*$
-
-  context:
-
-    script_defaults:
-      template_environment_variables: true
-
-    task_defaults:
-      environment_variables:
-        ACTIVESUPPORT: '6'
-        RUBY: 'ruby-2.6.3'
-
-      max_trials: 2
-      dispatch_storm_delay_duration: 1 Seconds
-      include:
-        - cider-ci/task_components/ruby.yml
-        - cider-ci/task_components/bundle.yml
-        - cider-ci/task_components/rspec.yml
-
-    tasks:
-      all-rspec:
-        name: All rspec tests, using ActiveSupport v6

data/cider-ci/jobs/rubocop.yml

@@ -1,18 +0,0 @@
-rubocop:
-  name: 'Rubocop'
-
-  run_when:
-    'some HEAD has been updated':
-      type: branch
-      include_match: ^.*$
-
-  context:
-
-    tasks:
-
-      rubocop:
-
-        include:
-          - cider-ci/task_components/ruby.yml
-          - cider-ci/task_components/bundle.yml
-          - cider-ci/task_components/rubocop.yml

data/cider-ci/task_components/bundle.yml

@@ -1,22 +0,0 @@
-traits:
-  ruby-install: true
-  Bash: true
-
-trial_attachments:
-  gemfile:
-    include_match: Gemfile
-    content_type: text/plain
-
-environment_variables:
-  BUNDLER: '_1.17.3_'
-
-scripts:
-
-  bundle:
-    exclusive_executor_resource: ruby-install_{{$RUBY}}
-    timeout: 20 Minutes
-    body: cider-ci/bin/bundle
-    start_when:
-      'ruby installed':
-        script_key: ruby-install
-

data/cider-ci/task_components/rspec.yml

@@ -1,36 +0,0 @@
-ports:
-  CAPYBARA_PORT:
-    min: 8000
-    max: 8999
-  PHANTOMJS_PORT:
-    min: 44600
-    max: 44999
-
-environment_variables:
-  RUBY:
-    read_and_replace_with: .ruby-version
-  RAILS_ENV: 'test'
-
-scripts:
-  rspec:
-    body: |
-      #!/usr/bin/env bash
-      set -eux
-      mkdir -p tmp/cache
-      export PATH=~/.rubies/$RUBY/bin:$PATH
-      if [ ! -z ${ACTIVESUPPORT:-} ]; then BUNDLE_GEMFILE=Gemfile.activesupport$ACTIVESUPPORT bundle $BUNDLER exec rspec; else bundle exec rspec; fi
-
-    start_when:
-      'bundled':
-        script_key: bundle
-
-trial_attachments:
-  logs:
-    include_match: log\/.*\.log$
-    content_type: text/plain
-  image-screenshots:
-    include_match: tmp\/capybara\/.*\.png$
-    content_type: image/png
-  html-screenshots:
-    include_match: tmp\/capybara\/.*\.html$
-    content_type: text/html

data/cider-ci/task_components/rubocop.yml

@@ -1,29 +0,0 @@
-trial_attachments:
-  logs:
-    include_match: tmp\/checkstyle.json$
-    content_type: application/json
-
-tree_attachments:
-  logs:
-    include_match: tmp\/checkstyle.json$
-    content_type: application/json
-
-environment_variables:
-  RUBY:
-    read_and_replace_with: .ruby-version
-  RESULT_PATH: 'tmp/checkstyle.json'
-
-max_trials: 1
-
-scripts:
-  rubocop:
-    start_when:
-      'bundled':
-        script_key: bundle
-    body: |
-      #!/usr/bin/env bash
-      set -eux
-      mkdir -p tmp/cache
-      export PATH=~/.rubies/$RUBY/bin:$PATH
-      bundle exec rubocop --config .rubocop.yml \
-        --format json --out $RESULT_PATH --format progress

data/cider-ci/task_components/ruby.yml

@@ -1,15 +0,0 @@
-environment_variables:
-  RUBY:
-    read_and_replace_with: .ruby-version
-
-scripts:
-  ruby-version:
-    body: cider-ci/bin/ruby_version
-  ruby-install:
-    exclusive_executor_resource: ruby-install_{{$RUBY}}
-    timeout: 20 Minutes
-    body: cider-ci/bin/ruby_install
-    start_when:
-      'ruby version checked':
-        script_key: ruby-version
-