From 3494c8e2288b4abe775c29dffdde0297aa380eae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robin=20Bo=CC=88ning?= Date: Mon, 5 Jul 2021 14:11:40 +0200 Subject: [PATCH] minor: fix formatting violations detected/changed by rufo --- app/controllers/alchemy/admin/resources_controller.rb | 4 ++-- app/models/alchemy/attachment.rb | 6 +++--- app/models/alchemy/page.rb | 6 +++--- app/models/alchemy/picture.rb | 6 +++--- app/views/alchemy/admin/pictures/index.html.erb | 2 +- lib/alchemy/resource_filter.rb | 3 ++- spec/dummy/app/models/event.rb | 6 +++--- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app/controllers/alchemy/admin/resources_controller.rb b/app/controllers/alchemy/admin/resources_controller.rb index 6d577ea588..ea71f3b96e 100644 --- a/app/controllers/alchemy/admin/resources_controller.rb +++ b/app/controllers/alchemy/admin/resources_controller.rb @@ -131,7 +131,7 @@ def argument_scope_filter?(filter) end def sanitize_filter_params! - search_filter_params[:filter].reject! do |_,v| + search_filter_params[:filter].reject! do |_, v| eligible_resource_filter_values.exclude?(v) end end @@ -201,7 +201,7 @@ def common_search_filter_includes if resource_has_filters search_filters << { - filter: resource_model.alchemy_resource_filters.map { |f| f[:name] } + filter: resource_model.alchemy_resource_filters.map { |f| f[:name] }, } end diff --git a/app/models/alchemy/attachment.rb b/app/models/alchemy/attachment.rb index aea2ef6d5c..57876dc89c 100644 --- a/app/models/alchemy/attachment.rb +++ b/app/models/alchemy/attachment.rb @@ -59,12 +59,12 @@ def alchemy_resource_filters [ { name: :filter, - values: %w(recent last_upload without_tag) + values: %w(recent last_upload without_tag), }, { name: :by_file_type, - values: distinct.pluck(:file_mime_type).map { |type| [Alchemy.t(type, scope: "mime_types"), type] }.sort_by(&:first) - } + values: distinct.pluck(:file_mime_type).map { |type| [Alchemy.t(type, scope: "mime_types"), type] }.sort_by(&:first), + }, ] end diff --git a/app/models/alchemy/page.rb b/app/models/alchemy/page.rb index edb17b2f8c..09d7b1df2b 100644 --- a/app/models/alchemy/page.rb +++ b/app/models/alchemy/page.rb @@ -185,12 +185,12 @@ def alchemy_resource_filters [ { name: :by_page_layout, - values: PageLayout.all.map { |p| [Alchemy.t(p["name"], scope: "page_layout_names"), p["name"]] } + values: PageLayout.all.map { |p| [Alchemy.t(p["name"], scope: "page_layout_names"), p["name"]] }, }, { name: :status, - values: %w[published not_public restricted] - } + values: %w[published not_public restricted], + }, ] end diff --git a/app/models/alchemy/picture.rb b/app/models/alchemy/picture.rb index f0a7f2972b..7ad340861c 100644 --- a/app/models/alchemy/picture.rb +++ b/app/models/alchemy/picture.rb @@ -139,12 +139,12 @@ def alchemy_resource_filters [ { name: :filter, - values: %w(recent last_upload without_tag) + values: %w(recent last_upload without_tag), }, { name: :by_file_format, - values: distinct.pluck(:image_file_format) - } + values: distinct.pluck(:image_file_format), + }, ] end diff --git a/app/views/alchemy/admin/pictures/index.html.erb b/app/views/alchemy/admin/pictures/index.html.erb index cc2a162149..0681952fed 100644 --- a/app/views/alchemy/admin/pictures/index.html.erb +++ b/app/views/alchemy/admin/pictures/index.html.erb @@ -6,7 +6,7 @@ file_attribute: 'image_file', redirect_url: alchemy.admin_pictures_path( size: @size, - filter: {filter: 'last_upload'} + filter: { filter: 'last_upload' } ) %>
<% end %> diff --git a/lib/alchemy/resource_filter.rb b/lib/alchemy/resource_filter.rb index 8152680130..2fb0fa0b94 100644 --- a/lib/alchemy/resource_filter.rb +++ b/lib/alchemy/resource_filter.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + module Alchemy class ResourceFilter attr_reader :name @@ -33,7 +35,6 @@ def translated_values else @values.map { |v| Alchemy.t(v.to_sym, scope: ["filters", @resource_name, @name, "values"]) } end - end end end diff --git a/spec/dummy/app/models/event.rb b/spec/dummy/app/models/event.rb index daa68c6b78..968acd0b84 100644 --- a/spec/dummy/app/models/event.rb +++ b/spec/dummy/app/models/event.rb @@ -12,7 +12,7 @@ class Event < ActiveRecord::Base def self.alchemy_resource_relations { - location: {attr_method: "name", attr_type: "string"}, + location: { attr_method: "name", attr_type: "string" }, } end @@ -20,8 +20,8 @@ def self.alchemy_resource_filters [ { name: :start, - values: %w(starting_today future) - } + values: %w(starting_today future), + }, ] end