Skip to content

Commit e13567e

Browse files
authored
Merge pull request #11667 from neinteractiveliterature/add-import-convention-data-service
Replace direct-DB importers with JSON pipeline (ImportConventionDataService)
2 parents df443f3 + 12376cb commit e13567e

67 files changed

Lines changed: 1110 additions & 3715 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.rubocop.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ inherit_from: .rubocop_todo.yml
33
plugins:
44
- rubocop-performance
55
- rubocop-rails
6-
- rubocop-sequel
76
- rubocop-factory_bot
87
- rubocop-graphql
98
- rubocop-capybara
@@ -29,11 +28,6 @@ AllCops:
2928
- tmp/**/*
3029
- vendor/bundle/**/*
3130

32-
Sequel:
33-
Enabled: false
34-
Include:
35-
- lib/intercode/import/**/*.rb
36-
3731
Style/BeginBlock:
3832
Description: 'Avoid the use of BEGIN blocks.'
3933
StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-BEGIN-blocks'

Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ USER root
1111
RUN useradd www
1212
WORKDIR /usr/src/intercode
1313

14-
RUN apt-get update && apt-get install -y libvips42 git build-essential shared-mime-info libpq-dev libmariadb-dev libyaml-dev && rm -rf /var/lib/apt/lists/*
14+
RUN apt-get update && apt-get install -y libvips42 git build-essential shared-mime-info libpq-dev libyaml-dev && rm -rf /var/lib/apt/lists/*
1515

1616
COPY --chown=www:www Gemfile Gemfile.lock .ruby-version /usr/src/intercode/
1717
RUN bundle config set without 'development test' \
@@ -71,8 +71,7 @@ USER root
7171
# libjemalloc2: more efficient memory allocation in Ruby and Node
7272
# shared-mime-info: Rails dependency
7373
# libpq5: pg gem dependency
74-
# mariadb-client: dependency for Intercode 1 import
75-
RUN apt-get update && apt-get install -y --no-install-recommends openssh-server iproute2 curl python3 libvips42 poppler-utils xz-utils libjemalloc2 shared-mime-info libpq5 mariadb-client gosu && rm -rf /var/lib/apt/lists/*
74+
RUN apt-get update && apt-get install -y --no-install-recommends openssh-server iproute2 curl python3 libvips42 poppler-utils xz-utils libjemalloc2 shared-mime-info libpq5 gosu && rm -rf /var/lib/apt/lists/*
7675
RUN useradd -ms $(which bash) www
7776
RUN mkdir /opt/node && \
7877
cd /opt/node && \

Gemfile

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,6 @@ gem "rollbar"
115115
# Reduces boot times through caching; required in config/boot.rb
116116
gem "bootsnap", ">= 1.1.0", require: false
117117

118-
gem "parallel", groups: %i[development intercode1_import]
119-
120118
# Production profiling
121119
group :skylight do
122120
gem "rbtrace"
@@ -159,7 +157,6 @@ group :development do
159157
gem "rubocop-performance"
160158
gem "rubocop-rails"
161159
gem "rubocop-rspec", require: false
162-
gem "rubocop-sequel"
163160
gem "syntax_tree"
164161
gem "syntax_tree-haml"
165162
gem "syntax_tree-rbs"
@@ -176,13 +173,6 @@ group :development, :test do
176173
gem "pry-remote"
177174
end
178175

179-
group :intercode1_import do
180-
gem "mysql2", "~> 0.5.3"
181-
gem "reverse_markdown"
182-
gem "sequel"
183-
gem "term-ansicolor"
184-
end
185-
186176
group :test do
187177
gem "capybara"
188178
gem "cuprite"

Gemfile.lock

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -401,8 +401,6 @@ GEM
401401
railties (>= 7.0)
402402
msgpack (1.8.1)
403403
mutex_m (0.3.0)
404-
mysql2 (0.5.7)
405-
bigdecimal
406404
nats-pure (2.4.0)
407405
concurrent-ruby (~> 1.0)
408406
net-http (0.9.1)
@@ -547,8 +545,6 @@ GEM
547545
responders (3.2.0)
548546
actionpack (>= 7.0)
549547
railties (>= 7.0)
550-
reverse_markdown (3.0.2)
551-
nokogiri
552548
rexml (3.4.4)
553549
rollbar (3.8.0)
554550
rouge (3.26.1)
@@ -589,9 +585,6 @@ GEM
589585
lint_roller (~> 1.1)
590586
regexp_parser (>= 2.0)
591587
rubocop (~> 1.86, >= 1.86.2)
592-
rubocop-sequel (0.4.1)
593-
lint_roller (~> 1.1)
594-
rubocop (>= 1.72.1, < 2)
595588
ruby-progressbar (1.13.0)
596589
ruby-statistics (4.1.0)
597590
ruby-vips (2.3.0)
@@ -609,8 +602,6 @@ GEM
609602
bigdecimal
610603
concurrent-ruby (~> 1.0, >= 1.0.2)
611604
logger
612-
sequel (5.105.0)
613-
bigdecimal
614605
shoryuken (6.2.1)
615606
aws-sdk-core (>= 2)
616607
concurrent-ruby
@@ -643,7 +634,6 @@ GEM
643634
bigdecimal
644635
logger
645636
strscan (3.1.8)
646-
sync (0.5.0)
647637
syntax_tree (6.3.0)
648638
prettier_print (>= 1.2.0)
649639
syntax_tree-haml (4.0.3)
@@ -655,14 +645,9 @@ GEM
655645
rbs
656646
syntax_tree (>= 2.0.1)
657647
temple (0.10.3)
658-
term-ansicolor (1.11.3)
659-
tins (~> 1)
660648
thor (1.5.0)
661649
tilt (2.3.0)
662650
timeout (0.6.1)
663-
tins (1.33.0)
664-
bigdecimal
665-
sync
666651
toml (0.3.0)
667652
parslet (>= 1.8.0, < 3.0.0)
668653
tsort (0.2.0)
@@ -761,10 +746,8 @@ DEPENDENCIES
761746
minitest-reporters
762747
minitest-spec-rails
763748
money-rails
764-
mysql2 (~> 0.5.3)
765749
oj (~> 3.17.0)
766750
openssl (~> 4.0)
767-
parallel
768751
pg
769752
pg_search
770753
phonelib
@@ -786,7 +769,6 @@ DEPENDENCIES
786769
readline (~> 0.0.4)
787770
recaptcha
788771
redcarpet
789-
reverse_markdown
790772
rollbar
791773
rubocop (>= 1.82)
792774
rubocop-capybara
@@ -795,12 +777,10 @@ DEPENDENCIES
795777
rubocop-performance
796778
rubocop-rails
797779
rubocop-rspec
798-
rubocop-sequel
799780
ruby-vips
800781
scheduled_value (~> 1.4.0)
801782
sentry-rails (~> 6.0)
802783
sentry-ruby (~> 6.0)
803-
sequel
804784
shoryuken
805785
simplecov
806786
simplecov-cobertura
@@ -811,7 +791,6 @@ DEPENDENCIES
811791
syntax_tree
812792
syntax_tree-haml
813793
syntax_tree-rbs
814-
term-ansicolor
815794
twilio-ruby (~> 7.10.0)
816795
typeprof
817796
tzinfo-data
@@ -824,4 +803,4 @@ RUBY VERSION
824803
ruby 4.0.5p0
825804

826805
BUNDLED WITH
827-
2.6.2
806+
4.0.13

0 commit comments

Comments
 (0)