Skip to content

Commit 8420ed0

Browse files
sbhawsingkassinghi
authored andcommitted
rubocop syntax updates in lib folder (#14)
1 parent 5ed72dc commit 8420ed0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+489
-533
lines changed
Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
require 'rails/generators/active_record'
1+
require "rails/generators/active_record"
22

33
class PaperclipGenerator < ActiveRecord::Generators::Base
44
desc "Create a migration to add paperclip-specific fields to your model. " +
55
"The NAME argument is the name of your model, and the following " +
66
"arguments are the name of the attachments"
77

8-
argument :attachment_names, :required => true, :type => :array, :desc => "The names of the attachment(s) to add.",
9-
:banner => "attachment_one attachment_two attachment_three ..."
8+
argument :attachment_names, required: true, type: :array, desc: "The names of the attachment(s) to add.",
9+
banner: "attachment_one attachment_two attachment_three ..."
1010

1111
def self.source_root
12-
@source_root ||= File.expand_path('../templates', __FILE__)
12+
@source_root ||= File.expand_path("templates", __dir__)
1313
end
1414

1515
def generate_migration
@@ -19,7 +19,7 @@ def generate_migration
1919
end
2020

2121
def migration_name
22-
"add_attachment_#{attachment_names.join("_")}_to_#{name.underscore.pluralize}"
22+
"add_attachment_#{attachment_names.join('_')}_to_#{name.underscore.pluralize}"
2323
end
2424

2525
def migration_file_name
@@ -31,8 +31,6 @@ def migration_class_name
3131
end
3232

3333
def migration_version
34-
if Rails.version.start_with? "5"
35-
"[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
36-
end
34+
"[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]" if Rails.version.start_with? "5"
3735
end
3836
end

lib/paperclip.rb

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -25,37 +25,37 @@
2525
#
2626
# See the +has_attached_file+ documentation for more details.
2727

28-
require 'erb'
29-
require 'digest'
30-
require 'tempfile'
31-
require 'paperclip/version'
32-
require 'paperclip/geometry_parser_factory'
33-
require 'paperclip/geometry_detector_factory'
34-
require 'paperclip/geometry'
35-
require 'paperclip/processor'
36-
require 'paperclip/processor_helpers'
37-
require 'paperclip/tempfile'
38-
require 'paperclip/thumbnail'
39-
require 'paperclip/interpolations/plural_cache'
40-
require 'paperclip/interpolations'
41-
require 'paperclip/tempfile_factory'
42-
require 'paperclip/style'
43-
require 'paperclip/attachment'
44-
require 'paperclip/storage'
45-
require 'paperclip/callbacks'
46-
require 'paperclip/file_command_content_type_detector'
47-
require 'paperclip/media_type_spoof_detector'
48-
require 'paperclip/content_type_detector'
49-
require 'paperclip/glue'
50-
require 'paperclip/errors'
51-
require 'paperclip/missing_attachment_styles'
52-
require 'paperclip/validators'
53-
require 'paperclip/logger'
54-
require 'paperclip/helpers'
55-
require 'paperclip/has_attached_file'
56-
require 'paperclip/attachment_registry'
57-
require 'paperclip/filename_cleaner'
58-
require 'paperclip/rails_environment'
28+
require "erb"
29+
require "digest"
30+
require "tempfile"
31+
require "paperclip/version"
32+
require "paperclip/geometry_parser_factory"
33+
require "paperclip/geometry_detector_factory"
34+
require "paperclip/geometry"
35+
require "paperclip/processor"
36+
require "paperclip/processor_helpers"
37+
require "paperclip/tempfile"
38+
require "paperclip/thumbnail"
39+
require "paperclip/interpolations/plural_cache"
40+
require "paperclip/interpolations"
41+
require "paperclip/tempfile_factory"
42+
require "paperclip/style"
43+
require "paperclip/attachment"
44+
require "paperclip/storage"
45+
require "paperclip/callbacks"
46+
require "paperclip/file_command_content_type_detector"
47+
require "paperclip/media_type_spoof_detector"
48+
require "paperclip/content_type_detector"
49+
require "paperclip/glue"
50+
require "paperclip/errors"
51+
require "paperclip/missing_attachment_styles"
52+
require "paperclip/validators"
53+
require "paperclip/logger"
54+
require "paperclip/helpers"
55+
require "paperclip/has_attached_file"
56+
require "paperclip/attachment_registry"
57+
require "paperclip/filename_cleaner"
58+
require "paperclip/rails_environment"
5959

6060
begin
6161
# Use mime/types/columnar if available, for reduced memory usage
@@ -64,12 +64,12 @@
6464
require "mime/types"
6565
end
6666

67-
require 'mimemagic'
68-
require 'mimemagic/overlay'
69-
require 'logger'
70-
require 'terrapin'
67+
require "mimemagic"
68+
require "mimemagic/overlay"
69+
require "logger"
70+
require "terrapin"
7171

72-
require 'paperclip/railtie' if defined?(Rails::Railtie)
72+
require "paperclip/railtie" if defined?(Rails::Railtie)
7373

7474
# The base module that gets included in ActiveRecord::Base. See the
7575
# documentation for Paperclip::ClassMethods for more useful information.
@@ -201,15 +201,15 @@ def has_attached_file(name, options = {})
201201
end
202202

203203
# This stuff needs to be run after Paperclip is defined.
204-
require 'paperclip/io_adapters/registry'
205-
require 'paperclip/io_adapters/abstract_adapter'
206-
require 'paperclip/io_adapters/empty_string_adapter'
207-
require 'paperclip/io_adapters/identity_adapter'
208-
require 'paperclip/io_adapters/file_adapter'
209-
require 'paperclip/io_adapters/stringio_adapter'
210-
require 'paperclip/io_adapters/data_uri_adapter'
211-
require 'paperclip/io_adapters/nil_adapter'
212-
require 'paperclip/io_adapters/attachment_adapter'
213-
require 'paperclip/io_adapters/uploaded_file_adapter'
214-
require 'paperclip/io_adapters/uri_adapter'
215-
require 'paperclip/io_adapters/http_url_proxy_adapter'
204+
require "paperclip/io_adapters/registry"
205+
require "paperclip/io_adapters/abstract_adapter"
206+
require "paperclip/io_adapters/empty_string_adapter"
207+
require "paperclip/io_adapters/identity_adapter"
208+
require "paperclip/io_adapters/file_adapter"
209+
require "paperclip/io_adapters/stringio_adapter"
210+
require "paperclip/io_adapters/data_uri_adapter"
211+
require "paperclip/io_adapters/nil_adapter"
212+
require "paperclip/io_adapters/attachment_adapter"
213+
require "paperclip/io_adapters/uploaded_file_adapter"
214+
require "paperclip/io_adapters/uri_adapter"
215+
require "paperclip/io_adapters/http_url_proxy_adapter"

0 commit comments

Comments
 (0)