paperclip_i18n 0.0.2 → 0.1.0

data/.gitignore

@@ -2,4 +2,8 @@
 .bundle
 Gemfile.lock
 pkg/*
-.rvmrc
+.rvmrc
+nbproject
+spec/paperclip_i18n.db
+spec/uploads
+vendor

data/README.md

@@ -1,3 +1,31 @@
-# Paperclip I18n
+Paperclip I18n
+===
+
+Is an extension for the [thoughtbot paperclip](https://github.com/thoughtbot/paperclip) plugin to i18n support to file upload.
+Every language has a seperate file scope.
+
+* Tested with Rails 3.1
+
+# Installation Instruction
+
+Add this line to your Gemfile
+
+    gem 'paranoid_i18n'
+
+Bundle update in your console:
+
+    bundle update
+
+You may want to run the generator for final touches (see next step).
+
+## Generator
+
+There's a generator which creates the basic model, migration & controller for you:
+
+    rails g paperclip_i18n
+    rake db:migrate
+
+You have to specify the controller in your config/routes.rb
+
+    resources :assets, :only=>[:show]
 
-Is an extension for the [thoughtbot paperclip](https://github.com/thoughtbot/paperclip) plugin to i18n support to file upload. For each language a separate file can be uploaded.

data/Rakefile

@@ -1,2 +1,11 @@
 require('bundler')
+require('rspec/core/rake_task')
+
 Bundler::GemHelper.install_tasks
+
+desc('Run RSpec')
+RSpec::Core::RakeTask.new do |t|
+  t.verbose = false
+end
+
+task(:default => :spec)

data/lib/{paperclip_i18n/generators → generators}/paperclip_i18n/paperclip_i18n_generator.rb

@@ -11,6 +11,7 @@ class PaperclipI18nGenerator < Rails::Generators::Base
     end
   end
 
+  desc "Creates an asset model & migration, prepares an assets controller"
   def create_paperclip_i18n_migration
     migration_template('migration.rb', 'db/migrate/paperclip_i18n_tables.rb')
     copy_file('assets_controller.rb', 'app/controllers/assets_controller.rb')

data/lib/paperclip_i18n.rb

@@ -1,3 +1,8 @@
+require('active_model')
+require('active_record')
+require('paperclip')
+require('paperclip/railtie')
+Paperclip::Railtie.insert
 require('paperclip_i18n/has_many_attached_files')
 require('paperclip_i18n/acts_as_attachment')
 require('paperclip_i18n/upload_file_validator')

data/lib/paperclip_i18n/acts_as_attachment.rb

@@ -10,12 +10,13 @@ module PaperclipI18n
       # This module needs the paperclip plugin to work
       # http://www.thoughtbot.com/projects/paperclip
       def acts_as_attachment(options = {})
-        default_options = { :url => "/uploads/#{Rails.env}/assets/:id_partition/:basename.:style.:extension",
-                            :path => "#{Rails.root}/public/uploads/#{Rails.env}/assets/:id_partition/:basename.:style.:extension" }.merge(options)
+        default_options = options
+        default_options[:url] = "/uploads/#{Rails.env}/assets/:id_partition/:basename.:style.:extension" if default_options[:url].blank?
+        default_options[:path] = "#{Rails.root}/public/uploads/#{Rails.env}/assets/:id_partition/:basename.:style.:extension" if default_options[:path].blank?
 
         has_attached_file(:upload, default_options)
         belongs_to(:attachable, :polymorphic => true)
-        scope(:i18ns, lambda { where(:upload_language => ::I18n.locale) })
+        scope(:i18ns, lambda { where(:upload_language => ::I18n.locale.to_s) })
         include(::PaperclipI18n::ActsAsAttachment::InstanceMethods)
       end
     end

data/lib/paperclip_i18n/has_many_attached_files.rb

@@ -10,20 +10,20 @@ module PaperclipI18n
       # This module needs the paperclip plugin to work
       # http://www.thoughtbot.com/projects/paperclip
       def has_many_attached_files(options = {})
-        write_inheritable_attribute(:has_many_attached_files_options, { :counter_cache => options[:counter_cache], :styles => options[:styles] })
-        class_inheritable_reader(:has_many_attached_files_options)
+        class_attribute(:has_many_attached_files_options)
+        self.has_many_attached_files_options = { :counter_cache => options[:counter_cache], :styles => options[:styles], :model => options[:model] ||= ::Asset }
         
         attr_accessor(:upload)
         attr_accessor(:current_file_language)
         after_save(:save_attached_files)
-        has_many(:assets, :as => :attachable, :dependent => :destroy)
+        has_many(:assets, :as => :attachable, :dependent => :destroy, :class_name => self.has_many_attached_files_options[:model].to_s)
         include(::PaperclipI18n::HasManyAttachedFiles::InstanceMethods)
       end
     end
     
     module InstanceMethods
       def save_attached_files
-        ::Asset.transaction do
+        self.has_many_attached_files_options[:model].transaction do
           if upload.is_a?(Array)
             upload.each do |data_item|
               create_or_update_asset(data_item) unless data_item.nil? || data_item.blank?
@@ -36,7 +36,7 @@ module PaperclipI18n
 
       def create_or_update_asset(data_item)
         override_default_styles, normalised_styles = override_default_styles?(data_item.original_filename)
-        asset = assets.where(:upload_language => current_language).first || Asset.new # is there an attachment, then delete the old
+        asset = assets.where(:upload_language => current_language).first || self.has_many_attached_files_options[:model].new # is there an attachment, then delete the old
         asset.upload.instance_variable_set('@styles', normalised_styles) if override_default_styles
         asset.upload = data_item
         asset.upload_language = current_language
@@ -51,10 +51,10 @@ module PaperclipI18n
       end
 
       def override_default_styles?(filename)
-        if !has_many_attached_files_options[:styles].nil?
+        if !self.has_many_attached_files_options[:styles].nil?
           normalised_styles = {}
           
-          has_many_attached_files_options[:styles].each do |name, args|
+          self.has_many_attached_files_options[:styles].each do |name, args|
             dimensions, format = [args, nil].flatten[0..1]
             format = nil if format.blank?
             
@@ -74,7 +74,7 @@ module PaperclipI18n
       
       # based on the Authlogic plugin (http://agilewebdevelopment.com/plugins/authgasm)
       def current_language
-        @current_file_language || ::I18n.locale
+        @current_file_language || ::I18n.locale.to_s
       end
     end
   end

data/lib/paperclip_i18n/upload_file_validator.rb

@@ -1,4 +1,4 @@
-class UploadFileValidator < ActiveModel::EachValidator
+class UploadFileValidator < ::ActiveModel::EachValidator
   DEFAULT_OPTIONS = { :content_type => nil,
                       :less_then => nil,
                       :presence => true }

data/lib/paperclip_i18n/version.rb

@@ -1,3 +1,3 @@
 module PaperclipI18n
-  VERSION = '0.0.2'
+  VERSION = '0.1.0'
 end

data/paperclip_i18n.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email       = ["rg@create.at", 'philipp.ullmann@create.at']
   s.homepage    = ""
   s.summary     = 'Adding I18n image upload support to paperclip plugin'
-  s.description = "This gem depends on the paperclip gem. A separate file can be uploaded for each language."
+  s.description = "This gem depends on the paperclip gem and Rails 3.1. A separate file can be uploaded for each language."
 
   s.rubyforge_project = 'paperclip_i18n'
 
@@ -19,5 +19,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
   
-  s.add_dependency('paperclip', ['>= 2.3.8'])
+  s.add_dependency('paperclip', ['>= 2.4.0'])
+  s.add_dependency('sqlite3', ['>= 1.3.4'])
+  s.add_development_dependency('activemodel', ['>= 3.1.0'])
+  s.add_development_dependency('activerecord', ['>= 3.1.0'])
+  s.add_development_dependency('rspec', ['>= 2.6.0'])
+  s.add_development_dependency('rake', ['0.9.2'])
 end

data/spec/database.yml

@@ -0,0 +1,3 @@
+test:
+  :adapter: sqlite3
+  :database: spec/paperclip_i18n.db

data/spec/models.rb

@@ -0,0 +1,7 @@
+class Attachment < ActiveRecord::Base
+  acts_as_attachment :url => '/uploads/:basename.:style.:extension', :path => File.expand_path(File.dirname(__FILE__) + '/uploads')
+end
+
+class Document < ActiveRecord::Base
+  has_many_attached_files :model => ::Attachment
+end

data/spec/paperclip_i18n_spec.rb

@@ -0,0 +1,40 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/models')
+
+describe PaperclipI18n do
+  describe "has_many_attached_files" do
+    before :each do
+      I18n.locale = :en
+      @file = File.new(File.dirname(__FILE__) + "/upload_dummy.txt")
+      @doc = Document.new
+      @doc.upload = @file
+      @doc.save
+    end
+    it('should read the file name properly') do
+      @doc.assets.i18ns.first.name.should == File.basename('upload_dummy.txt')
+    end
+    it('should store the file size properly') do
+      @doc.assets.i18ns.first.size.should == @file.size
+    end
+
+    context("default language german") do
+      before :each do
+        @file_german = File.new(File.dirname(__FILE__)+"/upload_dummy.txt")
+        I18n.locale = :de
+        @doc.upload = @file_german
+        @doc.save
+        @doc.assets.reload
+      end
+      it('should have one english upload') do
+        I18n.locale = :en
+        @doc.assets.i18ns.count == 1
+      end
+      it('should have one german upload') do
+        @doc.assets.i18ns.count == 1
+      end
+      it('should have 2 uploads in total') do
+        @doc.assets.count == 2
+      end
+    end
+  end
+end

data/spec/schema.rb

@@ -0,0 +1,15 @@
+ActiveRecord::Schema.define do
+  create_table "attachments", :force => true do |t|
+    t.string   "attachable_type"
+    t.integer  "attachable_id"
+    t.string   "upload_file_name"
+    t.integer  "upload_content_type"
+    t.datetime "upload_file_size"
+    t.datetime "upload_updated_at"
+    t.string   "upload_language"
+  end
+
+  create_table "documents", :force => true do |t|
+    t.string   "title"
+  end
+end

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/spec/spec_helper.rb

@@ -0,0 +1,32 @@
+require 'rubygems'
+require 'bundler/setup'
+require 'paperclip_i18n'
+
+$enabled = false
+
+ActiveSupport::Notifications.subscribe(/sql/i) do |*args|
+  if $enabled
+    event = ActiveSupport::Notifications::Event.new(*args)
+    puts "SQL #{event.duration}: #{event.payload[:sql]}"
+  end
+end
+
+def connect(environment)
+  conf = YAML::load(File.open(File.dirname(__FILE__) + '/database.yml'))
+  ActiveRecord::Base.establish_connection(conf[environment])
+end
+
+# Open ActiveRecord connection
+connect('test')
+
+original_stdout = $stdout
+$stdout = StringIO.new
+
+begin
+  load(File.dirname(__FILE__) + "/schema.rb")
+ensure
+  $stdout = original_stdout
+end
+
+# Disable logging of paperclip, because it would throw nil.info(..) error message
+Paperclip.options[:log] = false

data/spec/upload_dummy.txt

@@ -0,0 +1 @@
+Hallo Welt!

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Rene Gross
@@ -16,25 +16,105 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 Z
+date: 2011-09-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: paperclip
   prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 31
         segments: 
         - 2
-        - 3
-        - 8
-        version: 2.3.8
-  type: :runtime
+        - 4
+        - 0
+        version: 2.4.0
+  name: paperclip
   version_requirements: *id001
-description: This gem depends on the paperclip gem. A separate file can be uploaded for each language.
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 3
+        - 4
+        version: 1.3.4
+  name: sqlite3
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
+        version: 3.1.0
+  name: activemodel
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
+        version: 3.1.0
+  name: activerecord
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
+  name: rspec
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
+  name: rake
+  version_requirements: *id006
+description: This gem depends on the paperclip gem and Rails 3.1. A separate file can be uploaded for each language.
 email: 
 - rg@create.at
 - philipp.ullmann@create.at
@@ -49,17 +129,24 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- lib/generators/paperclip_i18n/USAGE
+- lib/generators/paperclip_i18n/paperclip_i18n_generator.rb
+- lib/generators/paperclip_i18n/templates/asset.rb
+- lib/generators/paperclip_i18n/templates/assets_controller.rb
+- lib/generators/paperclip_i18n/templates/migration.rb
 - lib/paperclip_i18n.rb
 - lib/paperclip_i18n/acts_as_attachment.rb
-- lib/paperclip_i18n/generators/paperclip_i18n/USAGE
-- lib/paperclip_i18n/generators/paperclip_i18n/paperclip_i18n_generator.rb
-- lib/paperclip_i18n/generators/paperclip_i18n/templates/asset.rb
-- lib/paperclip_i18n/generators/paperclip_i18n/templates/assets_controller.rb
-- lib/paperclip_i18n/generators/paperclip_i18n/templates/migration.rb
 - lib/paperclip_i18n/has_many_attached_files.rb
 - lib/paperclip_i18n/upload_file_validator.rb
 - lib/paperclip_i18n/version.rb
 - paperclip_i18n.gemspec
+- spec/database.yml
+- spec/models.rb
+- spec/paperclip_i18n_spec.rb
+- spec/schema.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/upload_dummy.txt
 homepage: ""
 licenses: []
 
@@ -89,9 +176,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: paperclip_i18n
-rubygems_version: 1.7.2
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Adding I18n image upload support to paperclip plugin
-test_files: []
-
+test_files: 
+- spec/database.yml
+- spec/models.rb
+- spec/paperclip_i18n_spec.rb
+- spec/schema.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/upload_dummy.txt