paperclip-globalize3 2.0.0 → 2.1.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjI1ODFiYzY1NGRiYzVmYmM0NTI2YTNhMDM0MTAwYzljYjIzMmE2Zg==
-  data.tar.gz: !binary |-
-    NDZkYjk4MWU4OTU3Nzk5NGQ0MDc0NDMwNWQzM2M0ZWU3MzllYjQzYw==
+SHA1:
+  metadata.gz: a27d7f1cd8ff477e2c557c2c4f5d736f923b115d
+  data.tar.gz: df9d760d21fd2e45a13e99fb0fedb3e37b614916
 SHA512:
-  metadata.gz: !binary |-
-    MjJkZDU5MTA1MzdiYzUzMzc2NDhmYWJiZGFkMTMxNzUyYjllOGMxMDgxZDFh
-    MjU4N2QwNWQzYzFmODM2ODIyY2M1ZTBkNThmYTc4MmU4NjYwYWE3OGM2OGJi
-    N2U1YzFiMGRmY2Y1MDYwODU3NWYyMDM2Njk3MjI2MGI5ODc2MDk=
-  data.tar.gz: !binary |-
-    NmQyYTg0YjM0N2M2MmI2MTc1MThmNDk2YTM0NzExMTk5MWM0MWVkNGNmODI3
-    NTBiYjk4ZDlhMzZkY2E4Y2U0YTFkZGI1OTg5ZmVmZTZiNjBkMGQ2NzdiZWQy
-    ZWUzNTc4MGQzNGIwYjI2ZmI0ZDJkYjExMDE1YThiMmE4NjhmMjM=
+  metadata.gz: a96c8d616f3d5e8e3955d196b0d1ce18bb2d35734450c6898696d56bf20c48d89aca349c61fddf65514bf1ab6785e9ecd4e5500ea5b479e8a31133cfb69659b2
+  data.tar.gz: c6098de0d37c1708279f743557877287b5970aba77a6d94f990d1599acf346a734e843109a937a285ca096ec3f3d22a91ac859a9f7aabade1969259175ffa81c

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.3
+  - 2.1.5
 script: "bundle exec rake spec"
 gemfile:
   - gemfiles/rails_4.0_paperclip_4_1.gemfile

data/LICENSE.txt

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

data/lib/paperclip-globalize3.rb

@@ -4,13 +4,26 @@ require "paperclip/globalize3/attachment"
 require "globalize"
 require "paperclip"
 
-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
-}
+# Paperclip locale interpolation: if locale fallbacks are used, we need to determine & use the fallback locale
+Paperclip.interpolates(:locale) do |attachment, _style_name|
+  record = attachment.instance
+  file_name_attr = "#{attachment.name}_file_name"
+  attachment_locale =
+    if record.respond_to?(:translation) && record.translated?(file_name_attr)
+      # determine via metadata if activated (I18n::Backend::Simple.include(I18n::Backend::Metadata))
+      if record.send(file_name_attr).respond_to?(:translation_metadata)
+        record.send(file_name_attr).translation_metadata[:locale]
+      else # determine via globalize fallback configuration
+        (record.globalize_fallbacks(Globalize.locale) & record.translated_locales).first # (nil if record is new)
+      end
+    else
+      Rails.logger.warn(
+        "WARN You have used :locale in a paperclip url/path for an untranslated model (in #{record.class.to_s})."
+      )
+      nil
+    end
+  (attachment_locale || Globalize.locale).to_s
+end
 
 unless Paperclip::Attachment.instance_methods.include?(:assign_attributes)
   Paperclip::Attachment.send(:include, Paperclip::Globalize3::Attachment::Compatibility::Paperclip41)

data/lib/paperclip/globalize3/attachment.rb

@@ -52,19 +52,25 @@ module Paperclip
 
         def queue_some_for_delete_with_globalize3(*args)
           options = args.extract_options!
-          styles = args
+          styles  = args
           with_locales_if_translated(options[:locales]) do
             queue_some_for_delete_without_globalize3(styles)
           end
         end
 
         # If translated, execute the block for the given locales only (or for all translated locales if none are given).
-        # Otherwise, simply execute the block.
+        # If any locales are given, only those for which a translation exists are used.
+        # If attachment is untranslated, simply execute the block.
         def with_locales_if_translated(with_locales = nil, &block)
           if instance.respond_to?(:translated_locales) && instance.translated?(:"#{name}_file_name")
             # TODO translated_locales are not present any more when this is called via destroy callback (unless 'translates' is defined AFTER 'has_attached_file' in the model class)
-            with_locales = instance.translated_locales if with_locales.nil?
-            Globalize.with_locales([*with_locales]) { yield }
+            with_locales =
+              if with_locales.nil?
+                [*instance.translated_locales]
+              else
+                [*with_locales] & instance.translated_locales
+              end
+            Globalize.with_locales(with_locales) { yield }
           else
             yield
           end

data/lib/paperclip/globalize3/version.rb

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

data/paperclip-globalize3.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "appraisal", "~> 0.5.1"
-  spec.add_development_dependency "rspec-rails", "~> 2.14.1"
+  spec.add_development_dependency "rspec-rails", ["~> 2.14.1", "< 2.99"]
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "wwtd", "~> 0.5"

data/spec/attachment_helper_spec.rb

@@ -24,7 +24,7 @@ describe 'Paperclip::Globalize3::Attachment' do
 
   context 'with translations' do
 
-    it 'should save different images for different locales' do
+    it 'saves different images for different locales' do
       p = Post.create
       Globalize.with_locale(:en) do
         p.image_file_name.should be_nil
@@ -46,7 +46,7 @@ describe 'Paperclip::Globalize3::Attachment' do
       Post.translation_class.count.should == 2
     end
 
-    it 'should only overwrite the image file for the current locale on re-assign' do
+    it 'only overwrites the image file for the current locale on re-assign' do
       p = Post.create
       path_en = Globalize.with_locale(:en) do
         p.update_attributes!(:image => test_image_file)
@@ -70,7 +70,7 @@ describe 'Paperclip::Globalize3::Attachment' do
       File.exist?(path_de).should be_true
     end
 
-    it 'should delete image files in all locales on destroy' do
+    it 'deletes image files in all locales on destroy' do
       p = Post.create
       path_en = Globalize.with_locale(:en) do
         p.update_attributes!(:image => test_image_file)
@@ -90,7 +90,7 @@ describe 'Paperclip::Globalize3::Attachment' do
 
     context 'with :only_process' do
 
-      it 'should only clear the provided style in the current locale on assign' do
+      it 'only clears the provided style in the current locale on assign' do
         p = OnlyProcessPost.create
         p.image.should_receive(:queue_some_for_delete).with(:thumb, :locales => :en)
         p.image.should_not_receive(:queue_all_for_delete)
@@ -106,7 +106,7 @@ describe 'Paperclip::Globalize3::Attachment' do
 
   context 'without translations' do
 
-    it 'should delete image files on destroy' do
+    it 'deletes image files on destroy' do
       p = Untranslated.create
       p.update_attributes!(:image => test_image_file)
       path = p.image.path
@@ -118,4 +118,34 @@ describe 'Paperclip::Globalize3::Attachment' do
 
   end
 
+  context 'with fallbacks' do
+    around :each do |example|
+      old_fallbacks = Globalize.fallbacks
+      Globalize.fallbacks = {en: [:en, :de], de: [:de, :en]}
+      example.run
+      Globalize.fallbacks = old_fallbacks
+    end
+
+    it 'interpolates the correct locale if fallback is used' do
+      p = nil
+      Globalize.with_locale(:en) { p = Post.new( image: test_image_file); p.save! }
+      Globalize.with_locale(:de) { expect(p.image.url).to match('/en/') }
+    end
+
+    it 'preserves attachments when a new translation is created' do
+      p = nil
+      Globalize.with_locale(:de) do
+        p = Post.new(image: test_image_file)
+        p.save!
+      end
+      Globalize.with_locale(:en) do
+        p.image          = test_image_file
+        p.save!
+      end
+
+      Globalize.with_locale(:en) { expect(File.exists?(p.image.path)).to be_true }
+      Globalize.with_locale(:de) { expect(File.exists?(p.image.path)).to be_true }
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-globalize3
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Maximilian Herold
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-25 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
@@ -73,6 +73,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.99'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -80,32 +83,35 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.99'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -163,17 +169,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: locale-specific attachments with paperclip and globalize