Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update development dependencies #176

Merged
merged 6 commits into from
Jan 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 15 additions & 35 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,51 +13,31 @@ jobs:
fail-fast: false
matrix:
ruby-version: ['3.1']
node-version: ['10']
node-version: ['14']
puppeteer-version: [
'1.20.0',
'2.1.1',
'3.3.0',
'4.0.1',
'5.5.0',
'6.0.0',
'7.1.0',
'8.0.0',
'9.1.1',
'10.4.0',
'11.0.0',
'12.0.1',
'13.7.0',
'14.4.1',
'15.5.0',
'16.2.0',
'17.1.3'
'14.4.1',
'15.5.0',
'16.2.0',
'17.1.3',
'18.2.1',
'19.5.2'
]
include:
- ruby-version: '2.6'
node-version: '10'
puppeteer-version: '17.1.3'
- ruby-version: '2.7'
node-version: '10'
puppeteer-version: '17.1.3'
node-version: '14'
puppeteer-version: '19.5.2'
- ruby-version: '3.0'
node-version: '10'
puppeteer-version: '17.1.3'
- ruby-version: '3.1'
node-version: '12'
puppeteer-version: '17.1.3'
- ruby-version: '3.1'
node-version: '14'
puppeteer-version: '17.1.3'
puppeteer-version: '19.5.2'
- ruby-version: '3.1'
node-version: '16'
puppeteer-version: '17.1.3'
puppeteer-version: '19.5.2'
- ruby-version: '3.1'
node-version: '18'
puppeteer-version: '17.1.3'
puppeteer-version: '19.5.2'

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Ruby
uses: ruby/setup-ruby@v1
Expand All @@ -66,7 +46,7 @@ jobs:
bundler-cache: true

- name: Set up Node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

Expand All @@ -82,6 +62,6 @@ jobs:
PUPPETEER_VERSION: ${{ matrix.puppeteer-version }}

- name: Test & publish code coverage
uses: paambaati/codeclimate-action@v3.0.0
uses: paambaati/codeclimate-action@v3.2.0
env:
CC_TEST_REPORTER_ID: 5cfed40102c670b5c9e509730782b751939ddbe53fc57c317b718f635bab1ce8
6 changes: 4 additions & 2 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
require: rubocop-rspec
require:
- rubocop-rake
- rubocop-rspec

AllCops:
NewCops: enable
TargetRubyVersion: 2.6
TargetRubyVersion: 2.7

Layout/DotPosition:
EnforcedStyle: trailing
Expand Down
18 changes: 9 additions & 9 deletions grover.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)

require 'grover/version'

Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
Gem::Specification.new do |spec|
spec.name = 'grover'
spec.version = Grover::VERSION
spec.authors = ['Andrew Bromwich']
Expand All @@ -16,7 +16,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
SUMMARY
spec.homepage = 'https://github.com/Studiosity/grover'
spec.license = 'MIT'
spec.required_ruby_version = ['>= 2.6.0', '< 3.2.0']
spec.required_ruby_version = ['>= 2.7.0', '< 3.2.0']

# Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
# delete this section to allow pushing this gem to any host.
Expand All @@ -27,19 +27,19 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength

spec.files = `git ls-files lib`.split("\n") + ['LICENSE']
spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
spec.test_files = spec.files.grep(%r{^spec/})
spec.require_paths = ['lib']

spec.add_dependency 'combine_pdf', '~> 1.0'
spec.add_dependency 'nokogiri', '~> 1.0'

spec.add_development_dependency 'mini_magick', '~> 4.9'
spec.add_development_dependency 'pdf-reader', '~> 2.2'
spec.add_development_dependency 'mini_magick', '~> 4.12'
spec.add_development_dependency 'pdf-reader', '~> 2.11'
spec.add_development_dependency 'rack-test', '~> 1.1'
spec.add_development_dependency 'rake', '~> 12.3'
spec.add_development_dependency 'rspec', '~> 3.8'
spec.add_development_dependency 'rubocop', '~> 0.72'
spec.add_development_dependency 'rubocop-rspec', '~> 1.33'
spec.add_development_dependency 'rake', '~> 13.0'
spec.add_development_dependency 'rspec', '~> 3.12'
spec.add_development_dependency 'rubocop', '~> 1.43'
spec.add_development_dependency 'rubocop-rake', '~> 0.6'
spec.add_development_dependency 'rubocop-rspec', '~> 2.18'
# Limit simplecov to 0.17.x due to https://github.com/codeclimate/test-reporter/issues/413
spec.add_development_dependency 'simplecov', '~> 0.17', '< 0.18'
end
114 changes: 7 additions & 107 deletions lib/active_support_ext/object/duplicable.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,88 +31,6 @@ def duplicable?
end
end

class NilClass
begin
nil.dup
rescue TypeError
# +nil+ is not duplicable:
#
# nil.duplicable? # => false
# nil.dup # => TypeError: can't dup NilClass
def duplicable?
false
end
end
end

class FalseClass
begin
false.dup
rescue TypeError
# +false+ is not duplicable:
#
# false.duplicable? # => false
# false.dup # => TypeError: can't dup FalseClass
def duplicable?
false
end
end
end

class TrueClass
begin
true.dup
rescue TypeError
# +true+ is not duplicable:
#
# true.duplicable? # => false
# true.dup # => TypeError: can't dup TrueClass
def duplicable?
false
end
end
end

class Symbol
begin
:symbol.dup # Ruby 2.4.x.
'symbol_from_string'.to_sym.dup # Some symbols can't `dup` in Ruby 2.4.0.
rescue TypeError
# Symbols are not duplicable:
#
# :my_symbol.duplicable? # => false
# :my_symbol.dup # => TypeError: can't dup Symbol
def duplicable?
false
end
end
end

class Numeric
begin
1.dup
rescue TypeError
# Numbers are not duplicable:
#
# 3.duplicable? # => false
# 3.dup # => TypeError: can't dup Integer
def duplicable?
false
end
end
end

require 'bigdecimal'
class BigDecimal
# BigDecimals are duplicable:
#
# BigDecimal("1.2").duplicable? # => true
# BigDecimal("1.2").dup # => #<BigDecimal:...,'0.12E1',18(18)>
def duplicable?
true
end
end

class Method
# Methods are not duplicable:
#
Expand All @@ -123,30 +41,12 @@ def duplicable?
end
end

class Complex
begin
Complex(1).dup
rescue TypeError
# Complexes are not duplicable:
#
# Complex(1).duplicable? # => false
# Complex(1).dup # => TypeError: can't copy Complex
def duplicable?
false
end
end
end

class Rational
begin
Rational(1).dup
rescue TypeError
# Rationals are not duplicable:
#
# Rational(1).duplicable? # => false
# Rational(1).dup # => TypeError: can't copy Rational
def duplicable?
false
end
class UnboundMethod
# Unbound methods are not duplicable:
#
# method(:puts).unbind.duplicable? # => false
# method(:puts).unbind.dup # => TypeError: allocator undefined for UnboundMethod
def duplicable?
false
end
end
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@
},
"homepage": "https://github.com/Studiosity/grover#readme",
"devDependencies": {
"puppeteer": "^17.1.3"
"puppeteer": "^19.5.2"
}
}
4 changes: 2 additions & 2 deletions spec/active_support_ext/object/deep_dup_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
object = Object.new
dup = object.deep_dup
dup.instance_variable_set(:@a, 1)
expect(object.instance_variable_defined?(:@a)).to eq false
expect(dup.instance_variable_defined?(:@a)).to eq true
expect(object.instance_variable_defined?(:@a)).to be false
expect(dup.instance_variable_defined?(:@a)).to be true
end
end

Expand Down
21 changes: 12 additions & 9 deletions spec/grover/processor_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
context 'when puppeteer package is not in package.json' do
before do
FileUtils.copy 'package.json', 'package.json.tmp'
IO.write('package.json', File.open('package.json') { |f| f.read.gsub(/"puppeteer"/, '"puppeteer-tmp"') })
File.write('package.json', File.open('package.json') { |f| f.read.gsub(/"puppeteer"/, '"puppeteer-tmp"') })
end

after { FileUtils.move 'package.json.tmp', 'package.json' }
Expand All @@ -99,10 +99,10 @@
end

context 'when stubbing the call to the Node processor' do
let(:stdin) { instance_double 'IO' }
let(:stdout) { instance_double 'IO' }
let(:stderr) { instance_double 'IO' }
let(:wait_thr) { instance_double 'Process::Waiter' }
let(:stdin) { instance_double IO }
let(:stdout) { instance_double IO }
let(:stderr) { instance_double IO }
let(:wait_thr) { instance_double Process::Waiter }

before do
allow(Open3).to(
Expand Down Expand Up @@ -540,19 +540,22 @@
basic_header_footer_options.merge(
'executeScript' => 'startProcessing()',
'waitForFunction' => 'doneProcessing === true',
'waitForFunctionOptions' => { "polling": 50, "timeout": wait_function_timeout }
'waitForFunctionOptions' => { 'polling' => 50, 'timeout' => wait_function_timeout }
)
end

it { expect(pdf_text_content).to eq "#{date} Hello, world! http://www.example.net/foo/bar 1/1" }

context 'when waiting for function takes too long' do
let(:wait_function_timeout) { 100 }
let(:timeout_error_regex) do
puppeteer_version_on_or_after?('18.0.0') ? /Waiting failed: 100ms exceeded/ : /waiting for function failed/
end

it 'raises a JavaScript error if waitForFunction fails' do
expect do
pdf_text_content
end.to raise_error Grover::JavaScript::TimeoutError, /waiting for function failed/
end.to raise_error Grover::JavaScript::TimeoutError, timeout_error_regex
end
end
end
Expand Down Expand Up @@ -669,7 +672,7 @@
<p id="loading">Loading</p>
<p id="content" style="display: none">Loaded</p>
</body>

<script>
setTimeout(function() {
document.getElementById('loading').remove();
Expand Down Expand Up @@ -879,7 +882,7 @@
<head>
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.0/dist/css/bootstrap.min.css"
integrity="sha384-KyZXEAg3QhqLMpG8r+8fhAXLRk2vvoC2f3B09zVXn8CA5QIVfZOJ3BCsw2P0p/We"
crossorigin="anonymous">
crossorigin="anonymous">
</head>
<body class="bg-dark"></body>
</html>
Expand Down
Loading