paperclip-meta 0.4.2 → 0.4.3

data/.travis.yml

@@ -2,6 +2,5 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - jruby
   - rbx-18mode
   - rbx-19mode

data/Gemfile

@@ -4,3 +4,5 @@ gem "activerecord-jdbcsqlite3-adapter", :platform => "jruby"
 
 # Specify your gem's dependencies in paperclip-meta.gemspec
 gemspec
+
+gem "paperclip", :git => "git://github.com/thoughtbot/paperclip.git"

data/lib/paperclip-meta/attachment.rb

@@ -33,8 +33,8 @@ module Paperclip
             @queued_for_write.each do |style, file|
               begin
                 geo = Geometry.from_file file
-                meta[style] = {:width => geo.width.to_i, :height => geo.height.to_i, :size => File.size(file) }
-              rescue NotIdentifiedByImageMagickError => e
+                meta[style] = {:width => geo.width.to_i, :height => geo.height.to_i, :size => file.size }
+              rescue Paperclip::Errors::NotIdentifiedByImageMagickError => e
                 meta[style] = {}
               end
             end
@@ -88,4 +88,4 @@ module Paperclip
       end
     end
   end
-end
+end

data/lib/paperclip-meta/version.rb

@@ -1,5 +1,5 @@
 module Paperclip
   module Meta
-    VERSION = "0.4.2"
+    VERSION = "0.4.3"
   end
 end

data/spec/spec_helper.rb

@@ -14,7 +14,7 @@ ActiveRecord::Base.establish_connection(
 ActiveRecord::Base.logger = Logger.new(nil)
 load(File.join(File.dirname(__FILE__), 'schema.rb'))
 
-Paperclip::Railtie.insert
+ActiveRecord::Base.send(:include, Paperclip::Glue)
 Paperclip::Meta::Railtie.insert
 
 class Image < ActiveRecord::Base
@@ -28,4 +28,4 @@ class Image < ActiveRecord::Base
     :path => "./spec/tmp/fixtures/tmp/:style/:id.:extension",
     :url => "./spec/tmp/fixtures/tmp/:style/:id.extension",
     :styles => { :small => "100x100#" }
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paperclip-meta
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-25 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70335966084140 !ruby/object:Gem::Requirement
+  requirement: &70167845502500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70335966084140
+  version_requirements: *70167845502500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70335966081980 !ruby/object:Gem::Requirement
+  requirement: &70167845499680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335966081980
+  version_requirements: *70167845499680
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70335966079860 !ruby/object:Gem::Requirement
+  requirement: &70167845514480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335966079860
+  version_requirements: *70167845514480
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70335966078160 !ruby/object:Gem::Requirement
+  requirement: &70167845512660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335966078160
+  version_requirements: *70167845512660
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70335966092420 !ruby/object:Gem::Requirement
+  requirement: &70167845509000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335966092420
+  version_requirements: *70167845509000
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70335966089540 !ruby/object:Gem::Requirement
+  requirement: &70167845523120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70335966089540
+  version_requirements: *70167845523120
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70335966086460 !ruby/object:Gem::Requirement
+  requirement: &70167845521820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70335966086460
+  version_requirements: *70167845521820
 description: Add width, height and size methods to paperclip thumbnails
 email:
 - y8@ya.ru