paperclip_database 0.0.2 → 0.1.0

data/Appraisals

@@ -1,3 +1,9 @@
+appraise "rails2_legacy" do
+  gem "rails", "~> 2.3.14"
+  gem "paperclip", "2.3.1"
+  gem "paperclip_database", :path => "../"
+end
+
 appraise "rails2" do
   gem "rails", "~> 2.3.14"
   gem "paperclip_database", :path => "../"

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    paperclip_database (0.0.2)
-      paperclip (>= 2.5.0)
+    paperclip_database (0.1.0)
+      paperclip
 
 GEM
   remote: http://rubygems.org/

data/features/basic_integration.feature

@@ -14,6 +14,18 @@ Feature: Rails integration
       has_attached_file :attachment,
                         :storage => :database,
                         :database_table => :user_attachments,
+                        :url => '/user_attachment_views/:id?style=:style'
+      """
+    And I run a rails generator to generate a "UserAttachmentView" scaffold with ""
+    Given I add this snippet to the "user_attachment_views" controller:
+      """
+        def show
+          style = params[:style] ? params[:style] : 'original'
+          record = User.find(params[:id])
+          send_data record.attachment.file_contents(style),
+                      :filename => record.attachment_file_name,
+                      :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 migration
@@ -23,7 +35,6 @@ Feature: Rails integration
     And I attach the file "test/fixtures/5k.png" to "Attachment"
     And I press "Submit"
     Then I should see "Name: something"
-    And I should see an image with a path of "/system/attachments/1/original/5k.png"
-#    And the table "attachments" should contain 3 rows.
-    And the result of "User.first.attachment.file_for(:original).file_contents" should be the same as "test/fixtures/5k.png"
+    And I should see an image with a path of "/user_attachment_views/1?style=original"
+    And the file at "/user_attachment_views/1?style=original" should be the same as "test/fixtures/5k.png"
 

data/features/step_definitions/rails_steps.rb

@@ -11,7 +11,7 @@ Given /^I generate a new rails application$/ do
       gem "capybara"
       gem "gherkin"
       gem "aws-sdk"
-      gem "paperclip"
+      gem "paperclip", "#{paperclip_version}"
       """
     And I configure the application to use "paperclip_database" from this project
     And I reset Bundler environment variable
@@ -83,6 +83,14 @@ 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"
+  in_current_dir do
+    content = File.read(file_name)
+    File.open(file_name, 'w') { |f| f << content.sub(/end\Z/, "#{snippet}\nend") }
+  end
+end
+
 Given /^I start the rails application$/ do
   in_current_dir do
     require "./config/environment"

data/features/support/rails.rb

@@ -43,4 +43,16 @@ module RailsCommandHelpers
     framework_version?("3") ? "script/rails runner" : "script/runner"
   end
 end
+
+module PaperclipGemHelpers
+  def paperclip_version?(version_string)
+    paperclip_version =~ /^#{version_string}/
+  end
+
+  def paperclip_version
+    @paperclip_version = Gem::Specification.find_by_name('paperclip').version.to_s
+  end
+end
+
 World(RailsCommandHelpers)
+World(PaperclipGemHelpers)

data/gemfiles/rails2_legacy.gemfile

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

data/lib/paperclip/storage/database.rb

@@ -89,6 +89,7 @@ module Paperclip
         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] }}
@@ -162,10 +163,9 @@ module Paperclip
       def flush_writes
         ActiveRecord::Base.logger.info("[paperclip] Writing files for #{name}")
         @queued_for_write.each do |style, file|
-          paperclip_file = @paperclip_file.new
+          paperclip_file = instance.send(@paperclip_files).send(:find_or_create_by_style, style.to_s)
           paperclip_file.file_contents = file.read
-          paperclip_file.style = style.to_s;
-          instance.send(@paperclip_files) << paperclip_file
+          paperclip_file.save!
         end        
         @queued_for_write = {}
       end

data/lib/paperclip_database/version.rb

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

data/paperclip_database.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
 
   s.requirements << "ImageMagick"
 
-  s.add_dependency('paperclip', '>= 2.5.0')
+  s.add_dependency('paperclip')
 
 #  s.add_development_dependency('shoulda')
   s.add_development_dependency('appraisal', '~> 0.4.0')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip_database
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-30 00:00:00.000000000Z
+date: 2012-01-31 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &15107440 !ruby/object:Gem::Requirement
+  requirement: &17068180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15107440
+  version_requirements: *17068180
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &15106100 !ruby/object:Gem::Requirement
+  requirement: &17067180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *15106100
+  version_requirements: *17067180
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &15090300 !ruby/object:Gem::Requirement
+  requirement: &17065840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15090300
+  version_requirements: *17065840
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &15088240 !ruby/object:Gem::Requirement
+  requirement: &17065100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.3.4
   type: :development
   prerelease: false
-  version_requirements: *15088240
+  version_requirements: *17065100
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &15086740 !ruby/object:Gem::Requirement
+  requirement: &17064220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *15086740
+  version_requirements: *17064220
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &15085600 !ruby/object:Gem::Requirement
+  requirement: &17063360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15085600
+  version_requirements: *17063360
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &15084380 !ruby/object:Gem::Requirement
+  requirement: &17062760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15084380
+  version_requirements: *17062760
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &15083800 !ruby/object:Gem::Requirement
+  requirement: &17062000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15083800
+  version_requirements: *17062000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &15082940 !ruby/object:Gem::Requirement
+  requirement: &17060980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15082940
+  version_requirements: *17060980
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &15069920 !ruby/object:Gem::Requirement
+  requirement: &17060500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15069920
+  version_requirements: *17060500
 description: ! 'To have all your data i one place: the database'
 email:
 - jarl@softace.dk
@@ -148,6 +148,7 @@ files:
 - features/support/rails.rb
 - features/support/selectors.rb
 - gemfiles/rails2.gemfile
+- gemfiles/rails2_legacy.gemfile
 - gemfiles/rails3.gemfile
 - gemfiles/rails3_1.gemfile
 - generators/paperclip_database/USAGE
@@ -179,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1778332653625708555
+      hash: 2952639071527051601
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -188,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1778332653625708555
+      hash: 2952639071527051601
 requirements:
 - ImageMagick
 rubyforge_project: paperclip_database