Cleanup setup and update dependencies

Author: khasinski

.env.docker

@@ -1,5 +1,6 @@
 RAILS_PORT=3001
 REDIS_URL=redis://localhost:6389/1
 DB_HOST=db
-DB_PORT=5432
+DB_PORT=5442
 APPSIGNAL_PUSH_API_KEY=
+RAILS_LOG_TO_STDOUT=true

.env.example

@@ -1,8 +1,10 @@
 # You can leave those as defaults
 RAILS_PORT=3001
-REDIS_URL=redis://localhost:6379/1
+REDIS_URL=redis://localhost:6389/1
 DB_HOST=localhost
-DB_PORT=5432
+DB_PORT=5442
+
+# This helps with ruby on macOS
 OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
 
 # You need to set those

.ruby-version

@@ -1 +1 @@
-3.1.4
+3.3.0

Dockerfile

@@ -1,15 +1,12 @@
 # Make sure it matches the Ruby version in .ruby-version and Gemfile
-ARG RUBY_VERSION=3.1.4
-FROM ruby:$RUBY_VERSION
+ARG RUBY_VERSION=3.3.0
+FROM ruby:$RUBY_VERSION-alpine
 
 # Install libvips for Active Storage preview support
-RUN apt-get update -qq && \
-    apt-get install -y build-essential libvips nodejs && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /usr/share/doc /usr/share/man
+RUN apk add --no-cache --update nodejs npm build-base vips-dev libpq postgresql-dev gcompat tzdata
 
 # Rails app lives here
-WORKDIR /app
+#WORKDIR /app
 
 # Set production environment
 ENV RAILS_LOG_TO_STDOUT="1" \
@@ -30,10 +27,8 @@ RUN mkdir -p /rails/log
 # Precompiling assets for production without requiring secret RAILS_MASTER_KEY
 RUN bundle exec rails assets:precompile
 
-# Entrypoint prepares the database.
-RUN chmod +x /app/bin/docker-entrypoint
-ENTRYPOINT ["/app/bin/docker-entrypoint"]
+WORKDIR /app
 
 # Start the server by default, this can be overwritten at runtime
-EXPOSE 3000
-CMD ["./bin/rails", "server"]
+EXPOSE 3001
+CMD ["./bin/rails", "server", "-b", "0.0.0.0", "-p", "3001"]

Gemfile

@@ -1,22 +1,11 @@
 source 'https://rubygems.org'
 
-ruby '~> 3.1.4'
+ruby '~> 3.3.0'
 
-# Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
-gem 'rails', '~> 6.1.7'
-# Use postgresql as the database for Active Record
+gem 'rails', '~> 6.1.7', '>= 6.1.7.6'
 gem 'pg', '~> 1.1'
-# Use Puma as the app server
 gem 'puma', '~> 5.0'
-# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
-# gem 'jbuilder', '~> 2.7'
-# Use Redis adapter to run Action Cable in production
 gem 'redis', '~> 4.0'
-# Use Active Model has_secure_password
-# gem 'bcrypt', '~> 3.1.7'
-
-# Use Active Storage variant
-# gem 'image_processing', '~> 1.2'
 gem 'faker', '~> 2.18.0'
 
 gem 'faraday', '~> 1.4.3'
@@ -27,7 +16,6 @@ gem 'appsignal', '~> 3.5.3'
 
 gem "jquery-rails"
 gem "non-stupid-digest-assets"
-gem "react-rails" # https://github.com/reactjs/react-rails
 gem "sass-rails"
 gem "uglifier"
 gem "geocoder"

Gemfile.lock

@@ -69,24 +69,19 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    appsignal (3.5.3)
+    appsignal (3.5.6)
       rack
-    babel-source (5.8.35)
-    babel-transpiler (0.7.0)
-      babel-source (>= 4.0, < 6)
-      execjs (~> 2.0)
     bootstrap-kaminari-views (0.0.5)
       kaminari (>= 0.13)
       rails (>= 3.1)
     builder (3.2.4)
     concurrent-ruby (1.2.3)
-    connection_pool (2.4.1)
     crass (1.0.6)
     date (3.3.4)
-    debug (1.9.1)
+    debug (1.9.2)
       irb (~> 1.10)
       reline (>= 0.3.8)
-    diff-lcs (1.5.0)
+    diff-lcs (1.5.1)
     dotenv (3.1.0)
     dotenv-rails (3.1.0)
       dotenv (= 3.1.0)
@@ -119,8 +114,8 @@ GEM
       activesupport (>= 6.1)
     i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    io-console (0.7.1)
-    irb (1.11.1)
+    io-console (0.7.2)
+    irb (1.12.0)
       rdoc
       reline (>= 0.4.2)
     jquery-rails (4.6.0)
@@ -139,7 +134,7 @@ GEM
       activerecord
       kaminari-core (= 1.2.2)
     kaminari-core (1.2.2)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.22.0)
@@ -154,36 +149,36 @@ GEM
     method_source (1.0.0)
     mini_mime (1.1.5)
     minitest (5.22.3)
-    multipart-post (2.3.0)
+    multipart-post (2.4.0)
     net-imap (0.4.10)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
       net-protocol
-    nio4r (2.7.0)
-    nokogiri (1.16.2-aarch64-linux)
+    nio4r (2.7.1)
+    nokogiri (1.16.3-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.16.2-arm64-darwin)
+    nokogiri (1.16.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.2-x86_64-darwin)
+    nokogiri (1.16.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.2-x86_64-linux)
+    nokogiri (1.16.3-x86_64-linux)
       racc (~> 1.4)
-    non-stupid-digest-assets (1.0.10)
+    non-stupid-digest-assets (1.0.11)
       sprockets (>= 2.0)
-    pg (1.5.4)
-    pghero (3.4.0)
+    pg (1.5.6)
+    pghero (3.4.1)
       activerecord (>= 6)
     psych (5.1.2)
       stringio
     puma (5.6.8)
       nio4r (~> 2.0)
     racc (1.7.3)
-    rack (2.2.8.1)
+    rack (2.2.9)
     rack-test (2.1.0)
       rack (>= 1.3)
     rails (6.1.7.7)
@@ -214,29 +209,23 @@ GEM
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
-    rake (13.1.0)
+    rake (13.2.1)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rdoc (6.6.3.1)
       psych (>= 4.0.0)
-    react-rails (3.2.0)
-      babel-transpiler (>= 0.7.0)
-      connection_pool
-      execjs
-      railties (>= 3.2)
-      tilt
     redis (4.8.1)
-    reline (0.4.2)
+    reline (0.5.1)
       io-console (~> 0.5)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    rspec-core (3.13.0)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.6)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
+      rspec-support (~> 3.13.0)
     rspec-rails (5.0.3)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
@@ -245,7 +234,7 @@ GEM
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.12.1)
+    rspec-support (3.13.1)
     ruby2_keywords (0.0.5)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
@@ -281,6 +270,7 @@ PLATFORMS
   aarch64-linux
   arm64-darwin-21
   arm64-darwin-22
+  arm64-darwin-23
   x86_64-darwin-21
   x86_64-darwin-23
   x86_64-linux
@@ -301,17 +291,16 @@ DEPENDENCIES
   pg (~> 1.1)
   pghero
   puma (~> 5.0)
-  rails (~> 6.1.7)
+  rails (~> 6.1.7, >= 6.1.7.6)
   rails-assets-bootswatch-sass (< 4.0.0)!
   rails-assets-jquery!
-  react-rails
   redis (~> 4.0)
   rspec-rails (~> 5.0.0)
   sass-rails
   uglifier
 
 RUBY VERSION
-   ruby 3.1.4p223
+   ruby 3.3.0p0
 
 BUNDLED WITH
    2.3.3

README.md

@@ -8,20 +8,6 @@
     - Create account on https://appsignal.com
     - APPSIGNAL_PUSH_API_KEY should be set in your env for configuration scripts to pick them up
 
-**Important note for users of MacBooks:**
-
-When you see error
-```
-objc[18501]: +[__NSCFConstantString initialize] may have been in progress in another thread when fork() was called.
-objc[18501]: +[__NSCFConstantString initialize] may have been in progress in another thread when fork() was called. We cannot safely call it or ignore it in the fork() child process. Crashing instead. Set a breakpoint on objc_initializeAfterForkError to debug.
-```
-
-Please set OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES in your env
-
-```
-export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
-```
-
 ## Setup
 
 1. Create account on https://appsignal.com and set as  an environment variable "APPSIGNAL_PUSH_API_KEY"
@@ -37,19 +23,6 @@ export OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES
 docker-compose up
 ```
 
-## Setup the Local Environment
-
-1. Install Ruby 3.1.4.
-
-1. Install PostgreSQL. Application was tested with PostgreSQL 16.0
-
-1. Install Redis
-
-1. Install gems
-      ```ruby
-      bundle install
-      ```
-
 1. Copy `.env.example` to `.env` and update ports based on your setup.
       ```ruby
       cp .env.example .env

app/models/pet.rb

@@ -28,6 +28,8 @@ class Pet < ApplicationRecord
     near([city[:latitude], city[:longitude]], distance, unit: :km)
   end
 
+  scope :random, -> { order("RANDOM()") }
+
   enum pet_type: { dog: 0, cat: 1 }
   enum gender: { male: 0, female: 1, unknown: 2 }
   enum size: { small: 0, medium: 1, large: 2, extra_large: 3 }
@@ -47,15 +49,15 @@ def image_url(width: 100, height: 100)
   end
 
   def similar_type_pets
-    Pet.where("id != ?", id).where(pet_type: pet_type).order("random()")
+    Pet.where.not(id: id).where(pet_type: pet_type).random
   end
 
   def similiar_name_pets
     first_name = name.split(" ").first
     last_name = name.split(" ").last
-    Pet.where("id != ?", id).where("name ILIKE ?", "%#{last_name}%").or(
-      Pet.where("id != ?", id).where("name ILIKE ?", "%#{first_name}%")
-    ).order("random()")
+    Pet.where.not(id: id).where("name ILIKE ?", "%#{last_name}%").or(
+      Pet.where.not(id: id).where("name ILIKE ?", "%#{first_name}%")
+    ).random
   end
 
   def tagline

config/database.yml

@@ -1,25 +1,10 @@
-# PostgreSQL. Versions 9.3 and up are supported.
-#
-# Install the pg driver:
-#   gem install pg
-# On macOS with Homebrew:
-#   gem install pg -- --with-pg-config=/usr/local/bin/pg_config
-# On macOS with MacPorts:
-#   gem install pg -- --with-pg-config=/opt/local/lib/postgresql84/bin/pg_config
-# On Windows:
-#   gem install pg
-#       Choose the win32 build.
-#       Install PostgreSQL and put its /bin directory on your path.
-#
-# Configure Using Gemfile
-# gem 'pg'
-#
 default: &default
   adapter: postgresql
   encoding: unicode
   host: <%= ENV.fetch("DB_HOST") { "db" } %>
   username: postgres
   password: postgres
+
   # For details on connection pooling, see Rails configuration guide
   # https://guides.rubyonrails.org/configuring.html#database-pooling
   pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %>