paperclip-globalize3 0.1.0 → 1.0.0

data/.travis.yml

@@ -1,9 +1,7 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
-  - ree
 script: "bundle exec rake spec"
 gemfile:
   - gemfiles/rails_3.0.gemfile

data/README.md

@@ -10,7 +10,9 @@ Note that this implementation patches some methods in the `Paperclip::Attachment
 
 ## Compatibility
 
-Currently, paperclip 2.x (>= 2.5) and globalize3 0.3 are supported. Support for paperclip 3.x is planned.
+Currently, paperclip 3.x (>= 3.3) and globalize3 0.3 are supported.
+
+For paperclip 2.x support please use the 0.x versions of this gem.
 
 ## Installation
 
@@ -46,7 +48,6 @@ Example:
 
 ## Todo / Future Plans
 
-* Support paperclip 3.x
 * 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`

data/lib/paperclip-globalize3.rb

@@ -6,4 +6,8 @@ require "paperclip"
 
 Paperclip.interpolates(:locale) { |_, _| Globalize.locale.to_s }
 
+unless Paperclip::Attachment.instance_methods.include?(:only_process)
+  Paperclip::Attachment.send(:include, Paperclip::Globalize3::Attachment::Compatibility::Paperclip33)
+end
+
 Paperclip::Attachment.send(:include, Paperclip::Globalize3::Attachment)

data/lib/paperclip/globalize3/attachment.rb

@@ -4,94 +4,94 @@ module Paperclip
 
       def self.included(base)
         base.send :include, InstanceMethods
-        base.send :alias_method_chain, :instance_write, :globalize3
-        base.send :alias_method_chain, :instance_read, :globalize3
         base.send :alias_method_chain, :assign, :globalize3
         base.send :alias_method_chain, :clear, :globalize3
-        base.send :alias_method_chain, :queue_existing_for_delete, :globalize3
+        base.send :alias_method_chain, :queue_all_for_delete, :globalize3
+        base.send :alias_method_chain, :queue_some_for_delete, :globalize3
       end
 
       module InstanceMethods
 
-        # use a localized cache if required
-        def cached_instance_variable_name(getter)
-          if instance.respond_to?(:translated?) && instance.translated?(getter.to_sym)
-            :"@_#{getter}_#{Globalize.locale}"
-          else
-            :"@_#{getter}"
-          end
-        end
-
-        def instance_write_with_globalize3(attr, value)
-          setter = :"#{name}_#{attr}="
-          responds = instance.respond_to?(setter)
-          self.instance_variable_set(cached_instance_variable_name(setter.to_s.chop), value)
-          instance.send(setter, value) if responds || attr.to_s == "file_name"
-        end
-
-        def instance_read_with_globalize3(attr)
-          getter = :"#{name}_#{attr}"
-          responds = instance.respond_to?(getter)
-          cached = self.instance_variable_get(cached_instance_variable_name(getter))
-          return cached if cached
-          instance.send(getter) if responds || attr.to_s == "file_name"
-        end
-
         def assign_with_globalize3(uploaded_file)
           ensure_required_accessors!
+          file = Paperclip.io_adapters.for(uploaded_file)
 
-          if uploaded_file.is_a?(Paperclip::Attachment)
-            uploaded_filename = uploaded_file.original_filename
-            uploaded_file = uploaded_file.to_file(:original)
-            close_uploaded_file = uploaded_file.respond_to?(:close)
-          else
-            instance_write(:uploaded_file, uploaded_file) if uploaded_file
-          end
-
-          return nil unless valid_assignment?(uploaded_file)
+          self.clear(*only_process, :locales => Globalize.locale) # [paperclip-globalize3] only clear current locale
+          return nil if file.nil?
 
-          uploaded_file.binmode if uploaded_file.respond_to? :binmode
-          self.clear(Globalize.locale) # [paperclip-globalize3] only clear current locale
-
-          return nil if uploaded_file.nil?
-
-          uploaded_filename ||= uploaded_file.original_filename
-          stores_fingerprint             = @instance.respond_to?("#{name}_fingerprint".to_sym)
-          @queued_for_write[:original]   = to_tempfile(uploaded_file)
-          instance_write(:file_name,       cleanup_filename(uploaded_filename.strip))
-          instance_write(:content_type,    uploaded_file.content_type.to_s.strip)
-          instance_write(:file_size,       uploaded_file.size.to_i)
-          instance_write(:fingerprint,     generate_fingerprint(uploaded_file)) if stores_fingerprint
+          @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
 
-          post_process(*@options[:only_process]) if post_processing
+          if post_processing &&
+              (Paperclip::Attachment.instance_method(:valid_assignment?).parameters.present? || # paperclip <=3.3 compatibility
+                  valid_assignment?)
+            post_process(*only_process)
+          end
 
-          # Reset the file size if the original file was reprocessed.
-          instance_write(:file_size,   @queued_for_write[:original].size.to_i)
-          instance_write(:fingerprint, generate_fingerprint(@queued_for_write[:original])) if stores_fingerprint
-        ensure
-          uploaded_file.close if close_uploaded_file
+          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(with_locales = nil)
-          queue_existing_for_delete(with_locales)
-          @queued_for_write  = {}
-          @errors            = {}
+        def clear_with_globalize3(*args)
+          options = args.extract_options!
+          styles_to_clear = args
+          if styles_to_clear.any?
+            queue_some_for_delete(*styles_to_clear, options)
+          else
+            queue_all_for_delete(options)
+            @queued_for_write  = {}
+            @errors            = {}
+          end
         end
 
         private
 
-        def queue_existing_for_delete_with_globalize3(with_locales = nil) #:nodoc:
+        def queue_all_for_delete_with_globalize3(options = {}) #:nodoc:
+          with_locales_if_translated(options[:locales]) do
+            queue_all_for_delete_without_globalize3
+          end
+        end
+
+        def queue_some_for_delete_with_globalize3(*args)
+          options = args.extract_options!
+          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.
+        def with_locales_if_translated(with_locales = nil, &block)
           if instance.respond_to?(:translated_locales) && instance.translated?(:"#{name}_file_name")
-            # do it for the given locales only (or for all translated locales if none are given)
             # 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]) { queue_existing_for_delete_without_globalize3 }
+            Globalize.with_locales([*with_locales]) { yield }
           else
-            queue_existing_for_delete_without_globalize3
+            yield
+          end
+        end
+
+      end
+
+      module Compatibility
+
+        # For compatibility with paperclip 3.3
+        module Paperclip33
+          def only_process
+            only_process = @options[:only_process].dup
+            only_process = only_process.call(self) if only_process.respond_to?(:call)
+            only_process.map(&:to_sym)
           end
         end
 

data/lib/paperclip/globalize3/version.rb

@@ -1,5 +1,5 @@
 module Paperclip
   module Globalize3
-    VERSION = "0.1.0"
+    VERSION = "1.0.0"
   end
 end

data/paperclip-globalize3.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "paperclip", "~> 2.5"
+  spec.add_runtime_dependency "paperclip", "~> 3.3"
   spec.add_runtime_dependency "globalize3", "~> 0.3"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/spec/attachment_helper_spec.rb

@@ -10,12 +10,16 @@ describe 'Paperclip::Globalize3::Attachment' do
     Rails.stub(:const_defined?).with(:Railtie).and_return(false)
   end
 
+  let (:test_image_dir) do
+    File.expand_path(File.join(File.dirname(__FILE__), 'data'))
+  end
+
   let(:test_image_file) do
-    File.new(File.expand_path(File.join(File.dirname(__FILE__), 'data/test.png')))
+    File.new(File.join(test_image_dir,'test.png'))
   end
 
   let(:test_image_file2) do
-    File.new(File.expand_path(File.join(File.dirname(__FILE__), 'data/test2.png')))
+    File.new(File.join(test_image_dir, 'test2.png'))
   end
 
   context 'with translations' do
@@ -84,6 +88,20 @@ describe 'Paperclip::Globalize3::Attachment' do
       File.exist?(path_de).should be_false
     end
 
+    context 'with :only_process' do
+
+      it 'should only clear 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)
+
+        Globalize.with_locale(:en) do
+          p.update_attributes!(:image => test_image_file)
+        end
+      end
+
+    end
+
   end
 
   context 'without translations' do

data/spec/data/models.rb

@@ -1,10 +1,23 @@
-class Post < ActiveRecord::Base
+class BasePost < ActiveRecord::Base
+  self.table_name = 'posts'
+end
+
+class Post < BasePost
   has_attached_file :image,
                     :url => "/system/:class/:attachment/:id/:locale/:style-:fingerprint.:extension"
 
   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",
+                    :styles => { :thumb => "10x10", :large => "40x40" },
+                    :only_process => [:thumb]
+
+  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"

metadata

@@ -1,120 +1,137 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: paperclip-globalize3
-version: !ruby/object:Gem::Version
-  version: 0.1.0
+version: !ruby/object:Gem::Version 
+  hash: 23
+  prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 0
+  version: 1.0.0
 platform: ruby
-authors:
+authors: 
 - Maximilian Herold
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-05-07 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: paperclip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.5'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.5'
-- !ruby/object:Gem::Dependency
-  name: globalize3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.3'
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 3
+        - 3
+        version: "3.3"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: globalize3
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 3
+        version: "0.3"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: appraisal
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.5.1
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 1
+        - 3
+        version: "1.3"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: appraisal
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 5
+        - 1
         version: 0.5.1
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.8.0
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
         version: 2.8.0
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: sqlite3
   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'
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
 description: locale-specific attachments with paperclip and globalize3
-email:
+email: 
 - herold@emjot.de
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rspec
 - .travis.yml
@@ -137,33 +154,43 @@ files:
 - spec/data/test2.png
 - spec/spec_helper.rb
 homepage: https://github.com/emjot/paperclip-globalize3
-licenses:
+licenses: 
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+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'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.15
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: locale-specific attachments with paperclip and globalize3
-test_files:
+test_files: 
 - spec/attachment_helper_spec.rb
 - spec/data/models.rb
 - spec/data/schema.rb
 - spec/data/test.png
 - spec/data/test2.png
 - spec/spec_helper.rb
+has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    Y2FmNjZlMGNjMGNkNzg4MDZkNGEwMDI4MmI4M2UzN2ZmZjA5NGYzZg==
-  data.tar.gz: !binary |-
-    NmI0ZTc1OGZmMjBiZDhjYjJlY2JlMDBmMDgzZGQ0ZmMzNjc5YTI4Zg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    MjE1ODcxNzc0MjA4MDNkOGRiNjQyMmM1Yzc0OGExOTNiNTYxOWIyNmI1ZDZi
-    NjY1ZmY1YTQ4NjYwNmFhNmEyOWM2MGE4OTU0ZDQ4NTAyYzJhMDk1YjhhN2Zi
-    ZDU5NDY4ZTc3YjJiMzZiMjdkYWI3MzQzOGY1MDUzYWRjNDI1MWI=
-  data.tar.gz: !binary |-
-    YTBmZTU2ZGNlM2JjOTAzZWY0ZDg0Y2NmMWYxZTAxZjc0MDA3OGQ2NzAxOWRl
-    NTE3ZWQxOTlhYmI4NzZmNDY5NWNjNzA4ZDA1ODIwY2MzN2U1MTQzNDYwNDQx
-    ODFiZDE1MmJhZDg4YzZlNTM5OTc0YThiYmJhYTFlOGU2YzkyOTU=