carrierwave-meta 0.0.3 → 0.0.4

data/carrierwave-meta.gemspec

@@ -17,13 +17,13 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-  
+
   s.add_dependency(%q<carrierwave>, [">= 0.5.7"])
-  s.add_dependency(%q<activesupport>, [">= 3.0"])  
+  s.add_dependency(%q<activesupport>, [">= 3.0"])
   s.add_dependency(%q<mime-types>)
   s.add_development_dependency(%q<rspec-rails>, ">= 2.6")
-  s.add_development_dependency(%q<sqlite3-ruby>)    
+  s.add_development_dependency(%q<sqlite3-ruby>)
   s.add_development_dependency(%q<rmagick>)
   s.add_development_dependency(%q<mini_magick>)
   s.add_development_dependency(%q<mime-types>)
-end
+end

data/lib/carrierwave-meta/meta.rb

@@ -7,7 +7,7 @@ module CarrierWave
       include CarrierWave::MimeTypes
 
       set_content_type(true)
-      
+
       after :retrieve_from_cache, :set_content_type
       after :retrieve_from_cache, :call_store_meta
       after :retrieve_from_store, :set_content_type
@@ -20,51 +20,50 @@ module CarrierWave
       model_delegate_attribute :height, 0
     end
 
-    module InstanceMethods
-      def store_meta
-        if self.file.present?
-          dimensions = get_dimensions
-          width, height = dimensions
-          self.content_type = self.file.content_type
-          self.file_size = self.file.size
-          self.image_size = dimensions
-          self.width = width
-          self.height = height
-        end
-      end
-      
-      def set_content_type(file = nil)
-        set_content_type(true)
-      end
-      
-      def image_size_s
-        image_size.join('x')
+    def store_meta
+      if self.file.present?
+        dimensions = get_dimensions
+        width, height = dimensions
+        self.content_type = self.file.content_type
+        self.file_size = self.file.size
+        self.image_size = dimensions
+        self.width = width
+        self.height = height
       end
-      
-      private
-      def call_store_meta(file = nil)
-        # Re-retrieve metadata for a file only if model is not present OR model is not saved.
-        store_meta if self.model.nil? || (self.model.respond_to?(:new_record?) && self.model.new_record?)
-      end
-      
-      def get_dimensions
-        [].tap do |size|
-          if self.file.content_type =~ /image/
-            manipulate! do |img|
-              if defined?(::Magick::Image) && img.is_a?(::Magick::Image)
-                size << img.columns
-                size << img.rows
-              elsif defined?(::MiniMagick::Image) && img.is_a?(::MiniMagick::Image)
-                size << img["width"]
-                size << img["height"]
-              else
-                raise "Only RMagick is supported yet. Fork and update it."
-              end        
-              img
+    end
+
+    def set_content_type(file = nil)
+      set_content_type(true)
+    end
+
+    def image_size_s
+      image_size.join('x')
+    end
+
+    private
+    def call_store_meta(file = nil)
+      # Re-retrieve metadata for a file only if model is not present OR model is not saved.
+      store_meta if self.model.nil? || (self.model.respond_to?(:new_record?) && self.model.new_record?)
+    end
+
+    def get_dimensions
+      [].tap do |size|
+        if self.file.content_type =~ /image/
+          manipulate! do |img|
+            if defined?(::Magick::Image) && img.is_a?(::Magick::Image)
+              size << img.columns
+              size << img.rows
+            elsif defined?(::MiniMagick::Image) && img.is_a?(::MiniMagick::Image)
+              size << img["width"]
+              size << img["height"]
+            else
+              raise "Only RMagick & MiniMagick are supported yet. Fork and update it."
             end
+            img
           end
         end
-      end        
+      end
+    rescue CarrierWave::ProcessingError
     end
   end
 end

data/lib/carrierwave-meta/model_delegate_attribute.rb

@@ -33,15 +33,13 @@ module CarrierWave
       end
     end
     
-    module InstanceMethods
-      private
-      def model_getter_name(attribute)
-        name = []
-        name << mounted_as if mounted_as.present?
-        name << version_name if version_name.present?
-        name << attribute
-        name.join('_')
-      end
+    private
+    def model_getter_name(attribute)
+      name = []
+      name << mounted_as if mounted_as.present?
+      name << version_name if version_name.present?
+      name << attribute
+      name.join('_')
     end
   end
 end

data/lib/carrierwave-meta/version.rb

@@ -1,5 +1,5 @@
 module Carrierwave
   module Meta
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/modules/meta_spec.rb

@@ -5,9 +5,10 @@ describe TestUploader do
   ORIGINAL_SIZE = [600, 277]
   VERSION_SIZE = [200, 200]
 
-  let(:file) { File.open("spec/fixtures/big.jpg") }  
+  let(:file) { File.open("spec/fixtures/big.jpg") }
+  let(:corrupted_file) { File.open("spec/fixtures/corrupted.bmp") }
   let(:file_name) { File.basename(file.path) }
-  let(:obj) { TestModel.new }  
+  let(:obj) { TestModel.new }
 
   def uploader_values_are_correct(uploader)
     uploader.width.should eq(ORIGINAL_SIZE[0])
@@ -22,7 +23,7 @@ describe TestUploader do
     uploader.version.image_size.should eq(VERSION_SIZE)
     uploader.version.content_type.should eq(MIME::Types.type_for(file_name).first.to_s)
     uploader.version.file_size.should_not be_blank
-    uploader.version.image_size_s.should eq(VERSION_SIZE.join('x'))    
+    uploader.version.image_size_s.should eq(VERSION_SIZE.join('x'))
   end
 
   def obj_values_are_correct(obj)
@@ -45,13 +46,13 @@ describe TestUploader do
       uploader.cache!(file)
       uploader_values_are_correct(uploader)
     end
-  
+
     it "stores metadata after store!" do
       uploader = TestUploader.new
       uploader.store!(file)
       uploader_values_are_correct(uploader)
     end
-  
+
     it "has metadata after cache!/retrieve_from_cache!" do
       uploader = TestUploader.new
       uploader.cache!(file)
@@ -61,16 +62,16 @@ describe TestUploader do
       uploader.retrieve_from_cache!(cache_name)
       uploader_values_are_correct(uploader)
     end
-    
+
     it "has metadata after store!/retrieve_from_store!" do
       uploader = TestUploader.new
       uploader.store!(file)
       uploader_values_are_correct(uploader)
-      
+
       uploader = TestUploader.new
       uploader.retrieve_from_store!(File.basename(file.path))
-      uploader_values_are_correct(uploader)      
-    end    
+      uploader_values_are_correct(uploader)
+    end
   end
 
   context "attached uploader" do
@@ -80,14 +81,14 @@ describe TestUploader do
       uploader_values_are_correct(uploader)
       obj_values_are_correct(obj)
     end
-  
+
     it "stores metadata after store!" do
       uploader = TestUploader.new(obj, :image)
       uploader.store!(file)
       uploader_values_are_correct(uploader)
-      obj_values_are_correct(obj)      
+      obj_values_are_correct(obj)
     end
-  
+
     it "has metadata after cache!/retrieve_from_cache!" do
       uploader = TestUploader.new(obj, :image)
       uploader.cache!(file)
@@ -97,15 +98,22 @@ describe TestUploader do
       uploader.retrieve_from_cache!(cache_name)
       uploader_values_are_correct(uploader)
     end
-    
+
     it "has metadata after store!/retrieve_from_store!" do
       uploader = TestUploader.new(obj, :image)
       uploader.store!(file)
       uploader_values_are_correct(uploader)
-      
+
       uploader = TestUploader.new(obj, :image)
       uploader.retrieve_from_store!(File.basename(file.path))
-      uploader_values_are_correct(uploader)      
-    end    
+      uploader_values_are_correct(uploader)
+    end
+  end
+
+  context "when file is corrupted/can not be processed" do
+    it "passes without exceptions" do
+      uploader = TestBlankUploader.new(obj, :image)
+      proc { uploader.store!(corrupted_file) }.should_not raise_error
+    end
   end
 end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ $LOAD_PATH << "." unless $LOAD_PATH.include?(".")
 begin
   require "bundler"
   Bundler.setup
-  Bundler.require  
+  Bundler.require
 rescue Bundler::GemNotFound
   raise RuntimeError, "Bundler couldn't find some gems." +
     "Did you run `bundle install`?"
@@ -15,6 +15,7 @@ require 'mime/types'
 require 'carrierwave'
 require 'carrierwave-meta'
 require 'support/test_delegate_uploader'
+require 'support/test_blank_uploader'
 require 'support/test_uploader'
 require 'support/test_model'
 

data/spec/support/test_blank_uploader.rb

@@ -0,0 +1,19 @@
+class TestBlankUploader < CarrierWave::Uploader::Base
+  if PROCESSOR == :mini_magick
+    include CarrierWave::MiniMagick
+  else
+    include CarrierWave::RMagick
+  end
+  include CarrierWave::Meta
+
+  def store_dir
+    "tmp/store"
+  end
+
+  def cache_dir
+    "tmp/cache"
+  end
+
+  storage :file
+  process :store_meta
+end

metadata

@@ -1,148 +1,151 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: carrierwave-meta
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Victor Sokolov
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-11 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-07-24 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: carrierwave
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 5
-        - 7
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.7
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.5.7
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mime-types
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rmagick
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rmagick
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: mini_magick
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: mime-types
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-description: ""
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ''
+email:
 - gzigzigzi@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - README.rdoc
@@ -154,55 +157,44 @@ files:
 - lib/carrierwave-meta/version.rb
 - spec/fixtures/big.jpg
 - spec/fixtures/big.zip
+- spec/fixtures/corrupted.bmp
 - spec/fixtures/small.png
 - spec/modules/meta_spec.rb
 - spec/modules/model_delegate_attribute_spec.rb
 - spec/spec_helper.rb
 - spec/support/schema.rb
+- spec/support/test_blank_uploader.rb
 - spec/support/test_delegate_uploader.rb
 - spec/support/test_model.rb
 - spec/support/test_uploader.rb
 homepage: http://github.com/gzigzigzeo/carrierwave-meta
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -518299106991217917
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -518299106991217917
 requirements: []
-
 rubyforge_project: carrierwave-meta
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: ""
-test_files: 
-- spec/fixtures/big.jpg
-- spec/fixtures/big.zip
-- spec/fixtures/small.png
-- spec/modules/meta_spec.rb
-- spec/modules/model_delegate_attribute_spec.rb
-- spec/spec_helper.rb
-- spec/support/schema.rb
-- spec/support/test_delegate_uploader.rb
-- spec/support/test_model.rb
-- spec/support/test_uploader.rb
+summary: ''
+test_files: []