some fixes from 0.48 rubocop update

This commit is contained in:
Devin Howard 2018-01-20 13:46:54 -08:00
parent 4f94123f3e
commit 139f7efe2b
50 changed files with 101 additions and 117 deletions

View file

@ -12,7 +12,7 @@ Rails:
Enabled: true
Metrics/LineLength:
Max: 100
Max: 120
Metrics/AbcSize:
Max: 16

0
Rakefile Normal file → Executable file
View file

View file

@ -1,12 +1,12 @@
# frozen_string_literal: true
class AccessController < ApplicationController
before_action :require_user, only: %i(access access_request
before_action :require_user, only: %i[access access_request
approve_access approve_access_post
deny_access deny_access_post request_access)
before_action :set_map, only: %i(access access_request
deny_access deny_access_post request_access]
before_action :set_map, only: %i[access access_request
approve_access approve_access_post
deny_access deny_access_post request_access)
deny_access deny_access_post request_access]
after_action :verify_authorized
# GET maps/:id/request_access

View file

@ -4,7 +4,7 @@ module Api
module V2
class MapsController < WithUpdatesController
def searchable_columns
%i(name desc)
%i[name desc]
end
def apply_filters(collection)

View file

@ -8,7 +8,7 @@ module Api
snorlax_used_rest!
before_action :load_resource, only: %i(show update destroy)
before_action :load_resource, only: %i[show update destroy]
after_action :verify_authorized
def index

View file

@ -4,7 +4,7 @@ module Api
module V2
class TopicsController < WithUpdatesController
def searchable_columns
%i(name desc link)
%i[name desc link]
end
end
end

View file

@ -1,7 +1,7 @@
# frozen_string_literal: true
class ExploreController < ApplicationController
before_action :require_authentication, only: %i(mine shared starred)
before_action :require_authentication, only: %i[mine shared starred]
before_action :authorize_explore
after_action :verify_authorized
after_action :verify_policy_scoped

View file

@ -1,7 +1,7 @@
# frozen_string_literal: true
class MappingsController < ApplicationController
before_action :require_user, only: %i(create update destroy)
before_action :require_user, only: %i[create update destroy]
after_action :verify_authorized, except: :index
after_action :verify_policy_scoped, only: :index

View file

@ -1,8 +1,8 @@
# frozen_string_literal: true
class MapsController < ApplicationController
before_action :require_user, only: %i(create update destroy events follow unfollow)
before_action :set_map, only: %i(show conversation update destroy contains events export follow unfollow unfollow_from_email)
before_action :require_user, only: %i[create update destroy events follow unfollow]
before_action :set_map, only: %i[show conversation update destroy contains events export follow unfollow unfollow_from_email]
after_action :verify_authorized
# GET maps/:id

View file

@ -1,8 +1,8 @@
# frozen_string_literal: true
class MetacodesController < ApplicationController
before_action :require_admin, except: %i(index show)
before_action :set_metacode, only: %i(edit update)
before_action :require_admin, except: %i[index show]
before_action :set_metacode, only: %i[edit update]
# GET /metacodes
# GET /metacodes.json

View file

@ -1,9 +1,9 @@
# frozen_string_literal: true
class NotificationsController < ApplicationController
before_action :set_receipts, only: %i(index show mark_read mark_unread)
before_action :set_notification, only: %i(show mark_read mark_unread)
before_action :set_receipt, only: %i(show mark_read mark_unread)
before_action :set_receipts, only: %i[index show mark_read mark_unread]
before_action :set_notification, only: %i[show mark_read mark_unread]
before_action :set_receipt, only: %i[show mark_read mark_unread]
def index
@notifications = current_user.mailbox.notifications.page(params[:page]).per(25)

View file

@ -8,7 +8,7 @@ class SearchController < ApplicationController
before_action :authorize_search
after_action :verify_authorized
after_action :verify_policy_scoped, only: %i(maps mappers synapses topics)
after_action :verify_policy_scoped, only: %i[maps mappers synapses topics]
# get /search/topics?term=SOMETERM
def topics

View file

@ -3,7 +3,7 @@
class SynapsesController < ApplicationController
include TopicsHelper
before_action :require_user, only: %i(create update destroy)
before_action :require_user, only: %i[create update destroy]
after_action :verify_authorized, except: :index
after_action :verify_policy_scoped, only: :index

View file

@ -3,10 +3,10 @@
class TopicsController < ApplicationController
include TopicsHelper
before_action :require_user, only: %i(create update destroy follow unfollow)
before_action :set_topic, only: %i(show update relative_numbers
before_action :require_user, only: %i[create update destroy follow unfollow]
before_action :set_topic, only: %i[show update relative_numbers
relatives network destroy
follow unfollow unfollow_from_email)
follow unfollow unfollow_from_email]
after_action :verify_authorized, except: :autocomplete_topic
respond_to :html, :js, :json

View file

@ -30,7 +30,7 @@ module Users
end
def configure_sign_up_params
devise_parameter_sanitizer.permit(:sign_up, keys: %i(name joinedwithcode))
devise_parameter_sanitizer.permit(:sign_up, keys: %i[name joinedwithcode])
end
def configure_account_update_params

View file

@ -1,7 +1,7 @@
# frozen_string_literal: true
class UsersController < ApplicationController
before_action :require_user, only: %i(edit update updatemetacodes update_metacode_focus)
before_action :require_user, only: %i[edit update updatemetacodes update_metacode_focus]
respond_to :html, :json

View file

@ -21,9 +21,7 @@ module MapsHelper
end
def first_contributor_image(map)
if map.contributors.count.positive?
return map.contributors[0].image.url(:thirtytwo)
end
return map.contributors[0].image.url(:thirtytwo) if map.contributors.count.positive?
'https://s3.amazonaws.com/metamaps-assets/site/user.png'
end

View file

@ -13,7 +13,7 @@ module SynapsesHelper
synapses.map do |s|
{
id: s.id,
label: s.desc.blank? ? '(no description)' : s.desc,
label: s.desc.presence || '(no description)',
value: s.desc,
permission: s.permission,
mapCount: s.maps.count,

View file

@ -1,11 +1,11 @@
# frozen_string_literal: true
class Event < ApplicationRecord
KINDS = %w(user_present_on_map user_not_present_on_map
KINDS = %w[user_present_on_map user_not_present_on_map
conversation_started_on_map
topic_added_to_map topic_moved_on_map topic_removed_from_map
synapse_added_to_map synapse_removed_from_map
topic_updated synapse_updated).freeze
topic_updated synapse_updated].freeze
belongs_to :eventable, polymorphic: true
belongs_to :map

View file

@ -1,7 +1,7 @@
# frozen_string_literal: true
class FollowReason < ApplicationRecord
REASONS = %w(created commented contributed followed shared_on starred).freeze
REASONS = %w[created commented contributed followed shared_on starred].freeze
belongs_to :follow

View file

@ -1,7 +1,7 @@
# frozen_string_literal: true
class Map < ApplicationRecord
ATTRS_TO_WATCH = %w(name desc permission).freeze
ATTRS_TO_WATCH = %w[name desc permission].freeze
belongs_to :user
belongs_to :source, class_name: :Map
@ -90,10 +90,10 @@ class Map < ApplicationRecord
def as_json(_options = {})
json = super(
methods: %i(user_name user_image star_count topic_count synapse_count
contributor_count collaborator_ids screenshot_url),
except: %i(screenshot_content_type screenshot_file_size screenshot_file_name
screenshot_updated_at)
methods: %i[user_name user_image star_count topic_count synapse_count
contributor_count collaborator_ids screenshot_url],
except: %i[screenshot_content_type screenshot_file_size screenshot_file_name
screenshot_updated_at]
)
json[:created_at_clean] = created_at_str
json[:updated_at_clean] = updated_at_str

View file

@ -25,7 +25,7 @@ class Mapping < ApplicationRecord
end
def as_json(_options = {})
super(methods: %i(user_name user_image))
super(methods: %i[user_name user_image])
end
def after_created

View file

@ -14,7 +14,7 @@ class Message < ApplicationRecord
end
def as_json(_options = {})
json = super(methods: %i(user_name user_image))
json = super(methods: %i[user_name user_image])
json
end

View file

@ -21,11 +21,7 @@ class Metacode < ApplicationRecord
end
def icon(*args)
if manual_icon.present?
manual_icon
else
aws_icon(*args)
end
manual_icon.presence || aws_icon(*args)
end
def as_json(options = {})
@ -57,9 +53,7 @@ class Metacode < ApplicationRecord
def manual_icon_https
if manual_icon.present?
unless manual_icon.starts_with? 'https'
errors.add(:base, 'Manual icon must begin with https')
end
errors.add(:base, 'Manual icon must begin with https') unless manual_icon.starts_with? 'https'
end
end
end

View file

@ -1,7 +1,7 @@
# frozen_string_literal: true
class PermittedParams < Struct.new(:params)
%w(map synapse topic mapping token).each do |kind|
%w[map synapse topic mapping token].each do |kind|
define_method(kind) do
permitted_attributes = send("#{kind}_attributes")
params.require(kind).permit(*permitted_attributes)
@ -16,18 +16,18 @@ class PermittedParams < Struct.new(:params)
end
def map_attributes
%i(name desc permission arranged)
%i[name desc permission arranged]
end
def synapse_attributes
%i(desc category weight permission topic1_id topic2_id)
%i[desc category weight permission topic1_id topic2_id]
end
def topic_attributes
%i(name desc link permission metacode_id)
%i[name desc link permission metacode_id]
end
def mapping_attributes
%i(xloc yloc map_id mappable_type mappable_id)
%i[xloc yloc map_id mappable_type mappable_id]
end
end

View file

@ -1,7 +1,7 @@
# frozen_string_literal: true
class Synapse < ApplicationRecord
ATTRS_TO_WATCH = %w(desc category permission defer_to_map_id).freeze
ATTRS_TO_WATCH = %w[desc category permission defer_to_map_id].freeze
belongs_to :user
belongs_to :defer_to_map, class_name: 'Map', foreign_key: 'defer_to_map_id'
@ -55,7 +55,7 @@ class Synapse < ApplicationRecord
end
def as_json(_options = {})
super(methods: %i(user_name user_image collaborator_ids))
super(methods: %i[user_name user_image collaborator_ids])
end
def as_rdf

View file

@ -1,7 +1,7 @@
# frozen_string_literal: true
class Topic < ApplicationRecord
ATTRS_TO_WATCH = %w(name desc link metacode_id permission defer_to_map_id).freeze
ATTRS_TO_WATCH = %w[name desc link metacode_id permission defer_to_map_id].freeze
include TopicsHelper
include Attachable
@ -70,7 +70,7 @@ class Topic < ApplicationRecord
end
def as_json(options = {})
super(methods: %i(user_name user_image collaborator_ids))
super(methods: %i[user_name user_image collaborator_ids])
.merge(inmaps: inmaps(options[:user]), inmapsLinks: inmapsLinks(options[:user]),
map_count: map_count(options[:user]), synapse_count: synapse_count(options[:user]))
end

View file

@ -52,24 +52,24 @@ class User < ApplicationRecord
validates_attachment_content_type :image, content_type: %r{\Aimage/.*\Z}
# override default as_json
def as_json(_options = {})
def as_json(options = {})
json = { id: id,
name: name,
image: image.url(:sixtyfour),
admin: admin }
if _options[:follows]
if options[:follows]
json['follows'] = {
topics: following.active.where(followed_type: 'Topic').to_a.map(&:followed_id),
maps: following.active.where(followed_type: 'Map').to_a.map(&:followed_id)
}
end
if _options[:follow_settings]
if options[:follow_settings]
json['follow_topic_on_created'] = settings.follow_topic_on_created == '1'
json['follow_topic_on_contributed'] = settings.follow_topic_on_contributed == '1'
json['follow_map_on_created'] = settings.follow_map_on_created == '1'
json['follow_map_on_contributed'] = settings.follow_map_on_contributed == '1'
end
json['email'] = email if _options[:email]
json['email'] = email if options[:email]
json
end
@ -133,7 +133,7 @@ class User < ApplicationRecord
def has_map_open(map)
latestEvent = Event.where(map: map, user: self)
.where(kind: %w(user_present_on_map user_not_present_on_map))
.where(kind: %w[user_present_on_map user_not_present_on_map])
.order(:created_at)
.last
latestEvent && latestEvent.kind == 'user_present_on_map'

View file

@ -6,7 +6,7 @@ class UserPreference
def initialize
array = []
%w(Action Aim Idea Question Note Wildcard Subject).each do |m|
%w[Action Aim Idea Question Note Wildcard Subject].each do |m|
begin
metacode = Metacode.find_by(name: m)
array.push(metacode.id.to_s) if metacode

View file

@ -5,7 +5,7 @@ class Webhook < ApplicationRecord
validates :uri, presence: true
validates :hookable, presence: true
validates :kind, inclusion: { in: %w(slack) }
validates :kind, inclusion: { in: %w[slack] }
validates :event_types, length: { minimum: 1 }
def headers

View file

@ -3,7 +3,7 @@
class MapPolicy < ApplicationPolicy
class Scope < Scope
def resolve
visible = %w(public commons)
visible = %w[public commons]
return scope.where(permission: visible) unless user
scope.where(permission: visible)
@ -17,13 +17,13 @@ class MapPolicy < ApplicationPolicy
end
def show?
record.permission.in?(%w(commons public)) ||
record.permission.in?(%w[commons public]) ||
record.collaborators.include?(user) ||
record.user == user
end
def conversation?
show? && %w(connorturland@gmail.com devin@callysto.com chessscholar@gmail.com solaureum@gmail.com ishanshapiro@gmail.com).include?(user.email)
show? && %w[connorturland@gmail.com devin@callysto.com chessscholar@gmail.com solaureum@gmail.com ishanshapiro@gmail.com].include?(user.email)
end
def create?

View file

@ -7,7 +7,7 @@ class MappingPolicy < ApplicationPolicy
# it would be nice if we could also base this on the mappable, but that
# gets really complicated. Devin thinks it's OK to SHOW a mapping for
# a private topic, since you can't see the private topic anyways
visible = %w(public commons)
visible = %w[public commons]
permission = 'maps.permission IN (?)'
return scope.joins(:map).where(permission, visible) unless user

View file

@ -3,7 +3,7 @@
class MessagePolicy < ApplicationPolicy
class Scope < Scope
def resolve
visible = %w(public commons)
visible = %w[public commons]
permission = 'maps.permission IN (?)'
return scope.joins(:map).where(permission, visible) unless user

View file

@ -3,9 +3,9 @@
class SynapsePolicy < ApplicationPolicy
class Scope < Scope
def resolve
return scope.where(permission: %w(public commons)) unless user
return scope.where(permission: %w[public commons]) unless user
scope.where(permission: %w(public commons))
scope.where(permission: %w[public commons])
.or(scope.where(defer_to_map_id: user.all_accessible_maps.map(&:id)))
.or(scope.where(user_id: user.id))
end

View file

@ -3,9 +3,9 @@
class TopicPolicy < ApplicationPolicy
class Scope < Scope
def resolve
return scope.where(permission: %w(public commons)) unless user
return scope.where(permission: %w[public commons]) unless user
scope.where(permission: %w(public commons))
scope.where(permission: %w[public commons])
.or(scope.where(defer_to_map_id: user.all_accessible_maps.map(&:id)))
.or(scope.where(user_id: user.id))
end
@ -23,7 +23,7 @@ class TopicPolicy < ApplicationPolicy
if record.defer_to_map.present?
map_policy.show?
else
record.permission.in?(%w(commons public)) || record.user == user
record.permission.in?(%w[commons public]) || record.user == user
end
end

View file

@ -8,9 +8,7 @@ class FollowService
return if (reason == 'created' || reason == 'contributed') && !should_auto_follow(entity, user, reason)
follow = Follow.where(followed: entity, user: user).first_or_create
unless follow.update(muted: false)
raise follow.errors.full_messages.join("\n")
end
raise follow.errors.full_messages.join("\n") unless follow.update(muted: false)
if FollowReason::REASONS.include?(reason) && !follow.follow_reason.read_attribute(reason)
follow.follow_reason.update_attribute(reason, true)
end
@ -19,9 +17,7 @@ class FollowService
def unfollow(entity, user)
follow = Follow.where(followed: entity, user: user).first
if follow
unless follow.update(muted: true)
raise follow.errors.full_messages.join("\n")
end
raise follow.errors.full_messages.join("\n") unless follow.update(muted: true)
end
end
@ -38,7 +34,7 @@ class FollowService
def should_auto_follow(entity, user, reason)
follow = Follow.where(followed: entity, user: user).first
return false if follow && follow.muted
return false if follow&.muted
if entity.class == Topic
if reason == 'created'
return user.settings.follow_topic_on_created == '1'

View file

@ -5,7 +5,7 @@ class MapActivityService
'Activity on map ' + map.name
end
def self.summarize_data(map, user, until_moment = DateTime.now)
def self.summarize_data(map, user, until_moment = DateTime.current)
results = {
stats: {}
}
@ -18,15 +18,13 @@ class MapActivityService
message_count = Message.where(resource: map)
.where('created_at > ? AND created_at < ?', since, until_moment)
.where.not(user: user).count
results[:stats][:messages_sent] = message_count if message_count > 0
results[:stats][:messages_sent] = message_count if message_count.positive?
moved_count = Event.where(kind: 'topic_moved_on_map', map: map)
.where('created_at > ? AND created_at < ?', since, until_moment)
.where(eventable_id: scoped_topic_ids)
.where.not(user: user).group(:eventable_id).count
unless moved_count.keys.empty?
results[:stats][:topics_moved] = moved_count.keys.length
end
results[:stats][:topics_moved] = moved_count.keys.length unless moved_count.keys.empty?
topics_added_events = Event.where(kind: 'topic_added_to_map', map: map)
.where('created_at > ? AND created_at < ?', since, until_moment)

View file

@ -47,16 +47,16 @@ class MapExportService
private
def topic_headings
%i(id name metacode x y description link user permission)
%i[id name metacode x y description link user permission]
end
def synapse_headings
%i(topic1 topic2 category description user permission)
%i[topic1 topic2 category description user permission]
end
def exportable_topics
visible_topics ||= Pundit.policy_scope!(user, map.topics)
topic_mappings = Mapping.includes(mappable: %i(metacode user))
topic_mappings = Mapping.includes(mappable: %i[metacode user])
.where(mappable: visible_topics, map: map)
topic_mappings.map do |mapping|
topic = mapping.mappable

View file

@ -2,7 +2,7 @@
class Perm
# e.g. Perm::ISSIONS
ISSIONS = %i(commons public private).freeze
ISSIONS = %i[commons public private].freeze
class << self
def short(permission)

View file

@ -25,7 +25,7 @@ Rails.application.configure do
# Print deprecation notices to the Rails logger
config.active_support.deprecation = :log
config.action_mailer.preview_path = "#{Rails.root}/spec/mailers/previews"
config.action_mailer.preview_path = Rails.root.join('spec', 'mailers', 'preview')
# Expands the lines which load the assets
config.assets.debug = false

View file

@ -10,5 +10,5 @@ Rails.application.configure do
# Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
config.assets.precompile += %w(application-secret.css application-secret.js webpacked/metamaps.bundle.js)
config.assets.precompile += %w[application-secret.css application-secret.js webpacked/metamaps.bundle.js]
end

View file

@ -5,6 +5,6 @@ Rails.application.config.middleware.insert_before 0, Rack::Cors do
origins '*'
resource '/api/*',
headers: :any,
methods: %i(get post put delete options head)
methods: %i[get post put delete options head]
end
end

View file

@ -11,4 +11,4 @@ Delayed::Worker.class_eval do
prepend ExceptionNotifierInDelayedJob
end
Delayed::Worker.logger = Logger.new(File.join(Rails.root, 'log', 'delayed_job.log'))
Delayed::Worker.logger = Logger.new(Rails.root.join('log', 'delayed_job.log'))

View file

@ -51,11 +51,11 @@ ExceptionNotification.configure do |config|
# Ignore additional exception types.
# ActiveRecord::RecordNotFound, AbstractController::ActionNotFound and
# ActionController::RoutingError are already added.
config.ignored_exceptions += %w(
config.ignored_exceptions += %w[
ActionView::TemplateError CustomError UnauthorizedException
InvalidArgumentException InvalidEntityException InvalidRequestException
NotFoundException ValidationException
)
]
# Adds a condition to decide when an exception must be ignored or not.
# The ignore_if method can be invoked multiple times to add extra conditions.

View file

@ -1,5 +1,5 @@
# frozen_string_literal: true
def is_tester(user)
user && %w(connorturland@gmail.com devin@callysto.com chessscholar@gmail.com solaureum@gmail.com ishanshapiro@gmail.com).include?(user.email)
user && %w[connorturland@gmail.com devin@callysto.com chessscholar@gmail.com solaureum@gmail.com ishanshapiro@gmail.com].include?(user.email)
end

View file

@ -17,7 +17,7 @@ Metamaps::Application.routes.draw do
end
get :explore, to: redirect('/')
resources :maps, except: %i(index edit) do
resources :maps, except: %i[index edit] do
member do
get :conversation
get :export
@ -55,10 +55,10 @@ Metamaps::Application.routes.draw do
end
end
resources :mappings, except: %i(index new edit)
resources :mappings, except: %i[index new edit]
resources :messages, only: %i(show create update destroy)
resources :notifications, only: %i(index show) do
resources :messages, only: %i[show create update destroy]
resources :notifications, only: %i[index show] do
collection do
get :unsubscribe
end
@ -80,9 +80,9 @@ Metamaps::Application.routes.draw do
get :synapses
end
resources :synapses, except: %i(index new edit)
resources :synapses, except: %i[index new edit]
resources :topics, except: %i(index new edit) do
resources :topics, except: %i[index new edit] do
member do
get :network
get :relative_numbers
@ -111,7 +111,7 @@ Metamaps::Application.routes.draw do
get 'join' => 'users/registrations#new', :as => :sign_up
end
resources :users, except: %i(index destroy) do
resources :users, except: %i[index destroy] do
member do
get :details
end
@ -121,16 +121,16 @@ Metamaps::Application.routes.draw do
namespace :api, path: '/api', default: { format: :json } do
namespace :v2, path: '/v2' do
resources :metacodes, only: %i(index show)
resources :mappings, only: %i(index create show update destroy)
resources :maps, only: %i(index create show update destroy) do
resources :metacodes, only: %i[index show]
resources :mappings, only: %i[index create show update destroy]
resources :maps, only: %i[index create show update destroy] do
post :stars, to: 'stars#create', on: :member
delete :stars, to: 'stars#destroy', on: :member
end
resources :synapses, only: %i(index create show update destroy)
resources :tokens, only: %i(index create destroy)
resources :topics, only: %i(index create show update destroy)
resources :users, only: %i(index show) do
resources :synapses, only: %i[index create show update destroy]
resources :tokens, only: %i[index create destroy]
resources :topics, only: %i[index create show update destroy]
resources :users, only: %i[index show] do
get :current, on: :collection
end
match '*path', to: 'restful#catch_404', via: :all

View file

@ -1,9 +1,9 @@
# frozen_string_literal: true
%w(
%w[
.ruby-version
.ruby-gemset
.rbenv-vars
tmp/restart.txt
tmp/caching-dev.txt
).each { |path| Spring.watch(path) }
].each { |path| Spring.watch(path) }

0
script/rails Normal file → Executable file
View file

View file

@ -6,9 +6,7 @@ require File.expand_path('../../config/environment', __FILE__)
require 'rspec/rails'
# Prevent database truncation if the environment is production
if Rails.env.production?
abort('The Rails environment is running in production mode!')
end
abort('The Rails environment is running in production mode!') if Rails.env.production?
# require all support files
Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
@ -17,7 +15,7 @@ ActiveRecord::Migration.maintain_test_schema!
RSpec.configure do |config|
# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
config.fixture_path = "#{::Rails.root}/spec/fixtures"
config.fixture_path = ::Rails.root.join('spec', 'fixtures')
config.use_transactional_fixtures = true

View file

@ -15,7 +15,7 @@ RSpec::Matchers.define :match_json_schema do |schema_name|
end
def get_json_example(resource)
filepath = "#{Rails.root}/doc/api/examples/#{resource}.json"
filepath = Rails.root.join('doc', 'api', 'examples', "#{resource}.json")
OpenStruct.new(body: File.read(filepath))
end
@ -25,7 +25,7 @@ def update_file_refs(schema)
schema[key] = if value.is_a? Hash
update_file_refs(value)
elsif key == '$ref'
"#{Rails.root}/doc/api/schemas/#{value}"
Rails.root.join('doc', 'api', 'schemas', value.to_s)
else
value
end