paperclip 3.4.0 → 6.1.0

data/features/step_definitions/web_steps.rb

@@ -103,107 +103,5 @@ When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"$/ do |path, field|
 end
 
 Then /^(?:|I )should see "([^"]*)"$/ do |text|
-  if page.respond_to? :should
-    page.should have_content(text)
-  else
-    assert page.has_content?(text)
-  end
-end
-
-Then /^(?:|I )should see \/([^\/]*)\/$/ do |regexp|
-  regexp = Regexp.new(regexp)
-
-  if page.respond_to? :should
-    page.should have_xpath('//*', :text => regexp)
-  else
-    assert page.has_xpath?('//*', :text => regexp)
-  end
-end
-
-Then /^(?:|I )should not see "([^"]*)"$/ do |text|
-  if page.respond_to? :should
-    page.should have_no_content(text)
-  else
-    assert page.has_no_content?(text)
-  end
-end
-
-Then /^(?:|I )should not see \/([^\/]*)\/$/ do |regexp|
-  regexp = Regexp.new(regexp)
-
-  if page.respond_to? :should
-    page.should have_no_xpath('//*', :text => regexp)
-  else
-    assert page.has_no_xpath?('//*', :text => regexp)
-  end
-end
-
-Then /^the "([^"]*)" field(?: within (.*))? should contain "([^"]*)"$/ do |field, parent, value|
-  with_scope(parent) do
-    field = find_field(field)
-    if field.value.respond_to? :should
-      field.value.should =~ /#{value}/
-    else
-      assert_match(/#{value}/, field.value)
-    end
-  end
-end
-
-Then /^the "([^"]*)" field(?: within (.*))? should not contain "([^"]*)"$/ do |field, parent, value|
-  with_scope(parent) do
-    field = find_field(field)
-    if field.value.respond_to? :should_not
-      field.value.should_not =~ /#{value}/
-    else
-      assert_no_match(/#{value}/, field.value)
-    end
-  end
-end
-
-Then /^the "([^"]*)" checkbox(?: within (.*))? should be checked$/ do |label, parent|
-  with_scope(parent) do
-    field_checked = find_field(label)['checked']
-    if field_checked.respond_to? :should
-      field_checked.should be_true
-    else
-      assert field_checked
-    end
-  end
-end
-
-Then /^the "([^"]*)" checkbox(?: within (.*))? should not be checked$/ do |label, parent|
-  with_scope(parent) do
-    field_checked = find_field(label)['checked']
-    if field_checked.respond_to? :should
-      field_checked.should be_false
-    else
-      assert !field_checked
-    end
-  end
-end
-
-Then /^(?:|I )should be on (.+)$/ do |page_name|
-  current_path = URI.parse(current_url).path
-  if current_path.respond_to? :should
-    current_path.should == path_to(page_name)
-  else
-    assert_equal path_to(page_name), current_path
-  end
-end
-
-Then /^(?:|I )should have the following query string:$/ do |expected_pairs|
-  query = URI.parse(current_url).query
-  actual_params = query ? CGI.parse(query) : {}
-  expected_params = {}
-  expected_pairs.rows_hash.each_pair{|k,v| expected_params[k] = v.split(',')}
-
-  if actual_params.respond_to? :should
-    actual_params.should == expected_params
-  else
-    assert_equal expected_params, actual_params
-  end
-end
-
-Then /^show me the page$/ do
-  save_and_open_page
+  expect(page).to have_content(text)
 end

data/features/support/env.rb

@@ -1,11 +1,12 @@
 require 'aruba/cucumber'
 require 'capybara/cucumber'
-require 'test/unit/assertions'
+require 'rspec/matchers'
 
 $CUCUMBER=1
 
-World(Test::Unit::Assertions)
+World(RSpec::Matchers)
 
 Before do
+  aruba.config.command_launcher = ENV.fetch("DEBUG", nil) ? :debug : :spawn
   @aruba_timeout_seconds = 120
 end

data/features/support/fakeweb.rb

@@ -4,7 +4,10 @@ FakeWeb.allow_net_connect = false
 
 module FakeWeb
   class StubSocket
-    def read_timeout=(ignored)
+    def read_timeout=(_ignored)
+    end
+
+    def continue_timeout=(_ignored)
     end
   end
 end

data/features/support/file_helpers.rb

@@ -1,6 +1,6 @@
 module FileHelpers
   def append_to(path, contents)
-    in_current_dir do
+    cd(".") do
       File.open(path, "a") do |file|
         file.puts
         file.puts contents
@@ -13,12 +13,22 @@ module FileHelpers
   end
 
   def comment_out_gem_in_gemfile(gemname)
-    in_current_dir do
+    cd(".") do
       gemfile = File.read("Gemfile")
       gemfile.sub!(/^(\s*)(gem\s*['"]#{gemname})/, "\\1# \\2")
       File.open("Gemfile", 'w'){ |file| file.write(gemfile) }
     end
   end
+
+  def read_from_web(url)
+    file = if url.match %r{^https?://}
+             Net::HTTP.get(URI.parse(url))
+           else
+             visit(url)
+             page.source
+           end
+    file.force_encoding("UTF-8") if file.respond_to?(:force_encoding)
+  end
 end
 
 World(FileHelpers)

data/features/support/fixtures/gemfile.txt

@@ -2,4 +2,4 @@ source "http://rubygems.org"
 
 gem "rails", "RAILS_VERSION"
 gem "rdoc"
-gem "sqlite3"
+gem "sqlite3", "1.3.8"

data/features/support/paths.rb

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

data/features/support/rails.rb

@@ -6,7 +6,8 @@ ORIGINAL_BUNDLE_VARS = Hash[ENV.select{ |key,value| BUNDLE_ENV_VARS.include?(key
 ENV['RAILS_ENV'] = 'test'
 
 Before do
-  ENV['BUNDLE_GEMFILE'] = File.join(Dir.pwd, ENV['BUNDLE_GEMFILE']) unless ENV['BUNDLE_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
 
@@ -31,16 +32,8 @@ module RailsCommandHelpers
     @framework_version ||= `rails -v`[/^Rails (.+)$/, 1]
   end
 
-  def new_application_command
-    "rails new"
-  end
-
-  def generator_command
-    "script/rails generate"
-  end
-
-  def runner_command
-    "script/rails runner"
+  def framework_major_version
+    framework_version.split(".").first.to_i
   end
 end
 World(RailsCommandHelpers)

data/gemfiles/4.2.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.3.8", :platforms => :ruby
+gem "pry"
+gem "rails", "~> 4.2.0"
+
+group :development, :test do
+  gem "activerecord-import"
+  gem "mime-types"
+  gem "builder"
+  gem "rubocop", :require => false
+  gem "rspec"
+end
+
+gemspec :path => "../"

data/gemfiles/5.0.gemfile

@@ -0,0 +1,17 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", "~> 1.3.8", :platforms => :ruby
+gem "pry"
+gem "rails", "~> 5.0.0"
+
+group :development, :test do
+  gem "activerecord-import"
+  gem "mime-types"
+  gem "builder"
+  gem "rubocop", :require => false
+  gem "rspec"
+end
+
+gemspec :path => "../"

data/lib/generators/paperclip/paperclip_generator.rb

@@ -13,11 +13,11 @@ class PaperclipGenerator < ActiveRecord::Generators::Base
   end
 
   def generate_migration
-    migration_template "paperclip_migration.rb.erb", "db/migrate/#{migration_file_name}"
+    migration_template("paperclip_migration.rb.erb",
+                       "db/migrate/#{migration_file_name}",
+                       migration_version: migration_version)
   end
 
-  protected
-
   def migration_name
     "add_attachment_#{attachment_names.join("_")}_to_#{name.underscore.pluralize}"
   end
@@ -29,4 +29,10 @@ class PaperclipGenerator < ActiveRecord::Generators::Base
   def migration_class_name
     migration_name.camelize
   end
+
+  def migration_version
+    if Rails.version.start_with? "5"
+      "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+    end
+  end
 end

data/lib/generators/paperclip/templates/paperclip_migration.rb.erb

@@ -1,4 +1,4 @@
-class <%= migration_class_name %> < ActiveRecord::Migration
+class <%= migration_class_name %> < ActiveRecord::Migration<%= migration_version %>
   def self.up
     change_table :<%= table_name %> do |t|
 <% attachment_names.each do |attachment| -%>
@@ -9,7 +9,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration
 
   def self.down
 <% attachment_names.each do |attachment| -%>
-    drop_attached_file :<%= table_name %>, :<%= attachment %>
+    remove_attachment :<%= table_name %>, :<%= attachment %>
 <% end -%>
   end
 end