paperclip-globalize3 1.0.0 → 1.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZTJlOTRhNDE3Y2NiNDNkZTY0OTI0M2M3ZDUzNzc5YmRlMTZmNDM4Zg==
+  data.tar.gz: !binary |-
+    MmNmZjBhMjMzYjY3ZTQ0NDQ2YjA1MThmNmRlOTk4ZjJmOGU3NDk5ZQ==
+SHA512:
+  metadata.gz: !binary |-
+    ZTIwYWMwYTdlZTZmNjFiYTA5MWNhMzhlMmZkM2Y2MmY2ODM2MmZmOGQ1ZmRl
+    Yjg4M2UyMDRmMTk4N2FkYmM4OTQzMzA0ODg2OTM1M2MyN2QxMTYwMmZiOGFj
+    NGVkYTQxYzE2NTRmN2YzYzE0YzI1N2JjMTEwOGNiMTRmNzc1YjI=
+  data.tar.gz: !binary |-
+    MThkODE3ZTYxMjI1NzYxOGVkYzlmMGViMjVhNGZlOGE1OTgwNzQ1ZWM0MmFi
+    NzgzZDAyMTkxMmNhYzliYTBkMzViZTdhNmQxZjM5MDFjN2RiMjI3ZDEwMmEy
+    NjlkMTAyMjYxNzI2MzNjZjFmMGQyMDRlYmM5NzcxOWI0ODI2Mzg=

data/.travis.yml

@@ -2,6 +2,9 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+env:
+  - PAPERCLIP_VERSION="3.4.0"
+  - PAPERCLIP_VERSION="~> 3.4"
 script: "bundle exec rake spec"
 gemfile:
   - gemfiles/rails_3.0.gemfile

data/README.md

@@ -1,6 +1,6 @@
 # Paperclip::Globalize3
 
-[![Build Status](https://travis-ci.org/emjot/paperclip-globalize3.png?branch=master)](https://travis-ci.org/emjot/paperclip-globalize3)
+[![Build Status](https://travis-ci.org/emjot/paperclip-globalize3.png?branch=1.x-stable)](https://travis-ci.org/emjot/paperclip-globalize3)
 
 Use locale-specific attachments in your Rails app with paperclip and globalize3.
 
@@ -10,7 +10,7 @@ Note that this implementation patches some methods in the `Paperclip::Attachment
 
 ## Compatibility
 
-Currently, paperclip 3.x (>= 3.3) and globalize3 0.3 are supported.
+This is a maintenance branch for paperclip 3.x support. Currently, paperclip 3.x (>= 3.4) and globalize3 0.3 are supported.
 
 For paperclip 2.x support please use the 0.x versions of this gem.
 
@@ -18,7 +18,7 @@ For paperclip 2.x support please use the 0.x versions of this gem.
 
 Add this line to your application's Gemfile:
 
-    gem 'paperclip-globalize3'
+    gem 'paperclip-globalize3', '~> 1.1.0'
 
 And then execute:
 

data/Rakefile

@@ -1,9 +1,8 @@
 require 'bundler/setup'
+require 'paperclip/globalize3/gem_tasks'
 require 'appraisal'
 require 'rspec/core/rake_task'
 
-require 'bundler/gem_tasks'
-
 desc 'Default: run all tests with all supported versions'
 task :default => :all
 

data/lib/paperclip-globalize3.rb

@@ -6,8 +6,4 @@ 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

@@ -16,6 +16,7 @@ module Paperclip
           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?
 
@@ -30,8 +31,7 @@ module Paperclip
           @dirty = true
 
           if post_processing &&
-              (Paperclip::Attachment.instance_method(:valid_assignment?).parameters.present? || # paperclip <=3.3 compatibility
-                  valid_assignment?)
+              (file.respond_to?(:assignment?) || valid_assignment?)
             post_process(*only_process)
           end
 
@@ -84,19 +84,6 @@ module Paperclip
 
       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
-
-      end
-
     end
   end
 end

data/lib/paperclip/globalize3/gem_helper.rb

@@ -0,0 +1,15 @@
+module Paperclip
+  module Globalize3
+
+    # Like Bundler::GemHelper, but tags versions without the 'v' prefix (e.g. '1.0.0' instead of 'v1.0.0')
+    class GemHelper < Bundler::GemHelper
+
+      protected
+
+      def version_tag
+        "#{version}"
+      end
+
+    end
+  end
+end

data/lib/paperclip/globalize3/gem_tasks.rb

@@ -0,0 +1,2 @@
+require 'paperclip/globalize3/gem_helper'
+Paperclip::Globalize3::GemHelper.install_tasks

data/lib/paperclip/globalize3/version.rb

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

data/paperclip-globalize3.gemspec

@@ -3,6 +3,11 @@ 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
@@ -18,7 +23,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", "~> 3.3"
+  spec.add_runtime_dependency "paperclip", paperclip_version
   spec.add_runtime_dependency "globalize3", "~> 0.3"
 
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,137 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: paperclip-globalize3
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+version: !ruby/object:Gem::Version
+  version: 1.1.0
 platform: ruby
-authors: 
+authors:
 - Maximilian Herold
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-07 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-09-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: paperclip
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 3
-        version: "3.3"
+      - !ruby/object:Gem::Version
+        version: '3.3'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: globalize3
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.3'
+- !ruby/object:Gem::Dependency
+  name: globalize3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 3
-        version: "0.3"
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: appraisal
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 5
-        - 1
+      - !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
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
+      - !ruby/object:Gem::Version
+        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: *id005
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        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: *id006
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  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
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: locale-specific attachments with paperclip and globalize3
-email: 
+email:
 - herold@emjot.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -145,6 +128,8 @@ files:
 - gemfiles/rails_3.2.gemfile
 - lib/paperclip-globalize3.rb
 - lib/paperclip/globalize3/attachment.rb
+- lib/paperclip/globalize3/gem_helper.rb
+- lib/paperclip/globalize3/gem_tasks.rb
 - lib/paperclip/globalize3/version.rb
 - paperclip-globalize3.gemspec
 - spec/attachment_helper_spec.rb
@@ -154,43 +139,33 @@ 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 
-  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"
+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: 1.8.15
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 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: