Merge branch '3624-upgrade' into ruby3-prerelease

.annotaterb.yml

@@ -0,0 +1,58 @@
+---
+:position: before
+:position_in_additional_file_patterns: before
+:position_in_class: before
+:position_in_factory: before
+:position_in_fixture: before
+:position_in_routes: before
+:position_in_serializer: before
+:position_in_test: before
+:classified_sort: true
+:exclude_controllers: true
+:exclude_factories: true
+:exclude_fixtures: true
+:exclude_helpers: true
+:exclude_scaffolds: true
+:exclude_serializers: false
+:exclude_sti_subclasses: false
+:exclude_tests: true
+:force: false
+:format_markdown: false
+:format_rdoc: false
+:format_yard: false
+:frozen: false
+:ignore_model_sub_dir: false
+:ignore_unknown_models: false
+:include_version: false
+:show_check_constraints: false
+:show_complete_foreign_keys: false
+:show_foreign_keys: true
+:show_indexes: true
+:simple_indexes: false
+:sort: false
+:timestamp: false
+:trace: false
+:with_comment: true
+:with_column_comments: true
+:with_table_comments: true
+:active_admin: false
+:command:
+:debug: false
+:hide_default_column_types: ''
+:hide_limit_column_types: ''
+:ignore_columns:
+:ignore_routes:
+:models: true
+:routes: false
+:skip_on_db_migrate: false
+:target_action: :do_annotations
+:wrapper:
+:wrapper_close:
+:wrapper_open:
+:classes_default_to_s: []
+:additional_file_patterns: []
+:model_dir:
+- app/models
+:require: []
+:root_dir:
+- ''

.github/workflows/ci.yml

@@ -0,0 +1,55 @@
+name: "CI"
+on:
+  push: {}
+  pull_request: {}
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_DATABASE: diary_test
+          MYSQL_ROOT_PASSWORD: password
+        ports:
+          - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+    env:
+      RAILS_ENV: test
+      MYSQL_ROOT_PASSWORD: password
+      MYSQL_SOCKET: /tmp/mysql.sock
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Install Ruby and gems
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.3.5
+          bundler-cache: true
+      - name: Install dependencies
+        run: |
+          sudo apt-get -qq update
+          sudo apt-get install -y ghostscript poppler-utils graphviz pandoc texlive-full
+          bundle install --jobs 4 --retry 3
+      - name: Create db
+        run: bundle exec rake db:create
+      - name: Migrate
+        run: bundle exec rake db:migrate
+      - name: Load fixtures
+        run: bundle exec rake db:fixtures:load FIXTURES_PATH=spec/fixtures
+      - name: Run RuboCop
+        run: bundle exec rubocop
+        continue-on-error: true
+      - name: Run tests
+        uses: coactions/setup-xvfb@v1
+        with:
+          run: bundle exec rspec spec
+        env:
+          COVERAGE: 'true'
+          CI: 'true'
+      - name: Run Coveralls
+        if: ${{ github.event_name == 'pull_request' }}
+        uses: coverallsapp/[email protected]
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          path-to-lcov: "./coverage/lcov.info"

.gitignore

@@ -7,15 +7,15 @@
 # Ignore bundler config
 /.bundle
 /.project
-/node_modules
+/node_modules
 
 # Ignore the default SQLite database.
 /db/*.sqlite3
 
 /db/development.sqlite3
 
-/coverage
-/public/imports
+/coverage
+/public/imports
 /public/images/working
 /public/images/simple_captcha
 /public/uploads
@@ -51,4 +51,4 @@ tags
 /**/svg-source
 
 .env
-config/locales/.DS_Store
+.DS_Store

.ruby-version

@@ -1 +1 @@
-2.7.1
+3.3.5

CONTRIBUTING.md

@@ -0,0 +1,20 @@
+# Contributing to FromThePage
+
+Thanks for your interest in FromThePage!  We're excited that you'd like to improve this open-source tool which has been installed on six continents.  If you'd like something small to start, check out issues labelled [good first issue](https://github.com/benwbrum/fromthepage/issues?q=is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22).
+
+# Issues
+
+Please open an issue before creating a pull request, even if the feature has been discussed via email or Slack.  If possible, include a link to an example of the problem.
+
+
+# Pull Requests
+Please create a branch off of `development`.  The branch name should start with the issue number.
+
+All commit messages should include the issue number.
+
+All pull requests should be linked to an issue, ideally using closing keywords.
+
+## Coding conventions
+* Indentation is via two spaces.  
+* We prefer [slim templates](https://slim-template.github.io/), but ERB is acceptable.
+