paperclip_database 1.0.5 → 2.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 09d3aa4732581467b9fc42956a01b056ed8886f4
+  data.tar.gz: b6c7a2b6dc89f0b4cf417026c211b27c3a1f3099
+SHA512:
+  metadata.gz: 0d4e3af513f1d0f97e07338ed3ad9f88bb4c452b4b5d06b124190b5e3b57873936ad55ac2693abc8c8d9366ae772849a31b90ea91abaa169d4b737ccce3f1127
+  data.tar.gz: 30e43365c0bd6612037944d90332da8285426a8f2930216ee2d1a6b7aa3b51cb0f68bbc8d1701c09f777982f3afa00aabc3cb07404ac85380487777501eeb8be

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3-p448

data/.travis.yml

@@ -1,16 +1,19 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
 gemfile:
-  - gemfiles/rails2_legacy.gemfile
-  - gemfiles/rails2_paperclip27.gemfile
-  - gemfiles/rails30_paperclip25.gemfile
-  - gemfiles/rails30_paperclip27.gemfile
-  - gemfiles/rails30_paperclip31.gemfile
-  - gemfiles/rails31_paperclip25.gemfile
-  - gemfiles/rails31_paperclip27.gemfile
-  - gemfiles/rails31_paperclip31.gemfile
-  - gemfiles/rails32_paperclip25.gemfile
-  - gemfiles/rails32_paperclip27.gemfile
-  - gemfiles/rails32_paperclip31.gemfile
+  - gemfiles/rails30_paperclip23.gemfile
+  - gemfiles/rails30_paperclip2x.gemfile
+  - gemfiles/rails30_paperclip30.gemfile
+  - gemfiles/rails30_paperclip3x.gemfile
+  - gemfiles/rails31_paperclip23.gemfile
+  - gemfiles/rails31_paperclip2x.gemfile
+  - gemfiles/rails31_paperclip30.gemfile
+  - gemfiles/rails31_paperclip3x.gemfile
+  - gemfiles/rails32_paperclip23.gemfile
+  - gemfiles/rails32_paperclip2x.gemfile
+  - gemfiles/rails32_paperclip30.gemfile
+  - gemfiles/rails32_paperclip3x.gemfile
+  - gemfiles/rails40_paperclip34.gemfile
+  - gemfiles/rails40_paperclip3x.gemfile

data/Appraisals

@@ -1,46 +1,15 @@
 #-*- ruby -*-
-appraise "rails2_legacy" do
-  gem "rails", "~> 2.3"
-  gem "paperclip", "~> 2.3.1"
-  gem "paperclip_database", :path => "../"
-end
-
-appraise "rails2_paperclip25" do
-  gem "rails", "~> 2.3.0"
-  gem "paperclip", "~> 2.5.0"
-  gem "paperclip_database", :path => "../"
-end
-
-appraise "rails2_paperclip26" do
-  gem "rails", "~> 2.3.0"
-  gem "paperclip", "~> 2.6.0"
-  gem "paperclip_database", :path => "../"
-end
-
-appraise "rails2_paperclip27" do
-  gem "rails", "~> 2.3.0"
-  gem "paperclip", "~> 2.7.0"
-  gem "paperclip_database", :path => "../"
-end
-
-
 ## Rails 3.0
 
-appraise "rails30_paperclip25" do
-  gem "rails", "~> 3.0.0"
-  gem "paperclip", "~> 2.5.0"
-  gem "paperclip_database", :path => "../"
-end
-
-appraise "rails30_paperclip26" do
+appraise "rails30_paperclip23" do
   gem "rails", "~> 3.0.0"
-  gem "paperclip", "~> 2.6.0"
+  gem "paperclip", "~> 2.3.0"
   gem "paperclip_database", :path => "../"
 end
 
-appraise "rails30_paperclip27" do
+appraise "rails30_paperclip2x" do
   gem "rails", "~> 3.0.0"
-  gem "paperclip", "~> 2.7.0"
+  gem "paperclip", "~> 2.3"
   gem "paperclip_database", :path => "../"
 end
 
@@ -50,36 +19,23 @@ appraise "rails30_paperclip30" do
   gem "paperclip_database", :path => "../"
 end
 
-appraise "rails30_paperclip31" do
+appraise "rails30_paperclip3x" do
   gem "rails", "~> 3.0.0"
-  gem "paperclip", "~> 3.1.0"
+  gem "paperclip", "~> 3.0"
   gem "paperclip_database", :path => "../"
 end
 
-appraise "rails30_paperclip32" do
-  gem "rails", "~> 3.0.0"
-  gem "paperclip", "~> 3.2.0"
-  gem "paperclip_database", :path => "../"
-end
-
-
 ## Rails 3.1
 
-appraise "rails31_paperclip25" do
-  gem "rails", "~> 3.1.0"
-  gem "paperclip", "~> 2.5.0"
-  gem "paperclip_database", :path => "../"
-end
-
-appraise "rails31_paperclip26" do
+appraise "rails31_paperclip23" do
   gem "rails", "~> 3.1.0"
-  gem "paperclip", "~> 2.6.0"
+  gem "paperclip", "~> 2.3.0"
   gem "paperclip_database", :path => "../"
 end
 
-appraise "rails31_paperclip27" do
+appraise "rails31_paperclip2x" do
   gem "rails", "~> 3.1.0"
-  gem "paperclip", "~> 2.7.0"
+  gem "paperclip", "~> 2.3"
   gem "paperclip_database", :path => "../"
 end
 
@@ -89,36 +45,23 @@ appraise "rails31_paperclip30" do
   gem "paperclip_database", :path => "../"
 end
 
-appraise "rails31_paperclip31" do
-  gem "rails", "~> 3.1.0"
-  gem "paperclip", "~> 3.1.0"
-  gem "paperclip_database", :path => "../"
-end
-
-appraise "rails31_paperclip32" do
+appraise "rails31_paperclip3x" do
   gem "rails", "~> 3.1.0"
-  gem "paperclip", "~> 3.2.0"
+  gem "paperclip", "~> 3.0"
   gem "paperclip_database", :path => "../"
 end
 
-
 ## Rails 3.2
 
-appraise "rails32_paperclip25" do
-  gem "rails", "~> 3.2.0"
-  gem "paperclip", "~> 2.5.0"
-  gem "paperclip_database", :path => "../"
-end
-
-appraise "rails32_paperclip26" do
+appraise "rails32_paperclip23" do
   gem "rails", "~> 3.2.0"
-  gem "paperclip", "~> 2.6.0"
+  gem "paperclip", "~> 2.3.0"
   gem "paperclip_database", :path => "../"
 end
 
-appraise "rails32_paperclip27" do
+appraise "rails32_paperclip2x" do
   gem "rails", "~> 3.2.0"
-  gem "paperclip", "~> 2.7.0"
+  gem "paperclip", "~> 2.3"
   gem "paperclip_database", :path => "../"
 end
 
@@ -128,16 +71,23 @@ appraise "rails32_paperclip30" do
   gem "paperclip_database", :path => "../"
 end
 
-appraise "rails32_paperclip31" do
+appraise "rails32_paperclip3x" do
   gem "rails", "~> 3.2.0"
-  gem "paperclip", "~> 3.1.0"
+  gem "paperclip", "~> 3.0"
   gem "paperclip_database", :path => "../"
 end
 
-appraise "rails32_paperclip32" do
-  gem "rails", "~> 3.2.0"
-  gem "paperclip", "~> 3.2.0"
+## Rails 4.0
+
+appraise "rails40_paperclip34" do
+  gem "rails", "~> 4.0.0"
+  gem "paperclip", "~> 3.4.0"
   gem "paperclip_database", :path => "../"
 end
 
+appraise "rails40_paperclip3x" do
+  gem "rails", "~> 4.0.0"
+  gem "paperclip", "~> 3.0"
+  gem "paperclip_database", :path => "../"
+end
 

data/Gemfile

@@ -1,3 +1,5 @@
 source "http://rubygems.org"
 
 gemspec
+
+#gem 'aruba', :path => '../aruba'

data/README.md

@@ -1,7 +1,9 @@
 Paperclip Database Storage
 ==========================
 
-[![Build Status](https://secure.travis-ci.org/softace/paperclip_database.png)](http://travis-ci.org/softace/paperclip_database) [![Dependency Status](https://gemnasium.com/softace/paperclip_database.png)](https://gemnasium.com/softace/paperclip_database) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/softace/paperclip_database)
+[![Build Status](https://secure.travis-ci.org/softace/paperclip_database.png)](http://travis-ci.org/softace/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
@@ -12,6 +14,10 @@ Requirements
 
 `paperclip_database` depends on `paperclip`
 
+It is recommended to use the
+[trim_blobs](https://github.com/softace/trim_blobs) gem to limit the
+logging of BLOB data in your logfiles.
+
 Installation
 ------------
 
@@ -20,7 +26,7 @@ should be used in your app.
 
 Include the gem in your Gemfile:
 
-    gem "paperclip_database", "~> 1.0"
+    gem "paperclip_database", "~> 2.0"
 
 Or, if you want to get the latest, you can get master from the main
 paperclip repository:
@@ -33,20 +39,11 @@ to specify the master branch if you want to use them. This README is
 probably ahead of the latest released version, if you're reading it on
 GitHub.
 
-For rails 2 you should add this to snippet to your environment.
-
-    # In config/environment.rb
-    ...
-    Rails::Initializer.run do |config|
-      ...
-      config.gem "paperclip", :version => "~> 2.5"
-      ...
-    end
-
 Supported Versions
 ------------------
 
-Supported version are rails >= 2.3 and paperclip version >= 2.5
+As of version 2.0, Rails 2 is no longer supported.
+Supported version are rails >= 3.0 and paperclip version >= 2.5
 
 Quick Start
 -----------
@@ -72,10 +69,6 @@ In your model:
 There is a migration generator that will create a basic migration for
 the extra table.
 
-On the console (rails 2):
-
-    ./script/generate paperclip_database User avatar
-
 On the console (rails 3):
 
     bundle exec ./script/rails generate paperclip_database:migration User avatar

data/features/basic_integration.feature

@@ -7,6 +7,7 @@ Feature: Rails integration
     And I run a migration
     And I update my new user view to include the file upload field
     And I update my user view to include the attachment
+    And I allow the attachment to be submitted
 
   Scenario: Database integration test
     Given I add this snippet to the User model:
@@ -15,10 +16,9 @@ Feature: Rails integration
                         :storage => :database,
                         :database_table => :user_attachments,
                         :url => '/user_attachment_views/:id?style=:style'
-      attr_accessible :name, :attachment
       """
     And I run a "scaffold" generator to generate a "UserAttachmentView" scaffold with ""
-    Given I add this snippet to the "user_attachment_views" controller:
+    Given I replace /^  def show$.*?^  end$/ with this snippet in the "user_attachment_views" controller:
       """
         def show
           style = params[:style] ? params[:style] : 'original'
@@ -28,6 +28,10 @@ Feature: Rails integration
                       :type => record.attachment_content_type
         end
       """
+    Given I replace /before_action :set_user_attachment_view.*?$/ with this snippet in the "user_attachment_views" controller:
+      """
+      """
+
     And I run a "paperclip_database:migration" generator to create storage for paperclip "attachment" to the "User" model
     And I run a migration
     And I start the rails application

data/features/step_definitions/rails_steps.rb

@@ -1,8 +1,9 @@
 Given /^I generate a new rails application$/ do
   steps %{
-    When I run `bundle exec #{new_application_command} #{APP_NAME}`
+    When I successfully run `bundle exec #{new_application_command(APP_NAME)}`
     And I cd to "#{APP_NAME}"
     And I turn off class caching
+    And I fix the application.rb for 3.0.12
     And I write to "Gemfile" with:
       """
       source "http://rubygems.org"
@@ -12,12 +13,58 @@ Given /^I generate a new rails application$/ do
       gem "gherkin"
       gem "paperclip", "#{paperclip_version}"
       """
+    And I remove turbolinks
+    And I empty the application.js file
     And I configure the application to use "paperclip_database" from this project
     And I reset Bundler environment variable
     And I successfully run `bundle install --local`
   }
 end
 
+Given "I fix the application.rb for 3.0.12" do
+  ##See https://github.com/rails/rails/issues/9619
+  in_current_dir do
+    File.open("config/application.rb", "a") do |f|
+      f << "ActionController::Base.config.relative_url_root = ''"
+    end
+  end
+end
+
+Given "I allow the attachment to be submitted" do
+  in_current_dir do
+    if framework_major_version == 3
+      transform_file("app/models/user.rb") do |content|
+        content.gsub("attr_accessible :name",
+                     "attr_accessible :name, :attachment")
+      end
+    else
+      transform_file("app/controllers/users_controller.rb") do |content|
+        content.gsub("params.require(:user).permit(:name)",
+                     "params.require(:user).permit!")
+      end
+    end
+  end
+end
+
+Given "I remove turbolinks" do
+  in_current_dir do
+    transform_file("app/assets/javascripts/application.js") do |content|
+      content.gsub("//= require turbolinks", "")
+    end
+    transform_file("app/views/layouts/application.html.erb") do |content|
+      content.gsub(', "data-turbolinks-track" => true', "")
+    end
+  end
+end
+
+Given "I empty the application.js file" do
+  in_current_dir do
+    transform_file("app/assets/javascripts/application.js") do |content|
+      ""
+    end
+  end
+end
+
 Given /^I run a "(.*?)" generator to generate a "(.*?)" scaffold with "(.*?)"$/ do |generator_name, model_name, attributes|
   step %[I successfully run `bundle exec #{generator_command} #{generator_name} #{model_name} #{attributes}`]
 end
@@ -38,33 +85,18 @@ Given /^I run a migration$/ do
 end
 
 Given /^I update my new user view to include the file upload field$/ do
-  if framework_version?("3")
-    steps %{
-      Given I overwrite "app/views/users/new.html.erb" with:
-        """
-        <%= form_for @user, :html => { :multipart => true } do |f| %>
-          <%= f.label :name %>
-          <%= f.text_field :name %>
-          <%= f.label :attachment %>
-          <%= f.file_field :attachment %>
-          <%= submit_tag "Submit" %>
-        <% end %>
-        """
-    }
-  else
-    steps %{
-      Given I overwrite "app/views/users/new.html.erb" with:
-        """
-        <% form_for @user, :html => { :multipart => true } do |f| %>
-          <%= f.label :name %>
-          <%= f.text_field :name %>
-          <%= f.label :attachment %>
-          <%= f.file_field :attachment %>
-          <%= submit_tag "Submit" %>
-        <% end %>
-        """
-    }
-  end
+  steps %{
+    Given I overwrite "app/views/users/new.html.erb" with:
+      """
+      <%= form_for @user, :html => { :multipart => true } do |f| %>
+        <%= f.label :name %>
+        <%= f.text_field :name %>
+        <%= f.label :attachment %>
+        <%= f.file_field :attachment %>
+        <%= submit_tag "Submit" %>
+      <% end %>
+      """
+  }
 end
 
 Given /^I update my user view to include the attachment$/ do
@@ -85,11 +117,11 @@ Given /^I add this snippet to the User model:$/ do |snippet|
   end
 end
 
-Given /^I add this snippet to the "(.*?)" controller:$/ do |controller_name, snippet|
-  file_name = "app/controllers/#{controller_name}_controller.rb"
+Given /^I replace \/(.*?)\/ with this snippet in the "(.*?)" controller:$/ do |pattern, controller_name, snippet|
   in_current_dir do
-    content = File.read(file_name)
-    File.open(file_name, 'w') { |f| f << content.sub(/end\Z/, "#{snippet}\nend") }
+    transform_file("app/controllers/#{controller_name}_controller.rb") do |content|
+      content.gsub(Regexp.new(pattern, Regexp::MULTILINE), snippet)
+    end
   end
 end
 
@@ -198,6 +230,16 @@ module FileHelpers
       File.open("Gemfile", 'w'){ |file| file.write(gemfile) }
     end
   end
+
+  def transform_file(filename)
+    if File.exists?(filename)
+      content = File.read(filename)
+      File.open(filename, "w") do |f|
+        content = yield(content)
+        f.write(content)
+      end
+    end
+  end
 end
 
 World(FileHelpers)

data/features/support/rails.rb

@@ -31,16 +31,20 @@ module RailsCommandHelpers
     @framework_version ||= `rails -v`[/^Rails (.+)$/, 1]
   end
 
-  def new_application_command
-    framework_version?("3") ? "rails new" : "rails"
+  def framework_major_version
+    framework_version.split(".").first.to_i
+  end
+
+  def new_application_command(app_name)
+    framework_major_version >= 3 ? "rails new #{app_name} --skip-sprockets --skip-javascript --skip-bundle" : "rails"
   end
 
   def generator_command
-    framework_version?("3") ? "script/rails generate" : "script/generate"
+    framework_major_version >= 3 ? "rails generate" : "script/generate"
   end
 
   def runner_command
-    framework_version?("3") ? "script/rails runner" : "script/runner"
+    framework_major_version >= 3 ? "rails runner" : "script/runner"
   end
 
   def rails2_generator_name(rails3_generator_name)

data/gemfiles/{rails30_paperclip25.gemfile → rails30_paperclip23.gemfile}

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

data/gemfiles/{rails30_paperclip31.gemfile → rails30_paperclip2x.gemfile}

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

data/gemfiles/{rails30_paperclip26.gemfile → rails30_paperclip3x.gemfile}

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

data/gemfiles/{rails31_paperclip25.gemfile → rails31_paperclip23.gemfile}

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

data/gemfiles/{rails31_paperclip31.gemfile → rails31_paperclip2x.gemfile}

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

data/gemfiles/{rails31_paperclip26.gemfile → rails31_paperclip3x.gemfile}

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

data/gemfiles/{rails32_paperclip25.gemfile → rails32_paperclip23.gemfile}

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

data/gemfiles/{rails32_paperclip31.gemfile → rails32_paperclip2x.gemfile}

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

data/gemfiles/{rails32_paperclip26.gemfile → rails32_paperclip3x.gemfile}

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

data/gemfiles/{rails2_paperclip27.gemfile → rails40_paperclip34.gemfile}

@@ -2,8 +2,8 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 2.3.0"
-gem "paperclip", "~> 2.7.0"
+gem "rails", "~> 4.0.0"
+gem "paperclip", "~> 3.4.0"
 gem "paperclip_database", :path=>"../"
 
 gemspec :path=>"../"

data/gemfiles/{rails2_legacy.gemfile → rails40_paperclip3x.gemfile}

@@ -2,8 +2,8 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 2.3"
-gem "paperclip", "~> 2.3.1"
+gem "rails", "~> 4.0.0"
+gem "paperclip", "~> 3.0"
 gem "paperclip_database", :path=>"../"
 
 gemspec :path=>"../"

data/lib/paperclip/storage/database.rb

@@ -1,61 +1,61 @@
 module Paperclip
   module Storage
     # Store files in a database.
-    # 
+    #
     # Usage is identical to the file system storage version, except:
-    # 
+    #
     # 1. In your model specify the "database" storage option; for example:
     #   has_attached_file :avatar, :storage => :database
-    # 
+    #
     # The files will be stored in a new database table named with the plural attachment name
     # by default, "avatars" in this example.
-    # 
+    #
     # 2. You need to create this new storage table with at least these columns:
     #   - file_contents
     #   - style
     #   - the primary key for the parent model (e.g. user_id)
-    # 
+    #
     # Note the "binary" migration will not work for the LONGBLOG type in MySQL for the
     # file_cotents column. You may need to craft a SQL statement for your migration,
     # depending on which database server you are using. Here's an example migration for MySQL:
-    # 
+    #
     # create_table :avatars do |t|
     #   t.string :style
     #   t.integer :user_id
     #   t.timestamps
     # end
     # execute 'ALTER TABLE avatars ADD COLUMN file_contents LONGBLOB'
-    # 
+    #
     # You can optionally specify any storage table name you want and whether or not deletion is done by cascading or not as follows:
     #   has_attached_file :avatar, :storage => :database, :database_table => 'avatar_files', :cascade_deletion => true
-    # 
+    #
     # 3. By default, URLs will be set to this pattern:
     #   /:relative_root/:class/:attachment/:id?style=:style
-    # 
+    #
     # Example:
     #   /app-root-url/users/avatars/23?style=original
-    # 
+    #
     # The idea here is that to retrieve a file from the database storage, you will need some
     # controller's code to be executed.
-    #     
+    #
     # Once you pick a controller to use for downloading, you can add this line
     # to generate the download action for the default URL/action (the plural attachment name),
     # "avatars" in this example:
     #   downloads_files_for :user, :avatar
-    # 
+    #
     # Or you can write a download method manually if there are security, logging or other
     # requirements.
-    # 
+    #
     # If you prefer a different URL for downloading files you can specify that in the model; e.g.:
     #   has_attached_file :avatar, :storage => :database, :url => '/users/show_avatar/:id/:style'
-    # 
+    #
     # 4. Add a route for the download to the controller which will handle downloads, if necessary.
-    # 
+    #
     # The default URL, /:relative_root/:class/:attachment/:id?style=:style, will be matched by
     # the default route: :controller/:action/:id
-    # 
+    #
     module Database
- 
+
       def self.extended(base)
         base.instance_eval do
           setup_paperclip_files_model
@@ -75,10 +75,10 @@ module Paperclip
             ActionController::Base.relative_url_root
           end
         end
-        
+
         ActiveRecord::Base.logger.info("[paperclip] Database Storage Initalized.")
       end
- 
+
       def setup_paperclip_files_model
         #TODO: This fails when your model is in a namespace.
         @paperclip_files = "#{instance.class.name.underscore}_#{name.to_s}_paperclip_files"
@@ -98,11 +98,11 @@ module Paperclip
         @database_table = @paperclip_file.table_name
         #FIXME: This fails when using  set_table_name "<myname>" in your model
         #FIXME: This should be fixed in ActiveRecord...
-        instance.class.has_many @paperclip_files, :foreign_key => instance.class.table_name.classify.underscore + '_id'
+        instance.class.has_many @paperclip_files.to_sym, :foreign_key => instance.class.table_name.classify.underscore + '_id'
 
       end
       private :setup_paperclip_files_model
-      
+
       def copy_to_local_file(style, dest_path)
         File.open(dest_path, 'wb+'){|df| to_file(style).tap{|sf| File.copy_stream(sf, df); sf.close;sf.unlink} }
       end
@@ -114,11 +114,11 @@ module Paperclip
         @options[:path] = ":database_path"
       end
       private :override_default_options
-        
+
       def database_table
         @database_table
       end
-      
+
       def database_path(style)
         paperclip_file = file_for(style)
         if paperclip_file
@@ -127,7 +127,7 @@ module Paperclip
           "#{database_table}(id=new,style=#{style.to_s})"
         end
       end
-      
+
       def exists?(style = default_style)
         if original_filename
           !file_for(style).nil?
@@ -135,7 +135,7 @@ module Paperclip
           false
         end
       end
-          
+
       # Returns representation of the data of the file assigned to the given
       # style, in the format most representative of the current storage.
       def to_file style = default_style
@@ -151,31 +151,38 @@ module Paperclip
         else
           nil
         end
- 
+
       end
       alias_method :to_io, :to_file
- 
+
       def file_for(style)
         db_result = instance.send("#{@paperclip_files}").send(:file_for, style.to_s).to_ary
         raise RuntimeError, "More than one result for #{style}" if db_result.size > 1
         db_result.first
       end
-        
+
       def file_contents(style)
         file_for(style).file_contents
       end
- 
+
       def flush_writes
         ActiveRecord::Base.logger.info("[paperclip] Writing files for #{name}")
         @queued_for_write.each do |style, file|
-          paperclip_file = instance.send(@paperclip_files).send(:find_or_create_by_style, style.to_s)
+            case Rails::VERSION::STRING
+            when /^2/, /^3/
+              paperclip_file = instance.send(@paperclip_files).send(:find_or_create_by_style, style.to_s)
+            when /^4/
+              paperclip_file = instance.send(@paperclip_files).send(:find_or_create_by, style: style.to_s)
+            else # 4.x
+              raise "Rails version #{Rails::VERSION::STRING} is not supported (yet)"
+            end
           paperclip_file.file_contents = file.read
           paperclip_file.save!
           instance.reload
-        end        
+        end
         @queued_for_write = {}
       end
- 
+
       def flush_deletes #:nodoc:
         ActiveRecord::Base.logger.info("[paperclip] Deleting files for #{name}")
         @queued_for_delete.uniq! ##This is apparently necessary for paperclip v 3.x
@@ -189,7 +196,7 @@ module Paperclip
         end
         @queued_for_delete = []
       end
- 
+
       module ControllerClassMethods
         def self.included(base)
           base.extend(self)

data/lib/paperclip_database/version.rb

@@ -1,3 +1,3 @@
 module PaperclipDatabase
-  VERSION = "1.0.5" unless defined? PaperclipDatabase::VERSION
+  VERSION = "2.0.0" unless defined? PaperclipDatabase::VERSION
 end

data/paperclip_database.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email             = ["jarl@softace.dk"]
   s.homepage          = "https://github.com/softace/paperclip_database"
   s.summary           = "Database storage for paperclip"
-  s.description       = "To have all your data i one place: the database"
+  s.description       = "To have all your data in one place: the database"
 
   s.rubyforge_project = "paperclip_database"
 
@@ -20,19 +20,17 @@ Gem::Specification.new do |s|
 
   s.requirements << "ImageMagick"
 
+  s.add_dependency('rails', '>= 3.0.0')
   s.add_dependency('paperclip', '>= 2.3.0')
 
-#  s.add_development_dependency('shoulda')
   s.add_development_dependency('appraisal', '~> 0.4')
   s.add_development_dependency('mocha')
   s.add_development_dependency('sqlite3', '~> 1.3')
   s.add_development_dependency('cucumber', '~> 1.1')
   s.add_development_dependency('launchy', '~> 2.1')
   s.add_development_dependency('aruba')
-  s.add_development_dependency('capybara')
+  s.add_development_dependency('capybara', '~> 2.0.0', '< 2.1.0')
   s.add_development_dependency('bundler')
-#  s.add_development_dependency('cocaine', '~> 0.2')
-#  s.add_development_dependency('fog')
   s.add_development_dependency('rake')
   s.add_development_dependency('fakeweb')
 end

metadata

@@ -1,36 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: paperclip_database
 version: !ruby/object:Gem::Version
-  version: 1.0.5
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Jarl Friis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2013-09-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,23 +55,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +104,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,84 +111,80 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'To have all your data i one place: the database'
+description: 'To have all your data in one place: the database'
 email:
 - jarl@softace.dk
 executables: []
@@ -197,7 +194,7 @@ files:
 - .document
 - .gitignore
 - .rspec
-- .rvmrc
+- .ruby-version
 - .travis.yml
 - Appraisals
 - Gemfile
@@ -214,28 +211,20 @@ files:
 - features/support/paths.rb
 - features/support/rails.rb
 - features/support/selectors.rb
-- gemfiles/rails2_legacy.gemfile
-- gemfiles/rails2_paperclip25.gemfile
-- gemfiles/rails2_paperclip26.gemfile
-- gemfiles/rails2_paperclip27.gemfile
-- gemfiles/rails30_paperclip25.gemfile
-- gemfiles/rails30_paperclip26.gemfile
-- gemfiles/rails30_paperclip27.gemfile
+- gemfiles/rails30_paperclip23.gemfile
+- gemfiles/rails30_paperclip2x.gemfile
 - gemfiles/rails30_paperclip30.gemfile
-- gemfiles/rails30_paperclip31.gemfile
-- gemfiles/rails30_paperclip32.gemfile
-- gemfiles/rails31_paperclip25.gemfile
-- gemfiles/rails31_paperclip26.gemfile
-- gemfiles/rails31_paperclip27.gemfile
+- gemfiles/rails30_paperclip3x.gemfile
+- gemfiles/rails31_paperclip23.gemfile
+- gemfiles/rails31_paperclip2x.gemfile
 - gemfiles/rails31_paperclip30.gemfile
-- gemfiles/rails31_paperclip31.gemfile
-- gemfiles/rails31_paperclip32.gemfile
-- gemfiles/rails32_paperclip25.gemfile
-- gemfiles/rails32_paperclip26.gemfile
-- gemfiles/rails32_paperclip27.gemfile
+- gemfiles/rails31_paperclip3x.gemfile
+- gemfiles/rails32_paperclip23.gemfile
+- gemfiles/rails32_paperclip2x.gemfile
 - gemfiles/rails32_paperclip30.gemfile
-- gemfiles/rails32_paperclip31.gemfile
-- gemfiles/rails32_paperclip32.gemfile
+- gemfiles/rails32_paperclip3x.gemfile
+- gemfiles/rails40_paperclip34.gemfile
+- gemfiles/rails40_paperclip3x.gemfile
 - generators/paperclip_database/USAGE
 - generators/paperclip_database/paperclip_database_generator.rb
 - generators/paperclip_database/templates/paperclip_database_migration.rb.erb
@@ -253,33 +242,26 @@ files:
 - test/fixtures/5k.png
 homepage: https://github.com/softace/paperclip_database
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4219737218162575604
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4219737218162575604
 requirements:
 - ImageMagick
 rubyforge_project: paperclip_database
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Database storage for paperclip
 test_files: []

data/.rvmrc

@@ -1 +0,0 @@
-rvm ruby-1.9.2-p320

data/gemfiles/rails2_paperclip25.gemfile

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

data/gemfiles/rails2_paperclip26.gemfile

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

data/gemfiles/rails30_paperclip27.gemfile

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

data/gemfiles/rails30_paperclip32.gemfile

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

data/gemfiles/rails31_paperclip27.gemfile

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

data/gemfiles/rails31_paperclip32.gemfile

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

data/gemfiles/rails32_paperclip27.gemfile

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

data/gemfiles/rails32_paperclip32.gemfile

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