aspecta 0.0.1 → 0.0.2

data/README.md

@@ -1,6 +1,6 @@
 # aspecta
 
-``aspect`` is small add-on for the awesome
+``aspecta`` is small add-on for the awesome
 [carrierwave](http://github.com/jnicklas/carrierwave) gem. ``aspecta``
 adds image dimensions validator to your ActiveRecords models.
 

data/aspecta.gemspec

@@ -17,7 +17,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "activemodel"
-  s.add_development_dependency "carrierwave"
+  s.add_development_dependency "activemodel", ">=3.0.0"
+  s.add_development_dependency "activerecord", ">=3.0.0"
+  s.add_development_dependency "carrierwave", "~>0.5.0"
   s.add_dependency "fastimage"
 end

data/lib/aspecta.rb

@@ -33,15 +33,19 @@ class DimensionsValidator < ActiveModel::EachValidator
 
     dimensions = FastImage.size value.path
 
-    DIMENSIONS.each_with_index do |dimension, index|
-      next if options[dimension].nil?
+    if dimensions.nil?
+      record.errors.add(attribute, :invalid)
+    else
+      DIMENSIONS.each_with_index do |dimension, index|
+        next if options[dimension].nil?
 
-      options[dimension].each do |measure, size|
-        unless dimensions[index].send(ATTRIBUTES[measure], size)
-             record.errors.add(attribute,
+        options[dimension].each do |measure, size|
+          unless dimensions[index].send(ATTRIBUTES[measure], size)
+            record.errors.add(attribute,
               MESSAGES[dimension][measure],
               :size => size
             )
+          end
         end
       end
     end

data/lib/aspecta/version.rb

@@ -1,3 +1,3 @@
 module Aspecta
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/test/{aspect_test.rb → aspecta_test.rb}

@@ -9,7 +9,7 @@ class AspectaTest < Test::Unit::TestCase
   # ===========
 
   def fixture(file)
-    File.open(File.dirname(__FILE__) + "/fixtures/#{file}.png")
+    File.open(File.dirname(__FILE__) + "/fixtures/#{file}")
   end
 
   # ===========
@@ -24,7 +24,7 @@ class AspectaTest < Test::Unit::TestCase
 
   def test_requires_width_or_height_option
     user = UserWithInvalidValidation.new
-    user.avatar = fixture "200x200"
+    user.avatar = fixture "200x200.png"
 
     exception = assert_raise ArgumentError do
       user.valid?
@@ -36,7 +36,7 @@ class AspectaTest < Test::Unit::TestCase
 
   def test_requires_minimum_or_maximum_for_height_option
     user = UserWithInvalidValitionHeightOptions.new
-    user.avatar = fixture "200x200"
+    user.avatar = fixture "200x200.png"
 
     exception = assert_raise ArgumentError do
       user.valid?
@@ -48,7 +48,7 @@ class AspectaTest < Test::Unit::TestCase
 
   def test_requires_minimum_or_maximum_for_width_option
     user = UserWithInvalidValitionWidthOptions.new
-    user.avatar = fixture "200x200"
+    user.avatar = fixture "200x200.png"
 
     exception = assert_raise ArgumentError do
       user.valid?
@@ -65,14 +65,14 @@ class AspectaTest < Test::Unit::TestCase
   def test_valid_minimum_width
     user = UserMinimumWidth200.new
 
-    user.avatar = fixture "200x200"
+    user.avatar = fixture "200x200.png"
     assert user.valid?
   end
 
   def test_invalid_minimum_width
     user = UserMinimumWidth200.new
 
-    user.avatar = fixture "199x199"
+    user.avatar = fixture "199x199.png"
     assert ! user.valid?
     assert user.errors[:avatar].
       include?("image is too narrow, minimum is 200 pixels")
@@ -85,14 +85,14 @@ class AspectaTest < Test::Unit::TestCase
   def test_valid_minimum_height
     user = UserMinimumHeight200.new
 
-    user.avatar = fixture "200x200"
+    user.avatar = fixture "200x200.png"
     assert user.valid?
   end
 
   def test_invalid_minimum_height
     user = UserMinimumHeight200.new
 
-    user.avatar = fixture "199x199"
+    user.avatar = fixture "199x199.png"
     assert ! user.valid?
     assert user.errors[:avatar].
       include?("image is too short, minimum is 200 pixels")
@@ -105,14 +105,14 @@ class AspectaTest < Test::Unit::TestCase
   def test_valid_maximum_width
     user = UserMaximumWidth200.new
 
-    user.avatar = fixture "200x200"
+    user.avatar = fixture "200x200.png"
     assert user.valid?
   end
 
   def test_invalid_maximum_width
     user = UserMaximumWidth200.new
 
-    user.avatar = fixture "201x201"
+    user.avatar = fixture "201x201.png"
     assert ! user.valid?
     assert user.errors[:avatar].
       include?("image is too wide, maximum is 200 pixels")
@@ -125,16 +125,28 @@ class AspectaTest < Test::Unit::TestCase
   def test_valid_maximum_height
     user = UserMaximumHeight200.new
 
-    user.avatar = fixture "200x200"
+    user.avatar = fixture "200x200.png"
     assert user.valid?
   end
 
   def test_invalid_maximum_height
     user = UserMaximumHeight200.new
 
-    user.avatar = fixture "201x201"
+    user.avatar = fixture "201x201.png"
     assert ! user.valid?
     assert user.errors[:avatar].
       include?("image is too tall, maximum is 200 pixels")
   end
+
+  # =====================
+  # = invalid file type =
+  # =====================
+
+  def test_valid_maximum_height
+    user = UserMinimumDimensions100.new
+
+    user.avatar = fixture "200x200.tiff"
+    assert !user.valid?
+    assert user.errors[:avatar].include?("is invalid")
+  end
 end

data/test/lib/user.rb

@@ -47,4 +47,11 @@ class UserMaximumHeight200 < User
   validates :avatar, :dimensions => {
     :height => { :maximum => 200 }
   }
+end
+
+class UserMinimumDimensions100 < User
+  validates :avatar, :dimensions => {
+    :height => { :minimum => 100 },
+    :width => { :maximum => 100 }
+  }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aspecta
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-23 00:00:00.000000000Z
+date: 2012-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &2243656820 !ruby/object:Gem::Requirement
+  requirement: &70285277553340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *2243656820
+  version_requirements: *70285277553340
 - !ruby/object:Gem::Dependency
-  name: carrierwave
-  requirement: &2243656400 !ruby/object:Gem::Requirement
+  name: activerecord
+  requirement: &70285277552420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *70285277552420
+- !ruby/object:Gem::Dependency
+  name: carrierwave
+  requirement: &70285277551460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
   type: :development
   prerelease: false
-  version_requirements: *2243656400
+  version_requirements: *70285277551460
 - !ruby/object:Gem::Dependency
   name: fastimage
-  requirement: &2243655980 !ruby/object:Gem::Requirement
+  requirement: &70285277550820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2243655980
+  version_requirements: *70285277550820
 description: image dimensions ActiveRecord validator for carrierwave gem
 email:
 - filip@tepper.pl
@@ -58,9 +69,10 @@ files:
 - aspecta.gemspec
 - lib/aspecta.rb
 - lib/aspecta/version.rb
-- test/aspect_test.rb
+- test/aspecta_test.rb
 - test/fixtures/199x199.png
 - test/fixtures/200x200.png
+- test/fixtures/200x200.tiff
 - test/fixtures/201x201.png
 - test/lib/avatar_uploader.rb
 - test/lib/user.rb
@@ -86,14 +98,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: image dimensions ActiveRecord validator for carrierwave gem
 test_files:
-- test/aspect_test.rb
+- test/aspecta_test.rb
 - test/fixtures/199x199.png
 - test/fixtures/200x200.png
+- test/fixtures/200x200.tiff
 - test/fixtures/201x201.png
 - test/lib/avatar_uploader.rb
 - test/lib/user.rb