From e9f3ed0795b1827472337e9bd0b108dec8d7cdea Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Mon, 30 Oct 2023 14:34:22 -0400 Subject: Installed Wittle --- .gitignore | 3 +- Gemfile | 3 +- Gemfile.lock | 206 +++++++++++++-------- config/routes.rb | 1 + .../20231030181439_create_wittle_puzzles.wittle.rb | 12 ++ .../20231030181440_create_wittle_scores.wittle.rb | 13 ++ db/schema.rb | 20 +- 7 files changed, 174 insertions(+), 84 deletions(-) create mode 100644 db/migrate/20231030181439_create_wittle_puzzles.wittle.rb create mode 100644 db/migrate/20231030181440_create_wittle_scores.wittle.rb diff --git a/.gitignore b/.gitignore index 7e20915..7e4fe23 100644 --- a/.gitignore +++ b/.gitignore @@ -8,8 +8,7 @@ /.bundle # Ignore the default SQLite database. -/db/*.sqlite3 -/db/*.sqlite3-journal +/db/*.sqlite3* # Ignore all logfiles and tempfiles. /log/* diff --git a/Gemfile b/Gemfile index fd377fe..88a4899 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ end # Bundle edge Rails instead: gem 'rails', github: 'rails/rails' -gem 'rails', '~> 7.0.3' +gem 'rails', '~> 7.1.0' # Use sqlite3 as the database for Active Record gem 'sqlite3' # Use Puma as the app server @@ -84,3 +84,4 @@ gem 'active_storage_validations' gem "image_processing", ">= 1.2" gem "meta-tags" gem 'rails_autolink' +gem 'wittle', git: "https://git.fourisland.com/wittle", branch: "main" diff --git a/Gemfile.lock b/Gemfile.lock index 07908ec..29af576 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -11,7 +11,7 @@ GIT GIT remote: https://git.fourisland.com/pokeviewer - revision: e28f6b73ab7f2e59605ebd800e921a6146fc49ae + revision: c1b0443ba2aebdbd39291ddab0c189f3f4831320 specs: pokeviewer (0.1.0) activerecord-diff @@ -20,87 +20,108 @@ GIT haml jquery-rails normalize-rails - rails (~> 7.0.3) + rails (~> 7.1.0) sassc-rails sequenced victor +GIT + remote: https://git.fourisland.com/wittle + revision: a53bb4be6925439f9fead619292c662ea6e38748 + branch: main + specs: + wittle (0.1.0) + enumerize + haml + jquery-rails + rails (>= 7.1.1) + rice + sassc-rails + GEM remote: https://rubygems.org/ specs: - actioncable (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) + actioncable (7.1.1) + actionpack (= 7.1.1) + activesupport (= 7.1.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailbox (7.0.8) - actionpack (= 7.0.8) - activejob (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + zeitwerk (~> 2.6) + actionmailbox (7.1.1) + actionpack (= 7.1.1) + activejob (= 7.1.1) + activerecord (= 7.1.1) + activestorage (= 7.1.1) + activesupport (= 7.1.1) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.0.8) - actionpack (= 7.0.8) - actionview (= 7.0.8) - activejob (= 7.0.8) - activesupport (= 7.0.8) + actionmailer (7.1.1) + actionpack (= 7.1.1) + actionview (= 7.1.1) + activejob (= 7.1.1) + activesupport (= 7.1.1) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp - rails-dom-testing (~> 2.0) - actionpack (7.0.8) - actionview (= 7.0.8) - activesupport (= 7.0.8) - rack (~> 2.0, >= 2.2.4) + rails-dom-testing (~> 2.2) + actionpack (7.1.1) + actionview (= 7.1.1) + activesupport (= 7.1.1) + nokogiri (>= 1.8.5) + rack (>= 2.2.4) + rack-session (>= 1.0.1) rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.2.0) - actiontext (7.0.8) - actionpack (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actiontext (7.1.1) + actionpack (= 7.1.1) + activerecord (= 7.1.1) + activestorage (= 7.1.1) + activesupport (= 7.1.1) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.0.8) - activesupport (= 7.0.8) + actionview (7.1.1) + activesupport (= 7.1.1) builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.1, >= 1.2.0) - active_storage_validations (1.0.4) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + active_storage_validations (1.1.1) activejob (>= 5.2.0) activemodel (>= 5.2.0) activestorage (>= 5.2.0) activesupport (>= 5.2.0) - activejob (7.0.8) - activesupport (= 7.0.8) + activejob (7.1.1) + activesupport (= 7.1.1) globalid (>= 0.3.6) - activemodel (7.0.8) - activesupport (= 7.0.8) - activerecord (7.0.8) - activemodel (= 7.0.8) - activesupport (= 7.0.8) + activemodel (7.1.1) + activesupport (= 7.1.1) + activerecord (7.1.1) + activemodel (= 7.1.1) + activesupport (= 7.1.1) + timeout (>= 0.4.0) activerecord-diff (2.0.0) - activestorage (7.0.8) - actionpack (= 7.0.8) - activejob (= 7.0.8) - activerecord (= 7.0.8) - activesupport (= 7.0.8) + activestorage (7.1.1) + actionpack (= 7.1.1) + activejob (= 7.1.1) + activerecord (= 7.1.1) + activesupport (= 7.1.1) marcel (~> 1.0) - mini_mime (>= 1.1.0) - activesupport (7.0.8) + activesupport (7.1.1) + base64 + bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) minitest (>= 5.1) + mutex_m tzinfo (~> 2.0) - acts-as-taggable-on (9.0.1) - activerecord (>= 6.0, < 7.1) + acts-as-taggable-on (10.0.0) + activerecord (>= 6.1, < 7.2) addressable (2.8.5) public_suffix (>= 2.0.2, < 6.0) airbrussh (1.5.0) @@ -109,11 +130,13 @@ GEM audited (5.4.0) activerecord (>= 5.0, < 7.2) request_store (~> 1.2) + base64 (0.1.1) bcrypt (3.1.19) + bigdecimal (3.1.4) bindex (0.8.1) builder (3.2.4) byebug (11.1.3) - capistrano (3.17.3) + capistrano (3.18.0) airbrussh (>= 1.0.0) i18n rake (>= 10.0.0) @@ -144,14 +167,17 @@ GEM execjs coffee-script-source (1.12.2) concurrent-ruby (1.2.2) + connection_pool (2.4.1) crass (1.0.6) date (3.3.3) - devise (4.9.2) + devise (4.9.3) bcrypt (~> 3.0) orm_adapter (~> 0.1) railties (>= 4.1.0) responders warden (~> 1.2.3) + drb (2.1.1) + ruby2_keywords enumerize (2.7.0) activesupport (>= 3.2) erubi (1.12.0) @@ -174,6 +200,10 @@ GEM image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) + io-console (0.6.0) + irb (1.8.3) + rdoc + reline (>= 0.3.8) jbuilder (2.11.5) actionview (>= 5.0.0) activesupport (>= 5.0.0) @@ -200,7 +230,6 @@ GEM marcel (1.0.2) meta-tags (2.19.0) actionpack (>= 3.2.0, < 7.2) - method_source (1.0.0) mime-types (3.5.1) mime-types-data (~> 3.2015) mime-types-data (3.2023.1003) @@ -209,12 +238,13 @@ GEM rake mini_magick (4.12.0) mini_mime (1.1.5) - mini_portile2 (2.8.4) + mini_portile2 (2.8.5) mini_racer (0.8.0) libv8-node (~> 18.16.0.0) minitest (5.20.0) + mutex_m (0.1.2) mysql2 (0.5.5) - net-imap (0.4.1) + net-imap (0.4.3) date net-protocol net-pop (0.1.2) @@ -238,25 +268,32 @@ GEM mime-types mimemagic (~> 0.3.0) terrapin (~> 0.6.0) + psych (5.1.1.1) + stringio public_suffix (5.0.3) racc (1.7.1) rack (2.2.8) + rack-session (1.0.1) + rack (< 3) rack-test (2.1.0) rack (>= 1.3) - rails (7.0.8) - actioncable (= 7.0.8) - actionmailbox (= 7.0.8) - actionmailer (= 7.0.8) - actionpack (= 7.0.8) - actiontext (= 7.0.8) - actionview (= 7.0.8) - activejob (= 7.0.8) - activemodel (= 7.0.8) - activerecord (= 7.0.8) - activestorage (= 7.0.8) - activesupport (= 7.0.8) + rackup (1.0.0) + rack (< 3) + webrick + rails (7.1.1) + actioncable (= 7.1.1) + actionmailbox (= 7.1.1) + actionmailer (= 7.1.1) + actionpack (= 7.1.1) + actiontext (= 7.1.1) + actionview (= 7.1.1) + activejob (= 7.1.1) + activemodel (= 7.1.1) + activerecord (= 7.1.1) + activestorage (= 7.1.1) + activesupport (= 7.1.1) bundler (>= 1.15.0) - railties (= 7.0.8) + railties (= 7.1.1) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -268,27 +305,34 @@ GEM actionview (> 3.1) activesupport (> 3.1) railties (> 3.1) - railties (7.0.8) - actionpack (= 7.0.8) - activesupport (= 7.0.8) - method_source + railties (7.1.1) + actionpack (= 7.1.1) + activesupport (= 7.1.1) + irb + rackup (>= 1.0.0) rake (>= 12.2) - thor (~> 1.0) - zeitwerk (~> 2.5) - rake (13.0.6) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) + rake (13.1.0) rb-fsevent (0.11.2) rb-inotify (0.10.1) ffi (~> 1.0) + rdoc (6.5.0) + psych (>= 4.0.0) redcarpet (3.6.0) + reline (0.3.9) + io-console (~> 0.5) request_store (1.5.1) rack (>= 1.4) - responders (3.1.0) + responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) rexml (3.2.6) - rouge (4.1.3) - ruby-vips (2.1.4) + rice (4.1.0) + rouge (4.2.0) + ruby-vips (2.2.0) ffi (~> 1.12) + ruby2_keywords (0.0.5) rubyzip (2.3.2) sassc (2.4.0) ffi (~> 1.9) @@ -321,10 +365,11 @@ GEM sshkit (1.21.5) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) + stringio (3.0.8) temple (0.10.3) terrapin (0.6.0) climate_control (>= 0.0.3, < 1.0) - thor (1.2.2) + thor (1.3.0) tilt (2.3.0) timeout (0.4.0) turbolinks (5.2.1) @@ -385,7 +430,7 @@ DEPENDENCIES normalize-rails paperclip pokeviewer! - rails (~> 7.0.3) + rails (~> 7.1.0) rails_autolink redcarpet rouge @@ -401,6 +446,7 @@ DEPENDENCIES web-console (>= 3.3.0) webrick (~> 1.7) will_paginate (~> 4.0) + wittle! BUNDLED WITH 2.2.3 diff --git a/config/routes.rb b/config/routes.rb index 1671d54..81b5de2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -83,4 +83,5 @@ Rails.application.routes.draw do mount Pokeviewer::Engine => '/poke3' mount Lingo::Engine => '/lingo' + mount Wittle::Engine => '/wittle' end diff --git a/db/migrate/20231030181439_create_wittle_puzzles.wittle.rb b/db/migrate/20231030181439_create_wittle_puzzles.wittle.rb new file mode 100644 index 0000000..9accf92 --- /dev/null +++ b/db/migrate/20231030181439_create_wittle_puzzles.wittle.rb @@ -0,0 +1,12 @@ +# This migration comes from wittle (originally 20231028205751) +class CreateWittlePuzzles < ActiveRecord::Migration[7.1] + def change + create_table :wittle_puzzles do |t| + t.text :data + t.text :solved_data + t.string :category + + t.timestamps + end + end +end diff --git a/db/migrate/20231030181440_create_wittle_scores.wittle.rb b/db/migrate/20231030181440_create_wittle_scores.wittle.rb new file mode 100644 index 0000000..5110221 --- /dev/null +++ b/db/migrate/20231030181440_create_wittle_scores.wittle.rb @@ -0,0 +1,13 @@ +# This migration comes from wittle (originally 20231028210722) +class CreateWittleScores < ActiveRecord::Migration[7.1] + def change + create_table :wittle_scores do |t| + t.references :puzzle, null: false + t.string :name + t.string :ip + t.integer :seconds_taken + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 541f1c1..b036d7f 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2023_10_21_020306) do +ActiveRecord::Schema[7.1].define(version: 2023_10_30_181440) do create_table "active_storage_attachments", force: :cascade do |t| t.string "name", null: false t.string "record_type", null: false @@ -416,6 +416,24 @@ ActiveRecord::Schema[7.0].define(version: 2023_10_21_020306) do t.index ["votable_type", "votable_id"], name: "index_votes_on_votable" end + create_table "wittle_puzzles", force: :cascade do |t| + t.text "data" + t.text "solved_data" + t.string "category" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "wittle_scores", force: :cascade do |t| + t.integer "puzzle_id", null: false + t.string "name" + t.string "ip" + t.integer "seconds_taken" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["puzzle_id"], name: "index_wittle_scores_on_puzzle_id" + end + add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id" add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id" add_foreign_key "blogs", "users" -- cgit 1.4.1