From a989cee01811e9086a6daf4ddd21d3d732850250 Mon Sep 17 00:00:00 2001 From: f Date: Mon, 19 Jul 2021 18:43:20 -0300 Subject: [PATCH] =?UTF-8?q?yutear=20el=20c=C3=B3digo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 1 + Gemfile.lock | 20 ++++++++++++++++++++ app/controllers/application_controller.rb | 2 ++ app/controllers/measurements_controller.rb | 4 +++- app/helpers/application_helper.rb | 2 ++ app/jobs/application_job.rb | 2 ++ app/mailers/application_mailer.rb | 2 ++ app/models/application_record.rb | 2 ++ app/models/measurement.rb | 2 ++ app/models/sensor.rb | 2 ++ 10 files changed, 38 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index aa3ea14..01ba485 100644 --- a/Gemfile +++ b/Gemfile @@ -37,6 +37,7 @@ group :development do gem 'listen', '~> 3.3' # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' + gem 'rubocop' end group :test do diff --git a/Gemfile.lock b/Gemfile.lock index 6c756f0..56bcb77 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -62,6 +62,7 @@ GEM zeitwerk (~> 2.3) addressable (2.8.0) public_suffix (>= 2.0.2, < 5.0) + ast (2.4.2) bindex (0.8.1-x86_64-linux-musl) bootsnap (1.7.5-x86_64-linux-musl) msgpack (~> 1.0) @@ -102,6 +103,9 @@ GEM nio4r (2.5.7-x86_64-linux-musl) nokogiri (1.11.7-x86_64-linux) racc (~> 1.4) + parallel (1.20.1) + parser (3.0.2.0) + ast (~> 2.4.1) pg (1.2.3-x86_64-linux-musl) public_suffix (4.0.6) puma (5.3.2-x86_64-linux-musl) @@ -140,11 +144,25 @@ GEM method_source rake (>= 0.13) thor (~> 1.0) + rainbow (3.0.0) rake (13.0.6) rb-fsevent (0.11.0) rb-inotify (0.10.1) ffi (~> 1.0) regexp_parser (2.1.1) + rexml (3.2.5) + rubocop (1.18.3) + parallel (~> 1.10) + parser (>= 3.0.0.0) + rainbow (>= 2.2.2, < 4.0) + regexp_parser (>= 1.8, < 3.0) + rexml + rubocop-ast (>= 1.7.0, < 2.0) + ruby-progressbar (~> 1.7) + unicode-display_width (>= 1.4.0, < 3.0) + rubocop-ast (1.8.0) + parser (>= 3.0.1.1) + ruby-progressbar (1.11.0) rubyzip (2.3.2) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) @@ -175,6 +193,7 @@ GEM turbolinks-source (5.2.0) tzinfo (2.0.4) concurrent-ruby (~> 1.0) + unicode-display_width (2.0.0) web-console (4.1.0) actionview (>= 6.0.0) activemodel (>= 6.0.0) @@ -209,6 +228,7 @@ DEPENDENCIES puma (~> 5.0) rack-mini-profiler (~> 2.0) rails (~> 6.1.4) + rubocop sass-rails (>= 6) selenium-webdriver spring diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 09705d1..7944f9f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,2 +1,4 @@ +# frozen_string_literal: true + class ApplicationController < ActionController::Base end diff --git a/app/controllers/measurements_controller.rb b/app/controllers/measurements_controller.rb index 2b1fad6..97e0f8e 100644 --- a/app/controllers/measurements_controller.rb +++ b/app/controllers/measurements_controller.rb @@ -1,8 +1,10 @@ +# frozen_string_literal: true + class MeasurementsController < ApplicationController protect_from_forgery with: :null_session def create - sensor = Sensor.find_or_create_by id: params[:sensor_id] + sensor = Sensor.find_or_create_by id: params[:sensor_id] sensor.measurements.create params.permit(:temperature, :level, :flow, :turbidity, :conductivity, :ph) end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index de6be79..15b06f0 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,2 +1,4 @@ +# frozen_string_literal: true + module ApplicationHelper end diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb index d394c3d..bef3959 100644 --- a/app/jobs/application_job.rb +++ b/app/jobs/application_job.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ApplicationJob < ActiveJob::Base # Automatically retry jobs that encountered a deadlock # retry_on ActiveRecord::Deadlocked diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb index 286b223..d84cb6e 100644 --- a/app/mailers/application_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ApplicationMailer < ActionMailer::Base default from: 'from@example.com' layout 'mailer' diff --git a/app/models/application_record.rb b/app/models/application_record.rb index 10a4cba..71fbba5 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class ApplicationRecord < ActiveRecord::Base self.abstract_class = true end diff --git a/app/models/measurement.rb b/app/models/measurement.rb index 7edfc38..504ccbd 100644 --- a/app/models/measurement.rb +++ b/app/models/measurement.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Measurement < ApplicationRecord belongs_to :sensor end diff --git a/app/models/sensor.rb b/app/models/sensor.rb index cea4c07..9bc4a38 100644 --- a/app/models/sensor.rb +++ b/app/models/sensor.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + class Sensor < ApplicationRecord has_many :measurements end