paperclip_database 2.2.0 → 2.2.1

data/features/basic_integration.feature

@@ -14,21 +14,21 @@ Feature: Rails integration
       """
       has_attached_file :avatar,
                         :storage => :database,
-                        :database_table => :user_avatars,
-                        :url => '/user_avatar_views/:id?style=:style'
+                        :url => '/avatar_views/:id?style=:style'
       """
-    And I run a "scaffold" generator to generate a "UserAvatarView" scaffold with ""
-    Given I replace /^  def show$.*?^  end$/ with this snippet in the "user_avatar_views" controller:
+    And I run a "scaffold" generator to generate a "AvatarView" scaffold with ""
+    Given I replace /^  def show$.*?^  end$/ with this snippet in the "avatar_views" controller:
       """
         def show
           style = params[:style] ? params[:style] : 'original'
           record = User.find(params[:id])
+          raise 'Error' unless record.avatar.exists?(style)
           send_data record.avatar.file_contents(style),
                       :filename => record.avatar_file_name,
                       :type => record.avatar_content_type
         end
       """
-    Given I replace /before_action :set_user_avatar_view.*?$/ with this snippet in the "user_avatar_views" controller:
+    Given I replace /before_action :set_avatar_view.*?$/ with this snippet in the "avatar_views" controller:
       """
       """
 
@@ -40,6 +40,6 @@ Feature: Rails integration
     And I attach the file "test/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 "/user_avatar_views/1?style=original"
-    And the file at "/user_avatar_views/1?style=original" should be the same as "test/fixtures/5k.png"
+    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"
 

data/features/step_definitions/rails_steps.rb

@@ -74,9 +74,6 @@ Given /^I run a "(.*?)" generator to add a paperclip "(.*?)" to the "(.*?)" mode
 end
 
 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
 
@@ -146,30 +143,6 @@ When %r{I turn off class caching} do
   end
 end
 
-Given /^I update my application to use Bundler$/ do
-  if framework_version?("2")
-    boot_config_template = File.read('features/support/fixtures/boot_config.txt')
-    preinitializer_template = File.read('features/support/fixtures/preinitializer.txt')
-    gemfile_template = File.read('features/support/fixtures/gemfile.txt')
-    in_current_dir do
-      content = File.read("config/boot.rb").sub(/Rails\.boot!/, boot_config_template)
-      File.open("config/boot.rb", "w") { |file| file.write(content) }
-      File.open("config/preinitializer.rb", "w") { |file| file.write(preinitializer_template) }
-      File.open("Gemfile", "w") { |file| file.write(gemfile_template.sub(/RAILS_VERSION/, framework_version)) }
-    end
-  end
-end
-
-Given /^I add the paperclip rake task to a Rails 2.3 application$/ do
-  if framework_version?("2.3")
-    require 'fileutils'
-    source = File.expand_path('lib/tasks/paperclip.rake')
-    destination = in_current_dir { File.expand_path("lib/tasks") }
-    FileUtils.cp source, destination
-    append_to "Rakefile", "require 'paperclip'"
-  end
-end
-
 Then /^the file at "([^"]*)" should be the same as "([^"]*)"$/ do |web_file, path|
   expected = IO.binread(path)
   actual = if web_file.match %r{^https?://}

data/features/support/rails.rb

@@ -36,24 +36,16 @@ module RailsCommandHelpers
   end
 
   def new_application_command(app_name)
-    framework_major_version >= 3 ? "rails new #{app_name} --skip-sprockets --skip-javascript --skip-bundle" : "rails"
+    "rails new #{app_name} --skip-sprockets --skip-javascript --skip-bundle"
   end
 
   def generator_command
-    framework_major_version >= 3 ? "rails generate" : "script/generate"
+    "rails generate"
   end
 
   def runner_command
-    framework_major_version >= 3 ? "rails runner" : "script/runner"
+    "rails 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/lib/generators/paperclip_database/migration/templates/migration.rb.erb

@@ -1,7 +1,10 @@
 class <%= migration_class_name %> < ActiveRecord::Migration
   def self.up
+<%
+  module_names = class_name.underscore.split('/')[0...-1]
+-%>
 <% attachment_names.each do |attachment| -%>
-    create_table :<%= class_name.underscore.tr('/', '_') %>_<%= attachment.pluralize %> do |t|
+    create_table :<%= (module_names +[attachment.pluralize]).join("_") %> do |t|
       t.integer    :<%= class_name.underscore.tr('/', '_') %>_id
       t.string     :style
       t.binary     :file_contents
@@ -11,7 +14,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration
 
   def self.down
 <% attachment_names.each do |attachment| -%>
-    drop_table :<%= class_name.underscore.tr('/', '_') %>_<%= attachment.pluralize %>
+    drop_table :<%= (module_names +[attachment.pluralize]).join("_") %>
 <% end -%>
   end
 end

data/lib/paperclip/storage/database.rb

@@ -93,12 +93,7 @@ module Paperclip
           @paperclip_file = @paperclip_class_module.const_set(@paperclip_files.classify, Class.new(::ActiveRecord::Base))
           @paperclip_file.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| @paperclip_file.where('style = ?', style) }
-          end
+          @paperclip_file.scope :file_for, lambda {|style| @paperclip_file.where('style = ?', style) }
         else
           @paperclip_file = @paperclip_class_module.const_get(@paperclip_files.classify)
         end
@@ -136,7 +131,7 @@ module Paperclip
 
       def exists?(style = default_style)
         if original_filename
-          !file_for(style).nil?
+          instance.send("#{@paperclip_files}").where(:style => style).exists?
         else
           false
         end
@@ -175,11 +170,11 @@ module Paperclip
         ActiveRecord::Base.logger.info("[paperclip] Writing files for #{name}")
         @queued_for_write.each do |style, file|
             case Rails::VERSION::STRING
-            when /^2/, /^3/
+            when /^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
+            else
               raise "Rails version #{Rails::VERSION::STRING} is not supported (yet)"
             end
           paperclip_file.file_contents = file.read

data/lib/paperclip_database/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip_database
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-12 00:00:00.000000000 Z
+date: 2013-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -250,10 +250,6 @@ files:
 - 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
-- generators/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
@@ -284,7 +280,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -127264780216903599
+      hash: -2980498353163651834
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -293,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -127264780216903599
+      hash: -2980498353163651834
 requirements:
 - ImageMagick
 rubyforge_project: 

data/generators/paperclip_database/USAGE

@@ -1,5 +0,0 @@
-Usage:
-
-  script/generate paperclip_database model attachment
-
-This will create a migration that will add the proper table for the attachments.

data/generators/paperclip_database/paperclip_database_generator.rb

@@ -1,28 +0,0 @@
-class PaperclipDatabaseGenerator < Rails::Generator::NamedBase
-  attr_accessor :attachments, :migration_name
-
-  def initialize(args, options = {})
-    super
-    @class_name, @attachments = args[0], args[1..-1]
-  end
-
-  def manifest
-    file_name = generate_file_name
-    @migration_name = file_name.camelize
-    record do |m|
-      m.migration_template "paperclip_database_migration.rb.erb",
-                           File.join('db', 'migrate'),
-                           :migration_file_name => file_name
-    end
-  end
-
-  private
-
-  def generate_file_name
-    debugger
-    names = attachments.map{|a| "#{class_name.underscore.tr('/', '_')}_#{a.pluralize}" }
-    names = names[0..-2] + ["and", names[-1]] if names.length > 1
-    "create_#{names.join('_')}"
-  end
-
-end

data/generators/paperclip_database/templates/paperclip_database_migration.rb.erb

@@ -1,17 +0,0 @@
-class <%= migration_name %> < ActiveRecord::Migration
-  def self.up
-<% attachments.each do |attachment| -%>
-    create_table :<%= class_name.underscore.tr('/', '_') %>_<%= attachment.pluralize %> do |t|
-      t.integer    :<%= class_name.underscore.tr('/', '_') %>_id
-      t.string     :style
-      t.binary     :file_contents
-    end
-<% end -%>
-  end
-
-  def self.down
-<% attachments.each do |attachment| -%>
-    drop_table :<%= class_name.underscore.tr('/', '_') %>_<%= attachment.pluralize %>
-<% end -%>
-  end
-end

data/generators/templates/paperclip_database_migration.rb.erb

@@ -1,17 +0,0 @@
-class <%= migration_name %> < ActiveRecord::Migration
-  def self.up
-<% attachments.each do |attachment| -%>
-    create_table :<%= name.underscore.camelize.tableize.tr('/', '_') %>_<%= attachment.pluralize %> do |t|
-      t.integer    :<%= name.underscore.camelize.tableize.tr('/', '_') %>_id
-      t.string     :style
-      t.binary     :file_contents
-    end
-  end
-<% end -%>
-
-  def self.down
-<% attachments.each do |attachment| -%>
-    drop_table :<%= name.underscore.camelize.tableize.tr('/', '_') %>_<%= attachment.pluralize %>
-<% end -%>
-  end
-end