paperclip-globalize3 1.1.0 → 2.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTJlOTRhNDE3Y2NiNDNkZTY0OTI0M2M3ZDUzNzc5YmRlMTZmNDM4Zg==
+    MjI1ODFiYzY1NGRiYzVmYmM0NTI2YTNhMDM0MTAwYzljYjIzMmE2Zg==
   data.tar.gz: !binary |-
-    MmNmZjBhMjMzYjY3ZTQ0NDQ2YjA1MThmNmRlOTk4ZjJmOGU3NDk5ZQ==
+    NDZkYjk4MWU4OTU3Nzk5NGQ0MDc0NDMwNWQzM2M0ZWU3MzllYjQzYw==
 SHA512:
   metadata.gz: !binary |-
-    ZTIwYWMwYTdlZTZmNjFiYTA5MWNhMzhlMmZkM2Y2MmY2ODM2MmZmOGQ1ZmRl
-    Yjg4M2UyMDRmMTk4N2FkYmM4OTQzMzA0ODg2OTM1M2MyN2QxMTYwMmZiOGFj
-    NGVkYTQxYzE2NTRmN2YzYzE0YzI1N2JjMTEwOGNiMTRmNzc1YjI=
+    MjJkZDU5MTA1MzdiYzUzMzc2NDhmYWJiZGFkMTMxNzUyYjllOGMxMDgxZDFh
+    MjU4N2QwNWQzYzFmODM2ODIyY2M1ZTBkNThmYTc4MmU4NjYwYWE3OGM2OGJi
+    N2U1YzFiMGRmY2Y1MDYwODU3NWYyMDM2Njk3MjI2MGI5ODc2MDk=
   data.tar.gz: !binary |-
-    MThkODE3ZTYxMjI1NzYxOGVkYzlmMGViMjVhNGZlOGE1OTgwNzQ1ZWM0MmFi
-    NzgzZDAyMTkxMmNhYzliYTBkMzViZTdhNmQxZjM5MDFjN2RiMjI3ZDEwMmEy
-    NjlkMTAyMjYxNzI2MzNjZjFmMGQyMDRlYmM5NzcxOWI0ODI2Mzg=
+    NmQyYTg0YjM0N2M2MmI2MTc1MThmNDk2YTM0NzExMTk5MWM0MWVkNGNmODI3
+    NTBiYjk4ZDlhMzZkY2E4Y2U0YTFkZGI1OTg5ZmVmZTZiNjBkMGQ2NzdiZWQy
+    ZWUzNTc4MGQzNGIwYjI2ZmI0ZDJkYjExMDE1YThiMmE4NjhmMjM=

data/.travis.yml

@@ -1,12 +1,11 @@
 language: ruby
 rvm:
-  - 1.9.2
   - 1.9.3
-env:
-  - PAPERCLIP_VERSION="3.4.0"
-  - PAPERCLIP_VERSION="~> 3.4"
+  - 2.0.0
+  - 2.1.3
 script: "bundle exec rake spec"
 gemfile:
-  - gemfiles/rails_3.0.gemfile
-  - gemfiles/rails_3.1.gemfile
-  - gemfiles/rails_3.2.gemfile
+  - gemfiles/rails_4.0_paperclip_4_1.gemfile
+  - gemfiles/rails_4.0_paperclip_4_2.gemfile
+  - gemfiles/rails_4.1_paperclip_4_1.gemfile
+  - gemfiles/rails_4.1_paperclip_4_2.gemfile

data/Appraisals

@@ -1,11 +1,23 @@
-appraise 'rails-3.0' do
-  gem 'rails',      '~> 3.0.0'
+# Rails 4.0
+
+appraise 'rails-4.0-paperclip-4-1' do
+  gem 'rails',      '~> 4.0.0'
+  gem 'paperclip',  '~> 4.1.0'
+end
+
+appraise 'rails-4.0-paperclip-4-2' do
+  gem 'rails',      '~> 4.0.0'
+  gem 'paperclip',  '~> 4.2.0'
 end
 
-appraise 'rails-3.1' do
-  gem 'rails',      '~> 3.1.0'
+# Rails 4.1
+
+appraise 'rails-4.1-paperclip-4-1' do
+  gem 'rails',      '~> 4.1.0'
+  gem 'paperclip',  '~> 4.1.0'
 end
 
-appraise 'rails-3.2' do
-  gem 'rails',      '~> 3.2.0'
+appraise 'rails-4.1-paperclip-4-2' do
+  gem 'rails',      '~> 4.1.0'
+  gem 'paperclip',  '~> 4.2.0'
 end

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013 emjot GmbH & Co. KG
+Copyright (c) 2014 emjot GmbH & Co. KG
 
 MIT License
 

data/README.md

@@ -1,8 +1,9 @@
 # Paperclip::Globalize3
 
-[![Build Status](https://travis-ci.org/emjot/paperclip-globalize3.png?branch=1.x-stable)](https://travis-ci.org/emjot/paperclip-globalize3)
+[![Build Status](https://travis-ci.org/emjot/paperclip-globalize3.png?branch=master)](https://travis-ci.org/emjot/paperclip-globalize3)
 
-Use locale-specific attachments in your Rails app with paperclip and globalize3.
+Use locale-specific attachments in your Rails app with [paperclip](https://github.com/thoughtbot/paperclip) and 
+[globalize](https://github.com/globalize/globalize).
 
 You can transparently read and write your attachments in context of the current locale. E.g. `my_model.my_attachment` returns a different attachment when your current locale is 'en' compared to when your current locale is 'de'.
 
@@ -10,15 +11,15 @@ Note that this implementation patches some methods in the `Paperclip::Attachment
 
 ## Compatibility
 
-This is a maintenance branch for paperclip 3.x support. Currently, paperclip 3.x (>= 3.4) and globalize3 0.3 are supported.
+Currently, paperclip 4.1/4.2 and globalize 4.0 are supported.
 
-For paperclip 2.x support please use the 0.x versions of this gem.
+For paperclip 3.x with globalize3 support please use the 1.x versions of this gem.
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'paperclip-globalize3', '~> 1.1.0'
+    gem 'paperclip-globalize3'
 
 And then execute:
 
@@ -43,18 +44,24 @@ Example:
     class User < ActiveRecord::Base
       has_attached_file :avatar,
                         :url => "/system/:attachment/:id/:locale/:style-:fingerprint.:extension"
+      validates_attachment_content_type :avatar, :content_type => /\Aimage\/.*\Z/                        
       translates :avatar_file_name, :avatar_file_size, :avatar_created_at, :avatar_updated_at, :avatar_fingerprint
     end
 
-## Todo / Future Plans
+## Development
 
-* Make it easier to specify translated attachments, e.g. using one of these options:
-  * support `translates :attachment_name`
-  * support `:translated` option for `has_attached_file`
-  * eliminate the need to specify; automatically set `translates` as soon as the :locale interpolation is used
-* Don't depend on order of definition for it to work (`translates` after `has_attached_file`)
+### Testing
 
-## Contributing
+To setup tests, make sure all the ruby versions defined in `.travis.yml` are installed on your system.
+
+Run tests via:
+
+* `rake wwtd` for all combinations of ruby/rails/paperclip versions (NOTE that when using `rake wwtd:parallel` there 
+   might be some flickering test failures - needs to be investigated) 
+* `rake wwtd:local` for all rails/paperclip versions, but only on current ruby
+* `rake spec` (or e.g. `bundle exec rspec spec --format documentation`) with main Gemfile and only on current ruby 
+
+### Contributing
 
 1. Fork it
 2. Create your feature branch (`git checkout -b my-new-feature`)

data/Rakefile

@@ -2,6 +2,7 @@ require 'bundler/setup'
 require 'paperclip/globalize3/gem_tasks'
 require 'appraisal'
 require 'rspec/core/rake_task'
+require 'wwtd/tasks'
 
 desc 'Default: run all tests with all supported versions'
 task :default => :all
@@ -11,6 +12,8 @@ task :all => ["appraisal:install"] do
   exec('rake appraisal spec')
 end
 
+task :local => "wwtd:local" # run all gemfiles with local ruby
+
 desc 'Run all tests'
 RSpec::Core::RakeTask.new('spec') do |t|
   t.pattern = FileList['spec/**/*_spec.rb']

data/gemfiles/{rails_3.0.gemfile → rails_4.0_paperclip_4_1.gemfile}

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 3.0.0"
+gem "rails", "~> 4.0.0"
+gem "paperclip", "~> 4.1.0"
 
 gemspec :path=>"../"

data/gemfiles/{rails_3.1.gemfile → rails_4.0_paperclip_4_2.gemfile}

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 3.1.0"
+gem "rails", "~> 4.0.0"
+gem "paperclip", "~> 4.2.0"
 
 gemspec :path=>"../"

data/gemfiles/{rails_3.2.gemfile → rails_4.1_paperclip_4_1.gemfile}

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 3.2.0"
+gem "rails", "~> 4.1.0"
+gem "paperclip", "~> 4.1.0"
 
 gemspec :path=>"../"

data/gemfiles/rails_4.1_paperclip_4_2.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.1.0"
+gem "paperclip", "~> 4.2.0"
+
+gemspec :path=>"../"

data/lib/paperclip-globalize3.rb

@@ -4,6 +4,16 @@ require "paperclip/globalize3/attachment"
 require "globalize"
 require "paperclip"
 
-Paperclip.interpolates(:locale) { |_, _| Globalize.locale.to_s }
+Paperclip.interpolates(:locale) { |attachment, _|
+  if attachment.instance.send("#{attachment.name}_file_name").respond_to?(:translation_metadata)
+    attachment.instance.send("#{attachment.name}_file_name").translation_metadata[:locale].to_s
+  else
+    Globalize.locale.to_s
+  end
+}
+
+unless Paperclip::Attachment.instance_methods.include?(:assign_attributes)
+  Paperclip::Attachment.send(:include, Paperclip::Globalize3::Attachment::Compatibility::Paperclip41)
+end
 
 Paperclip::Attachment.send(:include, Paperclip::Globalize3::Attachment)

data/lib/paperclip/globalize3/attachment.rb

@@ -11,37 +11,25 @@ module Paperclip
       end
 
       module InstanceMethods
-
         def assign_with_globalize3(uploaded_file)
+          @file = Paperclip.io_adapters.for(uploaded_file)
           ensure_required_accessors!
-          file = Paperclip.io_adapters.for(uploaded_file)
-
-          return nil if file.respond_to?(:assignment?) && !file.assignment?
-          self.clear(*only_process, :locales => Globalize.locale) # [paperclip-globalize3] only clear current locale
-          return nil if file.nil?
-
-          @queued_for_write[:original]   = file
-          instance_write(:file_name,       cleanup_filename(file.original_filename))
-          instance_write(:content_type,    file.content_type.to_s.strip)
-          instance_write(:file_size,       file.size)
-          instance_write(:fingerprint,     file.fingerprint) if instance_respond_to?(:fingerprint)
-          instance_write(:created_at,      Time.now) if has_enabled_but_unset_created_at?
-          instance_write(:updated_at,      Time.now)
-
-          @dirty = true
-
-          if post_processing &&
-              (file.respond_to?(:assignment?) || valid_assignment?)
-            post_process(*only_process)
+          ensure_required_validations!
+
+          if @file.assignment?
+            clear(*only_process, :locales => Globalize.locale) # [paperclip-globalize3] only clear current locale
+            if @file.nil?
+              nil
+            else
+              assign_attributes
+              post_process_file
+              reset_file_if_original_reprocessed
+            end
+          else
+            nil
           end
-
-          instance_write(:file_size,   @queued_for_write[:original].size)
-          instance_write(:fingerprint, @queued_for_write[:original].fingerprint) if instance_respond_to?(:fingerprint)
-          updater = :"#{name}_file_name_will_change!"
-          instance.send updater if instance.respond_to? updater
         end
 
-
         def clear_with_globalize3(*args)
           options = args.extract_options!
           styles_to_clear = args
@@ -81,7 +69,67 @@ module Paperclip
             yield
           end
         end
+      end
+
+      module Compatibility
+        # The paperclip-globalize3 patches are based on paperclip 4.2 code;
+        # this module needs to be included when trying to use with paperclip 4.1.
+        module Paperclip41
+          def assign_attributes
+            @queued_for_write[:original] = @file
+            assign_file_information
+            assign_fingerprint(@file.fingerprint)
+            assign_timestamps
+          end
+
+          def assign_file_information
+            instance_write(:file_name, cleanup_filename(@file.original_filename))
+            instance_write(:content_type, @file.content_type.to_s.strip)
+            instance_write(:file_size, @file.size)
+          end
+
+          def assign_fingerprint(fingerprint)
+            if instance_respond_to?(:fingerprint)
+              instance_write(:fingerprint, fingerprint)
+            end
+          end
 
+          def assign_timestamps
+            if has_enabled_but_unset_created_at?
+              instance_write(:created_at, Time.now)
+            end
+
+            instance_write(:updated_at, Time.now)
+          end
+
+          def post_process_file
+            dirty!
+
+            if post_processing
+              post_process(*only_process)
+            end
+          end
+
+          def dirty!
+            @dirty = true
+          end
+
+          def reset_file_if_original_reprocessed
+            instance_write(:file_size, @queued_for_write[:original].size)
+            assign_fingerprint(@queued_for_write[:original].fingerprint)
+            reset_updater
+          end
+
+          def reset_updater
+            if instance.respond_to?(updater)
+              instance.send(updater)
+            end
+          end
+
+          def updater
+            :"#{name}_file_name_will_change!"
+          end
+        end
       end
 
     end

data/lib/paperclip/globalize3/version.rb

@@ -1,5 +1,5 @@
 module Paperclip
   module Globalize3
-    VERSION = "1.1.0"
+    VERSION = "2.0.0"
   end
 end

data/paperclip-globalize3.gemspec

@@ -3,18 +3,13 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'paperclip/globalize3/version'
 
-paperclip_version = '~> 3.3'
-unless ENV['PAPERCLIP_VERSION'].to_s.empty?
-  paperclip_version = Gem::Requirement.new(ENV['PAPERCLIP_VERSION'])
-end
-
 Gem::Specification.new do |spec|
   spec.name          = "paperclip-globalize3"
   spec.version       = Paperclip::Globalize3::VERSION
   spec.authors       = ["Maximilian Herold"]
   spec.email         = ["herold@emjot.de"]
-  spec.description   = %q{locale-specific attachments with paperclip and globalize3}
-  spec.summary       = %q{locale-specific attachments with paperclip and globalize3}
+  spec.description   = %q{locale-specific attachments with paperclip and globalize}
+  spec.summary       = %q{locale-specific attachments with paperclip and globalize}
   spec.homepage      = "https://github.com/emjot/paperclip-globalize3"
   spec.license       = "MIT"
 
@@ -23,12 +18,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "paperclip", paperclip_version
-  spec.add_runtime_dependency "globalize3", "~> 0.3"
+  spec.add_runtime_dependency "paperclip", "~> 4.1"
+  spec.add_runtime_dependency "globalize", "~> 4.0.0"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "appraisal", "~> 0.5.1"
-  spec.add_development_dependency "rspec-rails", "~> 2.8.0"
+  spec.add_development_dependency "rspec-rails", "~> 2.14.1"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "wwtd", "~> 0.5"
 end

data/spec/attachment_helper_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 describe 'Paperclip::Globalize3::Attachment' do
 
   before(:each) do
-    Object.const_set(:Rails, double('Rails'))
+    stub_const('Rails', double('Rails'))
     Rails.stub(:root).and_return(ROOT.join('tmp'))
     Rails.stub(:env).and_return('test')
     Rails.stub(:const_defined?).with(:Railtie).and_return(false)

data/spec/data/models.rb

@@ -4,22 +4,25 @@ end
 
 class Post < BasePost
   has_attached_file :image,
-                    :url => "/system/:class/:attachment/:id/:locale/:style-:fingerprint.:extension"
+                    :url => "/system/:test_env_number/:class/:attachment/:id/:locale/:style-:fingerprint.:extension"
+  validates_attachment :image, :content_type => { :content_type => ['image/png'] }
 
   translates :image_file_name, :image_content_type, :image_file_size, :image_updated_at, :image_fingerprint
 end
 
 class OnlyProcessPost < BasePost
   has_attached_file :image,
-                    :url => "/system/:class/:attachment/:id/:locale/:style-:fingerprint.:extension",
+                    :url => "/system/:test_env_number/:class/:attachment/:id/:locale/:style-:fingerprint.:extension",
                     :styles => { :thumb => "10x10", :large => "40x40" },
                     :only_process => [:thumb]
+  validates_attachment :image, :content_type => { :content_type => ['image/png'] }
 
   translates :image_file_name, :image_content_type, :image_file_size, :image_updated_at, :image_fingerprint
 end
 
 class Untranslated < ActiveRecord::Base
   has_attached_file :image,
-                    :url => "/system/:class/:attachment/:id/:style-:fingerprint.:extension"
+                    :url => "/system/:test_env_number/:class/:attachment/:id/:style-:fingerprint.:extension"
+  validates_attachment :image, :content_type => { :content_type => ['image/png'] }
 end
 

data/spec/spec_helper.rb

@@ -20,6 +20,10 @@ require File.expand_path(File.join(File.dirname(__FILE__), '../lib/paperclip-glo
 
 ActiveRecord::Base.send(:include, Paperclip::Glue)
 
+Paperclip.interpolates(:test_env_number) do |_, _|
+  ENV['TEST_ENV_NUMBER'].presence || '0'
+end
+
 # set up globalize3 and models (borrowed from globalize3)
 require 'fileutils'
 require 'logger'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-globalize3
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Maximilian Herold
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
-  name: globalize3
+  name: globalize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.14.1
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +108,21 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: locale-specific attachments with paperclip and globalize3
+- !ruby/object:Gem::Dependency
+  name: wwtd
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+description: locale-specific attachments with paperclip and globalize
 email:
 - herold@emjot.de
 executables: []
@@ -123,9 +137,10 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- gemfiles/rails_3.0.gemfile
-- gemfiles/rails_3.1.gemfile
-- gemfiles/rails_3.2.gemfile
+- gemfiles/rails_4.0_paperclip_4_1.gemfile
+- gemfiles/rails_4.0_paperclip_4_2.gemfile
+- gemfiles/rails_4.1_paperclip_4_1.gemfile
+- gemfiles/rails_4.1_paperclip_4_2.gemfile
 - lib/paperclip-globalize3.rb
 - lib/paperclip/globalize3/attachment.rb
 - lib/paperclip/globalize3/gem_helper.rb
@@ -161,7 +176,7 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: locale-specific attachments with paperclip and globalize3
+summary: locale-specific attachments with paperclip and globalize
 test_files:
 - spec/attachment_helper_spec.rb
 - spec/data/models.rb