paperclip_database 0.1.0 → 0.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    paperclip_database (0.1.0)
+    paperclip_database (0.2.0)
       paperclip
 
 GEM

data/lib/paperclip/storage/database.rb

@@ -26,8 +26,8 @@ module Paperclip
     # end
     # execute 'ALTER TABLE avatars ADD COLUMN file_contents LONGBLOB'
     # 
-    # You can optionally specify any storage table name you want as follows:
-    #   has_attached_file :avatar, :storage => :database, :database_table => 'avatar_files'
+    # 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
@@ -84,18 +84,18 @@ module Paperclip
         @paperclip_files = "#{instance.class.name.underscore}_#{name.to_s}_paperclip_files"
         if !Object.const_defined?(@paperclip_files.classify)
           @paperclip_file = Object.const_set(@paperclip_files.classify, Class.new(::ActiveRecord::Base))
+          @paperclip_file.set_table_name @options[:database_table] || name.to_s.pluralize
+          @paperclip_file.validates_uniqueness_of :style, :scope => instance.class.table_name.classify.underscore + '_id'
+          case Rails::VERSION::STRING
+          when /^2/
+            @paperclip_file.named_scope :file_for, lambda {|style| { :conditions => ['style = ?', style] }}
+          else # 3.x
+            @paperclip_file.scope :file_for, lambda {|style| { :conditions => ['style = ?', style] }}
+          end
         else
           @paperclip_file = Object.const_get(@paperclip_files.classify)
         end
-        @database_table = @options[:database_table] || name.to_s.pluralize
-        @paperclip_file.set_table_name @database_table
-        @paperclip_file.validates_uniqueness_of :style, :scope => instance.class.table_name.classify.underscore + '_id'
-        case Rails::VERSION::STRING
-        when /^2/
-          @paperclip_file.named_scope :file_for, lambda {|style| { :conditions => ['style = ?', style] }}
-        else # 3.x
-          @paperclip_file.scope :file_for, lambda {|style| { :conditions => ['style = ?', style] }}
-        end
+        @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'
@@ -174,7 +174,11 @@ module Paperclip
         ActiveRecord::Base.logger.info("[paperclip] Deleting files for #{name}")
         @queued_for_delete.each do |path|
           /id=([0-9]+)/.match(path)
-          @paperclip_file.destroy $1
+          if @options[:cascade_deletion] && !instance.class.exists?(instance.id)
+            raise RuntimeError, "Deletion has not been done by through cascading." if @paperclip_file.exists?($1)
+          else
+            @paperclip_file.destroy $1
+          end
         end
         @queued_for_delete = []
       end

data/lib/paperclip_database/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip_database
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-31 00:00:00.000000000Z
+date: 2012-02-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &17068180 !ruby/object:Gem::Requirement
+  requirement: &18765700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17068180
+  version_requirements: *18765700
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &17067180 !ruby/object:Gem::Requirement
+  requirement: &18765040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *17067180
+  version_requirements: *18765040
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &17065840 !ruby/object:Gem::Requirement
+  requirement: &18764480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17065840
+  version_requirements: *18764480
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &17065100 !ruby/object:Gem::Requirement
+  requirement: &18763760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *17065100
+  version_requirements: *18763760
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &17064220 !ruby/object:Gem::Requirement
+  requirement: &18763120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *17064220
+  version_requirements: *18763120
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &17063360 !ruby/object:Gem::Requirement
+  requirement: &18750580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17063360
+  version_requirements: *18750580
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &17062760 !ruby/object:Gem::Requirement
+  requirement: &18749960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17062760
+  version_requirements: *18749960
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &17062000 !ruby/object:Gem::Requirement
+  requirement: &18749420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17062000
+  version_requirements: *18749420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17060980 !ruby/object:Gem::Requirement
+  requirement: &18748780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17060980
+  version_requirements: *18748780
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &17060500 !ruby/object:Gem::Requirement
+  requirement: &18748200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17060500
+  version_requirements: *18748200
 description: ! 'To have all your data i one place: the database'
 email:
 - jarl@softace.dk
@@ -180,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2952639071527051601
+      hash: -4564896165259778295
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2952639071527051601
+      hash: -4564896165259778295
 requirements:
 - ImageMagick
 rubyforge_project: paperclip_database