paperclip-meta 0.1 → 0.2

data/{README → README.rdoc}

@@ -6,6 +6,10 @@ Paperclip Meta will get image dimensions right after post_process_styles using p
 
 ==Quick Start
 
+Add paperclip-meta to Gemfile:
+
+  gem 'paperclip-meta'
+  
 Create migration:
 
   class AddMetaToAvatar < ActiveRecord::Migration
@@ -38,7 +42,7 @@ Meta column is simple hash:
 
 This hash will be marshaled and base64 encoded before writing to model attribute.
 
-New methods provided:
+Meta methods provided:
   - width
   - height
   - size

data/Rakefile

@@ -1,8 +1,34 @@
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rspec/core'
+require 'rspec/core/rake_task'
 
-desc "Build the gem into the current directory"
-task :gem => :gemspec do
-  `gem build #{spec.name}.gemspec`
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec
+
+begin
+  include_files = ["README*", "LICENSE", "Rakefile", "init.rb", "{lib,test}/**/*"].map do |glob|
+    Dir[glob]
+  end.flatten
+  
+  require "jeweler"
+  Jeweler::Tasks.new do |s|
+    s.name              = "paperclip-meta"
+    s.version           = "0.1"
+    s.author            = "Alexey Bondar"
+    s.email             = "y8@ya.ru"
+    s.homepage          = "http://github.com/y8/paperclip-meta"
+    s.description       = "Add width, height and size methods to paperclip thumbnails"
+    s.summary           = "Thumbnail dimensions for paperclip"
+    s.platform          = Gem::Platform::RUBY
+    s.files             = include_files
+    s.require_path      = "lib"
+    s.rubyforge_project = "paperclip-meta"
+    s.has_rdoc          = false
+    s.add_dependency 'paperclip'    
+  end
+  
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end

data/init.rb

@@ -1 +1 @@
-require File.join(File.dirname(__FILE__), "lib", "paperclip_meta")
+require File.join(File.dirname(__FILE__), "lib", "paperclip-meta")

data/lib/paperclip-meta.rb

@@ -1,7 +1,16 @@
 module Paperclip
   class Attachment
-    alias original_post_process_styles post_process_styles
+    alias :original_post_process_styles :post_process_styles
+    alias :original_save :save
 
+    # If attachment deleted - destroy meta data
+    def save
+      unless @queued_for_delete.empty?
+        instance_write(:meta, ActiveSupport::Base64.encode64(Marshal.dump({}))) if instance.respond_to?(:"#{name}_meta=")
+      end
+      original_save
+    end
+      
     # If model has #{name}_meta column we getting sizes of processed
     # thumbnails and saving it to #{name}_meta column.
     def post_process_styles
@@ -11,8 +20,12 @@ module Paperclip
         meta = {}
 
         @queued_for_write.each do |style, file|
-          geo = Geometry.from_file file
-          meta[style] = {:width => geo.width.to_i, :height => geo.height.to_i, :size => File.size(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] = {}
+          end
         end
 
         instance_write(:meta, ActiveSupport::Base64.encode64(Marshal.dump(meta)))
@@ -38,6 +51,6 @@ module Paperclip
           meta.key?(style) ? meta[style][item] : nil
         end
       end
-    end
+    end    
   end
 end

data/spec/paperclip-meta/paperclip-meta_spec.rb

@@ -0,0 +1,56 @@
+require 'spec_helper'
+
+describe "Geometry saver plugin" do
+  before(:each) do
+    small_path = File.join(File.dirname(__FILE__), '..', 'fixtures', 'small.png')
+    big_path = File.join(File.dirname(__FILE__), '..', 'fixtures', 'big.jpg')
+    not_path = File.join(File.dirname(__FILE__), '..', 'fixtures', 'big.zip')
+    @big_image = File.open(big_path)
+    @small_image = File.open(small_path)
+    @big_size = Paperclip::Geometry.from_file(big_path)
+    @small_size = Paperclip::Geometry.from_file(small_path)
+    @not_image = File.open(not_path)
+  end
+
+  it "saves image geometry for original image" do
+    img = Image.new
+    img.small_image = @small_image
+    img.save!
+
+    img.reload # Ensure that updates really saved to db
+
+    img.small_image.width eq(@small_size.width)
+    img.small_image.height eq(@small_size.height)
+  end
+
+  it "saves geometry for styles" do
+    img = Image.new
+    img.small_image = @small_image
+    img.big_image = @big_image
+    img.save!
+
+    img.big_image.width(:small).should == 100
+    img.big_image.height(:small).should == 100
+  end
+
+  it "clears geometry fields when image is destroyed" do
+    img = Image.new
+    img.small_image = @small_image
+    img.big_image = @big_image
+    img.save!
+
+    img.big_image.width(:small).should == 100
+
+    img.big_image = nil
+    img.save!
+
+    img.big_image.width(:small).should be_nil
+  end
+
+  it "does not fails when file is not an image" do
+    img = Image.new
+    img.small_image = @not_image
+    lambda { img.save! }.should_not raise_error
+    img.small_image.width(:small).should be_nil
+  end
+end

data/spec/schema.rb

@@ -0,0 +1,15 @@
+ActiveRecord::Schema.define :version => 0 do
+  create_table "images", :force => true do |t|
+    t.string  :small_image_file_name
+    t.string  :small_image_content_type
+    t.integer :small_image_updated_at
+    t.integer :small_image_file_size
+    t.string  :small_image_meta
+
+    t.string  :big_image_file_name
+    t.string  :big_image_content_type
+    t.integer :big_image_updated_at
+    t.integer :big_image_file_size
+    t.string  :big_image_meta
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,36 @@
+$LOAD_PATH << "." unless $LOAD_PATH.include?(".")
+
+begin
+  require "bundler"
+  Bundler.setup
+rescue Bundler::GemNotFound
+  raise RuntimeError, "Bundler couldn't find some gems." +
+    "Did you run `bundle install`?"
+end
+
+Bundler.require
+require 'logger'
+Paperclip::Railtie.insert
+
+ActiveRecord::Base.establish_connection(
+  "adapter" => "sqlite3", 
+  "database" => ":memory:"
+)
+
+ActiveRecord::Base.logger = Logger.new(nil)
+
+load(File.dirname(__FILE__) + '/schema.rb')
+$: << File.join(File.dirname(__FILE__), '..', 'lib')
+
+class Image < ActiveRecord::Base
+  has_attached_file :small_image,
+    :storage => :filesystem,
+    :path => "./spec/tmp/:style/:id.:extension",
+    :url => "./spec/tmp/:style/:id.extension"
+
+  has_attached_file :big_image,
+    :storage => :filesystem,
+    :path => "./spec/tmp/fixtures/tmp/:style/:id.:extension",
+    :url => "./spec/tmp/fixtures/tmp/:style/:id.extension",
+    :styles => { :small => "100x100#" }
+end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: paperclip-meta
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 1
-  version: "0.1"
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Alexey Bondar
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-03 00:00:00 +04:00
+date: 2010-11-30 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,20 +37,23 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: []
-
+extra_rdoc_files: 
+- README.rdoc
 files: 
-- README
+- README.rdoc
 - Rakefile
 - init.rb
 - lib/paperclip-meta.rb
+- spec/paperclip-meta/paperclip-meta_spec.rb
+- spec/schema.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/y8/paperclip-meta
 licenses: []
 
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -78,5 +81,7 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Thumbnail dimensions for paperclip
-test_files: []
-
+test_files: 
+- spec/paperclip-meta/paperclip-meta_spec.rb
+- spec/schema.rb
+- spec/spec_helper.rb