paperclip_database 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 654fa1e438f9fadcf44928b5647042234f6c6579
-  data.tar.gz: 63ac11d032c0c8cf77ebcc2dfb0353c4fbd71cbc
+  metadata.gz: cfe008fb0a854193ec05d861183921b701c39792
+  data.tar.gz: 96c9078fbc881ffb26a84025a8cec507ada14bba
 SHA512:
-  metadata.gz: e790ed0d73796a74a802b9ccdd412065ba4f2d8fc1b9b5b35ad09197821a4ce612959a736745777e1276b0fb86ff1e77c09e780d4642d024fcaeefa0c86c39e8
-  data.tar.gz: 92a5835976253d91dc37424c85f016e522617882bb8edc11f6a954fc6c923769dd30e3c7704f1ba35b18fdce1455d55a63f0fd54a66f9248b5fac548fe0612a0
+  metadata.gz: bf69777dec19e8c447b8be26339910658059643f535c864859b9b9c1426b682653e8a6e2c917a4bd982524c6947cf989d8e6ed0e938a02c6093bc9d5418ac656
+  data.tar.gz: 52b37c509f81772b957e1b72cb727b6f2d531c85e63c22a13d61081b107647e7e7e7f3fb05c29a79322edf95a0cd9ae37342ec2cc5f798464dd4de50a9625a39

data/.gitignore

@@ -21,9 +21,9 @@ pkg
 *emfile.lock
 
 # Test suite generated
-test/debug.log
+spec/debug.log
 
-# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore:
 #
 # * Create a file at ~/.gitignore
 # * Include files you want ignored

data/.rspec

@@ -1 +1 @@
---color
+--color --format doc

data/.travis.yml

@@ -3,6 +3,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.1
+  - 2.1.2
 gemfile:
   - gemfiles/rails30_paperclip23.gemfile
   - gemfiles/rails30_paperclip2x.gemfile
@@ -18,7 +19,7 @@ gemfile:
   - gemfiles/rails32_paperclip3x.gemfile
   - gemfiles/rails32_paperclip40.gemfile
   - gemfiles/rails32_paperclip4x.gemfile
-  - gemfiles/rails40_paperclip34.gemfile
-  - gemfiles/rails40_paperclip3x.gemfile
-  - gemfiles/rails40_paperclip40.gemfile
+  - gemfiles/rails40_paperclip42.gemfile
   - gemfiles/rails40_paperclip4x.gemfile
+  - gemfiles/rails41_paperclip42.gemfile
+  - gemfiles/rails41_paperclip4x.gemfile

data/Appraisals

@@ -91,26 +91,30 @@ end
 
 ## Rails 4.0
 
-appraise "rails40_paperclip34" do
+appraise "rails40_paperclip42" do
   gem "rails", "~> 4.0.0"
-  gem "paperclip", "~> 3.4.0"
+  gem "minitest", "~> 4.2"
+  gem "paperclip", "~> 4.2.0"
   gem "paperclip_database", :path => "../"
 end
 
-appraise "rails40_paperclip3x" do
+appraise "rails40_paperclip4x" do
   gem "rails", "~> 4.0.0"
-  gem "paperclip", "~> 3.0"
+  gem "minitest", "~> 4.2"
+  gem "paperclip", "~> 4.2"
   gem "paperclip_database", :path => "../"
 end
 
-appraise "rails40_paperclip40" do
-  gem "rails", "~> 4.0.0"
-  gem "paperclip", "~> 4.0.0"
+## Rails 4.1
+
+appraise "rails41_paperclip42" do
+  gem "rails", "~> 4.1.0"
+  gem "paperclip", "~> 4.2.0"
   gem "paperclip_database", :path => "../"
 end
 
-appraise "rails40_paperclip4x" do
-  gem "rails", "~> 4.0.0"
-  gem "paperclip", "~> 4.0"
+appraise "rails41_paperclip4x" do
+  gem "rails", "~> 4.1.0"
+  gem "paperclip", "~> 4.2"
   gem "paperclip_database", :path => "../"
 end

data/README.md

@@ -2,11 +2,12 @@ Paperclip Database Storage
 ==========================
 
 [![Build Status](https://travis-ci.org/softace/paperclip_database.png)](http://travis-ci.org/softace/paperclip_database)
+[![Gem Version](https://badge.fury.io/rb/paperclip_database.svg)](http://badge.fury.io/rb/paperclip_database)
 [![Dependency Status](https://gemnasium.com/softace/paperclip_database.png)](https://gemnasium.com/softace/paperclip_database)
 [![Code Climate](https://codeclimate.com/github/softace/paperclip_database.png)](https://codeclimate.com/github/softace/paperclip_database)
 
 Paperclip Database Storage is an additional storage option for
-Paperclip. It give you the opportunity to store your paperclip binary
+Paperclip. It gives you the opportunity to store your paperclip binary
 file uploads in the database along with all your other data.
 
 Requirements
@@ -43,7 +44,7 @@ Supported Versions
 ------------------
 
 As of version 2.0, Rails 2 is no longer supported.
-Supported version are rails >= 3.0 and paperclip version >= 2.5
+Supported version are rails >= 3.0 and paperclip version >= 2.3
 
 Quick Start
 -----------
@@ -93,9 +94,10 @@ To start develop, please download the source code
 When downloaded, you can start issuing the commands like
 
     bundle install
-    bundle exec rake appraisal:gemfiles
-    bundle exec rake appraisal:install
-    bundle exec rake all
+    bundle exec appraisal clean
+    bundle exec appraisal generate
+    bundle exec appraisal install
+    bundle exec appraisal rake
 
 Or you can see what other options are there:
 

data/Rakefile

@@ -1,6 +1,6 @@
 require 'bundler/gem_tasks'
 require 'appraisal'
-require 'rake/testtask'
+require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
 
 desc 'Default: clean, appraisal:install, all.'
@@ -9,19 +9,17 @@ task :default => [:clean, :all]
 desc 'Test the paperclip_database plugin under all supported Rails versions.'
 task :all do |t|
   if ENV['BUNDLE_GEMFILE']
-    exec('rake test cucumber')
+    exec('rake spec cucumber')
   else
+    exec("rm gemfiles/*.lock")
+    Rake::Task["appraisal:gemfiles"].execute
     Rake::Task["appraisal:install"].execute
-    exec('rake appraisal test cucumber')
+    exec('rake appraisal')
   end
 end
 
 desc 'Test the paperclip_database plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib' << 'profile'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
+RSpec::Core::RakeTask.new(:spec)
 
 desc 'Run integration test'
 Cucumber::Rake::Task.new do |t|
@@ -40,7 +38,5 @@ task :clean do |t|
   FileUtils.rm_rf "tmp"
   FileUtils.rm_rf "pkg"
   FileUtils.rm_rf "public"
-  FileUtils.rm "test/debug.log" rescue nil
-  FileUtils.rm "test/paperclip_database.db" rescue nil
   Dir.glob("paperclip_database-*.gem").each{|f| FileUtils.rm f }
 end

data/features/basic_integration.feature

@@ -38,8 +38,8 @@ Feature: Rails integration
     And I start the rails application
     When I go to the new user page
     And I fill in "Name" with "something"
-    And I attach the file "test/fixtures/5k.png" to "Avatar"
+    And I attach the file "spec/fixtures/5k.png" to "Avatar"
     And I press "Submit"
     Then I should see "Name: something"
     And I should see an image with a path of "/avatar_views/1?style=original"
-    And the file at "/avatar_views/1?style=original" should be the same as "test/fixtures/5k.png"
+    And the file at "/avatar_views/1?style=original" should be the same as "spec/fixtures/5k.png"

data/features/step_definitions/html_steps.rb

@@ -1,5 +1,5 @@
 Then %r{I should see an image with a path of "([^"]*)"} do |path|
-  page.should have_css("img[src^='#{path}']")
+  expect(page).to have_css("img[src^='#{path}']")
 end
 
 Then %r{^the file at "([^"]*)" is the same as "([^"]*)"$} do |web_file, path|
@@ -11,5 +11,5 @@ Then %r{^the file at "([^"]*)" is the same as "([^"]*)"$} do |web_file, path|
     page.body
   end
   actual.force_encoding("UTF-8") if actual.respond_to?(:force_encoding)
-  actual.should == expected
+  expect(actual).to eq expected
 end

data/features/step_definitions/rails_steps.rb

@@ -151,7 +151,7 @@ Then /^the file at "([^"]*)" should be the same as "([^"]*)"$/ do |web_file, pat
     visit(web_file)
     page.source
   end
-  actual.should == expected
+  expect(actual).to eq expected
 end
 
 When /^I configure the application to use "([^\"]+)" from this project$/ do |name|
@@ -178,7 +178,7 @@ end
 Then /^the result of "(.*?)" should be the same as "(.*?)"$/ do |rails_expr, path|
   expected = IO.binread(path)
   actual = eval "#{rails_expr}"
-  actual.should == expected
+  expect(actual).to eq expected
 end
 
 

data/features/step_definitions/web_steps.rb

@@ -102,105 +102,11 @@ When /^(?:|I )attach the file "([^"]*)" to "([^"]*)"$/ do |path, field|
   attach_file(field, File.expand_path(path))
 end
 
-Then /^(?:|I )should see "([^"]*)"$/ do |text|
-  if page.respond_to? :should
-    page.should have_content(text)
+Then /^(?:|I )should (not )?see "([^"]*)"$/ do |negate, text|
+  if negate
+    expect(page).not_to 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
+    expect(page).to have_content(text)
   end
 end
 

data/gemfiles/rails30_paperclip23.gemfile

@@ -4,6 +4,6 @@ source "http://rubygems.org"
 
 gem "rails", "~> 3.0.0"
 gem "paperclip", "~> 2.3.0"
-gem "paperclip_database", :path=>"../"
+gem "paperclip_database", :path => "../"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails30_paperclip2x.gemfile

@@ -4,6 +4,6 @@ source "http://rubygems.org"
 
 gem "rails", "~> 3.0.0"
 gem "paperclip", "~> 2.3"
-gem "paperclip_database", :path=>"../"
+gem "paperclip_database", :path => "../"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails30_paperclip30.gemfile

@@ -4,6 +4,6 @@ source "http://rubygems.org"
 
 gem "rails", "~> 3.0.0"
 gem "paperclip", "~> 3.0.0"
-gem "paperclip_database", :path=>"../"
+gem "paperclip_database", :path => "../"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails30_paperclip3x.gemfile

@@ -4,6 +4,6 @@ source "http://rubygems.org"
 
 gem "rails", "~> 3.0.0"
 gem "paperclip", "~> 3.0"
-gem "paperclip_database", :path=>"../"
+gem "paperclip_database", :path => "../"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails31_paperclip23.gemfile

@@ -4,6 +4,6 @@ source "http://rubygems.org"
 
 gem "rails", "~> 3.1.0"
 gem "paperclip", "~> 2.3.0"
-gem "paperclip_database", :path=>"../"
+gem "paperclip_database", :path => "../"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails31_paperclip2x.gemfile

@@ -4,6 +4,6 @@ source "http://rubygems.org"
 
 gem "rails", "~> 3.1.0"
 gem "paperclip", "~> 2.3"
-gem "paperclip_database", :path=>"../"
+gem "paperclip_database", :path => "../"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails31_paperclip30.gemfile

@@ -4,6 +4,6 @@ source "http://rubygems.org"
 
 gem "rails", "~> 3.1.0"
 gem "paperclip", "~> 3.0.0"
-gem "paperclip_database", :path=>"../"
+gem "paperclip_database", :path => "../"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails31_paperclip3x.gemfile

@@ -4,6 +4,6 @@ source "http://rubygems.org"
 
 gem "rails", "~> 3.1.0"
 gem "paperclip", "~> 3.0"
-gem "paperclip_database", :path=>"../"
+gem "paperclip_database", :path => "../"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails32_paperclip23.gemfile

@@ -4,6 +4,6 @@ source "http://rubygems.org"
 
 gem "rails", "~> 3.2.0"
 gem "paperclip", "~> 2.3.0"
-gem "paperclip_database", :path=>"../"
+gem "paperclip_database", :path => "../"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails32_paperclip2x.gemfile

@@ -4,6 +4,6 @@ source "http://rubygems.org"
 
 gem "rails", "~> 3.2.0"
 gem "paperclip", "~> 2.3"
-gem "paperclip_database", :path=>"../"
+gem "paperclip_database", :path => "../"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails32_paperclip30.gemfile

@@ -4,6 +4,6 @@ source "http://rubygems.org"
 
 gem "rails", "~> 3.2.0"
 gem "paperclip", "~> 3.0.0"
-gem "paperclip_database", :path=>"../"
+gem "paperclip_database", :path => "../"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails32_paperclip3x.gemfile

@@ -4,6 +4,6 @@ source "http://rubygems.org"
 
 gem "rails", "~> 3.2.0"
 gem "paperclip", "~> 3.0"
-gem "paperclip_database", :path=>"../"
+gem "paperclip_database", :path => "../"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails32_paperclip40.gemfile

@@ -4,6 +4,6 @@ source "http://rubygems.org"
 
 gem "rails", "~> 3.2.0"
 gem "paperclip", "~> 4.0.0"
-gem "paperclip_database", :path=>"../"
+gem "paperclip_database", :path => "../"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails32_paperclip4x.gemfile

@@ -4,6 +4,6 @@ source "http://rubygems.org"
 
 gem "rails", "~> 3.2.0"
 gem "paperclip", "~> 4.0"
-gem "paperclip_database", :path=>"../"
+gem "paperclip_database", :path => "../"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails40_paperclip42.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 4.0.0"
+gem "minitest", "~> 4.2"
+gem "paperclip", "~> 4.2.0"
+gem "paperclip_database", :path => "../"
+
+gemspec :path => "../"

data/gemfiles/rails40_paperclip4x.gemfile

@@ -3,7 +3,8 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 4.0.0"
-gem "paperclip", "~> 4.0"
-gem "paperclip_database", :path=>"../"
+gem "minitest", "~> 4.2"
+gem "paperclip", "~> 4.2"
+gem "paperclip_database", :path => "../"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/gemfiles/rails41_paperclip42.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 4.1.0"
+gem "paperclip", "~> 4.2.0"
+gem "paperclip_database", :path => "../"
+
+gemspec :path => "../"

data/gemfiles/rails41_paperclip4x.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 4.1.0"
+gem "paperclip", "~> 4.2"
+gem "paperclip_database", :path => "../"
+
+gemspec :path => "../"

data/lib/generators/paperclip_database/migration/migration_generator.rb

@@ -21,8 +21,6 @@ module PaperclipDatabase
         migration_template "migration.rb.erb", "db/migrate/#{migration_file_name}"
       end
 
-      protected
-
       def migration_name
         "create_#{name.underscore.tr('/', '_')}_#{attachment_names.map{|n| n.pluralize}.join('_and_')}"
       end