paperclip-dimension-validator 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 906f02c9a9c4f39db7f1879384f3298a601a85f9
-  data.tar.gz: e7e839d102a9fa317f581df4c535694b2a969924
+  metadata.gz: 3eadc6df06e33aa0236d1b139f63eafb0cb13391
+  data.tar.gz: d56a47f5c0ee1dc3d4118653577620f1a812cb04
 SHA512:
-  metadata.gz: e8091b1070e2dc328a16af634ad5e27e7e3cff1bb3788768c11e4166b170b481389ed79ac34ee695c9575cbcea806b8b5ac80750fb3b0697b1e1f1fa5851a22f
-  data.tar.gz: c41e2458e21aa273e0a9a9ffe8ae6b5eae0600a07ae6dc6a4c16e5f1bc8bbb789e838f34873696dc9e2e5801053bac4eb3c8a8a4eec5d8dce5d3558563e82746
+  metadata.gz: 3b230d0edef2aaa22c8d5f1711dee58a19e7ce5bcb538cf236931ad87c6bdb16b0e99b6a7eb5f2c0018695f6ffa0afc4a1e215feb65275edf785a23dc1a19e62
+  data.tar.gz: c9ba385711d79e7759f4052e22c0d1edbf5ef690fc4738a0bfbcb8451295dbdf41ec4caf46cded6ce4fc384eaca72f3fab83274eaf9ed0d1b60d0709be55f065

data/lib/paperclip/matchers/validate_attachment_dimensions_matcher.rb

@@ -0,0 +1,92 @@
+require 'tempfile'
+
+module Paperclip
+  module Shoulda
+    module Matchers
+      def validate_attachment_dimensions(name)
+        ValidateAttachmentDimensionsMatcher.new(name)
+      end
+
+      class ValidateAttachmentDimensionsMatcher
+        def initialize(attachment_name)
+          unless defined?(ChunkyPNG)
+            puts 'WARNING: Add chunky_png or oily_png to your Gemfile to use paperclip dimension matchers'
+          end
+
+          @attachment_name = attachment_name
+        end
+
+        def height(height)
+          @height = height
+          self
+        end
+
+        def width(width)
+          @width = width
+          self
+        end
+
+        def matches?(subject)
+          @subject = subject
+          @subject = @subject.new if @subject.class == Class
+          shorter_than_height? && taller_than_height? && smaller_than_width? && larger_than_width?
+        end
+
+        def failure_message
+          message = "Attachment #{@attachment_name} must have"
+          message += " a height of #{@height}px" if @height
+          message += " and" if @height && @width
+          message += " a width of #{@width}px" if @width
+        end
+
+        def failure_message_when_negated
+          message = "Attachment #{@attachment_name} cannot have"
+          message += " a height of #{@height}px" if @height
+          message += " and" if @height && @width
+          message += " a width of #{@width}px" if @width
+        end
+        alias negative_failure_message failure_message_when_negated
+
+        def description
+          "validate width and height in pixels for attachment #{@attachment_name}"
+        end
+
+        protected
+        def validation_with_height(height)
+          @subject.send(@attachment_name).assign(generate_png(height, @width))
+          @subject.valid?
+          @subject.errors[@attachment_name].include?("must have a height of #{@height}px was #{height}px")
+        end
+
+        def validation_with_width(width)
+          @subject.send(@attachment_name).assign(generate_png(@height, width))
+          @subject.valid?
+          @subject.errors[@attachment_name].include?("must have a width of #{@width}px was #{width}px")
+        end
+
+        def shorter_than_height?
+          @height.nil? || validation_with_height(@height - 1)
+        end
+
+        def taller_than_height?
+          @height.nil? || validation_with_height(@height + 1)
+        end
+
+        def smaller_than_width?
+          @width.nil? || validation_with_width(@width - 1)
+        end
+
+        def larger_than_width?
+          @width.nil? || validation_with_width(@width + 1)
+        end
+
+        def generate_png(height, width)
+          file = Tempfile.new([Time.now.to_i.to_s, '.png'])
+          file.binmode
+          ChunkyPNG::Image.new(width || 1, height || 1, ChunkyPNG::Color('black')).save(file.path)
+          file
+        end
+      end
+    end
+  end
+end

data/lib/paperclip/validators/attachment_dimensions_validator.rb

@@ -10,12 +10,18 @@ module Paperclip
       end
 
       def validate_each(record, attribute, value)
-        dimensions = Paperclip::Geometry.from_file(value.queued_for_write[:original].path)
+        return unless value.queued_for_write[:original]
 
-        [:height, :width].each do |dimension|
-          if options[dimension] && dimensions.send(dimension) != options[dimension].to_f
-            record.errors.add(attribute.to_sym, :dimension, dimension_type: dimension.to_s, dimension: options[dimension], actual_dimension: dimensions.send(dimension).to_i)
+        begin
+          dimensions = Paperclip::Geometry.from_file(value.queued_for_write[:original].path)
+
+          [:height, :width].each do |dimension|
+            if options[dimension] && dimensions.send(dimension) != options[dimension].to_f
+              record.errors.add(attribute.to_sym, :dimension, dimension_type: dimension.to_s, dimension: options[dimension], actual_dimension: dimensions.send(dimension).to_i)
+            end
           end
+        rescue Paperclip::Errors::NotIdentifiedByImageMagickError
+          Paperclip.log("cannot validate dimensions on #{attribute}")
         end
       end
     end

data/paperclip-dimension-validator.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "paperclip-dimension-validator"
-  spec.version       = '0.1.0'
+  spec.version       = '0.1.1'
   spec.authors       = ["Anthony Smith"]
   spec.email         = ["anthony@sticksnleaves.com"]
   spec.description   = %q{Validate image height and width for Paperclip}
@@ -17,7 +17,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activerecord', '>= 3.1'
   spec.add_dependency 'paperclip',    '>= 4.0.0'
 
   spec.add_development_dependency "bundler", "~> 1.3"

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-dimension-validator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Anthony Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-07-24 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +66,7 @@ files:
 - Rakefile
 - lib/locales/en.yml
 - lib/paperclip-dimension-validator.rb
+- lib/paperclip/matchers/validate_attachment_dimensions_matcher.rb
 - lib/paperclip/validators/attachment_dimensions_validator.rb
 - paperclip-dimension-validator.gemspec
 homepage: https://github.com/anthonator/paperclip-dimension-validator