paperclip_database 1.0.4 → 1.0.5

data/.travis.yml

@@ -0,0 +1,16 @@
+language: ruby
+rvm:
+  - 1.9.2
+  - 1.9.3
+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

data/Appraisals

@@ -56,6 +56,12 @@ appraise "rails30_paperclip31" do
   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
 
@@ -89,6 +95,12 @@ appraise "rails31_paperclip31" do
   gem "paperclip_database", :path => "../"
 end
 
+appraise "rails31_paperclip32" do
+  gem "rails", "~> 3.1.0"
+  gem "paperclip", "~> 3.2.0"
+  gem "paperclip_database", :path => "../"
+end
+
 
 ## Rails 3.2
 
@@ -122,4 +134,10 @@ appraise "rails32_paperclip31" do
   gem "paperclip_database", :path => "../"
 end
 
+appraise "rails32_paperclip32" do
+  gem "rails", "~> 3.2.0"
+  gem "paperclip", "~> 3.2.0"
+  gem "paperclip_database", :path => "../"
+end
+
 

data/README.md

@@ -1,6 +1,8 @@
 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)
+
 Paperclip Database Storage is an additional storage option for
 Paperclip. It give you the opportunity to store your paperclip binary
 file uploads in the database along with all your other data.
@@ -72,18 +74,21 @@ the extra table.
 
 On the console (rails 2):
 
-    ./script/generate paperclip_database_migration User avatar
+    ./script/generate paperclip_database User avatar
 
 On the console (rails 3):
 
-    rails generate paperclip_database_migration User avatar
-
-The generated migration should be sufficient, but yo may consider
-adding additional code to it such as `t.timestamps` for adding
-standard rails timesstamps or a referential database constraint. If
-you add a refferential constraint with the option `ON DELETE CASCADE`,
-then you need to add the option `:cascade_deletion => true` to your
-paperclip `has_attached_file` declaration.
+    bundle exec ./script/rails generate paperclip_database:migration User avatar
+
+The generated migration should be sufficient, but you may consider
+adding additional code to the migration such as `t.timestamps` for
+adding standard rails timesstamps or a referential database
+constraint, or an index on the foreign key id column. If you add a
+refferential constraint with the option `ON DELETE CASCADE`, then you
+need to add the option `:cascade_deletion => true` to your paperclip
+`has_attached_file` declaration to let PaperclipDatabase know that the
+Database takes care of it. Otherwise PaperclipDatabase will do the
+cascade deletion.
 
 Development
 -----------

data/features/basic_integration.feature

@@ -2,8 +2,8 @@ Feature: Rails integration
 
   Background:
     Given I generate a new rails application
-    And I run a rails generator to generate a "User" scaffold with "name:string"
-    And I run a paperclip generator to add a paperclip "attachment" to the "User" model
+    And I run a "scaffold" generator to generate a "User" scaffold with "name:string"
+    And I run a "paperclip" generator to add a paperclip "attachment" to the "User" model
     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
@@ -17,7 +17,7 @@ Feature: Rails integration
                         :url => '/user_attachment_views/:id?style=:style'
       attr_accessible :name, :attachment
       """
-    And I run a rails generator to generate a "UserAttachmentView" scaffold with ""
+    And I run a "scaffold" generator to generate a "UserAttachmentView" scaffold with ""
     Given I add this snippet to the "user_attachment_views" controller:
       """
         def show
@@ -28,7 +28,7 @@ Feature: Rails integration
                       :type => record.attachment_content_type
         end
       """
-    And I run a paperclip_database generator to create storage for paperclip "attachment" to the "User" model
+    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
     When I go to the new user page

data/features/step_definitions/rails_steps.rb

@@ -18,16 +18,19 @@ Given /^I generate a new rails application$/ do
   }
 end
 
-Given /^I run a rails generator to generate a "([^"]*)" scaffold with "([^"]*)"$/ do |model_name, attributes|
-  step %[I successfully run `bundle exec #{generator_command} scaffold #{model_name} #{attributes}`]
+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
 
-Given /^I run a paperclip generator to add a paperclip "([^"]*)" to the "([^"]*)" model$/ do |attachment_name, model_name|
-  step %[I successfully run `bundle exec #{generator_command} paperclip #{model_name} #{attachment_name}`]
+Given /^I run a "(.*?)" generator to add a paperclip "(.*?)" to the "(.*?)" model$/ do |generator_name, attachment_name, model_name|
+  step %[I successfully run `bundle exec #{generator_command} #{generator_name} #{model_name} #{attachment_name}`]
 end
 
-Given /^I run a paperclip_database generator to create storage for paperclip "(.*?)" to the "(.*?)" model$/ do |attachment_name, model_name|
-  step %[I successfully run `bundle exec #{generator_command} paperclip_database #{model_name} #{attachment_name}`]
+Given /^I run a "(.*?)" generator to create storage for paperclip "(.*?)" to the "(.*?)" model$/ do |generator_name, attachment_name, model_name|
+  if framework_version?("2")
+    generator_name = rails2_generator_name(generator_name)
+  end
+  step %[I successfully run `bundle exec #{generator_command} #{generator_name} #{model_name} #{attachment_name}`]
 end
 
 Given /^I run a migration$/ do

data/features/support/rails.rb

@@ -42,6 +42,14 @@ module RailsCommandHelpers
   def runner_command
     framework_version?("3") ? "script/rails runner" : "script/runner"
   end
+
+  def rails2_generator_name(rails3_generator_name)
+    case rails3_generator_name
+    when "paperclip_database:migration" then "paperclip_database"
+    else rails3_generator_name
+    end
+  end
+
 end
 
 module PaperclipGemHelpers

data/gemfiles/rails30_paperclip32.gemfile

@@ -0,0 +1,9 @@
+# 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_paperclip32.gemfile

@@ -0,0 +1,9 @@
+# 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_paperclip32.gemfile

@@ -0,0 +1,9 @@
+# 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=>"../"

data/lib/generators/paperclip_database/{USAGE → migration/USAGE}

@@ -2,7 +2,7 @@ Description:
     The generator generates a database migration for the paperclip database storage
 
 Example:
-    rails generate paperclip_database Class attachments
+    rails generate paperclip_database_migration User attachment
 
     This will create:
-        what/will/it/create
+        db/migrations/YYYYMMDDHHmmss_create_user_attachments.rb

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

@@ -0,0 +1,40 @@
+require 'rails/generators/active_record'
+
+module PaperclipDatabase
+  module Generators
+    class MigrationGenerator < ActiveRecord::Generators::Base
+      desc "Create a migration to add database storage for the paperclip database storage." +
+        "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 ..."
+
+      def self.source_root
+        @source_root ||= File.expand_path('../templates', __FILE__)
+      end
+
+      def generate_migration
+        migration_template "migration.rb.erb", "db/migrate/#{migration_file_name}"
+      end
+
+      protected
+
+      def migration_name
+        "create_#{name.underscore}_#{attachment_names.map{|n| n.pluralize}.join('_and_')}"
+      end
+
+      def migration_file_name
+        "#{migration_name}.rb"
+      end
+
+      def migration_class_name
+        migration_name.camelize
+      end
+
+    end
+  end
+end

data/lib/paperclip_database/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip_database
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-05 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -198,6 +198,7 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc
+- .travis.yml
 - Appraisals
 - Gemfile
 - LICENSE.txt
@@ -222,23 +223,26 @@ files:
 - gemfiles/rails30_paperclip27.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/rails31_paperclip30.gemfile
 - gemfiles/rails31_paperclip31.gemfile
+- gemfiles/rails31_paperclip32.gemfile
 - gemfiles/rails32_paperclip25.gemfile
 - gemfiles/rails32_paperclip26.gemfile
 - gemfiles/rails32_paperclip27.gemfile
 - gemfiles/rails32_paperclip30.gemfile
 - gemfiles/rails32_paperclip31.gemfile
+- gemfiles/rails32_paperclip32.gemfile
 - generators/paperclip_database/USAGE
 - generators/paperclip_database/paperclip_database_generator.rb
 - generators/paperclip_database/templates/paperclip_database_migration.rb.erb
 - generators/templates/paperclip_database_migration.rb.erb
-- lib/generators/paperclip_database/USAGE
-- lib/generators/paperclip_database/paperclip_database_generator.rb
-- lib/generators/paperclip_database/templates/paperclip_database_migration.rb.erb
+- lib/generators/paperclip_database/migration/USAGE
+- lib/generators/paperclip_database/migration/migration_generator.rb
+- lib/generators/paperclip_database/migration/templates/migration.rb.erb
 - lib/paperclip/storage/database.rb
 - lib/paperclip_database.rb
 - lib/paperclip_database/version.rb
@@ -261,7 +265,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 726529476168973417
+      hash: -4219737218162575604
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -270,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 726529476168973417
+      hash: -4219737218162575604
 requirements:
 - ImageMagick
 rubyforge_project: paperclip_database

data/lib/generators/paperclip_database/paperclip_database_generator.rb

@@ -1,33 +0,0 @@
-require 'rails/generators/active_record'
-
-class PaperclipDatabaseGenerator < ActiveRecord::Generators::Base
-  desc "Create a migration to add database storage for the paperclip database storage." +
-       "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 ..."
-
-  def self.source_root
-    @source_root ||= File.expand_path('../templates', __FILE__)
-  end
-
-  def generate_migration
-    migration_template "paperclip_database_migration.rb.erb", "db/migrate/#{migration_file_name}"
-  end
-
-  protected
-
-  def migration_name
-    "create_#{name.underscore}_#{attachment_names.map{|n| n.pluralize}.join('_and_')}"
-  end
-
-  def migration_file_name
-    "#{migration_name}.rb"
-  end
-
-  def migration_class_name
-    migration_name.camelize
-  end
-
-end