kt-paperclip 5.4.0 → 7.1.1

data/features/step_definitions/attachment_steps.rb

@@ -23,7 +23,7 @@ When /^I modify my attachment definition to:$/ do |definition|
 end
 
 When /^I upload the fixture "([^"]*)"$/ do |filename|
-  run_simple %(bundle exec rails runner "User.create!(:attachment => File.open('#{fixture_path(filename)}'))")
+  aruba_run_simple %(bundle exec rails runner "User.create!(:attachment => File.open('#{fixture_path(filename)}'))")
 end
 
 Then /^the attachment "([^"]*)" should have a dimension of (\d+x\d+)$/ do |filename, dimension|
@@ -41,7 +41,7 @@ end
 
 When /^I swap the attachment "([^"]*)" with the fixture "([^"]*)"$/ do |attachment_filename, fixture_filename|
   cd(".") do
-    require 'fileutils'
+    require "fileutils"
     FileUtils.rm_f attachment_path(attachment_filename)
     FileUtils.cp fixture_path(fixture_filename), attachment_path(attachment_filename)
   end
@@ -76,7 +76,7 @@ Then /^the attachment should have the same file size as the fixture "([^"]*)"$/
   end
 end
 
-Then /^the attachment file "([^"]*)" should (not )?exist$/ do |filename, not_exist|
+Then /^the attachment file "([^"]*)" should (not )?exist$/ do |filename, _not_exist|
   cd(".") do
     expect(attachment_path(filename)).not_to be_an_existing_file
   end
@@ -84,12 +84,12 @@ end
 
 Then /^I should have attachment columns for "([^"]*)"$/ do |attachment_name|
   cd(".") do
-    columns = eval(`bundle exec rails runner "puts User.columns.map{ |column| [column.name, column.type] }.inspect"`.strip)
+    columns = eval(`bundle exec rails runner "puts User.columns.map{ |column| [column.name, column.sql_type] }.inspect"`.strip)
     expect_columns = [
-      ["#{attachment_name}_file_name", :string],
-      ["#{attachment_name}_content_type", :string],
-      ["#{attachment_name}_file_size", :integer],
-      ["#{attachment_name}_updated_at", :datetime]
+      ["#{attachment_name}_file_name", "varchar"],
+      ["#{attachment_name}_content_type", "varchar"],
+      ["#{attachment_name}_file_size", "bigint"],
+      ["#{attachment_name}_updated_at", "datetime"]
     ]
     expect(columns).to include(*expect_columns)
   end
@@ -97,14 +97,24 @@ end
 
 Then /^I should not have attachment columns for "([^"]*)"$/ do |attachment_name|
   cd(".") do
-    columns = eval(`bundle exec rails runner "puts User.columns.map{ |column| [column.name, column.type] }.inspect"`.strip)
+    columns = eval(`bundle exec rails runner "puts User.columns.map{ |column| [column.name, column.sql_type] }.inspect"`.strip)
     expect_columns = [
-      ["#{attachment_name}_file_name", :string],
-      ["#{attachment_name}_content_type", :string],
-      ["#{attachment_name}_file_size", :integer],
-      ["#{attachment_name}_updated_at", :datetime]
+      ["#{attachment_name}_file_name", "varchar"],
+      ["#{attachment_name}_content_type", "varchar"],
+      ["#{attachment_name}_file_size", "bigint"],
+      ["#{attachment_name}_updated_at", "datetime"]
     ]
 
     expect(columns).not_to include(*expect_columns)
   end
 end
+
+# we have to support different versions of aruba, and this method was renamed for 1.0
+# https://github.com/cucumber/aruba/pull/438
+def aruba_run_simple(*args)
+  if respond_to?(:run_simple)
+    run_simple(*args)
+  elsif respond_to?(:run_command_and_stop)
+    run_command_and_stop(*args)
+  end
+end

data/features/step_definitions/html_steps.rb

@@ -5,11 +5,11 @@ end
 Then %r{^the file at "([^"]*)" is the same as "([^"]*)"$} do |web_file, path|
   expected = IO.read(path)
   actual = if web_file.match %r{^https?://}
-    Net::HTTP.get(URI.parse(web_file))
-  else
-    visit(web_file)
-    page.body
-  end
+             Net::HTTP.get(URI.parse(web_file))
+           else
+             visit(web_file)
+             page.body
+           end
   actual.force_encoding("UTF-8") if actual.respond_to?(:force_encoding)
   expect(actual).to eq(expected)
 end

data/features/step_definitions/rails_steps.rb

@@ -17,7 +17,7 @@ Given /^I generate a new rails application$/ do
       gem "jruby-openssl", :platform => :jruby
       gem "capybara"
       gem "gherkin"
-      gem "aws-sdk", "~> 2.0.0"
+      gem "aws-sdk-s3"
       gem "racc", :platform => :rbx
       gem "rubysl", :platform => :rbx
       """
@@ -30,6 +30,14 @@ Given /^I generate a new rails application$/ do
   FileUtils.chdir("../../..")
 end
 
+Given /^I generate a "([^"]*)" model:$/ do |model_name|
+  step %[I successfully run `rails generate model #{model_name}`]
+end
+
+Given /^I run a paperclip migration to add a paperclip "([^"]*)" to the "([^"]*)" model$/ do |attachment_name, model_name|
+  step %[I successfully run `rails generate paperclip #{model_name} #{attachment_name}`]
+end
+
 Given "I allow the attachment to be submitted" do
   cd(".") do
     transform_file("app/controllers/users_controller.rb") do |content|
@@ -84,7 +92,7 @@ end
 
 Given "I empty the application.js file" do
   cd(".") do
-    transform_file("app/assets/javascripts/application.js") do |content|
+    transform_file("app/assets/javascripts/application.js") do |_content|
       ""
     end
   end
@@ -135,7 +143,7 @@ Given /^I add this snippet to the User model:$/ do |snippet|
   file_name = "app/models/user.rb"
   cd(".") do
     content = File.read(file_name)
-    File.open(file_name, 'w') { |f| f << content.sub(/end\Z/, "#{snippet}\nend") }
+    File.open(file_name, "w") { |f| f << content.sub(/end\Z/, "#{snippet}\nend") }
   end
 end
 
@@ -143,7 +151,21 @@ Given /^I add this snippet to config\/application.rb:$/ do |snippet|
   file_name = "config/application.rb"
   cd(".") do
     content = File.read(file_name)
-    File.open(file_name, 'w') {|f| f << content.sub(/class Application < Rails::Application.*$/, "class Application < Rails::Application\n#{snippet}\n")}
+    File.open(file_name, "w") do |f|
+      f << content.sub(/class Application < Rails::Application.*$/,
+                       "class Application < Rails::Application\n#{snippet}\n")
+    end
+  end
+end
+
+Given /^I replace this snippet to app\/views\/layouts\/application.html.erb:$/ do |snippet|
+  file_name = "app/views/layouts/application.html.erb"
+  cd(".") do
+    content = File.read(file_name)
+    File.open(file_name, "w") do |f|
+      f << content.sub(/<%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>$/,
+                       "#{snippet}")
+    end
   end
 end
 
@@ -166,7 +188,7 @@ When /^I turn off class caching$/ do
     config = IO.read(file)
     config.gsub!(%r{^\s*config.cache_classes.*$},
                  "config.cache_classes = false")
-    File.open(file, "w"){|f| f.write(config) }
+    File.open(file, "w") { |f| f.write(config) }
   end
 end
 
@@ -186,10 +208,8 @@ When /^I configure the application to use "([^\"]+)"$/ do |gem_name|
 end
 
 When /^I append gems from Appraisal Gemfile$/ do
-  File.read(ENV['BUNDLE_GEMFILE']).split(/\n/).each do |line|
-    if line =~ /^gem "(?!rails|appraisal)/
-      append_to_gemfile line.strip
-    end
+  File.read(ENV["BUNDLE_GEMFILE"]).split(/\n/).each do |line|
+    append_to_gemfile line.strip if line =~ /^gem "(?!rails|appraisal)/
   end
 end
 

data/features/step_definitions/s3_steps.rb

@@ -1,11 +1,11 @@
 When /^I attach the file "([^"]*)" to "([^"]*)" on S3$/ do |file_path, field|
   definition = Paperclip::AttachmentRegistry.definitions_for(User)[field.downcase.to_sym]
   path = "https://paperclip.s3.us-west-2.amazonaws.com#{definition[:path]}"
-  path.gsub!(':filename', File.basename(file_path))
-  path.gsub!(/:([^\/\.]+)/) do |match|
+  path.gsub!(":filename", File.basename(file_path))
+  path.gsub!(/:([^\/\.]+)/) do |_match|
     "([^\/\.]+)"
   end
-  FakeWeb.register_uri(:put, Regexp.new(path), :body => "<xml></xml>")
+  FakeWeb.register_uri(:put, Regexp.new(path), body: "<xml></xml>")
   step "I attach the file \"#{file_path}\" to \"#{field}\""
 end
 

data/features/step_definitions/web_steps.rb

@@ -18,9 +18,8 @@
 # * http://elabs.se/blog/15-you-re-cuking-it-wrong
 #
 
-
-require 'uri'
-require 'cgi'
+require "uri"
+require "cgi"
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "paths"))
 require File.expand_path(File.join(File.dirname(__FILE__), "..", "support", "selectors"))
 
@@ -58,11 +57,11 @@ When /^(?:|I )follow "([^"]*)"$/ do |link|
 end
 
 When /^(?:|I )fill in "([^"]*)" with "([^"]*)"$/ do |field, value|
-  fill_in(field, :with => value)
+  fill_in(field, with: value)
 end
 
 When /^(?:|I )fill in "([^"]*)" for "([^"]*)"$/ do |value, field|
-  fill_in(field, :with => value)
+  fill_in(field, with: value)
 end
 
 # Use this to fill in an entire form with data from a table. Example:
@@ -83,7 +82,7 @@ When /^(?:|I )fill in the following:$/ do |fields|
 end
 
 When /^(?:|I )select "([^"]*)" from "([^"]*)"$/ do |value, field|
-  select(value, :from => field)
+  select(value, from: field)
 end
 
 When /^(?:|I )check "([^"]*)"$/ do |field|

data/features/support/env.rb

@@ -1,8 +1,8 @@
-require 'aruba/cucumber'
-require 'capybara/cucumber'
-require 'rspec/matchers'
+require "aruba/cucumber"
+require "capybara/cucumber"
+require "rspec/matchers"
 
-$CUCUMBER=1
+$CUCUMBER = 1
 
 World(RSpec::Matchers)
 

data/features/support/fakeweb.rb

@@ -1,13 +1,11 @@
-require 'fake_web'
+require "fake_web"
 
 FakeWeb.allow_net_connect = false
 
 module FakeWeb
   class StubSocket
-    def read_timeout=(_ignored)
-    end
+    def read_timeout=(_ignored); end
 
-    def continue_timeout=(_ignored)
-    end
+    def continue_timeout=(_ignored); end
   end
 end

data/features/support/file_helpers.rb

@@ -9,14 +9,14 @@ module FileHelpers
   end
 
   def append_to_gemfile(contents)
-    append_to('Gemfile', contents)
+    append_to("Gemfile", contents)
   end
 
   def comment_out_gem_in_gemfile(gemname)
     cd(".") do
       gemfile = File.read("Gemfile")
       gemfile.sub!(/^(\s*)(gem\s*['"]#{gemname})/, "\\1# \\2")
-      File.open("Gemfile", 'w'){ |file| file.write(gemfile) }
+      File.open("Gemfile", "w") { |file| file.write(gemfile) }
     end
   end
 

data/features/support/paths.rb

@@ -9,17 +9,17 @@ module NavigationHelpers
     case page_name
 
     when /the home\s?page/
-      '/'
+      "/"
     when /the new user page/
-      '/users/new'
+      "/users/new"
     else
       begin
         page_name =~ /the (.*) page/
         path_components = $1.split(/\s+/)
-        self.send(path_components.push('path').join('_').to_sym)
+        send(path_components.push("path").join("_").to_sym)
       rescue Object
         raise "Can't find mapping from \"#{page_name}\" to a path.\n" +
-          "Now, go and add a mapping in #{__FILE__}"
+              "Now, go and add a mapping in #{__FILE__}"
       end
     end
   end

data/features/support/rails.rb

@@ -1,13 +1,13 @@
-PROJECT_ROOT     = File.expand_path(File.join(File.dirname(__FILE__), '..', '..')).freeze
-APP_NAME         = 'testapp'.freeze
-BUNDLE_ENV_VARS = %w(RUBYOPT BUNDLE_PATH BUNDLE_BIN_PATH BUNDLE_GEMFILE)
-ORIGINAL_BUNDLE_VARS = Hash[ENV.select{ |key,value| BUNDLE_ENV_VARS.include?(key) }]
+PROJECT_ROOT     = File.expand_path(File.join(File.dirname(__FILE__), "..", "..")).freeze
+APP_NAME         = "testapp"
+BUNDLE_ENV_VARS = %w(RUBYOPT BUNDLE_PATH BUNDLE_BIN_PATH BUNDLE_GEMFILE).freeze
+ORIGINAL_BUNDLE_VARS = Hash[ENV.select { |key, _value| BUNDLE_ENV_VARS.include?(key) }]
 
-ENV['RAILS_ENV'] = 'test'
+ENV["RAILS_ENV"] = "test"
 
 Before do
-  gemfile = ENV['BUNDLE_GEMFILE'].to_s
-  ENV['BUNDLE_GEMFILE'] = File.join(Dir.pwd, gemfile) unless gemfile.start_with?(Dir.pwd)
+  gemfile = ENV["BUNDLE_GEMFILE"].to_s
+  ENV["BUNDLE_GEMFILE"] = File.join(Dir.pwd, gemfile) unless gemfile.start_with?(Dir.pwd)
   @framework_version = nil
 end
 

data/features/support/selectors.rb

@@ -11,7 +11,7 @@ module HtmlSelectorsHelpers
       "html > body"
     else
       raise "Can't find mapping from \"#{locator}\" to a selector.\n" +
-        "Now, go and add a mapping in #{__FILE__}"
+            "Now, go and add a mapping in #{__FILE__}"
     end
   end
 end

data/gemfiles/4.2.gemfile

@@ -2,16 +2,19 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", "~> 1.3.8", :platforms => :ruby
 gem "pry"
+gem "sqlite3", "~> 1.3.8", platforms: :ruby
 gem "rails", "~> 4.2.0"
 
 group :development, :test do
   gem "activerecord-import"
-  gem "mime-types"
+  gem "bootsnap", require: false
   gem "builder"
-  gem "rubocop", :require => false
+  gem "listen", "~> 3.0.8"
   gem "rspec"
+  gem "rubocop", require: false
+  gem "rubocop-rails"
+  gem "sprockets", "3.7.2"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/5.0.gemfile

@@ -2,16 +2,19 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", "~> 1.3.8", :platforms => :ruby
 gem "pry"
+gem "sqlite3", "~> 1.3.8", platforms: :ruby
 gem "rails", "~> 5.0.0"
 
 group :development, :test do
   gem "activerecord-import"
-  gem "mime-types"
+  gem "bootsnap", require: false
   gem "builder"
-  gem "rubocop", :require => false
+  gem "listen", "~> 3.0.8"
   gem "rspec"
+  gem "rubocop", require: false
+  gem "rubocop-rails"
+  gem "sprockets", "3.7.2"
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/5.1.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pry"
+gem "sqlite3", "~> 1.3.8", platforms: :ruby
+gem "rails", "~> 5.1.0"
+
+group :development, :test do
+  gem "activerecord-import"
+  gem "bootsnap", require: false
+  gem "builder"
+  gem "listen", "~> 3.0.8"
+  gem "rspec"
+  gem "rubocop", require: false
+  gem "rubocop-rails"
+  gem "sprockets", "3.7.2"
+end
+
+gemspec path: "../"

data/gemfiles/5.2.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pry"
+gem "sqlite3", "~> 1.3.8", platforms: :ruby
+gem "rails", "~> 5.2.0"
+
+group :development, :test do
+  gem "activerecord-import"
+  gem "bootsnap", require: false
+  gem "builder"
+  gem "listen", "~> 3.0.8"
+  gem "rspec"
+  gem "rubocop", require: false
+  gem "rubocop-rails"
+  gem "sprockets", "3.7.2"
+end
+
+gemspec path: "../"

data/gemfiles/6.0.gemfile

@@ -0,0 +1,20 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pry"
+gem "sqlite3", "~> 1.4", platforms: :ruby
+gem "rails", "~> 6.0.0"
+
+group :development, :test do
+  gem "activerecord-import"
+  gem "bootsnap", require: false
+  gem "builder"
+  gem "listen", "~> 3.0.8"
+  gem "rspec"
+  gem "rubocop", require: false
+  gem "rubocop-rails"
+  gem "sprockets", "3.7.2"
+end
+
+gemspec path: "../"

data/gemfiles/6.1.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pry"
+gem "sqlite3", "~> 1.4", platforms: :ruby
+gem "aruba", "~> 1.0", ">= 1.0.4"
+gem "rails", "~> 6.1", ">= 6.1.1"
+
+group :development, :test do
+  gem "activerecord-import"
+  gem "bootsnap", require: false
+  gem "builder"
+  gem "listen", "~> 3.0.8"
+  gem "rspec"
+  gem "rubocop", require: false
+  gem "rubocop-rails"
+  gem "sprockets", "3.7.2"
+end
+
+gemspec path: "../"

data/gemfiles/7.0.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "pry"
+gem "sqlite3", "~> 1.4", platforms: :ruby
+gem "aruba", "~> 1.0", ">= 1.0.4"
+gem "rails", "~> 7.0.0"
+
+group :development, :test do
+  gem "activerecord-import"
+  gem "bootsnap", require: false
+  gem "builder"
+  gem "listen", "~> 3.0.8"
+  gem "rspec"
+  gem "rubocop", require: false
+  gem "rubocop-rails"
+  gem "sprockets", "3.7.2"
+end
+
+gemspec path: "../"

data/lib/generators/paperclip/paperclip_generator.rb

@@ -1,15 +1,15 @@
-require 'rails/generators/active_record'
+require "rails/generators/active_record"
 
 class PaperclipGenerator < ActiveRecord::Generators::Base
   desc "Create a migration to add paperclip-specific fields to your model. " +
        "The NAME argument is the name of your model, and the following " +
        "arguments are the name of the attachments"
 
-  argument :attachment_names, :required => true, :type => :array, :desc => "The names of the attachment(s) to add.",
-           :banner => "attachment_one attachment_two attachment_three ..."
+  argument :attachment_names, required: true, type: :array, desc: "The names of the attachment(s) to add.",
+                              banner: "attachment_one attachment_two attachment_three ..."
 
   def self.source_root
-    @source_root ||= File.expand_path('../templates', __FILE__)
+    @source_root ||= File.expand_path("templates", __dir__)
   end
 
   def generate_migration
@@ -19,7 +19,7 @@ class PaperclipGenerator < ActiveRecord::Generators::Base
   end
 
   def migration_name
-    "add_attachment_#{attachment_names.join("_")}_to_#{name.underscore.pluralize}"
+    "add_attachment_#{attachment_names.join('_')}_to_#{name.underscore.pluralize}"
   end
 
   def migration_file_name
@@ -31,8 +31,6 @@ class PaperclipGenerator < ActiveRecord::Generators::Base
   end
 
   def migration_version
-    if Rails.version.start_with? "5"
-      "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
-    end
+    "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]" if Rails.version.first.to_i > 4
   end
 end