paperclip-meta 0.6.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aabd2e01ad47d7f22e378b79e409a9798a4778c9
-  data.tar.gz: 9ea6f76f9f3fcd8aec42555ece5570363d4f7f78
+  metadata.gz: 26f6874af5f0ccd6241f7bfb4377733e5ac3c0a3
+  data.tar.gz: 0fec2a2421336b03906be6ed5e8ddcf738fa744e
 SHA512:
-  metadata.gz: 85a9971fd625ad0efc89959e6e04663dd1fabe2f079bfdaaa867913cac834a60a3609713da04d06ed464fecc5fe61528a6d00b4039a14232f522a4e8409e9d03
-  data.tar.gz: 880f048a350568ec742879385ea8c1559648c78cc74909a2124d510b2e1568edfd6475a9b59e75257649843af392330adc3f0cd201a39fa27ff07a32aa3d19c9
+  metadata.gz: c9309a1f582b6065ea645b3baa731c2a554b4f3ff13efeb21c6daaba00bbb6deab35376545b184e089cc3658812b6f20b5e3fa83a1dd808e65a6710f478efd3d
+  data.tar.gz: 750638ff3e27067e02adc6782643d3fe83d64afd4100ee6b685846204dc02442c7e2b4982d896a95e1a0649cf7ed3ffe6ecc2131ed7432325f14a7995d922911

data/.gitignore

@@ -3,4 +3,5 @@
 .rvmrc
 Gemfile.lock
 pkg/*
+spec/gemfiles/*.lock
 spec/tmp/*/**

data/.travis.yml

@@ -3,3 +3,6 @@ rvm:
   - 2.0.0
   - 2.1.0
   - rbx
+gemfile:
+  - spec/gemfiles/Gemfile.paperclip-3
+  - spec/gemfiles/Gemfile.paperclip-4

data/README.md

@@ -7,6 +7,8 @@ Add width, height, and size to paperclip images.
 
 Paperclip Meta gets image dimensions after `post_process_styles` using paperclip's `Geometry.from_file`.
 
+Paperclip Meta works with paperclip versions 3.x and 4.x.
+
 ### Setup
 
 Add paperclip-meta to Gemfile:
@@ -65,3 +67,26 @@ You can pass the image style to these methods. If a style is not passed, the def
 ### Alternatives
 
 https://github.com/thoughtbot/paperclip/wiki/Extracting-image-dimensions
+
+### Development
+
+Test:
+
+```sh
+bundle
+rake
+```
+
+Test paperclip 3.x:
+
+```sh
+BUNDLE_GEMFILE=./spec/gemfiles/Gemfile.paperclip-3 bundle
+BUNDLE_GEMFILE=./spec/gemfiles/Gemfile.paperclip-3 rake
+```
+
+Test paperclip 4.x:
+
+```sh
+BUNDLE_GEMFILE=./spec/gemfiles/Gemfile.paperclip-4 bundle
+BUNDLE_GEMFILE=./spec/gemfiles/Gemfile.paperclip-4 rake
+```

data/Rakefile

@@ -1,7 +1,10 @@
 require 'bundler/gem_tasks'
-require 'rspec/core'
-require 'rspec/core/rake_task'
+require 'rake/testtask'
 
-RSpec::Core::RakeTask.new(:spec)
+Rake::TestTask.new(:spec) do |t|
+  t.libs << 'spec'
+  t.test_files = %w(spec/**/*_spec.rb)
+  t.verbose = false
+end
 
 task default: :spec

data/lib/paperclip-meta/version.rb

@@ -1,5 +1,5 @@
 module Paperclip
   module Meta
-    VERSION = "0.6.0"
+    VERSION = "1.0.0"
   end
 end

data/paperclip-meta.gemspec

@@ -18,11 +18,12 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 1.9.3"
 
-  s.add_dependency "paperclip", "~> 3.0"
+  s.add_dependency "paperclip", ">= 3.0.2", "< 5.0"
 
   s.add_development_dependency "bundler", "~> 1.5"
   s.add_development_dependency "rake", "~> 10.1"
-  s.add_development_dependency "rspec", "~> 2.14"
+  s.add_development_dependency "minitest", "~> 4.7"
+  s.add_development_dependency "mocha", "~> 1.0"
   s.add_development_dependency "activerecord", "~> 4.0"
   s.add_development_dependency "sqlite3", "~> 1.3"
 end

data/spec/{paperclip-meta/paperclip-meta_spec.rb → attachment_spec.rb}

@@ -5,14 +5,14 @@ describe "Attachment" do
     img = Image.create(small_image: small_image)
     img.reload
     geometry = geometry_for(small_path)
-    img.small_image.width.should == geometry.width
-    img.small_image.height.should == geometry.height
+    assert_equal geometry.width, img.small_image.width
+    assert_equal geometry.height, img.small_image.height
   end
 
   it "saves geometry for styles" do
     img = Image.create(small_image: small_image, big_image: big_image)
-    img.big_image.width(:thumb).should == 100
-    img.big_image.height(:thumb).should == 100
+    assert_equal 100, img.big_image.width(:thumb)
+    assert_equal 100, img.big_image.height(:thumb)
   end
 
   it "sets geometry on update" do
@@ -20,8 +20,8 @@ describe "Attachment" do
     img.small_image = small_image
     img.save
     geometry = geometry_for(small_path)
-    img.small_image.width.should == geometry.width
-    img.small_image.height.should == geometry.height
+    assert_equal geometry.width, img.small_image.width
+    assert_equal geometry.height, img.small_image.height
   end
 
   describe 'file size' do
@@ -30,42 +30,48 @@ describe "Attachment" do
     end
 
     it 'should save file size with meta data ' do
-      path = File.join(File.dirname(__FILE__), "../tmp/fixtures/tmp/thumb/#{@image.id}.jpg")
+      path = File.join(File.dirname(__FILE__), "tmp/fixtures/tmp/thumb/#{@image.id}.jpg")
       size = File.stat(path).size
-      @image.big_image.size(:thumb).should == size
+      assert_equal size, @image.big_image.size(:thumb)
     end
 
     it 'should access normal paperclip method when no style passed' do
-      @image.big_image.should_receive(:size_without_meta_data).once.and_return(1234)
-      @image.big_image.size.should == 1234
+      @image.big_image.expects size_without_meta_data: 1234
+      assert_equal 1234, @image.big_image.size
     end
 
     it 'should have access to original file size' do
-      @image.big_image.size.should == 37042
+      assert_equal 37042, @image.big_image.size
     end
   end
 
   it "clears geometry fields when image is destroyed" do
     img = Image.create(small_image: small_image, big_image: big_image)
-    img.big_image.width(:thumb).should == 100
-
+    assert_equal 100, img.big_image.width(:thumb)
     img.big_image = nil
     img.save!
-
-    img.big_image.width(:thumb).should be_nil
+    assert_nil img.big_image.width(:thumb)
   end
 
-  it "does not fails when file is not an image" do
+  it "does not save when file is not an image" do
     img = Image.new
     img.small_image = not_image
-    -> { img.save! }.should_not raise_error
-    img.small_image.width(:thumb).should be_nil
+    refute img.save
+    assert_nil img.small_image.width
+  end
+
+  it "returns nil attributes when file is not an image" do
+    img = ImageWithNoValidation.new
+    img.small_image = not_image
+    img.save!
+    assert_nil img.small_image.width
+    assert_nil img.small_image.height
   end
 
   private
 
   def small_path
-    File.join(File.dirname(__FILE__), '..', 'fixtures', 'small.png')
+    File.join(File.dirname(__FILE__), 'fixtures', 'small.png')
   end
 
   def small_image
@@ -77,10 +83,10 @@ describe "Attachment" do
   end
 
   def big_image
-    File.open(File.join(File.dirname(__FILE__), '..', 'fixtures', 'big.jpg'))
+    File.open(File.join(File.dirname(__FILE__), 'fixtures', 'big.jpg'))
   end
 
   def not_image
-    File.open(File.join(File.dirname(__FILE__), '..', 'fixtures', 'big.zip'))
+    File.open(File.join(File.dirname(__FILE__), 'fixtures', 'big.zip'))
   end
 end

data/spec/gemfiles/Gemfile.paperclip-3

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+end
+
+platforms :rbx do
+  gem 'json'
+  gem 'rubysl', '~> 2.0'
+end
+
+# See paperclip-meta.gemspec
+gemspec path: '../..'
+
+gem 'paperclip', '~> 3.5'

data/spec/gemfiles/Gemfile.paperclip-4

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+end
+
+platforms :rbx do
+  gem 'json'
+  gem 'rubysl', '~> 2.0'
+end
+
+# See paperclip-meta.gemspec
+gemspec path: '../..'
+
+gem 'paperclip', '~> 4.0'

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 require 'bundler/setup'
 Bundler.require(:default)
-require "active_record"
+require 'active_record'
+require 'minitest/autorun'
+require 'mocha/setup'
 
 ActiveRecord::Base.establish_connection(
   adapter: "sqlite3",
@@ -18,15 +20,34 @@ load(File.join(File.dirname(__FILE__), 'schema.rb'))
 ActiveRecord::Base.send(:include, Paperclip::Glue)
 Paperclip::Meta::Railtie.insert
 
+I18n.enforce_available_locales = true
+
 class Image < ActiveRecord::Base
   has_attached_file :small_image,
-    :storage => :filesystem,
-    :path => "./spec/tmp/:style/:id.:extension",
-    :url => "./spec/tmp/:style/:id.extension"
+    storage: :filesystem,
+    path: "./spec/tmp/:style/:id.:extension",
+    url: "./spec/tmp/:style/:id.extension"
 
   has_attached_file :big_image,
-    :storage => :filesystem,
-    :path => "./spec/tmp/fixtures/tmp/:style/:id.:extension",
-    :url => "./spec/tmp/fixtures/tmp/:style/:id.extension",
-    :styles => { :thumb => "100x100#" }
+    storage: :filesystem,
+    path: "./spec/tmp/fixtures/tmp/:style/:id.:extension",
+    url: "./spec/tmp/fixtures/tmp/:style/:id.extension",
+    styles: { thumb: "100x100#" }
+
+  # paperclip 4.0 requires a validator
+  validates_attachment_content_type :small_image, content_type: /\Aimage/
+  validates_attachment_content_type :big_image, content_type: /\Aimage/
+end
+
+class ImageWithNoValidation < ActiveRecord::Base
+  self.table_name = :images
+
+  has_attached_file :small_image,
+    storage: :filesystem,
+    path: "./spec/tmp/:style/:id.:extension",
+    url: "./spec/tmp/:style/:id.extension"
+
+  if Paperclip::VERSION >= "4.0"
+    do_not_validate_attachment_file_type :small_image
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-meta
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Alexey Bondar
@@ -9,22 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.2
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -54,19 +60,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.7'
+- !ruby/object:Gem::Dependency
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.14'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -115,10 +135,12 @@ files:
 - lib/paperclip-meta/railtie.rb
 - lib/paperclip-meta/version.rb
 - paperclip-meta.gemspec
+- spec/attachment_spec.rb
 - spec/fixtures/big.jpg
 - spec/fixtures/big.zip
 - spec/fixtures/small.png
-- spec/paperclip-meta/paperclip-meta_spec.rb
+- spec/gemfiles/Gemfile.paperclip-3
+- spec/gemfiles/Gemfile.paperclip-4
 - spec/schema.rb
 - spec/spec_helper.rb
 homepage: http://github.com/teeparham/paperclip-meta
@@ -145,9 +167,11 @@ signing_key:
 specification_version: 4
 summary: Add width, height, and size to paperclip images
 test_files:
+- spec/attachment_spec.rb
 - spec/fixtures/big.jpg
 - spec/fixtures/big.zip
 - spec/fixtures/small.png
-- spec/paperclip-meta/paperclip-meta_spec.rb
+- spec/gemfiles/Gemfile.paperclip-3
+- spec/gemfiles/Gemfile.paperclip-4
 - spec/schema.rb
 - spec/spec_helper.rb