From 9e5c333a7d3c61e3cc64c550a38895287b3573e9 Mon Sep 17 00:00:00 2001 From: Raphael Date: Sat, 6 Mar 2021 00:48:39 -0300 Subject: [PATCH 01/11] first commit, add crud post/category --- .gitignore | 27 +++ .ruby-version | 1 + Gemfile | 41 +++++ Gemfile.lock | 166 ++++++++++++++++++ README.md | 24 +++ Rakefile | 6 + app/channels/application_cable/channel.rb | 4 + app/channels/application_cable/connection.rb | 4 + app/controllers/api/v1/api_controller.rb | 9 + .../api/v1/categories_controller.rb | 73 ++++++++ app/controllers/api/v1/posts_controller.rb | 76 ++++++++ app/controllers/application_controller.rb | 2 + app/controllers/concerns/.keep | 0 app/jobs/application_job.rb | 7 + app/mailers/application_mailer.rb | 4 + app/models/application_record.rb | 3 + app/models/category.rb | 2 + app/models/concerns/.keep | 0 app/models/post.rb | 3 + app/views/layouts/mailer.html.erb | 13 ++ app/views/layouts/mailer.text.erb | 1 + bin/bundle | 114 ++++++++++++ bin/rails | 9 + bin/rake | 9 + bin/setup | 33 ++++ bin/spring | 17 ++ config.ru | 5 + config/application.rb | 37 ++++ config/boot.rb | 4 + config/cable.yml | 10 ++ config/credentials.yml.enc | 1 + config/database.yml | 85 +++++++++ config/environment.rb | 5 + config/environments/development.rb | 52 ++++++ config/environments/production.rb | 105 +++++++++++ config/environments/test.rb | 49 ++++++ .../application_controller_renderer.rb | 8 + config/initializers/backtrace_silencers.rb | 7 + config/initializers/cors.rb | 16 ++ .../initializers/filter_parameter_logging.rb | 4 + config/initializers/inflections.rb | 16 ++ config/initializers/mime_types.rb | 4 + config/initializers/wrap_parameters.rb | 14 ++ config/locales/en.yml | 33 ++++ config/puma.rb | 38 ++++ config/routes.rb | 3 + config/spring.rb | 6 + config/storage.yml | 34 ++++ .../20210306032002_create_categories.rb | 9 + db/migrate/20210306032007_create_posts.rb | 12 ++ db/schema.rb | 35 ++++ db/seeds.rb | 7 + lib/tasks/.keep | 0 log/.keep | 0 public/robots.txt | 1 + storage/.keep | 0 .../application_cable/connection_test.rb | 11 ++ test/controllers/.keep | 0 .../api/v1/categories_controller_test.rb | 7 + .../api/v1/posts_controller_test.rb | 7 + test/fixtures/.keep | 0 test/fixtures/categories.yml | 7 + test/fixtures/files/.keep | 0 test/fixtures/posts.yml | 13 ++ test/integration/.keep | 0 test/mailers/.keep | 0 test/models/.keep | 0 test/models/category_test.rb | 7 + test/models/post_test.rb | 7 + test/test_helper.rb | 13 ++ tmp/.keep | 0 tmp/pids/.keep | 0 vendor/.keep | 0 73 files changed, 1320 insertions(+) create mode 100644 .gitignore create mode 100644 .ruby-version create mode 100644 Gemfile create mode 100644 Gemfile.lock create mode 100644 README.md create mode 100644 Rakefile create mode 100644 app/channels/application_cable/channel.rb create mode 100644 app/channels/application_cable/connection.rb create mode 100644 app/controllers/api/v1/api_controller.rb create mode 100644 app/controllers/api/v1/categories_controller.rb create mode 100644 app/controllers/api/v1/posts_controller.rb create mode 100644 app/controllers/application_controller.rb create mode 100644 app/controllers/concerns/.keep create mode 100644 app/jobs/application_job.rb create mode 100644 app/mailers/application_mailer.rb create mode 100644 app/models/application_record.rb create mode 100644 app/models/category.rb create mode 100644 app/models/concerns/.keep create mode 100644 app/models/post.rb create mode 100644 app/views/layouts/mailer.html.erb create mode 100644 app/views/layouts/mailer.text.erb create mode 100755 bin/bundle create mode 100755 bin/rails create mode 100755 bin/rake create mode 100755 bin/setup create mode 100755 bin/spring create mode 100644 config.ru create mode 100644 config/application.rb create mode 100644 config/boot.rb create mode 100644 config/cable.yml create mode 100644 config/credentials.yml.enc create mode 100644 config/database.yml create mode 100644 config/environment.rb create mode 100644 config/environments/development.rb create mode 100644 config/environments/production.rb create mode 100644 config/environments/test.rb create mode 100644 config/initializers/application_controller_renderer.rb create mode 100644 config/initializers/backtrace_silencers.rb create mode 100644 config/initializers/cors.rb create mode 100644 config/initializers/filter_parameter_logging.rb create mode 100644 config/initializers/inflections.rb create mode 100644 config/initializers/mime_types.rb create mode 100644 config/initializers/wrap_parameters.rb create mode 100644 config/locales/en.yml create mode 100644 config/puma.rb create mode 100644 config/routes.rb create mode 100644 config/spring.rb create mode 100644 config/storage.yml create mode 100644 db/migrate/20210306032002_create_categories.rb create mode 100644 db/migrate/20210306032007_create_posts.rb create mode 100644 db/schema.rb create mode 100644 db/seeds.rb create mode 100644 lib/tasks/.keep create mode 100644 log/.keep create mode 100644 public/robots.txt create mode 100644 storage/.keep create mode 100644 test/channels/application_cable/connection_test.rb create mode 100644 test/controllers/.keep create mode 100644 test/controllers/api/v1/categories_controller_test.rb create mode 100644 test/controllers/api/v1/posts_controller_test.rb create mode 100644 test/fixtures/.keep create mode 100644 test/fixtures/categories.yml create mode 100644 test/fixtures/files/.keep create mode 100644 test/fixtures/posts.yml create mode 100644 test/integration/.keep create mode 100644 test/mailers/.keep create mode 100644 test/models/.keep create mode 100644 test/models/category_test.rb create mode 100644 test/models/post_test.rb create mode 100644 test/test_helper.rb create mode 100644 tmp/.keep create mode 100644 tmp/pids/.keep create mode 100644 vendor/.keep diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..8a1b1134 --- /dev/null +++ b/.gitignore @@ -0,0 +1,27 @@ +# See https://help.github.com/articles/ignoring-files for more about ignoring files. +# +# If you find yourself ignoring temporary files generated by your text editor +# or operating system, you probably want to add a global ignore instead: +# git config --global core.excludesfile '~/.gitignore_global' + +# Ignore bundler config. +/.bundle + +# Ignore all logfiles and tempfiles. +/log/* +/tmp/* +!/log/.keep +!/tmp/.keep + +# Ignore pidfiles, but keep the directory. +/tmp/pids/* +!/tmp/pids/ +!/tmp/pids/.keep + +# Ignore uploaded files in development. +/storage/* +!/storage/.keep +.byebug_history + +# Ignore master key for decrypting credentials and more. +/config/master.key diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 00000000..12d9bd05 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +ruby-2.6.1 diff --git a/Gemfile b/Gemfile new file mode 100644 index 00000000..e1d47cfa --- /dev/null +++ b/Gemfile @@ -0,0 +1,41 @@ +source 'https://rubygems.org' +git_source(:github) { |repo| "https://github.com/#{repo}.git" } + +ruby '2.6.1' + +# Bundle edge Rails instead: gem 'rails', github: 'rails/rails' +gem 'rails', '~> 6.0.3', '>= 6.0.3.5' +# Use postgresql as the database for Active Record +gem 'pg', '>= 0.18', '< 2.0' +# Use Puma as the app server +gem 'puma', '~> 4.1' +# 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' + +# Reduces boot times through caching; required in config/boot.rb +gem 'bootsnap', '>= 1.4.2', require: false + +# Use Rack CORS for handling Cross-Origin Resource Sharing (CORS), making cross-origin AJAX possible +# gem 'rack-cors' + +group :development, :test do + # Call 'byebug' anywhere in the code to stop execution and get a debugger console + gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] +end + +group :development do + gem 'listen', '~> 3.2' + # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring + gem 'spring' + gem 'spring-watcher-listen', '~> 2.0.0' +end + +# Windows does not include zoneinfo files, so bundle the tzinfo-data gem +gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] diff --git a/Gemfile.lock b/Gemfile.lock new file mode 100644 index 00000000..a6b1faad --- /dev/null +++ b/Gemfile.lock @@ -0,0 +1,166 @@ +GEM + remote: https://rubygems.org/ + specs: + actioncable (6.0.3.5) + actionpack (= 6.0.3.5) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + actionmailbox (6.0.3.5) + actionpack (= 6.0.3.5) + activejob (= 6.0.3.5) + activerecord (= 6.0.3.5) + activestorage (= 6.0.3.5) + activesupport (= 6.0.3.5) + mail (>= 2.7.1) + actionmailer (6.0.3.5) + actionpack (= 6.0.3.5) + actionview (= 6.0.3.5) + activejob (= 6.0.3.5) + mail (~> 2.5, >= 2.5.4) + rails-dom-testing (~> 2.0) + actionpack (6.0.3.5) + actionview (= 6.0.3.5) + activesupport (= 6.0.3.5) + rack (~> 2.0, >= 2.0.8) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actiontext (6.0.3.5) + actionpack (= 6.0.3.5) + activerecord (= 6.0.3.5) + activestorage (= 6.0.3.5) + activesupport (= 6.0.3.5) + nokogiri (>= 1.8.5) + actionview (6.0.3.5) + activesupport (= 6.0.3.5) + builder (~> 3.1) + erubi (~> 1.4) + rails-dom-testing (~> 2.0) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activejob (6.0.3.5) + activesupport (= 6.0.3.5) + globalid (>= 0.3.6) + activemodel (6.0.3.5) + activesupport (= 6.0.3.5) + activerecord (6.0.3.5) + activemodel (= 6.0.3.5) + activesupport (= 6.0.3.5) + activestorage (6.0.3.5) + actionpack (= 6.0.3.5) + activejob (= 6.0.3.5) + activerecord (= 6.0.3.5) + marcel (~> 0.3.1) + activesupport (6.0.3.5) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + zeitwerk (~> 2.2, >= 2.2.2) + bootsnap (1.7.2) + msgpack (~> 1.0) + builder (3.2.4) + byebug (11.1.3) + concurrent-ruby (1.1.8) + crass (1.0.6) + erubi (1.10.0) + ffi (1.14.2) + globalid (0.4.2) + activesupport (>= 4.2.0) + i18n (1.8.9) + concurrent-ruby (~> 1.0) + listen (3.4.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) + loofah (2.9.0) + crass (~> 1.0.2) + nokogiri (>= 1.5.9) + mail (2.7.1) + mini_mime (>= 0.1.1) + marcel (0.3.3) + mimemagic (~> 0.3.2) + method_source (1.0.0) + mimemagic (0.3.5) + mini_mime (1.0.2) + mini_portile2 (2.5.0) + minitest (5.14.4) + msgpack (1.4.2) + nio4r (2.5.7) + nokogiri (1.11.1) + mini_portile2 (~> 2.5.0) + racc (~> 1.4) + pg (1.2.3) + puma (4.3.7) + nio4r (~> 2.0) + racc (1.5.2) + rack (2.2.3) + rack-test (1.1.0) + rack (>= 1.0, < 3) + rails (6.0.3.5) + actioncable (= 6.0.3.5) + actionmailbox (= 6.0.3.5) + actionmailer (= 6.0.3.5) + actionpack (= 6.0.3.5) + actiontext (= 6.0.3.5) + actionview (= 6.0.3.5) + activejob (= 6.0.3.5) + activemodel (= 6.0.3.5) + activerecord (= 6.0.3.5) + activestorage (= 6.0.3.5) + activesupport (= 6.0.3.5) + bundler (>= 1.3.0) + railties (= 6.0.3.5) + sprockets-rails (>= 2.0.0) + rails-dom-testing (2.0.3) + activesupport (>= 4.2.0) + nokogiri (>= 1.6) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (6.0.3.5) + actionpack (= 6.0.3.5) + activesupport (= 6.0.3.5) + method_source + rake (>= 0.8.7) + thor (>= 0.20.3, < 2.0) + rake (13.0.3) + rb-fsevent (0.10.4) + rb-inotify (0.10.1) + ffi (~> 1.0) + spring (2.1.1) + spring-watcher-listen (2.0.1) + listen (>= 2.7, < 4.0) + spring (>= 1.2, < 3.0) + sprockets (4.0.2) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.2.2) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + thor (1.1.0) + thread_safe (0.3.6) + tzinfo (1.2.9) + thread_safe (~> 0.1) + websocket-driver (0.7.3) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + zeitwerk (2.4.2) + +PLATFORMS + ruby + +DEPENDENCIES + bootsnap (>= 1.4.2) + byebug + listen (~> 3.2) + pg (>= 0.18, < 2.0) + puma (~> 4.1) + rails (~> 6.0.3, >= 6.0.3.5) + spring + spring-watcher-listen (~> 2.0.0) + tzinfo-data + +RUBY VERSION + ruby 2.6.1p33 + +BUNDLED WITH + 2.1.4 diff --git a/README.md b/README.md new file mode 100644 index 00000000..7db80e4c --- /dev/null +++ b/README.md @@ -0,0 +1,24 @@ +# README + +This README would normally document whatever steps are necessary to get the +application up and running. + +Things you may want to cover: + +* Ruby version + +* System dependencies + +* Configuration + +* Database creation + +* Database initialization + +* How to run the test suite + +* Services (job queues, cache servers, search engines, etc.) + +* Deployment instructions + +* ... diff --git a/Rakefile b/Rakefile new file mode 100644 index 00000000..e85f9139 --- /dev/null +++ b/Rakefile @@ -0,0 +1,6 @@ +# Add your own tasks in files placed in lib/tasks ending in .rake, +# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. + +require_relative 'config/application' + +Rails.application.load_tasks diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb new file mode 100644 index 00000000..d6726972 --- /dev/null +++ b/app/channels/application_cable/channel.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Channel < ActionCable::Channel::Base + end +end diff --git a/app/channels/application_cable/connection.rb b/app/channels/application_cable/connection.rb new file mode 100644 index 00000000..0ff5442f --- /dev/null +++ b/app/channels/application_cable/connection.rb @@ -0,0 +1,4 @@ +module ApplicationCable + class Connection < ActionCable::Connection::Base + end +end diff --git a/app/controllers/api/v1/api_controller.rb b/app/controllers/api/v1/api_controller.rb new file mode 100644 index 00000000..09d86c32 --- /dev/null +++ b/app/controllers/api/v1/api_controller.rb @@ -0,0 +1,9 @@ +module Api::V1 + + class ApiController < ApplicationController + +   # Métodos globais + + end + +end \ No newline at end of file diff --git a/app/controllers/api/v1/categories_controller.rb b/app/controllers/api/v1/categories_controller.rb new file mode 100644 index 00000000..6b187adc --- /dev/null +++ b/app/controllers/api/v1/categories_controller.rb @@ -0,0 +1,73 @@ +class Api::V1::CategoriesController < ApplicationController +  before_action :set_category, only: [:create, :index, :update, :destroy] + + # GET /api/v1/categories + + def index + +   render json: Category.all + + end + + # GET /api/v1/categories/1 + + def show + +   render json: @categories + + end + + # Category /api/v1/categories + + def create + + category = Category.new(category_params) + + if category.save + render json: category + else + render json: @category.errors, status: :unprocessable_entity + end + + end + + # PATCH/PUT /api/v1/categories/1 + + def update + +   if @category.update(category_params) + +     render json: @category + +   else + +     render json: @category.errors, status: :unprocessable_entity + +   end + + end + + # DELETE /api/v1/categories/1 + + def destroy + +   @category.destroy + + end + + private + + +   def set_category + +     @category = Category.find(params[:id]) + +   end + + +   def category_params + +     params.require(:category).permit(:name) + +   end +end diff --git a/app/controllers/api/v1/posts_controller.rb b/app/controllers/api/v1/posts_controller.rb new file mode 100644 index 00000000..f484aa5d --- /dev/null +++ b/app/controllers/api/v1/posts_controller.rb @@ -0,0 +1,76 @@ +class Api::V1::PostsController < ApplicationController + + + before_action :set_post, only: [:create, :index, :update, :destroy] + + # GET /api/v1/posts + + def index + +   render json: Post.all + + end + + # GET /api/v1/posts/1 + + def show + +   render json: @posts + + end + + # POST /api/v1/posts + + def create + + post = Post.new(post_params) + + if post.save + render json: post + else + render json: @post.errors, status: :unprocessable_entity + end + + end + + # PATCH/PUT /api/v1/posts/1 + + def update + +   if @post.update(post_params) + +     render json: @post + +   else + +     render json: @post.errors, status: :unprocessable_entity + +   end + + end + + # DELETE /api/v1/posts/1 + + def destroy + +   @post.destroy + + end + + private + + +   def set_post + +     @post = Post.find(params[:id]) + +   end + + +   def post_params + +     params.require(:post).permit(:title, :body, :posted_at, :category_id) + +   end + +end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb new file mode 100644 index 00000000..4ac8823b --- /dev/null +++ b/app/controllers/application_controller.rb @@ -0,0 +1,2 @@ +class ApplicationController < ActionController::API +end diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 00000000..e69de29b diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb new file mode 100644 index 00000000..d394c3d1 --- /dev/null +++ b/app/jobs/application_job.rb @@ -0,0 +1,7 @@ +class ApplicationJob < ActiveJob::Base + # Automatically retry jobs that encountered a deadlock + # retry_on ActiveRecord::Deadlocked + + # Most jobs are safe to ignore if the underlying records are no longer available + # discard_on ActiveJob::DeserializationError +end diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb new file mode 100644 index 00000000..286b2239 --- /dev/null +++ b/app/mailers/application_mailer.rb @@ -0,0 +1,4 @@ +class ApplicationMailer < ActionMailer::Base + default from: 'from@example.com' + layout 'mailer' +end diff --git a/app/models/application_record.rb b/app/models/application_record.rb new file mode 100644 index 00000000..10a4cba8 --- /dev/null +++ b/app/models/application_record.rb @@ -0,0 +1,3 @@ +class ApplicationRecord < ActiveRecord::Base + self.abstract_class = true +end diff --git a/app/models/category.rb b/app/models/category.rb new file mode 100644 index 00000000..54cb6aee --- /dev/null +++ b/app/models/category.rb @@ -0,0 +1,2 @@ +class Category < ApplicationRecord +end diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 00000000..e69de29b diff --git a/app/models/post.rb b/app/models/post.rb new file mode 100644 index 00000000..d62460c8 --- /dev/null +++ b/app/models/post.rb @@ -0,0 +1,3 @@ +class Post < ApplicationRecord + belongs_to :category +end diff --git a/app/views/layouts/mailer.html.erb b/app/views/layouts/mailer.html.erb new file mode 100644 index 00000000..cbd34d2e --- /dev/null +++ b/app/views/layouts/mailer.html.erb @@ -0,0 +1,13 @@ + + + + + + + + + <%= yield %> + + diff --git a/app/views/layouts/mailer.text.erb b/app/views/layouts/mailer.text.erb new file mode 100644 index 00000000..37f0bddb --- /dev/null +++ b/app/views/layouts/mailer.text.erb @@ -0,0 +1 @@ +<%= yield %> diff --git a/bin/bundle b/bin/bundle new file mode 100755 index 00000000..a71368e3 --- /dev/null +++ b/bin/bundle @@ -0,0 +1,114 @@ +#!/usr/bin/env ruby +# frozen_string_literal: true + +# +# This file was generated by Bundler. +# +# The application 'bundle' is installed as part of a gem, and +# this file is here to facilitate running it. +# + +require "rubygems" + +m = Module.new do + module_function + + def invoked_as_script? + File.expand_path($0) == File.expand_path(__FILE__) + end + + def env_var_version + ENV["BUNDLER_VERSION"] + end + + def cli_arg_version + return unless invoked_as_script? # don't want to hijack other binstubs + return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update` + bundler_version = nil + update_index = nil + ARGV.each_with_index do |a, i| + if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN + bundler_version = a + end + next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/ + bundler_version = $1 + update_index = i + end + bundler_version + end + + def gemfile + gemfile = ENV["BUNDLE_GEMFILE"] + return gemfile if gemfile && !gemfile.empty? + + File.expand_path("../../Gemfile", __FILE__) + end + + def lockfile + lockfile = + case File.basename(gemfile) + when "gems.rb" then gemfile.sub(/\.rb$/, gemfile) + else "#{gemfile}.lock" + end + File.expand_path(lockfile) + end + + def lockfile_version + return unless File.file?(lockfile) + lockfile_contents = File.read(lockfile) + return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/ + Regexp.last_match(1) + end + + def bundler_version + @bundler_version ||= + env_var_version || cli_arg_version || + lockfile_version + end + + def bundler_requirement + return "#{Gem::Requirement.default}.a" unless bundler_version + + bundler_gem_version = Gem::Version.new(bundler_version) + + requirement = bundler_gem_version.approximate_recommendation + + return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0") + + requirement += ".a" if bundler_gem_version.prerelease? + + requirement + end + + def load_bundler! + ENV["BUNDLE_GEMFILE"] ||= gemfile + + activate_bundler + end + + def activate_bundler + gem_error = activation_error_handling do + gem "bundler", bundler_requirement + end + return if gem_error.nil? + require_error = activation_error_handling do + require "bundler/version" + end + return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION)) + warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`" + exit 42 + end + + def activation_error_handling + yield + nil + rescue StandardError, LoadError => e + e + end +end + +m.load_bundler! + +if m.invoked_as_script? + load Gem.bin_path("bundler", "bundle") +end diff --git a/bin/rails b/bin/rails new file mode 100755 index 00000000..5badb2fd --- /dev/null +++ b/bin/rails @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +APP_PATH = File.expand_path('../config/application', __dir__) +require_relative '../config/boot' +require 'rails/commands' diff --git a/bin/rake b/bin/rake new file mode 100755 index 00000000..d87d5f57 --- /dev/null +++ b/bin/rake @@ -0,0 +1,9 @@ +#!/usr/bin/env ruby +begin + load File.expand_path('../spring', __FILE__) +rescue LoadError => e + raise unless e.message.include?('spring') +end +require_relative '../config/boot' +require 'rake' +Rake.application.run diff --git a/bin/setup b/bin/setup new file mode 100755 index 00000000..0e39e8cb --- /dev/null +++ b/bin/setup @@ -0,0 +1,33 @@ +#!/usr/bin/env ruby +require 'fileutils' + +# path to your application root. +APP_ROOT = File.expand_path('..', __dir__) + +def system!(*args) + system(*args) || abort("\n== Command #{args} failed ==") +end + +FileUtils.chdir APP_ROOT do + # This script is a way to setup or update your development environment automatically. + # This script is idempotent, so that you can run it at anytime and get an expectable outcome. + # Add necessary setup steps to this file. + + puts '== Installing dependencies ==' + system! 'gem install bundler --conservative' + system('bundle check') || system!('bundle install') + + # puts "\n== Copying sample files ==" + # unless File.exist?('config/database.yml') + # FileUtils.cp 'config/database.yml.sample', 'config/database.yml' + # end + + puts "\n== Preparing database ==" + system! 'bin/rails db:prepare' + + puts "\n== Removing old logs and tempfiles ==" + system! 'bin/rails log:clear tmp:clear' + + puts "\n== Restarting application server ==" + system! 'bin/rails restart' +end diff --git a/bin/spring b/bin/spring new file mode 100755 index 00000000..d89ee495 --- /dev/null +++ b/bin/spring @@ -0,0 +1,17 @@ +#!/usr/bin/env ruby + +# This file loads Spring without using Bundler, in order to be fast. +# It gets overwritten when you run the `spring binstub` command. + +unless defined?(Spring) + require 'rubygems' + require 'bundler' + + lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read) + spring = lockfile.specs.detect { |spec| spec.name == 'spring' } + if spring + Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path + gem 'spring', spring.version + require 'spring/binstub' + end +end diff --git a/config.ru b/config.ru new file mode 100644 index 00000000..f7ba0b52 --- /dev/null +++ b/config.ru @@ -0,0 +1,5 @@ +# This file is used by Rack-based servers to start the application. + +require_relative 'config/environment' + +run Rails.application diff --git a/config/application.rb b/config/application.rb new file mode 100644 index 00000000..de392872 --- /dev/null +++ b/config/application.rb @@ -0,0 +1,37 @@ +require_relative 'boot' + +require "rails" +# Pick the frameworks you want: +require "active_model/railtie" +require "active_job/railtie" +require "active_record/railtie" +require "active_storage/engine" +require "action_controller/railtie" +require "action_mailer/railtie" +require "action_mailbox/engine" +require "action_text/engine" +require "action_view/railtie" +require "action_cable/engine" +# require "sprockets/railtie" +require "rails/test_unit/railtie" + +# Require the gems listed in Gemfile, including any gems +# you've limited to :test, :development, or :production. +Bundler.require(*Rails.groups) + +module BackendChallenge + class Application < Rails::Application + # Initialize configuration defaults for originally generated Rails version. + config.load_defaults 6.0 + + # Settings in config/environments/* take precedence over those specified here. + # Application configuration can go into files in config/initializers + # -- all .rb files in that directory are automatically loaded after loading + # the framework and any gems in your application. + + # Only loads a smaller set of middleware suitable for API only apps. + # Middleware like session, flash, cookies can be added back manually. + # Skip views, helpers and assets when generating a new resource. + config.api_only = true + end +end diff --git a/config/boot.rb b/config/boot.rb new file mode 100644 index 00000000..b9e460ce --- /dev/null +++ b/config/boot.rb @@ -0,0 +1,4 @@ +ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) + +require 'bundler/setup' # Set up gems listed in the Gemfile. +require 'bootsnap/setup' # Speed up boot time by caching expensive operations. diff --git a/config/cable.yml b/config/cable.yml new file mode 100644 index 00000000..573c8c46 --- /dev/null +++ b/config/cable.yml @@ -0,0 +1,10 @@ +development: + adapter: async + +test: + adapter: test + +production: + adapter: redis + url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %> + channel_prefix: BackendChallenge_production diff --git a/config/credentials.yml.enc b/config/credentials.yml.enc new file mode 100644 index 00000000..ccfab1a8 --- /dev/null +++ b/config/credentials.yml.enc @@ -0,0 +1 @@ +9svCz8oV6fFj76i5Vh+nDpZ3trYGjwigCMGyZz83SRkJ+2X7vCkgZ4EgE+gsCfRgPEgpPFUYS1sBahyjLREJCRsi3USWHn/CJxAaGUWRKGxw2jnEIQkGR6Fo16DYPwHOfFmoD78NvS7MD2+XNL4Oj+bB5Gh2BB8XEOFv4DavWtjaVUNEQFOpHmYLZbEDm6X2IQxo9+cmqXNZFy1I7/WCr+VV73vGYm7VmK6YXpj5LWAe8jIoQa0tphOhPe2PLJGh/RSyCHqCclcr5KRoRD26qQvwFCWWfwnEHJXMROryq9yB993mwQE0gxkucgPiZKxQvgpiEHJdYwcEuq7JncjUKJL1SxeMQCfAYPpZIYF8WyI/28p4rHW1ORx4o7oFt+UGBk8Asiy5KwjaMa7di7oqovzTINxE6fB8bmLT--/KMZK2WAVMSxPfHu--aQsHo4ykRDftMwdKZRfXug== \ No newline at end of file diff --git a/config/database.yml b/config/database.yml new file mode 100644 index 00000000..e7a3913a --- /dev/null +++ b/config/database.yml @@ -0,0 +1,85 @@ +# 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 + # For details on connection pooling, see Rails configuration guide + # https://guides.rubyonrails.org/configuring.html#database-pooling + pool: <%= ENV.fetch("RAILS_MAX_THREADS") { 5 } %> + +development: + <<: *default + database: BackendChallenge_development + + # The specified database role being used to connect to postgres. + # To create additional roles in postgres see `$ createuser --help`. + # When left blank, postgres will use the default role. This is + # the same name as the operating system user that initialized the database. + #username: BackendChallenge + + # The password associated with the postgres role (username). + #password: + + # Connect on a TCP socket. Omitted by default since the client uses a + # domain socket that doesn't need configuration. Windows does not have + # domain sockets, so uncomment these lines. + #host: localhost + + # The TCP port the server listens on. Defaults to 5432. + # If your server runs on a different port number, change accordingly. + #port: 5432 + + # Schema search path. The server defaults to $user,public + #schema_search_path: myapp,sharedapp,public + + # Minimum log levels, in increasing order: + # debug5, debug4, debug3, debug2, debug1, + # log, notice, warning, error, fatal, and panic + # Defaults to warning. + #min_messages: notice + +# Warning: The database defined as "test" will be erased and +# re-generated from your development database when you run "rake". +# Do not set this db to the same as development or production. +test: + <<: *default + database: BackendChallenge_test + +# As with config/credentials.yml, you never want to store sensitive information, +# like your database password, in your source code. If your source code is +# ever seen by anyone, they now have access to your database. +# +# Instead, provide the password as a unix environment variable when you boot +# the app. Read https://guides.rubyonrails.org/configuring.html#configuring-a-database +# for a full rundown on how to provide these environment variables in a +# production deployment. +# +# On Heroku and other platform providers, you may have a full connection URL +# available as an environment variable. For example: +# +# DATABASE_URL="postgres://myuser:mypass@localhost/somedatabase" +# +# You can use this database configuration with: +# +# production: +# url: <%= ENV['DATABASE_URL'] %> +# +production: + <<: *default + database: BackendChallenge_production + username: BackendChallenge + password: <%= ENV['BACKENDCHALLENGE_DATABASE_PASSWORD'] %> diff --git a/config/environment.rb b/config/environment.rb new file mode 100644 index 00000000..426333bb --- /dev/null +++ b/config/environment.rb @@ -0,0 +1,5 @@ +# Load the Rails application. +require_relative 'application' + +# Initialize the Rails application. +Rails.application.initialize! diff --git a/config/environments/development.rb b/config/environments/development.rb new file mode 100644 index 00000000..698f159d --- /dev/null +++ b/config/environments/development.rb @@ -0,0 +1,52 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # In the development environment your application's code is reloaded on + # every request. This slows down response time but is perfect for development + # since you don't have to restart the web server when you make code changes. + config.cache_classes = false + + # Do not eager load code on boot. + config.eager_load = false + + # Show full error reports. + config.consider_all_requests_local = true + + # Enable/disable caching. By default caching is disabled. + # Run rails dev:cache to toggle caching. + if Rails.root.join('tmp', 'caching-dev.txt').exist? + config.cache_store = :memory_store + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{2.days.to_i}" + } + else + config.action_controller.perform_caching = false + + config.cache_store = :null_store + end + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Don't care if the mailer can't send. + config.action_mailer.raise_delivery_errors = false + + config.action_mailer.perform_caching = false + + # Print deprecation notices to the Rails logger. + config.active_support.deprecation = :log + + # Raise an error on page load if there are pending migrations. + config.active_record.migration_error = :page_load + + # Highlight code that triggered database queries in logs. + config.active_record.verbose_query_logs = true + + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true + + # Use an evented file watcher to asynchronously detect changes in source code, + # routes, locales, etc. This feature depends on the listen gem. + config.file_watcher = ActiveSupport::EventedFileUpdateChecker +end diff --git a/config/environments/production.rb b/config/environments/production.rb new file mode 100644 index 00000000..b0c2d7f2 --- /dev/null +++ b/config/environments/production.rb @@ -0,0 +1,105 @@ +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + # Code is not reloaded between requests. + config.cache_classes = true + + # Eager load code on boot. This eager loads most of Rails and + # your application in memory, allowing both threaded web servers + # and those relying on copy on write to perform better. + # Rake tasks automatically ignore this option for performance. + config.eager_load = true + + # Full error reports are disabled and caching is turned on. + config.consider_all_requests_local = false + + # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] + # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). + # config.require_master_key = true + + # Disable serving static files from the `/public` folder by default since + # Apache or NGINX already handles this. + config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present? + + # Enable serving of images, stylesheets, and JavaScripts from an asset server. + # config.action_controller.asset_host = 'http://assets.example.com' + + # Specifies the header that your server uses for sending files. + # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache + # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX + + # Store uploaded files on the local file system (see config/storage.yml for options). + config.active_storage.service = :local + + # Mount Action Cable outside main process or domain. + # config.action_cable.mount_path = nil + # config.action_cable.url = 'wss://example.com/cable' + # config.action_cable.allowed_request_origins = [ 'http://example.com', /http:\/\/example.*/ ] + + # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. + # config.force_ssl = true + + # Use the lowest log level to ensure availability of diagnostic information + # when problems arise. + config.log_level = :debug + + # Prepend all log lines with the following tags. + config.log_tags = [ :request_id ] + + # Use a different cache store in production. + # config.cache_store = :mem_cache_store + + # Use a real queuing backend for Active Job (and separate queues per environment). + # config.active_job.queue_adapter = :resque + # config.active_job.queue_name_prefix = "BackendChallenge_production" + + config.action_mailer.perform_caching = false + + # Ignore bad email addresses and do not raise email delivery errors. + # Set this to true and configure the email server for immediate delivery to raise delivery errors. + # config.action_mailer.raise_delivery_errors = false + + # Enable locale fallbacks for I18n (makes lookups for any locale fall back to + # the I18n.default_locale when a translation cannot be found). + config.i18n.fallbacks = true + + # Send deprecation notices to registered listeners. + config.active_support.deprecation = :notify + + # Use default logging formatter so that PID and timestamp are not suppressed. + config.log_formatter = ::Logger::Formatter.new + + # Use a different logger for distributed setups. + # require 'syslog/logger' + # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') + + if ENV["RAILS_LOG_TO_STDOUT"].present? + logger = ActiveSupport::Logger.new(STDOUT) + logger.formatter = config.log_formatter + config.logger = ActiveSupport::TaggedLogging.new(logger) + end + + # Do not dump schema after migrations. + config.active_record.dump_schema_after_migration = false + + # Inserts middleware to perform automatic connection switching. + # The `database_selector` hash is used to pass options to the DatabaseSelector + # middleware. The `delay` is used to determine how long to wait after a write + # to send a subsequent read to the primary. + # + # The `database_resolver` class is used by the middleware to determine which + # database is appropriate to use based on the time delay. + # + # The `database_resolver_context` class is used by the middleware to set + # timestamps for the last write to the primary. The resolver uses the context + # class timestamps to determine how long to wait before reading from the + # replica. + # + # By default Rails will store a last write timestamp in the session. The + # DatabaseSelector middleware is designed as such you can define your own + # strategy for connection switching and pass that into the middleware through + # these configuration options. + # config.active_record.database_selector = { delay: 2.seconds } + # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver + # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session +end diff --git a/config/environments/test.rb b/config/environments/test.rb new file mode 100644 index 00000000..0cb24249 --- /dev/null +++ b/config/environments/test.rb @@ -0,0 +1,49 @@ +# The test environment is used exclusively to run your application's +# test suite. You never need to work with it otherwise. Remember that +# your test database is "scratch space" for the test suite and is wiped +# and recreated between test runs. Don't rely on the data there! + +Rails.application.configure do + # Settings specified here will take precedence over those in config/application.rb. + + config.cache_classes = false + config.action_view.cache_template_loading = true + + # Do not eager load code on boot. This avoids loading your whole application + # just for the purpose of running a single test. If you are using a tool that + # preloads Rails for running tests, you may have to set it to true. + config.eager_load = false + + # Configure public file server for tests with Cache-Control for performance. + config.public_file_server.enabled = true + config.public_file_server.headers = { + 'Cache-Control' => "public, max-age=#{1.hour.to_i}" + } + + # Show full error reports and disable caching. + config.consider_all_requests_local = true + config.action_controller.perform_caching = false + config.cache_store = :null_store + + # Raise exceptions instead of rendering exception templates. + config.action_dispatch.show_exceptions = false + + # Disable request forgery protection in test environment. + config.action_controller.allow_forgery_protection = false + + # Store uploaded files on the local file system in a temporary directory. + config.active_storage.service = :test + + config.action_mailer.perform_caching = false + + # Tell Action Mailer not to deliver emails to the real world. + # The :test delivery method accumulates sent emails in the + # ActionMailer::Base.deliveries array. + config.action_mailer.delivery_method = :test + + # Print deprecation notices to the stderr. + config.active_support.deprecation = :stderr + + # Raises error for missing translations. + # config.action_view.raise_on_missing_translations = true +end diff --git a/config/initializers/application_controller_renderer.rb b/config/initializers/application_controller_renderer.rb new file mode 100644 index 00000000..89d2efab --- /dev/null +++ b/config/initializers/application_controller_renderer.rb @@ -0,0 +1,8 @@ +# Be sure to restart your server when you modify this file. + +# ActiveSupport::Reloader.to_prepare do +# ApplicationController.renderer.defaults.merge!( +# http_host: 'example.org', +# https: false +# ) +# end diff --git a/config/initializers/backtrace_silencers.rb b/config/initializers/backtrace_silencers.rb new file mode 100644 index 00000000..59385cdf --- /dev/null +++ b/config/initializers/backtrace_silencers.rb @@ -0,0 +1,7 @@ +# Be sure to restart your server when you modify this file. + +# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. +# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } + +# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. +# Rails.backtrace_cleaner.remove_silencers! diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb new file mode 100644 index 00000000..3b1c1b5e --- /dev/null +++ b/config/initializers/cors.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Avoid CORS issues when API is called from the frontend app. +# Handle Cross-Origin Resource Sharing (CORS) in order to accept cross-origin AJAX requests. + +# Read more: https://github.com/cyu/rack-cors + +# Rails.application.config.middleware.insert_before 0, Rack::Cors do +# allow do +# origins 'example.com' +# +# resource '*', +# headers: :any, +# methods: [:get, :post, :put, :patch, :delete, :options, :head] +# end +# end diff --git a/config/initializers/filter_parameter_logging.rb b/config/initializers/filter_parameter_logging.rb new file mode 100644 index 00000000..4a994e1e --- /dev/null +++ b/config/initializers/filter_parameter_logging.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Configure sensitive parameters which will be filtered from the log file. +Rails.application.config.filter_parameters += [:password] diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb new file mode 100644 index 00000000..ac033bf9 --- /dev/null +++ b/config/initializers/inflections.rb @@ -0,0 +1,16 @@ +# Be sure to restart your server when you modify this file. + +# Add new inflection rules using the following format. Inflections +# are locale specific, and you may define rules for as many different +# locales as you wish. All of these examples are active by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.plural /^(ox)$/i, '\1en' +# inflect.singular /^(ox)en/i, '\1' +# inflect.irregular 'person', 'people' +# inflect.uncountable %w( fish sheep ) +# end + +# These inflection rules are supported but not enabled by default: +# ActiveSupport::Inflector.inflections(:en) do |inflect| +# inflect.acronym 'RESTful' +# end diff --git a/config/initializers/mime_types.rb b/config/initializers/mime_types.rb new file mode 100644 index 00000000..dc189968 --- /dev/null +++ b/config/initializers/mime_types.rb @@ -0,0 +1,4 @@ +# Be sure to restart your server when you modify this file. + +# Add new mime types for use in respond_to blocks: +# Mime::Type.register "text/richtext", :rtf diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb new file mode 100644 index 00000000..bbfc3961 --- /dev/null +++ b/config/initializers/wrap_parameters.rb @@ -0,0 +1,14 @@ +# Be sure to restart your server when you modify this file. + +# This file contains settings for ActionController::ParamsWrapper which +# is enabled by default. + +# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. +ActiveSupport.on_load(:action_controller) do + wrap_parameters format: [:json] +end + +# To enable root element in JSON for ActiveRecord objects. +# ActiveSupport.on_load(:active_record) do +# self.include_root_in_json = true +# end diff --git a/config/locales/en.yml b/config/locales/en.yml new file mode 100644 index 00000000..cf9b342d --- /dev/null +++ b/config/locales/en.yml @@ -0,0 +1,33 @@ +# Files in the config/locales directory are used for internationalization +# and are automatically loaded by Rails. If you want to use locales other +# than English, add the necessary files in this directory. +# +# To use the locales, use `I18n.t`: +# +# I18n.t 'hello' +# +# In views, this is aliased to just `t`: +# +# <%= t('hello') %> +# +# To use a different locale, set it with `I18n.locale`: +# +# I18n.locale = :es +# +# This would use the information in config/locales/es.yml. +# +# The following keys must be escaped otherwise they will not be retrieved by +# the default I18n backend: +# +# true, false, on, off, yes, no +# +# Instead, surround them with single quotes. +# +# en: +# 'true': 'foo' +# +# To learn more, please read the Rails Internationalization guide +# available at https://guides.rubyonrails.org/i18n.html. + +en: + hello: "Hello world" diff --git a/config/puma.rb b/config/puma.rb new file mode 100644 index 00000000..5ed44377 --- /dev/null +++ b/config/puma.rb @@ -0,0 +1,38 @@ +# Puma can serve each request in a thread from an internal thread pool. +# The `threads` method setting takes two numbers: a minimum and maximum. +# Any libraries that use thread pools should be configured to match +# the maximum value specified for Puma. Default is set to 5 threads for minimum +# and maximum; this matches the default thread size of Active Record. +# +max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } +min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } +threads min_threads_count, max_threads_count + +# Specifies the `port` that Puma will listen on to receive requests; default is 3000. +# +port ENV.fetch("PORT") { 3000 } + +# Specifies the `environment` that Puma will run in. +# +environment ENV.fetch("RAILS_ENV") { "development" } + +# Specifies the `pidfile` that Puma will use. +pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" } + +# Specifies the number of `workers` to boot in clustered mode. +# Workers are forked web server processes. If using threads and workers together +# the concurrency of the application would be max `threads` * `workers`. +# Workers do not work on JRuby or Windows (both of which do not support +# processes). +# +# workers ENV.fetch("WEB_CONCURRENCY") { 2 } + +# Use the `preload_app!` method when specifying a `workers` number. +# This directive tells Puma to first boot the application and load code +# before forking the application. This takes advantage of Copy On Write +# process behavior so workers use less memory. +# +# preload_app! + +# Allow puma to be restarted by `rails restart` command. +plugin :tmp_restart diff --git a/config/routes.rb b/config/routes.rb new file mode 100644 index 00000000..c06383a1 --- /dev/null +++ b/config/routes.rb @@ -0,0 +1,3 @@ +Rails.application.routes.draw do + # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html +end diff --git a/config/spring.rb b/config/spring.rb new file mode 100644 index 00000000..db5bf130 --- /dev/null +++ b/config/spring.rb @@ -0,0 +1,6 @@ +Spring.watch( + ".ruby-version", + ".rbenv-vars", + "tmp/restart.txt", + "tmp/caching-dev.txt" +) diff --git a/config/storage.yml b/config/storage.yml new file mode 100644 index 00000000..d32f76e8 --- /dev/null +++ b/config/storage.yml @@ -0,0 +1,34 @@ +test: + service: Disk + root: <%= Rails.root.join("tmp/storage") %> + +local: + service: Disk + root: <%= Rails.root.join("storage") %> + +# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key) +# amazon: +# service: S3 +# access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %> +# secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %> +# region: us-east-1 +# bucket: your_own_bucket + +# Remember not to checkin your GCS keyfile to a repository +# google: +# service: GCS +# project: your_project +# credentials: <%= Rails.root.join("path/to/gcs.keyfile") %> +# bucket: your_own_bucket + +# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key) +# microsoft: +# service: AzureStorage +# storage_account_name: your_account_name +# storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %> +# container: your_container_name + +# mirror: +# service: Mirror +# primary: local +# mirrors: [ amazon, google, microsoft ] diff --git a/db/migrate/20210306032002_create_categories.rb b/db/migrate/20210306032002_create_categories.rb new file mode 100644 index 00000000..18db5f94 --- /dev/null +++ b/db/migrate/20210306032002_create_categories.rb @@ -0,0 +1,9 @@ +class CreateCategories < ActiveRecord::Migration[6.0] + def change + create_table :categories do |t| + t.string :name + + t.timestamps + end + end +end diff --git a/db/migrate/20210306032007_create_posts.rb b/db/migrate/20210306032007_create_posts.rb new file mode 100644 index 00000000..1f68b783 --- /dev/null +++ b/db/migrate/20210306032007_create_posts.rb @@ -0,0 +1,12 @@ +class CreatePosts < ActiveRecord::Migration[6.0] + def change + create_table :posts do |t| + t.string :title + t.text :body + t.datetime :posted_at + t.references :category, null: false, foreign_key: true + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb new file mode 100644 index 00000000..166b9878 --- /dev/null +++ b/db/schema.rb @@ -0,0 +1,35 @@ +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# This file is the source Rails uses to define your schema when running `rails +# db:schema:load`. When creating a new database, `rails db:schema:load` tends to +# be faster and is potentially less error prone than running all of your +# migrations from scratch. Old migrations may fail to apply correctly if those +# migrations use external dependencies or application code. +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema.define(version: 2021_03_06_032007) do + + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "categories", force: :cascade do |t| + t.string "name" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + end + + create_table "posts", force: :cascade do |t| + t.string "title" + t.text "body" + t.datetime "posted_at" + t.bigint "category_id", null: false + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.index ["category_id"], name: "index_posts_on_category_id" + end + + add_foreign_key "posts", "categories" +end diff --git a/db/seeds.rb b/db/seeds.rb new file mode 100644 index 00000000..1beea2ac --- /dev/null +++ b/db/seeds.rb @@ -0,0 +1,7 @@ +# This file should contain all the record creation needed to seed the database with its default values. +# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). +# +# Examples: +# +# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) +# Character.create(name: 'Luke', movie: movies.first) diff --git a/lib/tasks/.keep b/lib/tasks/.keep new file mode 100644 index 00000000..e69de29b diff --git a/log/.keep b/log/.keep new file mode 100644 index 00000000..e69de29b diff --git a/public/robots.txt b/public/robots.txt new file mode 100644 index 00000000..c19f78ab --- /dev/null +++ b/public/robots.txt @@ -0,0 +1 @@ +# See https://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file diff --git a/storage/.keep b/storage/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/channels/application_cable/connection_test.rb b/test/channels/application_cable/connection_test.rb new file mode 100644 index 00000000..800405f1 --- /dev/null +++ b/test/channels/application_cable/connection_test.rb @@ -0,0 +1,11 @@ +require "test_helper" + +class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase + # test "connects with cookies" do + # cookies.signed[:user_id] = 42 + # + # connect + # + # assert_equal connection.user_id, "42" + # end +end diff --git a/test/controllers/.keep b/test/controllers/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/controllers/api/v1/categories_controller_test.rb b/test/controllers/api/v1/categories_controller_test.rb new file mode 100644 index 00000000..6af2cfad --- /dev/null +++ b/test/controllers/api/v1/categories_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class Api::V1::CategoriesControllerTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end +end diff --git a/test/controllers/api/v1/posts_controller_test.rb b/test/controllers/api/v1/posts_controller_test.rb new file mode 100644 index 00000000..331cfe12 --- /dev/null +++ b/test/controllers/api/v1/posts_controller_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class Api::V1::PostsControllerTest < ActionDispatch::IntegrationTest + # test "the truth" do + # assert true + # end +end diff --git a/test/fixtures/.keep b/test/fixtures/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/fixtures/categories.yml b/test/fixtures/categories.yml new file mode 100644 index 00000000..7d412240 --- /dev/null +++ b/test/fixtures/categories.yml @@ -0,0 +1,7 @@ +# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + name: MyString + +two: + name: MyString diff --git a/test/fixtures/files/.keep b/test/fixtures/files/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/fixtures/posts.yml b/test/fixtures/posts.yml new file mode 100644 index 00000000..fec68a95 --- /dev/null +++ b/test/fixtures/posts.yml @@ -0,0 +1,13 @@ +# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html + +one: + title: MyString + body: MyText + posted_at: 2021-03-06 00:20:07 + category: one + +two: + title: MyString + body: MyText + posted_at: 2021-03-06 00:20:07 + category: two diff --git a/test/integration/.keep b/test/integration/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/mailers/.keep b/test/mailers/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/models/.keep b/test/models/.keep new file mode 100644 index 00000000..e69de29b diff --git a/test/models/category_test.rb b/test/models/category_test.rb new file mode 100644 index 00000000..47335415 --- /dev/null +++ b/test/models/category_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class CategoryTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/models/post_test.rb b/test/models/post_test.rb new file mode 100644 index 00000000..6d9d463a --- /dev/null +++ b/test/models/post_test.rb @@ -0,0 +1,7 @@ +require 'test_helper' + +class PostTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end diff --git a/test/test_helper.rb b/test/test_helper.rb new file mode 100644 index 00000000..d5300f88 --- /dev/null +++ b/test/test_helper.rb @@ -0,0 +1,13 @@ +ENV['RAILS_ENV'] ||= 'test' +require_relative '../config/environment' +require 'rails/test_help' + +class ActiveSupport::TestCase + # Run tests in parallel with specified workers + parallelize(workers: :number_of_processors) + + # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order. + fixtures :all + + # Add more helper methods to be used by all tests here... +end diff --git a/tmp/.keep b/tmp/.keep new file mode 100644 index 00000000..e69de29b diff --git a/tmp/pids/.keep b/tmp/pids/.keep new file mode 100644 index 00000000..e69de29b diff --git a/vendor/.keep b/vendor/.keep new file mode 100644 index 00000000..e69de29b From 965702d731c670f3b096b8fc856388dfdbfb5a68 Mon Sep 17 00:00:00 2001 From: Raphael Date: Sat, 6 Mar 2021 01:23:31 -0300 Subject: [PATCH 02/11] first commit, add crud post/category --- config/routes.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/config/routes.rb b/config/routes.rb index c06383a1..6ebe9427 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,7 @@ Rails.application.routes.draw do - # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html + namespace :api do + namespace :v1 do + resources :posts + resources :categories + end end From 273c39b64202efe14a77058a6f26ef623a449fbf Mon Sep 17 00:00:00 2001 From: Raphael Date: Sun, 7 Mar 2021 15:08:58 -0300 Subject: [PATCH 03/11] work create/del/upd/index/show --- app/controllers/api/v1/posts_controller.rb | 115 ++++++++------------- config/routes.rb | 3 +- 2 files changed, 43 insertions(+), 75 deletions(-) diff --git a/app/controllers/api/v1/posts_controller.rb b/app/controllers/api/v1/posts_controller.rb index f484aa5d..7a725502 100644 --- a/app/controllers/api/v1/posts_controller.rb +++ b/app/controllers/api/v1/posts_controller.rb @@ -1,76 +1,43 @@ class Api::V1::PostsController < ApplicationController - - - before_action :set_post, only: [:create, :index, :update, :destroy] - - # GET /api/v1/posts - - def index - -   render json: Post.all - - end - - # GET /api/v1/posts/1 - - def show - -   render json: @posts - - end - - # POST /api/v1/posts - - def create - - post = Post.new(post_params) - - if post.save - render json: post - else - render json: @post.errors, status: :unprocessable_entity - end - - end - - # PATCH/PUT /api/v1/posts/1 - - def update - -   if @post.update(post_params) - -     render json: @post - -   else - -     render json: @post.errors, status: :unprocessable_entity - -   end - - end - - # DELETE /api/v1/posts/1 - - def destroy - -   @post.destroy - - end - - private - - -   def set_post - -     @post = Post.find(params[:id]) - -   end - - -   def post_params - -     params.require(:post).permit(:title, :body, :posted_at, :category_id) - -   end - + + # Listar todos os posts + def index + posts = Post.order('created_at DESC'); + render json: {status: 'Success!', message:'Posts loaded', data:posts},status: :ok + end + + def show + post = Post.find(params[:id]) + render json: {status: 'Success!', message:'Post loaded', data:post},status: :ok + end + + def create + post = Post.new(post_params) + if post.save + render json: {status: 'Success!', message:'Saved Post', data:post},status: :ok + else + render json: {status: 'Error', message:'Posts not saved', data:post.erros},status: :unprocessable_entity + end + end + + def update + post = Post.find(params[:id]) + if post.update_attributes(post_params) + render json: {status: 'Success!', message:'Updated Post', data:post},status: :ok + else + render json: {status: 'Error', message:'Posts not update', data:post.erros},status: :unprocessable_entity + end + end + + def destroy + post = Post.find(params[:id]) + post.destroy + render json: {status: 'Success!', message:'Deleted post', data:post},status: :ok + end + # Parametros aceitos + private + def post_params + params.permit(:title, :body, :posted_at, :category_id) + end + end diff --git a/config/routes.rb b/config/routes.rb index 6ebe9427..dbe0b3e3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -4,4 +4,5 @@ resources :posts resources :categories end -end + end +end From 14398afa793cb96b3bcfc40b04bdad16ee43531c Mon Sep 17 00:00:00 2001 From: Raphael Date: Sun, 7 Mar 2021 16:00:38 -0300 Subject: [PATCH 04/11] work category create/del/upd/index/show --- .../api/v1/categories_controller.rb | 119 +++++++----------- 1 file changed, 46 insertions(+), 73 deletions(-) diff --git a/app/controllers/api/v1/categories_controller.rb b/app/controllers/api/v1/categories_controller.rb index 6b187adc..62d8701d 100644 --- a/app/controllers/api/v1/categories_controller.rb +++ b/app/controllers/api/v1/categories_controller.rb @@ -1,73 +1,46 @@ -class Api::V1::CategoriesController < ApplicationController -  before_action :set_category, only: [:create, :index, :update, :destroy] - - # GET /api/v1/categories - - def index - -   render json: Category.all - - end - - # GET /api/v1/categories/1 - - def show - -   render json: @categories - - end - - # Category /api/v1/categories - - def create - - category = Category.new(category_params) - - if category.save - render json: category - else - render json: @category.errors, status: :unprocessable_entity - end - - end - - # PATCH/PUT /api/v1/categories/1 - - def update - -   if @category.update(category_params) - -     render json: @category - -   else - -     render json: @category.errors, status: :unprocessable_entity - -   end - - end - - # DELETE /api/v1/categories/1 - - def destroy - -   @category.destroy - - end - - private - - -   def set_category - -     @category = Category.find(params[:id]) - -   end - - -   def category_params - -     params.require(:category).permit(:name) - -   end -end +module Api + module V1 + class CategoriesController < ApplicationController + + # Listar todos os artigos + def index + categories = Category.order('created_at DESC'); + render json: {status: 'Success!', message:'Categories loaded', data:categories},status: :ok + end + + def show + category = Category.find(params[:id]) + render json: {status: 'Success!', message:'Category loaded', data:category},status: :ok + end + + def create + category = Category.new(category_params) + if category.save + render json: {status: 'Success!', message:'Saved Category', data:category},status: :ok + else + render json: {status: 'Error', message:'Categories not saved', data:category.erros},status: :unprocessable_entity + end + end + + def update + category = Category.find(params[:id]) + if category.update_attributes(category_params) + render json: {status: 'Success!', message:'Updated Category', data:category},status: :ok + else + render json: {status: 'Error', message:'Categories not update', data:category.erros},status: :unprocessable_entity + end + end + + def destroy + category = Category.find(params[:id]) + category.destroy + render json: {status: 'Success!', message:'Deleted category', data:category},status: :ok + end + + private + def category_params + params.permit(:name) + end + end + end +end \ No newline at end of file From 96d005b0488079e27e65cacb5824ed4f55e4d298 Mon Sep 17 00:00:00 2001 From: Raphael Date: Sun, 7 Mar 2021 18:30:47 -0300 Subject: [PATCH 05/11] adjusted any changes to post/category controller --- Gemfile | 6 +- Gemfile.lock | 21 +++++ app/controllers/api/v1/api_controller.rb | 10 +-- .../api/v1/categories_controller.rb | 84 ++++++++++--------- app/controllers/api/v1/posts_controller.rb | 76 +++++++++-------- app/models/category.rb | 1 + app/models/post.rb | 2 +- bin/bundle | 44 +++++----- bin/rails | 2 +- bin/rake | 2 +- config/application.rb | 24 +++--- config/environments/development.rb | 1 - config/environments/production.rb | 6 +- config/puma.rb | 10 +-- config/routes.rb | 2 +- config/spring.rb | 8 +- db/seeds.rb | 8 +- .../application_cable/connection_test.rb | 2 +- 18 files changed, 167 insertions(+), 142 deletions(-) diff --git a/Gemfile b/Gemfile index e1d47cfa..3716e2f2 100644 --- a/Gemfile +++ b/Gemfile @@ -27,10 +27,12 @@ gem 'bootsnap', '>= 1.4.2', require: false group :development, :test do # Call 'byebug' anywhere in the code to stop execution and get a debugger console - gem 'byebug', platforms: [:mri, :mingw, :x64_mingw] + gem 'byebug', platforms: %i[mri mingw x64_mingw] end group :development do + gem 'rubocop', require: false + gem 'listen', '~> 3.2' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' @@ -38,4 +40,4 @@ group :development do end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem -gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby] +gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby] diff --git a/Gemfile.lock b/Gemfile.lock index a6b1faad..1b64d7c2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,6 +56,7 @@ GEM minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2, >= 2.2.2) + ast (2.4.2) bootsnap (1.7.2) msgpack (~> 1.0) builder (3.2.4) @@ -88,6 +89,9 @@ GEM nokogiri (1.11.1) mini_portile2 (~> 2.5.0) racc (~> 1.4) + parallel (1.17.0) + parser (3.0.0.0) + ast (~> 2.4.1) pg (1.2.3) puma (4.3.7) nio4r (~> 2.0) @@ -121,10 +125,25 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) + rainbow (3.0.0) rake (13.0.3) rb-fsevent (0.10.4) rb-inotify (0.10.1) ffi (~> 1.0) + regexp_parser (2.1.1) + rexml (3.1.9) + rubocop (1.11.0) + parallel (~> 1.10) + parser (>= 3.0.0.0) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml + rubocop-ast (>= 1.2.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.4.1) + parser (>= 2.7.1.5) + ruby-progressbar (1.10.1) spring (2.1.1) spring-watcher-listen (2.0.1) listen (>= 2.7, < 4.0) @@ -140,6 +159,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.9) thread_safe (~> 0.1) + unicode-display_width (1.6.0) websocket-driver (0.7.3) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -155,6 +175,7 @@ DEPENDENCIES pg (>= 0.18, < 2.0) puma (~> 4.1) rails (~> 6.0.3, >= 6.0.3.5) + rubocop spring spring-watcher-listen (~> 2.0.0) tzinfo-data diff --git a/app/controllers/api/v1/api_controller.rb b/app/controllers/api/v1/api_controller.rb index 09d86c32..3a496fd1 100644 --- a/app/controllers/api/v1/api_controller.rb +++ b/app/controllers/api/v1/api_controller.rb @@ -1,9 +1,7 @@ module Api::V1 +  class ApiController < ApplicationController - class ApiController < ApplicationController +     # Métodos globais -   # Métodos globais - - end - -end \ No newline at end of file +  end +end diff --git a/app/controllers/api/v1/categories_controller.rb b/app/controllers/api/v1/categories_controller.rb index 62d8701d..b3c8cfc6 100644 --- a/app/controllers/api/v1/categories_controller.rb +++ b/app/controllers/api/v1/categories_controller.rb @@ -1,46 +1,50 @@ module Api - module V1 - class CategoriesController < ApplicationController - - # Listar todos os artigos - def index - categories = Category.order('created_at DESC'); - render json: {status: 'Success!', message:'Categories loaded', data:categories},status: :ok - end + module V1 + class CategoriesController < ApplicationController - def show - category = Category.find(params[:id]) - render json: {status: 'Success!', message:'Category loaded', data:category},status: :ok - end + def index + categories = Category.order('created_at DESC') + render json: { data: categories }, status: :ok + end - def create - category = Category.new(category_params) - if category.save - render json: {status: 'Success!', message:'Saved Category', data:category},status: :ok - else - render json: {status: 'Error', message:'Categories not saved', data:category.erros},status: :unprocessable_entity - end - end + def show + category = Category.find(params[:id]) + render json: { data: category }, status: :ok + end - def update - category = Category.find(params[:id]) - if category.update_attributes(category_params) - render json: {status: 'Success!', message:'Updated Category', data:category},status: :ok - else - render json: {status: 'Error', message:'Categories not update', data:category.erros},status: :unprocessable_entity - end - end + def create + category = Category.new(category_params) + if category.save + render json: { status: 'Success!', message: 'Saved Category', data: category }, status: :created + else + render json: { data: category.errors }, status: :unprocessable_entity + end + end - def destroy - category = Category.find(params[:id]) - category.destroy - render json: {status: 'Success!', message:'Deleted category', data:category},status: :ok - end + def update + category = Category.find(params[:id]) + if category.update_attributes(category_params) + render json: { status: 'Success!', message: 'Updated Category', data: category }, + status: :upgrade_required + else + render json: { data: category.errors }, status: :unprocessable_entity + end + end - private - def category_params - params.permit(:name) - end - end - end -end \ No newline at end of file + def destroy + category = Category.find(params[:id]) + if category.destroy + head :ok + else + render json: category.errors, status: :unprocessable_entity + end + end + + private + + def category_params + params.permit(:name) + end + end + end +end diff --git a/app/controllers/api/v1/posts_controller.rb b/app/controllers/api/v1/posts_controller.rb index 7a725502..51f5170c 100644 --- a/app/controllers/api/v1/posts_controller.rb +++ b/app/controllers/api/v1/posts_controller.rb @@ -1,43 +1,45 @@ class Api::V1::PostsController < ApplicationController - - # Listar todos os posts - def index - posts = Post.order('created_at DESC'); - render json: {status: 'Success!', message:'Posts loaded', data:posts},status: :ok - end - def show - post = Post.find(params[:id]) - render json: {status: 'Success!', message:'Post loaded', data:post},status: :ok - end + def index + posts = Post.order('created_at DESC') + render json: { data: posts }, status: :ok + end - def create - post = Post.new(post_params) - if post.save - render json: {status: 'Success!', message:'Saved Post', data:post},status: :ok - else - render json: {status: 'Error', message:'Posts not saved', data:post.erros},status: :unprocessable_entity - end - end + def show + post = Post.find(params[:id]) + render json: { data: post }, status: :ok + end - def update - post = Post.find(params[:id]) - if post.update_attributes(post_params) - render json: {status: 'Success!', message:'Updated Post', data:post},status: :ok - else - render json: {status: 'Error', message:'Posts not update', data:post.erros},status: :unprocessable_entity - end - end + def create + post = Post.new(post_params) + if post.save + render json: { status: 'Success!', message: 'Saved Post', data: post }, status: :created + else + render json: { data: post.errors }, status: :unprocessable_entity + end + end - def destroy - post = Post.find(params[:id]) - post.destroy - render json: {status: 'Success!', message:'Deleted post', data:post},status: :ok - end - # Parametros aceitos - private - def post_params - params.permit(:title, :body, :posted_at, :category_id) - end - + def update + post = Post.find(params[:id]) + if post.update_attributes(post_params) + render json: { status: 'Success!', message: 'Updated Post', data: post }, status: :upgrade_required + else + render json: { data: post.errors }, status: :unprocessable_entity + end + end + + def destroy + post = Post.find(params[:id]) + if post.destroy + head :ok + else + render json: post.errors, status: :unprocessable_entity + end + end + + private + + def post_params + params.permit(:title, :body, :posted_at, :category_id) + end end diff --git a/app/models/category.rb b/app/models/category.rb index 54cb6aee..3a99188e 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -1,2 +1,3 @@ class Category < ApplicationRecord + has_many :posts end diff --git a/app/models/post.rb b/app/models/post.rb index d62460c8..8f5c34b1 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -1,3 +1,3 @@ class Post < ApplicationRecord belongs_to :category -end +end \ No newline at end of file diff --git a/bin/bundle b/bin/bundle index a71368e3..b9a7b0f3 100755 --- a/bin/bundle +++ b/bin/bundle @@ -8,7 +8,7 @@ # this file is here to facilitate running it. # -require "rubygems" +require 'rubygems' m = Module.new do module_function @@ -18,36 +18,36 @@ m = Module.new do end def env_var_version - ENV["BUNDLER_VERSION"] + ENV['BUNDLER_VERSION'] end def cli_arg_version return unless invoked_as_script? # don't want to hijack other binstubs - return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update` + return unless 'update'.start_with?(ARGV.first || ' ') # must be running `bundle update` + bundler_version = nil update_index = nil ARGV.each_with_index do |a, i| - if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN - bundler_version = a - end + bundler_version = a if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/ - bundler_version = $1 + + bundler_version = Regexp.last_match(1) update_index = i end bundler_version end def gemfile - gemfile = ENV["BUNDLE_GEMFILE"] + gemfile = ENV['BUNDLE_GEMFILE'] return gemfile if gemfile && !gemfile.empty? - File.expand_path("../../Gemfile", __FILE__) + File.expand_path('../Gemfile', __dir__) end def lockfile lockfile = case File.basename(gemfile) - when "gems.rb" then gemfile.sub(/\.rb$/, gemfile) + when 'gems.rb' then gemfile.sub(/\.rb$/, gemfile) else "#{gemfile}.lock" end File.expand_path(lockfile) @@ -55,15 +55,17 @@ m = Module.new do def lockfile_version return unless File.file?(lockfile) + lockfile_contents = File.read(lockfile) return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/ + Regexp.last_match(1) end def bundler_version @bundler_version ||= env_var_version || cli_arg_version || - lockfile_version + lockfile_version end def bundler_requirement @@ -73,28 +75,32 @@ m = Module.new do requirement = bundler_gem_version.approximate_recommendation - return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0") + return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new('2.7.0') - requirement += ".a" if bundler_gem_version.prerelease? + requirement += '.a' if bundler_gem_version.prerelease? requirement end def load_bundler! - ENV["BUNDLE_GEMFILE"] ||= gemfile + ENV['BUNDLE_GEMFILE'] ||= gemfile activate_bundler end def activate_bundler gem_error = activation_error_handling do - gem "bundler", bundler_requirement + gem 'bundler', bundler_requirement end return if gem_error.nil? + require_error = activation_error_handling do - require "bundler/version" + require 'bundler/version' + end + if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION)) + return end - return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION)) + warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`" exit 42 end @@ -109,6 +115,4 @@ end m.load_bundler! -if m.invoked_as_script? - load Gem.bin_path("bundler", "bundle") -end +load Gem.bin_path('bundler', 'bundle') if m.invoked_as_script? diff --git a/bin/rails b/bin/rails index 5badb2fd..7a8ff81e 100755 --- a/bin/rails +++ b/bin/rails @@ -1,6 +1,6 @@ #!/usr/bin/env ruby begin - load File.expand_path('../spring', __FILE__) + load File.expand_path('spring', __dir__) rescue LoadError => e raise unless e.message.include?('spring') end diff --git a/bin/rake b/bin/rake index d87d5f57..0ba8c48c 100755 --- a/bin/rake +++ b/bin/rake @@ -1,6 +1,6 @@ #!/usr/bin/env ruby begin - load File.expand_path('../spring', __FILE__) + load File.expand_path('spring', __dir__) rescue LoadError => e raise unless e.message.include?('spring') end diff --git a/config/application.rb b/config/application.rb index de392872..0e7234db 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,19 +1,19 @@ require_relative 'boot' -require "rails" +require 'rails' # Pick the frameworks you want: -require "active_model/railtie" -require "active_job/railtie" -require "active_record/railtie" -require "active_storage/engine" -require "action_controller/railtie" -require "action_mailer/railtie" -require "action_mailbox/engine" -require "action_text/engine" -require "action_view/railtie" -require "action_cable/engine" +require 'active_model/railtie' +require 'active_job/railtie' +require 'active_record/railtie' +require 'active_storage/engine' +require 'action_controller/railtie' +require 'action_mailer/railtie' +require 'action_mailbox/engine' +require 'action_text/engine' +require 'action_view/railtie' +require 'action_cable/engine' # require "sprockets/railtie" -require "rails/test_unit/railtie" +require 'rails/test_unit/railtie' # Require the gems listed in Gemfile, including any gems # you've limited to :test, :development, or :production. diff --git a/config/environments/development.rb b/config/environments/development.rb index 698f159d..92b57f01 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -42,7 +42,6 @@ # Highlight code that triggered database queries in logs. config.active_record.verbose_query_logs = true - # Raises error for missing translations. # config.action_view.raise_on_missing_translations = true diff --git a/config/environments/production.rb b/config/environments/production.rb index b0c2d7f2..6a3eb790 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -11,7 +11,7 @@ config.eager_load = true # Full error reports are disabled and caching is turned on. - config.consider_all_requests_local = false + config.consider_all_requests_local = false # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"] # or in config/master.key. This key is used to decrypt credentials (and other encrypted files). @@ -44,7 +44,7 @@ config.log_level = :debug # Prepend all log lines with the following tags. - config.log_tags = [ :request_id ] + config.log_tags = [:request_id] # Use a different cache store in production. # config.cache_store = :mem_cache_store @@ -73,7 +73,7 @@ # require 'syslog/logger' # config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name') - if ENV["RAILS_LOG_TO_STDOUT"].present? + if ENV['RAILS_LOG_TO_STDOUT'].present? logger = ActiveSupport::Logger.new(STDOUT) logger.formatter = config.log_formatter config.logger = ActiveSupport::TaggedLogging.new(logger) diff --git a/config/puma.rb b/config/puma.rb index 5ed44377..fd029342 100644 --- a/config/puma.rb +++ b/config/puma.rb @@ -4,20 +4,20 @@ # the maximum value specified for Puma. Default is set to 5 threads for minimum # and maximum; this matches the default thread size of Active Record. # -max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 } -min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count } +max_threads_count = ENV.fetch('RAILS_MAX_THREADS') { 5 } +min_threads_count = ENV.fetch('RAILS_MIN_THREADS') { max_threads_count } threads min_threads_count, max_threads_count # Specifies the `port` that Puma will listen on to receive requests; default is 3000. # -port ENV.fetch("PORT") { 3000 } +port ENV.fetch('PORT') { 3000 } # Specifies the `environment` that Puma will run in. # -environment ENV.fetch("RAILS_ENV") { "development" } +environment ENV.fetch('RAILS_ENV') { 'development' } # Specifies the `pidfile` that Puma will use. -pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" } +pidfile ENV.fetch('PIDFILE') { 'tmp/pids/server.pid' } # Specifies the number of `workers` to boot in clustered mode. # Workers are forked web server processes. If using threads and workers together diff --git a/config/routes.rb b/config/routes.rb index dbe0b3e3..b4b5e7e0 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,4 +5,4 @@ resources :categories end end -end +end diff --git a/config/spring.rb b/config/spring.rb index db5bf130..8f6432bf 100644 --- a/config/spring.rb +++ b/config/spring.rb @@ -1,6 +1,6 @@ Spring.watch( - ".ruby-version", - ".rbenv-vars", - "tmp/restart.txt", - "tmp/caching-dev.txt" + '.ruby-version', + '.rbenv-vars', + 'tmp/restart.txt', + 'tmp/caching-dev.txt' ) diff --git a/db/seeds.rb b/db/seeds.rb index 1beea2ac..f13f69b0 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,7 +1 @@ -# This file should contain all the record creation needed to seed the database with its default values. -# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup). -# -# Examples: -# -# movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }]) -# Character.create(name: 'Luke', movie: movies.first) +Post.create!(category: Category.last, title: 'lorem', body: 'loremlorem', posted_at: '2021-03-07 20:01:19') diff --git a/test/channels/application_cable/connection_test.rb b/test/channels/application_cable/connection_test.rb index 800405f1..d05dbd24 100644 --- a/test/channels/application_cable/connection_test.rb +++ b/test/channels/application_cable/connection_test.rb @@ -1,4 +1,4 @@ -require "test_helper" +require 'test_helper' class ApplicationCable::ConnectionTest < ActionCable::Connection::TestCase # test "connects with cookies" do From 28b62b810144fa3cbec1fc4dd26622e0b284b7e7 Mon Sep 17 00:00:00 2001 From: Raphael Date: Sun, 7 Mar 2021 18:52:23 -0300 Subject: [PATCH 06/11] fix controllers --- app/controllers/api/v1/categories_controller.rb | 2 +- app/controllers/api/v1/posts_controller.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/api/v1/categories_controller.rb b/app/controllers/api/v1/categories_controller.rb index b3c8cfc6..40f1c675 100644 --- a/app/controllers/api/v1/categories_controller.rb +++ b/app/controllers/api/v1/categories_controller.rb @@ -25,7 +25,7 @@ def update category = Category.find(params[:id]) if category.update_attributes(category_params) render json: { status: 'Success!', message: 'Updated Category', data: category }, - status: :upgrade_required + status: :ok else render json: { data: category.errors }, status: :unprocessable_entity end diff --git a/app/controllers/api/v1/posts_controller.rb b/app/controllers/api/v1/posts_controller.rb index 51f5170c..e9047591 100644 --- a/app/controllers/api/v1/posts_controller.rb +++ b/app/controllers/api/v1/posts_controller.rb @@ -22,7 +22,7 @@ def create def update post = Post.find(params[:id]) if post.update_attributes(post_params) - render json: { status: 'Success!', message: 'Updated Post', data: post }, status: :upgrade_required + render json: { status: 'Success!', message: 'Updated Post', data: post }, status: :ok else render json: { data: post.errors }, status: :unprocessable_entity end From 9ba8977c117b82a791dc66b37b2010f1975a3046 Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 8 Mar 2021 02:09:19 -0300 Subject: [PATCH 07/11] some changes to the search --- .../api/v1/categories_controller.rb | 6 ++++ app/controllers/api/v1/posts_controller.rb | 17 ++++++++-- app/models/post.rb | 5 ++- db/schema.rb | 31 +++++++++---------- 4 files changed, 40 insertions(+), 19 deletions(-) diff --git a/app/controllers/api/v1/categories_controller.rb b/app/controllers/api/v1/categories_controller.rb index 40f1c675..5e2f8c94 100644 --- a/app/controllers/api/v1/categories_controller.rb +++ b/app/controllers/api/v1/categories_controller.rb @@ -2,6 +2,8 @@ module Api module V1 class CategoriesController < ApplicationController + before_action :set_category, only: [:show, :edit, :destroy] + def index categories = Category.order('created_at DESC') render json: { data: categories }, status: :ok @@ -42,6 +44,10 @@ def destroy private + def set_category + category = Category.find(params[:id]) + end + def category_params params.permit(:name) end diff --git a/app/controllers/api/v1/posts_controller.rb b/app/controllers/api/v1/posts_controller.rb index e9047591..0bb3c1b8 100644 --- a/app/controllers/api/v1/posts_controller.rb +++ b/app/controllers/api/v1/posts_controller.rb @@ -1,8 +1,13 @@ class Api::V1::PostsController < ApplicationController + before_action :set_post, only: [:show, :edit, :destroy] + def index - posts = Post.order('created_at DESC') - render json: { data: posts }, status: :ok + + @posts = Post.where(nil) + filtering_params(params).each do |key, value| + @posts = @posts.public_send("filter_by_#{key}", value) if value.present? + end end def show @@ -38,6 +43,14 @@ def destroy end private + + def set_post + post = Post.find(params[:id]) + end + + def filtering_params(params) + params.slice(:category) + end def post_params params.permit(:title, :body, :posted_at, :category_id) diff --git a/app/models/post.rb b/app/models/post.rb index 8f5c34b1..326df4d9 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -1,3 +1,6 @@ class Post < ApplicationRecord belongs_to :category -end \ No newline at end of file + + scope :filter_by_category, ->(category_id) { where category_id: category_id } + +end diff --git a/db/schema.rb b/db/schema.rb index 166b9878..0bfab4b6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,26 +10,25 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2021_03_06_032007) do - +ActiveRecord::Schema.define(version: 20_210_306_032_007) do # These are extensions that must be enabled in order to support this database - enable_extension "plpgsql" + enable_extension 'plpgsql' - create_table "categories", force: :cascade do |t| - t.string "name" - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false + create_table 'categories', force: :cascade do |t| + t.string 'name' + t.datetime 'created_at', precision: 6, null: false + t.datetime 'updated_at', precision: 6, null: false end - create_table "posts", force: :cascade do |t| - t.string "title" - t.text "body" - t.datetime "posted_at" - t.bigint "category_id", null: false - t.datetime "created_at", precision: 6, null: false - t.datetime "updated_at", precision: 6, null: false - t.index ["category_id"], name: "index_posts_on_category_id" + create_table 'posts', force: :cascade do |t| + t.string 'title' + t.text 'body' + t.datetime 'posted_at' + t.bigint 'category_id', null: false + t.datetime 'created_at', precision: 6, null: false + t.datetime 'updated_at', precision: 6, null: false + t.index ['category_id'], name: 'index_posts_on_category_id' end - add_foreign_key "posts", "categories" + add_foreign_key 'posts', 'categories' end From 6187244dea2234c9830ccfda8c9fd90a37b25c93 Mon Sep 17 00:00:00 2001 From: Raphael Date: Mon, 8 Mar 2021 22:20:09 -0300 Subject: [PATCH 08/11] work filter category(id/name) and datetime --- .../api/v1/categories_controller.rb | 20 +++++--------- app/controllers/api/v1/posts_controller.rb | 26 +++++++++---------- app/models/category.rb | 2 ++ app/models/concerns/filterable.rb | 13 ++++++++++ app/models/post.rb | 8 ++++-- 5 files changed, 40 insertions(+), 29 deletions(-) create mode 100644 app/models/concerns/filterable.rb diff --git a/app/controllers/api/v1/categories_controller.rb b/app/controllers/api/v1/categories_controller.rb index 5e2f8c94..e75ac8f0 100644 --- a/app/controllers/api/v1/categories_controller.rb +++ b/app/controllers/api/v1/categories_controller.rb @@ -2,11 +2,10 @@ module Api module V1 class CategoriesController < ApplicationController - before_action :set_category, only: [:show, :edit, :destroy] - def index - categories = Category.order('created_at DESC') - render json: { data: categories }, status: :ok + @categories = Category.all.sorted_by_desc + + render json: @categories end def show @@ -17,19 +16,18 @@ def show def create category = Category.new(category_params) if category.save - render json: { status: 'Success!', message: 'Saved Category', data: category }, status: :created + render json: category , status: :created else - render json: { data: category.errors }, status: :unprocessable_entity + render json: category.errors, status: :unprocessable_entity end end def update category = Category.find(params[:id]) if category.update_attributes(category_params) - render json: { status: 'Success!', message: 'Updated Category', data: category }, - status: :ok + render json: category, status: :ok else - render json: { data: category.errors }, status: :unprocessable_entity + render json: category.errors, status: :unprocessable_entity end end @@ -44,10 +42,6 @@ def destroy private - def set_category - category = Category.find(params[:id]) - end - def category_params params.permit(:name) end diff --git a/app/controllers/api/v1/posts_controller.rb b/app/controllers/api/v1/posts_controller.rb index 0bb3c1b8..990ab3ce 100644 --- a/app/controllers/api/v1/posts_controller.rb +++ b/app/controllers/api/v1/posts_controller.rb @@ -1,35 +1,33 @@ class Api::V1::PostsController < ApplicationController - before_action :set_post, only: [:show, :edit, :destroy] + before_action :set_post, only: %i[show update destroy] def index - - @posts = Post.where(nil) - filtering_params(params).each do |key, value| - @posts = @posts.public_send("filter_by_#{key}", value) if value.present? - end + @posts = Post.filter(filtering_params).sorted_by_desc + render json: @posts + end def show post = Post.find(params[:id]) - render json: { data: post }, status: :ok + render json: post, status: :ok end def create post = Post.new(post_params) if post.save - render json: { status: 'Success!', message: 'Saved Post', data: post }, status: :created + render json: post , status: :created else - render json: { data: post.errors }, status: :unprocessable_entity + render json: post.errors , status: :unprocessable_entity end end def update post = Post.find(params[:id]) if post.update_attributes(post_params) - render json: { status: 'Success!', message: 'Updated Post', data: post }, status: :ok + render json: post , status: :ok else - render json: { data: post.errors }, status: :unprocessable_entity + render json: post.errors , status: :unprocessable_entity end end @@ -47,9 +45,9 @@ def destroy def set_post post = Post.find(params[:id]) end - - def filtering_params(params) - params.slice(:category) + + def filtering_params + params.slice(:category_name, :category_id, :posted_after, :posted_before) end def post_params diff --git a/app/models/category.rb b/app/models/category.rb index 3a99188e..56c585f1 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -1,3 +1,5 @@ class Category < ApplicationRecord has_many :posts + + scope :sorted_by_desc, -> { order('created_at DESC') } end diff --git a/app/models/concerns/filterable.rb b/app/models/concerns/filterable.rb new file mode 100644 index 00000000..fccb997c --- /dev/null +++ b/app/models/concerns/filterable.rb @@ -0,0 +1,13 @@ +module Filterable + extend ActiveSupport::Concern + + module ClassMethods + def filter(filtering_params) + results = where(nil) + filtering_params.each do |key, value| + results = results.public_send("filter_by_#{key}", value) if value.present? + end + results + end + end +end diff --git a/app/models/post.rb b/app/models/post.rb index 326df4d9..c86ad679 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -1,6 +1,10 @@ class Post < ApplicationRecord + include Filterable belongs_to :category - - scope :filter_by_category, ->(category_id) { where category_id: category_id } + scope :sorted_by_desc, -> { order('created_at DESC') } + scope :filter_by_category_name, ->(name) { joins(:category).where("categories.name ILIKE '%#{name}%'") } + scope :filter_by_category_id, ->(category_id) { (where category_id: category_id) } + scope :filter_by_posted_after, ->(date_time) { where('posted_at > ?', date_time) } + scope :filter_by_posted_before, ->(date_time) { where('posted_at <= ?', date_time) } end From 615698b7688d6bd740d3015c86cf74f506fe894b Mon Sep 17 00:00:00 2001 From: Raphael Date: Tue, 9 Mar 2021 01:41:50 -0300 Subject: [PATCH 09/11] populate seed --- Gemfile | 3 +++ Gemfile.lock | 3 +++ db/schema.rb | 31 ++++++++++++++++--------------- db/seeds.rb | 8 +++++++- 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/Gemfile b/Gemfile index 3716e2f2..a9a8afe6 100644 --- a/Gemfile +++ b/Gemfile @@ -9,6 +9,8 @@ gem 'rails', '~> 6.0.3', '>= 6.0.3.5' gem 'pg', '>= 0.18', '< 2.0' # Use Puma as the app server gem 'puma', '~> 4.1' + + # 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 @@ -32,6 +34,7 @@ end group :development do gem 'rubocop', require: false + gem 'faker' gem 'listen', '~> 3.2' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring diff --git a/Gemfile.lock b/Gemfile.lock index 1b64d7c2..d86c38ee 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,6 +64,8 @@ GEM concurrent-ruby (1.1.8) crass (1.0.6) erubi (1.10.0) + faker (2.16.0) + i18n (>= 1.6, < 2) ffi (1.14.2) globalid (0.4.2) activesupport (>= 4.2.0) @@ -171,6 +173,7 @@ PLATFORMS DEPENDENCIES bootsnap (>= 1.4.2) byebug + faker listen (~> 3.2) pg (>= 0.18, < 2.0) puma (~> 4.1) diff --git a/db/schema.rb b/db/schema.rb index 0bfab4b6..166b9878 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,25 +10,26 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20_210_306_032_007) do +ActiveRecord::Schema.define(version: 2021_03_06_032007) do + # These are extensions that must be enabled in order to support this database - enable_extension 'plpgsql' + enable_extension "plpgsql" - create_table 'categories', force: :cascade do |t| - t.string 'name' - t.datetime 'created_at', precision: 6, null: false - t.datetime 'updated_at', precision: 6, null: false + create_table "categories", force: :cascade do |t| + t.string "name" + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false end - create_table 'posts', force: :cascade do |t| - t.string 'title' - t.text 'body' - t.datetime 'posted_at' - t.bigint 'category_id', null: false - t.datetime 'created_at', precision: 6, null: false - t.datetime 'updated_at', precision: 6, null: false - t.index ['category_id'], name: 'index_posts_on_category_id' + create_table "posts", force: :cascade do |t| + t.string "title" + t.text "body" + t.datetime "posted_at" + t.bigint "category_id", null: false + t.datetime "created_at", precision: 6, null: false + t.datetime "updated_at", precision: 6, null: false + t.index ["category_id"], name: "index_posts_on_category_id" end - add_foreign_key 'posts', 'categories' + add_foreign_key "posts", "categories" end diff --git a/db/seeds.rb b/db/seeds.rb index f13f69b0..dbe7c90c 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1 +1,7 @@ -Post.create!(category: Category.last, title: 'lorem', body: 'loremlorem', posted_at: '2021-03-07 20:01:19') +3.times do |i| + Category.create!(name: "Categoria##{i}") +end + +3.times do |i| + Post.create!(title: "Título ..##{i}", body: "Sobre...", posted_at: DateTime.now + 1.day, category_id: rand(1..3)) +end \ No newline at end of file From d58f6cb93459f3e20ec6aedff4f63171294bb8d6 Mon Sep 17 00:00:00 2001 From: Raphael Date: Tue, 9 Mar 2021 02:17:28 -0300 Subject: [PATCH 10/11] adjust system to deploy --- Gemfile | 2 -- Gemfile.lock | 3 --- app/controllers/api/v1/api_controller.rb | 10 ++++------ app/controllers/api/v1/categories_controller.rb | 8 ++------ 4 files changed, 6 insertions(+), 17 deletions(-) diff --git a/Gemfile b/Gemfile index a9a8afe6..e0d34331 100644 --- a/Gemfile +++ b/Gemfile @@ -34,8 +34,6 @@ end group :development do gem 'rubocop', require: false - gem 'faker' - gem 'listen', '~> 3.2' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' diff --git a/Gemfile.lock b/Gemfile.lock index d86c38ee..1b64d7c2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,8 +64,6 @@ GEM concurrent-ruby (1.1.8) crass (1.0.6) erubi (1.10.0) - faker (2.16.0) - i18n (>= 1.6, < 2) ffi (1.14.2) globalid (0.4.2) activesupport (>= 4.2.0) @@ -173,7 +171,6 @@ PLATFORMS DEPENDENCIES bootsnap (>= 1.4.2) byebug - faker listen (~> 3.2) pg (>= 0.18, < 2.0) puma (~> 4.1) diff --git a/app/controllers/api/v1/api_controller.rb b/app/controllers/api/v1/api_controller.rb index 3a496fd1..a24be93f 100644 --- a/app/controllers/api/v1/api_controller.rb +++ b/app/controllers/api/v1/api_controller.rb @@ -1,7 +1,5 @@ module Api::V1 -  class ApiController < ApplicationController - -     # Métodos globais - -  end -end + class ApiController < ApplicationController + .. + end +end \ No newline at end of file diff --git a/app/controllers/api/v1/categories_controller.rb b/app/controllers/api/v1/categories_controller.rb index e75ac8f0..c74f55ab 100644 --- a/app/controllers/api/v1/categories_controller.rb +++ b/app/controllers/api/v1/categories_controller.rb @@ -1,8 +1,6 @@ -module Api - module V1 - class CategoriesController < ApplicationController +class Api::V1::CategoriesController < ApplicationController - def index + def index @categories = Category.all.sorted_by_desc render json: @categories @@ -46,5 +44,3 @@ def category_params params.permit(:name) end end - end -end From 46b35b7d67c3b733a6765d37905997bfa2afa956 Mon Sep 17 00:00:00 2001 From: Raphael Date: Tue, 9 Mar 2021 02:28:20 -0300 Subject: [PATCH 11/11] adjust system to deploy --- app/controllers/api/v1/api_controller.rb | 2 +- app/controllers/api/v1/categories_controller.rb | 2 +- app/controllers/api/v1/posts_controller.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/v1/api_controller.rb b/app/controllers/api/v1/api_controller.rb index a24be93f..fd4bd3f4 100644 --- a/app/controllers/api/v1/api_controller.rb +++ b/app/controllers/api/v1/api_controller.rb @@ -1,5 +1,5 @@ module Api::V1 class ApiController < ApplicationController - .. + end end \ No newline at end of file diff --git a/app/controllers/api/v1/categories_controller.rb b/app/controllers/api/v1/categories_controller.rb index c74f55ab..65a26248 100644 --- a/app/controllers/api/v1/categories_controller.rb +++ b/app/controllers/api/v1/categories_controller.rb @@ -1,4 +1,4 @@ -class Api::V1::CategoriesController < ApplicationController +class Api::V1::CategoriesController < Api::V1::ApiController def index @categories = Category.all.sorted_by_desc diff --git a/app/controllers/api/v1/posts_controller.rb b/app/controllers/api/v1/posts_controller.rb index 990ab3ce..6a75b17d 100644 --- a/app/controllers/api/v1/posts_controller.rb +++ b/app/controllers/api/v1/posts_controller.rb @@ -1,4 +1,4 @@ -class Api::V1::PostsController < ApplicationController +class Api::V1::PostsController < Api::V1::ApiController before_action :set_post, only: %i[show update destroy]