paperclip-dimension 0.2.1 → 0.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZmMwOTI0YTdlNWJkODUwMDczM2FjMDZlMTUyYzIwMDRlZmMzMTViMA==
-  data.tar.gz: !binary |-
-    ZWI5ZTc3NGNiNWM0MTRlNjM4MGI0NDYzMGEzNjM0MmU4NTJhZDRmYQ==
+SHA1:
+  metadata.gz: 7121833dd0fe9f1b3db0c6ff4022a16d9456bd2c
+  data.tar.gz: 479db6c06ebb406319523c948245112767cfae10
 SHA512:
-  metadata.gz: !binary |-
-    NDYyNDBjY2E4Yzg4OGUyM2RjNGViMmRlZWZkYWRkYWY5NDQ2OGY5OWZlY2Nj
-    M2Q3N2M0ZTY0YmQ0M2Q4Njk3ZjdjODA1NjBkY2Q3YzQ0Nzg2ZDg1YTE1Nzgy
-    ZmVmMjhjNzUzYjk2ZTcwNDljNmE3OTU2ZDA5NjUxMzAyZTdjYzc=
-  data.tar.gz: !binary |-
-    ZTAzMDUzZGQ2YjAxZDZjMTkyZjM2OTdjNjEyNTUyYjk3ZjA0NGQ1NTBhMDQ4
-    Y2U2ZTIxZDhjZGMxNzUxOTY2MzJlZGVkNTNjMDJiODk2NzVmN2EyY2FjYzZk
-    NjcyN2RlNGVkNWQ4N2Q1YjdmYWM1MTYxNDE2M2IwNGRmYmYyZWY=
+  metadata.gz: 7ea2c5a35ded79db2784da8a8d405802418858c9b4638f76bfc9838dba6bba6d2e17b0f4b3d102b1d7e9693b1a7fe0a6a93b24a5cfe87ead081559fe3a965170
+  data.tar.gz: a4c980107021aeb1cb2224a96ab8ceda12126491265612c84c8473558f87993f5ca7a5580f2f45cd19d9ee9a54c9709c100159a21808408f3d3801efd021f70c

data/lib/paperclip-dimension.rb

@@ -32,19 +32,11 @@ module Paperclip
     end
 
     def save_dimensions_for(name)
-      if self.class.respond_to?(:attachment_definitions)
-        # for Paperclip version <= 3.4.2 and >= 3.5.1
-        opts = self.class.attachment_definitions[name]
-      else
-        # for Paperclip version 3.5.0
-        opts = ::Paperclip::Tasks::Attachments.definitions_for(self.class)[name]
-      end
-
-      styles = [:original]
-      styles += opts[:styles].keys if opts[:styles]
       dimension_hash = {}
+      attachment = self.send(name)
+      styles = [:original]
+      styles += attachment.styles.keys if attachment.styles
       styles.each do |style|
-        attachment = self.send name
         geo = ::Paperclip::Geometry.from_file(attachment.queued_for_write[style])
         dimension_hash[style.to_s] = [ geo.width.to_i, geo.height.to_i ]
       end

data/lib/version.rb

@@ -1,6 +1,6 @@
 
 module Paperclip
   module Dimension
-    VERSION = '0.2.1'
+    VERSION = '0.3.0'.freeze
   end
 end

data/spec/paperclip-dimension_spec.rb

@@ -3,50 +3,64 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe Paperclip::Dimension do
   before(:each) do
     @p = Post.create!({
-     :image =>File.open(File.dirname(__FILE__) + '/ruby.png'),
-     :another_image => File.open(File.dirname(__FILE__) + '/ruby.png'),
-     :image_no_styles => File.open(File.dirname(__FILE__) + '/ruby.png')
+        :image => File.open(File.dirname(__FILE__) + '/ruby.png'),
+        :another_image => File.open(File.dirname(__FILE__) + '/ruby.png'),
+        :image_with_proc => File.open(File.dirname(__FILE__) + '/ruby.png'),
+        :image_no_styles => File.open(File.dirname(__FILE__) + '/ruby.png')
     })
     @p.reload
   end
 
   it "should save dimensions" do
-    @p.image_dimensions.should_not be_nil
-    @p.another_image_dimensions.should_not be_nil
-    @p.image_no_styles_dimensions.should_not be_nil
+    expect(@p.image_dimensions).to_not eq nil
+    expect(@p.another_image_dimensions).to_not eq nil
+    expect(@p.image_with_proc).to_not eq nil
+    expect(@p.image_no_styles_dimensions).to_not eq nil
   end
 
   it "should accept empty styles hash" do
-    @p.image_no_styles_dimension.should  == [995, 996]
-    @p.image_no_styles_dimension(:original).should == [995, 996]
-    @p.image_no_styles_dimension(:large).should be_nil
+    expect(@p.image_no_styles_dimension).to eq [995, 996]
+    expect(@p.image_no_styles_dimension(:original)).to eq [995, 996]
+    expect(@p.image_no_styles_dimension(:large)).to eq nil
   end
 
-  it "should retreive dimensions correctly" do
-    @p.image_dimension.should == [995, 996]
-    @p.image_dimension(:original).should == [995, 996]
-    @p.image_dimension(:large).should == [350, 350]
-    @p.image_dimension(:medium).should == [150, 150]
-    @p.image_dimension(:small).should == [30, 30]
-
-    @p.another_image_dimension.should == [995, 996]
-    @p.another_image_dimension(:original).should == [995, 996]
-    @p.another_image_dimension(:large).should == [350, 350]
-    @p.another_image_dimension(:medium).should == [150, 150]
-    @p.another_image_dimension(:small).should == [30, 30]
+  it "should retrieve dimensions correctly" do
+    expect(@p.image_dimension).to eq [995, 996]
+    expect(@p.image_dimension(:original)).to eq [995, 996]
+    expect(@p.image_dimension(:large)).to eq [350, 350]
+    expect(@p.image_dimension(:medium)).to eq [150, 150]
+    expect(@p.image_dimension(:small)).to eq [30, 30]
+
+    expect(@p.another_image_dimension).to eq [995, 996]
+    expect(@p.another_image_dimension(:original)).to eq [995, 996]
+    expect(@p.another_image_dimension(:large)).to eq [350, 350]
+    expect(@p.another_image_dimension(:medium)).to eq [150, 150]
+    expect(@p.another_image_dimension(:small)).to eq [30, 30]
+
+    expect(@p.image_with_proc_dimension).to eq [995, 996]
+    expect(@p.image_with_proc_dimension(:original)).to eq [995, 996]
+    expect(@p.image_with_proc_dimension(:large)).to eq [350, 350]
+    expect(@p.image_with_proc_dimension(:medium)).to eq [150, 150]
+    expect(@p.image_with_proc_dimension(:small)).to eq [30, 30]
   end
 
-  it "should retreive dimension strings correctly" do
-    @p.image_dimension_str.should == "995x996"
-    @p.image_dimension_str(:original).should == "995x996"
-    @p.image_dimension_str(:large).should == "350x350"
-    @p.image_dimension_str(:medium).should == "150x150"
-    @p.image_dimension_str(:small).should == "30x30"
-
-    @p.another_image_dimension_str.should == "995x996"
-    @p.another_image_dimension_str(:original).should == "995x996"
-    @p.another_image_dimension_str(:large).should == "350x350"
-    @p.another_image_dimension_str(:medium).should == "150x150"
-    @p.another_image_dimension_str(:small).should == "30x30"
+  it "should retrieve dimension strings correctly" do
+    expect(@p.image_dimension_str).to eq "995x996"
+    expect(@p.image_dimension_str(:original)).to eq "995x996"
+    expect(@p.image_dimension_str(:large)).to eq "350x350"
+    expect(@p.image_dimension_str(:medium)).to eq "150x150"
+    expect(@p.image_dimension_str(:small)).to eq "30x30"
+
+    expect(@p.another_image_dimension_str).to eq "995x996"
+    expect(@p.another_image_dimension_str(:original)).to eq "995x996"
+    expect(@p.another_image_dimension_str(:large)).to eq "350x350"
+    expect(@p.another_image_dimension_str(:medium)).to eq "150x150"
+    expect(@p.another_image_dimension_str(:small)).to eq "30x30"
+
+    expect(@p.image_with_proc_dimension_str).to eq "995x996"
+    expect(@p.image_with_proc_dimension_str(:original)).to eq "995x996"
+    expect(@p.image_with_proc_dimension_str(:large)).to eq "350x350"
+    expect(@p.image_with_proc_dimension_str(:medium)).to eq "150x150"
+    expect(@p.image_with_proc_dimension_str(:small)).to eq "30x30"
   end
 end

data/spec/spec_helper.rb

@@ -43,6 +43,7 @@ ActiveRecord::Schema.define do
   create_table :posts do |t|
     t.attachment :image
     t.attachment :another_image
+    t.attachment :image_with_proc
     t.attachment :image_no_styles
   end
 end
@@ -50,19 +51,30 @@ end
 # define model
 class Post < ActiveRecord::Base
   extend Paperclip::Dimension::ClassMethods
+
   has_attached_file :image, :styles => {
-    :large    =>    ['350x350>',     :jpg],
-    :medium   =>    ['150x150>',     :jpg],
-    :small    =>    ['30x30>',       :jpg]
+    :large  => ['350x350>', :jpg],
+    :medium => ['150x150>', :jpg],
+    :small  => ['30x30>',   :jpg]
   }
 
   has_attached_file :another_image, :styles => {
-    :large    =>    ['350x350>',     :jpg],
-    :medium   =>    ['150x150>',     :jpg],
-    :small    =>    ['30x30>',       :jpg]
+    :large  =>  ['350x350>', :jpg],
+    :medium => ['150x150>', :jpg],
+    :small  => ['30x30>',   :jpg]
   }
 
-  has_attached_file :image_no_styles
-end
+  has_attached_file :image_with_proc, :styles => Proc.new { |obj|
+    {
+        :large  => ['350x350>', :jpg],
+        :medium => ['150x150>', :jpg],
+        :small  => ['30x30>',   :jpg]
+    }
+  }
 
+  has_attached_file :image_no_styles
 
+  %i(image another_image image_with_proc image_no_styles).each do |field|
+    validates_attachment_content_type field, :content_type => ['image/png']
+  end
+end

metadata

@@ -1,133 +1,110 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-dimension
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Aaron Qian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2016-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          My4w
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: !binary |-
-          My4w
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   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: 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: rspec
   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: yard
+  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
-  name: bundler
+  name: gem-release
   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: jeweler
-  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'
 description: A simple plugin to persist image dimensions.
-email: aq1018@gmail.com
+email:
+- aq1018@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- LICENSE.txt
-- README.md
+extra_rdoc_files: []
 files:
-- .document
-- .rspec
-- Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
-- Rakefile
-- VERSION
 - lib/paperclip-dimension.rb
 - lib/version.rb
-- paperclip-dimension.gemspec
 - spec/paperclip-dimension_spec.rb
 - spec/ruby.png
 - spec/spec_helper.rb
@@ -141,18 +118,21 @@ 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.1.8
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: A simple plugin to persist image dimensions.
-test_files: []
+test_files:
+- spec/paperclip-dimension_spec.rb
+- spec/ruby.png
+- spec/spec_helper.rb

data/.document

@@ -1,5 +0,0 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/.rspec

@@ -1 +0,0 @@
---color

data/Gemfile

@@ -1,14 +0,0 @@
-source 'http://rubygems.org'
-
-gem "paperclip", '>= 3.0'
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  gem 'activerecord'
-  gem 'sqlite3'
-  gem 'rspec'
-  gem 'yard'
-  gem 'bundler'
-  gem 'jeweler'
-end

data/Rakefile

@@ -1,42 +0,0 @@
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
-require 'version'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  gem.name = "paperclip-dimension"
-  gem.homepage = "http://github.com/aq1018/paperclip-dimension"
-  gem.license = "MIT"
-  gem.summary = %Q{A simple plugin to persist image dimensions.}
-  gem.description = %Q{A simple plugin to persist image dimensions.}
-  gem.email = "aq1018@gmail.com"
-  gem.authors = ["Aaron Qian"]
-  gem.version = Paperclip::Dimension::VERSION
-
-  # this directory is generated by running the test, and should be ignored...
-  gem.files.exclude 'public'
-end
-
-Jeweler::RubygemsDotOrgTasks.new
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-  spec.rspec_opts = "--color --format progress"
-end
-
-task :default => :spec
-
-require 'yard'
-YARD::Rake::YardocTask.new

data/VERSION

@@ -1 +0,0 @@
-0.2.0

data/paperclip-dimension.gemspec

@@ -1,71 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-# stub: paperclip-dimension 0.2.1 ruby lib
-
-Gem::Specification.new do |s|
-  s.name = "paperclip-dimension"
-  s.version = "0.2.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Aaron Qian"]
-  s.date = "2013-10-14"
-  s.description = "A simple plugin to persist image dimensions."
-  s.email = "aq1018@gmail.com"
-  s.extra_rdoc_files = [
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    ".rspec",
-    "Gemfile",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "lib/paperclip-dimension.rb",
-    "lib/version.rb",
-    "paperclip-dimension.gemspec",
-    "spec/paperclip-dimension_spec.rb",
-    "spec/ruby.png",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = "http://github.com/aq1018/paperclip-dimension"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.1.8"
-  s.summary = "A simple plugin to persist image dimensions."
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<paperclip>, [">= 3.0"])
-      s.add_development_dependency(%q<activerecord>, [">= 0"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-    else
-      s.add_dependency(%q<paperclip>, [">= 3.0"])
-      s.add_dependency(%q<activerecord>, [">= 0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<paperclip>, [">= 3.0"])
-    s.add_dependency(%q<activerecord>, [">= 0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-  end
-end
-