diff --git a/Gemfile b/Gemfile index f434a75..c5bccc8 100644 --- a/Gemfile +++ b/Gemfile @@ -3,7 +3,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" } ruby "3.2.2" -gem "rails", "~> 7.1.0.rc1" +gem "rails", "~> 7.1" gem "sprockets-rails" gem "pg" gem "puma" diff --git a/Gemfile.lock b/Gemfile.lock index c22ba3d..79d408e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,70 +1,70 @@ GEM remote: https://rubygems.org/ specs: - actioncable (7.1.0.rc1) - actionpack (= 7.1.0.rc1) - activesupport (= 7.1.0.rc1) + actioncable (7.1.1) + actionpack (= 7.1.1) + activesupport (= 7.1.1) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.0.rc1) - actionpack (= 7.1.0.rc1) - activejob (= 7.1.0.rc1) - activerecord (= 7.1.0.rc1) - activestorage (= 7.1.0.rc1) - activesupport (= 7.1.0.rc1) + 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.1.0.rc1) - actionpack (= 7.1.0.rc1) - actionview (= 7.1.0.rc1) - activejob (= 7.1.0.rc1) - activesupport (= 7.1.0.rc1) + 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.2) - actionpack (7.1.0.rc1) - actionview (= 7.1.0.rc1) - activesupport (= 7.1.0.rc1) + 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.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.0.rc1) - actionpack (= 7.1.0.rc1) - activerecord (= 7.1.0.rc1) - activestorage (= 7.1.0.rc1) - activesupport (= 7.1.0.rc1) + 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.1.0.rc1) - activesupport (= 7.1.0.rc1) + actionview (7.1.1) + activesupport (= 7.1.1) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.0.rc1) - activesupport (= 7.1.0.rc1) + activejob (7.1.1) + activesupport (= 7.1.1) globalid (>= 0.3.6) - activemodel (7.1.0.rc1) - activesupport (= 7.1.0.rc1) - activerecord (7.1.0.rc1) - activemodel (= 7.1.0.rc1) - activesupport (= 7.1.0.rc1) + activemodel (7.1.1) + activesupport (= 7.1.1) + activerecord (7.1.1) + activemodel (= 7.1.1) + activesupport (= 7.1.1) timeout (>= 0.4.0) - activestorage (7.1.0.rc1) - actionpack (= 7.1.0.rc1) - activejob (= 7.1.0.rc1) - activerecord (= 7.1.0.rc1) - activesupport (= 7.1.0.rc1) + activestorage (7.1.1) + actionpack (= 7.1.1) + activejob (= 7.1.1) + activerecord (= 7.1.1) + activesupport (= 7.1.1) marcel (~> 1.0) - activesupport (7.1.0.rc1) + activesupport (7.1.1) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -105,16 +105,17 @@ GEM ruby2_keywords ed25519 (1.3.0) erubi (1.12.0) - globalid (1.1.0) - activesupport (>= 5.0) + globalid (1.2.1) + activesupport (>= 6.1) i18n (1.14.1) concurrent-ruby (~> 1.0) importmap-rails (1.2.1) actionpack (>= 6.0.0) railties (>= 6.0.0) io-console (0.6.0) - irb (1.7.4) - reline (>= 0.3.6) + irb (1.8.2) + rdoc + reline (>= 0.3.8) jbuilder (2.11.5) actionview (>= 5.0.0) activesupport (>= 5.0.0) @@ -128,7 +129,7 @@ GEM sshkit (~> 1.21) thor (~> 1.2) zeitwerk (~> 2.5) - loofah (2.21.3) + loofah (2.21.4) crass (~> 1.0.2) nokogiri (>= 1.12.0) mail (2.8.1) @@ -139,10 +140,10 @@ GEM marcel (1.0.2) matrix (0.4.2) mini_mime (1.1.5) - minitest (5.19.0) + minitest (5.20.0) msgpack (1.7.2) mutex_m (0.1.2) - net-imap (0.3.7) + net-imap (0.4.1) date net-protocol net-pop (0.1.2) @@ -155,37 +156,39 @@ GEM net-protocol net-ssh (7.2.0) nio4r (2.5.9) - nokogiri (1.15.3-aarch64-linux) + nokogiri (1.15.4-aarch64-linux) racc (~> 1.4) - nokogiri (1.15.3-x86_64-linux) + nokogiri (1.15.4-x86_64-linux) racc (~> 1.4) - pg (1.5.3) + pg (1.5.4) + psych (5.1.1) + stringio public_suffix (5.0.3) - puma (5.6.6) + puma (6.4.0) nio4r (~> 2.0) racc (1.7.1) - rack (2.2.8) - rack-session (1.0.1) - rack (< 3) + rack (3.0.8) + rack-session (2.0.0) + rack (>= 3.0.0) rack-test (2.1.0) rack (>= 1.3) - rackup (1.0.0) - rack (< 3) - webrick - rails (7.1.0.rc1) - actioncable (= 7.1.0.rc1) - actionmailbox (= 7.1.0.rc1) - actionmailer (= 7.1.0.rc1) - actionpack (= 7.1.0.rc1) - actiontext (= 7.1.0.rc1) - actionview (= 7.1.0.rc1) - activejob (= 7.1.0.rc1) - activemodel (= 7.1.0.rc1) - activerecord (= 7.1.0.rc1) - activestorage (= 7.1.0.rc1) - activesupport (= 7.1.0.rc1) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) + 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.1.0.rc1) + railties (= 7.1.1) rails-dom-testing (2.2.0) activesupport (>= 5.0.0) minitest @@ -193,26 +196,28 @@ GEM rails-html-sanitizer (1.6.0) loofah (~> 2.21) nokogiri (~> 1.14) - railties (7.1.0.rc1) - actionpack (= 7.1.0.rc1) - activesupport (= 7.1.0.rc1) + railties (7.1.1) + actionpack (= 7.1.1) + activesupport (= 7.1.1) irb rackup (>= 1.0.0) rake (>= 12.2) thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) rake (13.0.6) - regexp_parser (2.8.1) - reline (0.3.7) + rdoc (6.5.0) + psych (>= 4.0.0) + regexp_parser (2.8.2) + reline (0.3.9) io-console (~> 0.5) rexml (3.2.6) ruby2_keywords (0.0.5) rubyzip (2.3.2) - selenium-webdriver (4.11.0) + selenium-webdriver (4.14.0) rexml (~> 3.2, >= 3.2.5) rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) - sprockets (4.2.0) + sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) sprockets-rails (3.4.2) @@ -222,29 +227,30 @@ GEM sshkit (1.21.5) net-scp (>= 1.1.2) net-ssh (>= 2.8.0) - stimulus-rails (1.2.2) + stimulus-rails (1.3.0) railties (>= 6.0.0) + stringio (3.0.8) thor (1.2.2) timeout (0.4.0) - turbo-rails (1.4.0) + turbo-rails (1.5.0) actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - web-console (4.2.0) + web-console (4.2.1) actionview (>= 6.0.0) activemodel (>= 6.0.0) bindex (>= 0.4.0) railties (>= 6.0.0) webrick (1.8.1) - websocket (1.2.9) + websocket (1.2.10) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.11) + zeitwerk (2.6.12) PLATFORMS aarch64-linux @@ -260,7 +266,7 @@ DEPENDENCIES kamal pg puma - rails (~> 7.1.0.rc1) + rails (~> 7.1) selenium-webdriver sprockets-rails stimulus-rails @@ -271,4 +277,4 @@ RUBY VERSION ruby 3.2.2p53 BUNDLED WITH - 2.4.17 + 2.4.19 diff --git a/config/deploy.yml b/config/deploy.yml index 9f14f2c..357af4e 100644 --- a/config/deploy.yml +++ b/config/deploy.yml @@ -19,7 +19,7 @@ registry: env: clear: APPLICATION_HOST: tsvallender.co.uk - DB_HOST: 172.17.0.5 + DB_HOST: 172.17.0.3 RAILS_LOG_TO_STDOUT: true RAILS_SERVE_STATIC_FILES: true secret: @@ -46,7 +46,7 @@ accessories: volumes: - /srv/soc/data:/var/lib/postgresql/data options: - ip: 172.17.0.5 + ip: 172.17.0.3 builder: remote: diff --git a/devenv.lock b/devenv.lock index fa33caf..a28ae1e 100644 --- a/devenv.lock +++ b/devenv.lock @@ -3,11 +3,11 @@ "devenv": { "locked": { "dir": "src/modules", - "lastModified": 1692203620, - "narHash": "sha256-9SF/H8oCWv166q5o+JtV7tK+koydgFMu02HCB27UWpU=", + "lastModified": 1697058441, + "narHash": "sha256-gjtW+nkM9suMsjyid63HPmt6WZQEvuVqA5cOAf4lLM0=", "owner": "cachix", "repo": "devenv", - "rev": "eee80243720b7f284128873a9694a520d9967b2f", + "rev": "55294461a62d90c8626feca22f52b0d3d0e18e39", "type": "github" }, "original": { @@ -108,11 +108,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1692221125, - "narHash": "sha256-nKUDlbLL8/WW3Fpx9Y0sY+LliTqU3/GexvHU9BdA8Qk=", + "lastModified": 1697009197, + "narHash": "sha256-viVRhBTFT8fPJTb1N3brQIpFZnttmwo3JVKNuWRVc3s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "214c9de8159b25f3cdc8374a80794d4d5787b4cf", + "rev": "01441e14af5e29c9d27ace398e6dd0b293e25a54", "type": "github" }, "original": { @@ -131,11 +131,11 @@ ] }, "locked": { - "lastModified": 1691041172, - "narHash": "sha256-CJJffNMtL7ocUip/Zs7numYT7RJb3iRdtXzwQJyV0Mw=", + "lastModified": 1695879717, + "narHash": "sha256-r7q/6XOYptP1TbPR09p2olGKJEa9DKqsMCX5o6Myrtk=", "owner": "bobvanderlinden", "repo": "nixpkgs-ruby", - "rev": "ed5efe1e9416318782ee73784adb895b3b8a425d", + "rev": "a8612cd33ac2944cae93894bd0077e30c6b0f6e9", "type": "github" }, "original": { @@ -171,11 +171,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1692274144, - "narHash": "sha256-BxTQuRUANQ81u8DJznQyPmRsg63t4Yc+0kcyq6OLz8s=", + "lastModified": 1696846637, + "narHash": "sha256-0hv4kbXxci2+pxhuXlVgftj/Jq79VSmtAyvfabCCtYk=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "7e3517c03d46159fdbf8c0e5c97f82d5d4b0c8fa", + "rev": "42e1b6095ef80a51f79595d9951eb38e91c4e6ca", "type": "github" }, "original": { diff --git a/devenv.nix b/devenv.nix index 53af593..495a9d6 100644 --- a/devenv.nix +++ b/devenv.nix @@ -13,6 +13,7 @@ git pspg openssl + libyaml ]; languages.ruby.enable = true; diff --git a/test/controllers/microposts_controller_test.rb b/test/controllers/microposts_controller_test.rb index b2f0e96..e3fceb5 100644 --- a/test/controllers/microposts_controller_test.rb +++ b/test/controllers/microposts_controller_test.rb @@ -3,14 +3,14 @@ require "test_helper" class MicropostsControllerTest < ActionDispatch::IntegrationTest test "should get new" do sign_in(users(:user)) - get microposts_new_url + get new_micropost_url assert_response :success end test "should create" do post_content = "

Just some text

" sign_in(users(:user)) - post microposts_url, params: { content: post_content } + post microposts_url, params: { micropost: { content: post_content } } assert_response :redirect follow_redirect! assert_includes @response.body, post_content