automatic rubocop fixes
This commit is contained in:
parent
794c647967
commit
9561007b82
39 changed files with 86 additions and 86 deletions
|
@ -1,12 +1,12 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class AccessController < ApplicationController
|
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
|
approve_access approve_access_post
|
||||||
deny_access deny_access_post request_access)
|
deny_access deny_access_post request_access]
|
||||||
before_action :set_map, only: %i(access access_request
|
before_action :set_map, only: %i[access access_request
|
||||||
approve_access approve_access_post
|
approve_access approve_access_post
|
||||||
deny_access deny_access_post request_access)
|
deny_access deny_access_post request_access]
|
||||||
after_action :verify_authorized
|
after_action :verify_authorized
|
||||||
|
|
||||||
# GET maps/:id/request_access
|
# GET maps/:id/request_access
|
||||||
|
|
|
@ -4,7 +4,7 @@ module Api
|
||||||
module V2
|
module V2
|
||||||
class MapsController < WithUpdatesController
|
class MapsController < WithUpdatesController
|
||||||
def searchable_columns
|
def searchable_columns
|
||||||
%i(name desc)
|
%i[name desc]
|
||||||
end
|
end
|
||||||
|
|
||||||
def apply_filters(collection)
|
def apply_filters(collection)
|
||||||
|
|
|
@ -8,7 +8,7 @@ module Api
|
||||||
|
|
||||||
snorlax_used_rest!
|
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
|
after_action :verify_authorized
|
||||||
|
|
||||||
def index
|
def index
|
||||||
|
|
|
@ -4,7 +4,7 @@ module Api
|
||||||
module V2
|
module V2
|
||||||
class TopicsController < WithUpdatesController
|
class TopicsController < WithUpdatesController
|
||||||
def searchable_columns
|
def searchable_columns
|
||||||
%i(name desc link)
|
%i[name desc link]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class ExploreController < ApplicationController
|
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
|
before_action :authorize_explore
|
||||||
after_action :verify_authorized
|
after_action :verify_authorized
|
||||||
after_action :verify_policy_scoped
|
after_action :verify_policy_scoped
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class MappingsController < ApplicationController
|
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_authorized, except: :index
|
||||||
after_action :verify_policy_scoped, only: :index
|
after_action :verify_policy_scoped, only: :index
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class MapsController < ApplicationController
|
class MapsController < ApplicationController
|
||||||
before_action :require_user, only: %i(create update destroy events follow unfollow)
|
before_action :require_user, only: %i[create update destroy events follow unfollow]
|
||||||
before_action :set_map, only: %i(show conversation update destroy
|
before_action :set_map, only: %i[show conversation update destroy
|
||||||
contains events export
|
contains events export
|
||||||
follow unfollow unfollow_from_email)
|
follow unfollow unfollow_from_email]
|
||||||
after_action :verify_authorized
|
after_action :verify_authorized
|
||||||
|
|
||||||
# GET maps/:id
|
# GET maps/:id
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class MetacodesController < ApplicationController
|
class MetacodesController < ApplicationController
|
||||||
before_action :require_admin, except: %i(index show)
|
before_action :require_admin, except: %i[index show]
|
||||||
before_action :set_metacode, only: %i(edit update)
|
before_action :set_metacode, only: %i[edit update]
|
||||||
|
|
||||||
# GET /metacodes
|
# GET /metacodes
|
||||||
# GET /metacodes.json
|
# GET /metacodes.json
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class NotificationsController < ApplicationController
|
class NotificationsController < ApplicationController
|
||||||
before_action :set_receipts, only: %i(index 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_notification, only: %i[show mark_read mark_unread]
|
||||||
before_action :set_receipt, only: %i(show mark_read mark_unread)
|
before_action :set_receipt, only: %i[show mark_read mark_unread]
|
||||||
|
|
||||||
def index
|
def index
|
||||||
@notifications = current_user.mailbox.notifications.page(params[:page]).per(25)
|
@notifications = current_user.mailbox.notifications.page(params[:page]).per(25)
|
||||||
|
|
|
@ -8,7 +8,7 @@ class SearchController < ApplicationController
|
||||||
|
|
||||||
before_action :authorize_search
|
before_action :authorize_search
|
||||||
after_action :verify_authorized
|
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
|
# get /search/topics?term=SOMETERM
|
||||||
def topics
|
def topics
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
class SynapsesController < ApplicationController
|
class SynapsesController < ApplicationController
|
||||||
include TopicsHelper
|
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_authorized, except: :index
|
||||||
after_action :verify_policy_scoped, only: :index
|
after_action :verify_policy_scoped, only: :index
|
||||||
|
|
||||||
|
|
|
@ -3,10 +3,10 @@
|
||||||
class TopicsController < ApplicationController
|
class TopicsController < ApplicationController
|
||||||
include TopicsHelper
|
include TopicsHelper
|
||||||
|
|
||||||
before_action :require_user, only: %i(create update destroy follow unfollow)
|
before_action :require_user, only: %i[create update destroy follow unfollow]
|
||||||
before_action :set_topic, only: %i(show update relative_numbers
|
before_action :set_topic, only: %i[show update relative_numbers
|
||||||
relatives network destroy
|
relatives network destroy
|
||||||
follow unfollow unfollow_from_email)
|
follow unfollow unfollow_from_email]
|
||||||
after_action :verify_authorized, except: :autocomplete_topic
|
after_action :verify_authorized, except: :autocomplete_topic
|
||||||
|
|
||||||
respond_to :html, :js, :json
|
respond_to :html, :js, :json
|
||||||
|
|
|
@ -30,7 +30,7 @@ module Users
|
||||||
end
|
end
|
||||||
|
|
||||||
def configure_sign_up_params
|
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
|
end
|
||||||
|
|
||||||
def configure_account_update_params
|
def configure_account_update_params
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class UsersController < ApplicationController
|
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
|
respond_to :html, :json
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class Event < ApplicationRecord
|
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
|
conversation_started_on_map
|
||||||
topic_added_to_map topic_moved_on_map topic_removed_from_map
|
topic_added_to_map topic_moved_on_map topic_removed_from_map
|
||||||
synapse_added_to_map synapse_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 :eventable, polymorphic: true
|
||||||
belongs_to :map
|
belongs_to :map
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class FollowReason < ApplicationRecord
|
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
|
belongs_to :follow
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class Map < ApplicationRecord
|
class Map < ApplicationRecord
|
||||||
ATTRS_TO_WATCH = %w(name desc permission).freeze
|
ATTRS_TO_WATCH = %w[name desc permission].freeze
|
||||||
|
|
||||||
belongs_to :user
|
belongs_to :user
|
||||||
belongs_to :source, class_name: :Map
|
belongs_to :source, class_name: :Map
|
||||||
|
@ -90,10 +90,10 @@ class Map < ApplicationRecord
|
||||||
|
|
||||||
def as_json(_options = {})
|
def as_json(_options = {})
|
||||||
json = super(
|
json = super(
|
||||||
methods: %i(user_name user_image star_count topic_count synapse_count
|
methods: %i[user_name user_image star_count topic_count synapse_count
|
||||||
contributor_count collaborator_ids screenshot_url),
|
contributor_count collaborator_ids screenshot_url],
|
||||||
except: %i(screenshot_content_type screenshot_file_size screenshot_file_name
|
except: %i[screenshot_content_type screenshot_file_size screenshot_file_name
|
||||||
screenshot_updated_at)
|
screenshot_updated_at]
|
||||||
)
|
)
|
||||||
json[:created_at_clean] = created_at_str
|
json[:created_at_clean] = created_at_str
|
||||||
json[:updated_at_clean] = updated_at_str
|
json[:updated_at_clean] = updated_at_str
|
||||||
|
|
|
@ -25,7 +25,7 @@ class Mapping < ApplicationRecord
|
||||||
end
|
end
|
||||||
|
|
||||||
def as_json(_options = {})
|
def as_json(_options = {})
|
||||||
super(methods: %i(user_name user_image))
|
super(methods: %i[user_name user_image])
|
||||||
end
|
end
|
||||||
|
|
||||||
def after_created
|
def after_created
|
||||||
|
@ -57,8 +57,8 @@ class Mapping < ApplicationRecord
|
||||||
meta = { 'x': xloc, 'y': yloc, 'mapping_id': id }
|
meta = { 'x': xloc, 'y': yloc, 'mapping_id': id }
|
||||||
Events::TopicMovedOnMap.publish!(mappable, map, updated_by, meta)
|
Events::TopicMovedOnMap.publish!(mappable, map, updated_by, meta)
|
||||||
ActionCable.server.broadcast('map_' + map.id.to_s, type: 'topicMoved',
|
ActionCable.server.broadcast('map_' + map.id.to_s, type: 'topicMoved',
|
||||||
id: mappable.id, mapping_id: id,
|
id: mappable.id, mapping_id: id,
|
||||||
x: xloc, y: yloc)
|
x: xloc, y: yloc)
|
||||||
end
|
end
|
||||||
|
|
||||||
def after_updated_async
|
def after_updated_async
|
||||||
|
|
|
@ -14,7 +14,7 @@ class Message < ApplicationRecord
|
||||||
end
|
end
|
||||||
|
|
||||||
def as_json(_options = {})
|
def as_json(_options = {})
|
||||||
json = super(methods: %i(user_name user_image))
|
json = super(methods: %i[user_name user_image])
|
||||||
json
|
json
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ class Metacode < ApplicationRecord
|
||||||
default_url: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_wildcard.png'
|
default_url: 'https://s3.amazonaws.com/metamaps-assets/metacodes/generics/96px/gen_wildcard.png'
|
||||||
|
|
||||||
# Validate the attached icon is image/jpg, image/png, etc
|
# Validate the attached icon is image/jpg, image/png, etc
|
||||||
validates_attachment_content_type :aws_icon, content_type: %r(\Aimage/.*\Z)
|
validates_attachment_content_type :aws_icon, content_type: %r{\Aimage/.*\Z}
|
||||||
|
|
||||||
validate :aws_xor_manual_icon
|
validate :aws_xor_manual_icon
|
||||||
validate :manual_icon_https
|
validate :manual_icon_https
|
||||||
|
@ -56,7 +56,7 @@ class Metacode < ApplicationRecord
|
||||||
end
|
end
|
||||||
|
|
||||||
def manual_icon_https
|
def manual_icon_https
|
||||||
return unless manual_icon.present?
|
return if manual_icon.blank?
|
||||||
unless manual_icon.starts_with? 'https'
|
unless manual_icon.starts_with? 'https'
|
||||||
errors.add(:base, 'Manual icon must begin with https')
|
errors.add(:base, 'Manual icon must begin with https')
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class PermittedParams < Struct.new(:params)
|
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
|
define_method(kind) do
|
||||||
permitted_attributes = send("#{kind}_attributes")
|
permitted_attributes = send("#{kind}_attributes")
|
||||||
params.require(kind).permit(*permitted_attributes)
|
params.require(kind).permit(*permitted_attributes)
|
||||||
|
@ -16,18 +16,18 @@ class PermittedParams < Struct.new(:params)
|
||||||
end
|
end
|
||||||
|
|
||||||
def map_attributes
|
def map_attributes
|
||||||
%i(name desc permission arranged)
|
%i[name desc permission arranged]
|
||||||
end
|
end
|
||||||
|
|
||||||
def synapse_attributes
|
def synapse_attributes
|
||||||
%i(desc category weight permission topic1_id topic2_id)
|
%i[desc category weight permission topic1_id topic2_id]
|
||||||
end
|
end
|
||||||
|
|
||||||
def topic_attributes
|
def topic_attributes
|
||||||
%i(name desc link permission metacode_id)
|
%i[name desc link permission metacode_id]
|
||||||
end
|
end
|
||||||
|
|
||||||
def mapping_attributes
|
def mapping_attributes
|
||||||
%i(xloc yloc map_id mappable_type mappable_id)
|
%i[xloc yloc map_id mappable_type mappable_id]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class Synapse < ApplicationRecord
|
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 :user
|
||||||
belongs_to :defer_to_map, class_name: 'Map', foreign_key: 'defer_to_map_id'
|
belongs_to :defer_to_map, class_name: 'Map', foreign_key: 'defer_to_map_id'
|
||||||
|
@ -55,7 +55,7 @@ class Synapse < ApplicationRecord
|
||||||
end
|
end
|
||||||
|
|
||||||
def as_json(_options = {})
|
def as_json(_options = {})
|
||||||
super(methods: %i(user_name user_image collaborator_ids))
|
super(methods: %i[user_name user_image collaborator_ids])
|
||||||
end
|
end
|
||||||
|
|
||||||
def as_rdf
|
def as_rdf
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class Topic < ApplicationRecord
|
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 TopicsHelper
|
||||||
include Attachable
|
include Attachable
|
||||||
|
|
||||||
|
@ -70,7 +70,7 @@ class Topic < ApplicationRecord
|
||||||
end
|
end
|
||||||
|
|
||||||
def as_json(options = {})
|
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]),
|
.merge(inmaps: inmaps(options[:user]), inmapsLinks: inmapsLinks(options[:user]),
|
||||||
map_count: map_count(options[:user]), synapse_count: synapse_count(options[:user]))
|
map_count: map_count(options[:user]), synapse_count: synapse_count(options[:user]))
|
||||||
end
|
end
|
||||||
|
|
|
@ -137,7 +137,7 @@ class User < ApplicationRecord
|
||||||
|
|
||||||
def has_map_open(map)
|
def has_map_open(map)
|
||||||
latest_event = Event.where(map: map, user: self)
|
latest_event = 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)
|
.order(:created_at)
|
||||||
.last
|
.last
|
||||||
latest_event && latest_event.kind == 'user_present_on_map'
|
latest_event && latest_event.kind == 'user_present_on_map'
|
||||||
|
|
|
@ -13,7 +13,7 @@ class UserPreference
|
||||||
private
|
private
|
||||||
|
|
||||||
def init_metacodes
|
def init_metacodes
|
||||||
%w(Action Aim Idea Question Note Wildcard Subject).map do |m|
|
%w[Action Aim Idea Question Note Wildcard Subject].map do |m|
|
||||||
begin
|
begin
|
||||||
metacode = Metacode.find_by(name: m)
|
metacode = Metacode.find_by(name: m)
|
||||||
metacode.id.to_s if metacode
|
metacode.id.to_s if metacode
|
||||||
|
|
|
@ -5,7 +5,7 @@ class Webhook < ApplicationRecord
|
||||||
|
|
||||||
validates :uri, presence: true
|
validates :uri, presence: true
|
||||||
validates :hookable, presence: true
|
validates :hookable, presence: true
|
||||||
validates :kind, inclusion: { in: %w(slack) }
|
validates :kind, inclusion: { in: %w[slack] }
|
||||||
validates :event_types, length: { minimum: 1 }
|
validates :event_types, length: { minimum: 1 }
|
||||||
|
|
||||||
def headers
|
def headers
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
class MapPolicy < ApplicationPolicy
|
class MapPolicy < ApplicationPolicy
|
||||||
class Scope < Scope
|
class Scope < Scope
|
||||||
def resolve
|
def resolve
|
||||||
visible = %w(public commons)
|
visible = %w[public commons]
|
||||||
return scope.where(permission: visible) unless user
|
return scope.where(permission: visible) unless user
|
||||||
|
|
||||||
scope.where(permission: visible)
|
scope.where(permission: visible)
|
||||||
|
@ -17,13 +17,13 @@ class MapPolicy < ApplicationPolicy
|
||||||
end
|
end
|
||||||
|
|
||||||
def show?
|
def show?
|
||||||
record.permission.in?(%w(commons public)) ||
|
record.permission.in?(%w[commons public]) ||
|
||||||
record.collaborators.include?(user) ||
|
record.collaborators.include?(user) ||
|
||||||
record.user == user
|
record.user == user
|
||||||
end
|
end
|
||||||
|
|
||||||
def conversation?
|
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
|
end
|
||||||
|
|
||||||
def create?
|
def create?
|
||||||
|
|
|
@ -7,7 +7,7 @@ class MappingPolicy < ApplicationPolicy
|
||||||
# it would be nice if we could also base this on the mappable, but that
|
# 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
|
# 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
|
# a private topic, since you can't see the private topic anyways
|
||||||
visible = %w(public commons)
|
visible = %w[public commons]
|
||||||
permission = 'maps.permission IN (?)'
|
permission = 'maps.permission IN (?)'
|
||||||
return scope.joins(:map).where(permission, visible) unless user
|
return scope.joins(:map).where(permission, visible) unless user
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
class MessagePolicy < ApplicationPolicy
|
class MessagePolicy < ApplicationPolicy
|
||||||
class Scope < Scope
|
class Scope < Scope
|
||||||
def resolve
|
def resolve
|
||||||
visible = %w(public commons)
|
visible = %w[public commons]
|
||||||
permission = 'maps.permission IN (?)'
|
permission = 'maps.permission IN (?)'
|
||||||
return scope.joins(:map).where(permission, visible) unless user
|
return scope.joins(:map).where(permission, visible) unless user
|
||||||
|
|
||||||
|
|
|
@ -10,13 +10,13 @@ class SynapsePolicy < ApplicationPolicy
|
||||||
private
|
private
|
||||||
|
|
||||||
def authenticated_scope
|
def authenticated_scope
|
||||||
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(defer_to_map_id: user.all_accessible_maps.map(&:id)))
|
||||||
.or(scope.where(user_id: user.id))
|
.or(scope.where(user_id: user.id))
|
||||||
end
|
end
|
||||||
|
|
||||||
def unauthenticated_scope
|
def unauthenticated_scope
|
||||||
scope.where(permission: %w(public commons))
|
scope.where(permission: %w[public commons])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -10,13 +10,13 @@ class TopicPolicy < ApplicationPolicy
|
||||||
private
|
private
|
||||||
|
|
||||||
def authenticated_scope
|
def authenticated_scope
|
||||||
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(defer_to_map_id: user.all_accessible_maps.map(&:id)))
|
||||||
.or(scope.where(user_id: user.id))
|
.or(scope.where(user_id: user.id))
|
||||||
end
|
end
|
||||||
|
|
||||||
def unauthenticated_scope
|
def unauthenticated_scope
|
||||||
scope.where(permission: %w(public commons))
|
scope.where(permission: %w[public commons])
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -32,7 +32,7 @@ class TopicPolicy < ApplicationPolicy
|
||||||
if record.defer_to_map.present?
|
if record.defer_to_map.present?
|
||||||
map_policy.show?
|
map_policy.show?
|
||||||
else
|
else
|
||||||
record.permission.in?(%w(commons public)) || record.user == user
|
record.permission.in?(%w[commons public]) || record.user == user
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -47,16 +47,16 @@ class MapExportService
|
||||||
private
|
private
|
||||||
|
|
||||||
def topic_headings
|
def topic_headings
|
||||||
%i(id name metacode x y description link user permission)
|
%i[id name metacode x y description link user permission]
|
||||||
end
|
end
|
||||||
|
|
||||||
def synapse_headings
|
def synapse_headings
|
||||||
%i(topic1 topic2 category description user permission)
|
%i[topic1 topic2 category description user permission]
|
||||||
end
|
end
|
||||||
|
|
||||||
def exportable_topics
|
def exportable_topics
|
||||||
visible_topics ||= Pundit.policy_scope!(user, map.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)
|
.where(mappable: visible_topics, map: map)
|
||||||
topic_mappings.map do |mapping|
|
topic_mappings.map do |mapping|
|
||||||
topic = mapping.mappable
|
topic = mapping.mappable
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
class Perm
|
class Perm
|
||||||
# e.g. Perm::ISSIONS
|
# e.g. Perm::ISSIONS
|
||||||
ISSIONS = %i(commons public private).freeze
|
ISSIONS = %i[commons public private].freeze
|
||||||
|
|
||||||
class << self
|
class << self
|
||||||
def short(permission)
|
def short(permission)
|
||||||
|
|
|
@ -10,5 +10,5 @@ Rails.application.configure do
|
||||||
|
|
||||||
# Precompile additional assets.
|
# Precompile additional assets.
|
||||||
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
|
# 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
|
end
|
||||||
|
|
|
@ -5,6 +5,6 @@ Rails.application.config.middleware.insert_before 0, Rack::Cors do
|
||||||
origins '*'
|
origins '*'
|
||||||
resource '/api/*',
|
resource '/api/*',
|
||||||
headers: :any,
|
headers: :any,
|
||||||
methods: %i(get post put delete options head)
|
methods: %i[get post put delete options head]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -51,11 +51,11 @@ ExceptionNotification.configure do |config|
|
||||||
# Ignore additional exception types.
|
# Ignore additional exception types.
|
||||||
# ActiveRecord::RecordNotFound, AbstractController::ActionNotFound and
|
# ActiveRecord::RecordNotFound, AbstractController::ActionNotFound and
|
||||||
# ActionController::RoutingError are already added.
|
# ActionController::RoutingError are already added.
|
||||||
config.ignored_exceptions += %w(
|
config.ignored_exceptions += %w[
|
||||||
ActionView::TemplateError CustomError UnauthorizedException
|
ActionView::TemplateError CustomError UnauthorizedException
|
||||||
InvalidArgumentException InvalidEntityException InvalidRequestException
|
InvalidArgumentException InvalidEntityException InvalidRequestException
|
||||||
NotFoundException ValidationException
|
NotFoundException ValidationException
|
||||||
)
|
]
|
||||||
|
|
||||||
# Adds a condition to decide when an exception must be ignored or not.
|
# 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.
|
# The ignore_if method can be invoked multiple times to add extra conditions.
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
def is_tester(user)
|
def is_tester(user)
|
||||||
user && %w(
|
user && %w[
|
||||||
connorturland@gmail.com devin@callysto.com chessscholar@gmail.com solaureum@gmail.com
|
connorturland@gmail.com devin@callysto.com chessscholar@gmail.com solaureum@gmail.com
|
||||||
ishanshapiro@gmail.com
|
ishanshapiro@gmail.com
|
||||||
).include?(user.email)
|
].include?(user.email)
|
||||||
end
|
end
|
||||||
|
|
|
@ -17,7 +17,7 @@ Metamaps::Application.routes.draw do
|
||||||
end
|
end
|
||||||
get :explore, to: redirect('/')
|
get :explore, to: redirect('/')
|
||||||
|
|
||||||
resources :maps, except: %i(index edit) do
|
resources :maps, except: %i[index edit] do
|
||||||
member do
|
member do
|
||||||
get :conversation
|
get :conversation
|
||||||
get :export
|
get :export
|
||||||
|
@ -55,10 +55,10 @@ Metamaps::Application.routes.draw do
|
||||||
end
|
end
|
||||||
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 :messages, only: %i[show create update destroy]
|
||||||
resources :notifications, only: %i(index show) do
|
resources :notifications, only: %i[index show] do
|
||||||
collection do
|
collection do
|
||||||
get :unsubscribe
|
get :unsubscribe
|
||||||
end
|
end
|
||||||
|
@ -80,9 +80,9 @@ Metamaps::Application.routes.draw do
|
||||||
get :synapses
|
get :synapses
|
||||||
end
|
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
|
member do
|
||||||
get :network
|
get :network
|
||||||
get :relative_numbers
|
get :relative_numbers
|
||||||
|
@ -111,7 +111,7 @@ Metamaps::Application.routes.draw do
|
||||||
get 'join' => 'users/registrations#new', :as => :sign_up
|
get 'join' => 'users/registrations#new', :as => :sign_up
|
||||||
end
|
end
|
||||||
|
|
||||||
resources :users, except: %i(index destroy) do
|
resources :users, except: %i[index destroy] do
|
||||||
member do
|
member do
|
||||||
get :details
|
get :details
|
||||||
end
|
end
|
||||||
|
@ -121,16 +121,16 @@ Metamaps::Application.routes.draw do
|
||||||
|
|
||||||
namespace :api, path: '/api', default: { format: :json } do
|
namespace :api, path: '/api', default: { format: :json } do
|
||||||
namespace :v2, path: '/v2' do
|
namespace :v2, path: '/v2' do
|
||||||
resources :metacodes, only: %i(index show)
|
resources :metacodes, only: %i[index show]
|
||||||
resources :mappings, only: %i(index create show update destroy)
|
resources :mappings, only: %i[index create show update destroy]
|
||||||
resources :maps, only: %i(index create show update destroy) do
|
resources :maps, only: %i[index create show update destroy] do
|
||||||
post :stars, to: 'stars#create', on: :member
|
post :stars, to: 'stars#create', on: :member
|
||||||
delete :stars, to: 'stars#destroy', on: :member
|
delete :stars, to: 'stars#destroy', on: :member
|
||||||
end
|
end
|
||||||
resources :synapses, only: %i(index create show update destroy)
|
resources :synapses, only: %i[index create show update destroy]
|
||||||
resources :tokens, only: %i(index create destroy)
|
resources :tokens, only: %i[index create destroy]
|
||||||
resources :topics, only: %i(index create show update destroy)
|
resources :topics, only: %i[index create show update destroy]
|
||||||
resources :users, only: %i(index show) do
|
resources :users, only: %i[index show] do
|
||||||
get :current, on: :collection
|
get :current, on: :collection
|
||||||
end
|
end
|
||||||
match '*path', to: 'restful#catch_404', via: :all
|
match '*path', to: 'restful#catch_404', via: :all
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
%w(
|
%w[
|
||||||
.ruby-version
|
.ruby-version
|
||||||
.ruby-gemset
|
.ruby-gemset
|
||||||
.rbenv-vars
|
.rbenv-vars
|
||||||
tmp/restart.txt
|
tmp/restart.txt
|
||||||
tmp/caching-dev.txt
|
tmp/caching-dev.txt
|
||||||
).each { |path| Spring.watch(path) }
|
].each { |path| Spring.watch(path) }
|
||||||
|
|
Loading…
Add table
Reference in a new issue