Skip to content

Commit

Permalink
WIP
Browse files Browse the repository at this point in the history
  • Loading branch information
byroot committed Mar 15, 2022
1 parent 23fc497 commit 2814657
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: '2.7'
ruby-version: '2.6'
bundler-cache: true
- name: Run test
run: bundle exec rubocop
Expand All @@ -23,7 +23,7 @@ jobs:
strategy:
fail-fast: false
matrix:
ruby: [ ruby-head, '3.0', '2.7' ]
ruby: [ ruby-head, '3.0', '2.7', '2.6' ]
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ inherit_gem:
rubocop-shopify: rubocop.yml

AllCops:
TargetRubyVersion: 2.7
TargetRubyVersion: 2.6
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ gemspec
gem "msgpack", github: "msgpack/msgpack-ruby"

gem "rake", "~> 13.0"
gem "activesupport", ">= 7.0.0"
gem "activerecord", ">= 7.0.0"
gem "activesupport"
gem "activerecord"
gem "sqlite3"
gem "benchmark-ips"

Expand Down
18 changes: 10 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@ PATH
GEM
remote: https://rubygems.org/
specs:
activemodel (7.0.2.3)
activesupport (= 7.0.2.3)
activerecord (7.0.2.3)
activemodel (= 7.0.2.3)
activesupport (= 7.0.2.3)
activesupport (7.0.2.3)
activemodel (6.1.5)
activesupport (= 6.1.5)
activerecord (6.1.5)
activemodel (= 6.1.5)
activesupport (= 6.1.5)
activesupport (6.1.5)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
ast (2.4.2)
benchmark-ips (2.10.0)
byebug (11.1.3)
Expand Down Expand Up @@ -56,15 +57,16 @@ GEM
tzinfo (2.0.4)
concurrent-ruby (~> 1.0)
unicode-display_width (2.1.0)
zeitwerk (2.5.4)

PLATFORMS
ruby
x86_64-darwin-20
x86_64-linux

DEPENDENCIES
activerecord (>= 7.0.0)
activesupport (>= 7.0.0)
activerecord
activesupport
benchmark-ips
byebug
minitest (~> 5.0)
Expand Down
2 changes: 1 addition & 1 deletion dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: paquito

up:
- ruby:
version: 2.7.4
version: 2.6.9
- bundler

commands:
Expand Down
3 changes: 2 additions & 1 deletion lib/paquito/safe_yaml.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def [](klass)
end
end

def initialize(...)
def initialize(*)
super
@permitted_classes = Set.new(@options[:permitted_classes])
@dispatch_cache = DispatchCache.new(self, @dispatch_cache)
Expand All @@ -65,6 +65,7 @@ def initialize(...)
h[klass] = true
end.compare_by_identity
end
ruby2_keywords :initialize if respond_to?(:ruby2_keywords, true)

def dump_coder(target)
return unless permitted_class?(target.class)
Expand Down
2 changes: 1 addition & 1 deletion paquito.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
spec.description = "Framework for defining efficient and extendable serializers"
spec.homepage = "https://github.com/Shopify/paquito"
spec.license = "MIT"
spec.required_ruby_version = ">= 2.7.0"
spec.required_ruby_version = ">= 2.6.0"

spec.metadata["allowed_push_host"] = "https://rubygems.org"

Expand Down

0 comments on commit 2814657

Please sign in to comment.