grip 0.4.4 → 0.5.0

data/README.rdoc

@@ -15,7 +15,7 @@ The grip gem is hosted on gemcutter.org:
       include MongoMapper::Document
       include Grip
 
-      has_grid_attachment :image, :resize => {:width=>50,:height=>50}
+      has_grid_attachment :image, :versions => {:thumb => {:width=>50,:height=>50}}
       has_grid_attachment :pdf
       
       # Hook for resizing or whatever gets you there.

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.5.0

data/grip.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grip}
-  s.version = "0.4.4"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["twoism", "jnunemaker"]
-  s.date = %q{2009-12-23}
+  s.date = %q{2009-12-30}
   s.description = %q{GridFS attachments for MongoMapper}
   s.email = %q{signalstatic@gmail.com}
   s.extra_rdoc_files = [

data/lib/grip.rb

@@ -1,28 +1,14 @@
 require 'mongo/gridfs'
 require 'mime/types'
 require 'tempfile'
-
-# if thumbnailable?
-#   tmp = Tempfile.new("thumb_#{filename}")
-#   MojoMagick::resize(uploaded_file.path, tmp.path, {:width => 50, :height => 40, :scale => '>'})
-#   self.thumbnail = tmp.read      
-# end
-
-# open    : db, name, mode, options (:root, :metadata, :content_type)
-# read    : db, name, length, offset
-# unlink  : db, names
-# list    : db, root collection
-#
-# GridStore.open(database, 'filename', 'w') { |f|
-#   f.puts "Hello, world!"
-# }
+require 'mojo_magick'
 
 module Grip
   def self.included(base)
     base.extend Grip::ClassMethods
     base.class_eval do
-      after_save :save_attachments
-      before_destroy :destroy_attached_files
+      after_save      :save_attachments
+      before_destroy  :destroy_attached_files
     end
   end
   
@@ -31,26 +17,40 @@ module Grip
       write_inheritable_attribute(:attachment_definitions, {}) if attachment_definitions.nil?
       attachment_definitions[name] = opts
       
-      key "#{name}_size".to_sym, Integer
-      key "#{name}_path".to_sym, String
-      key "#{name}_name".to_sym, String
-      key "#{name}_content_type".to_sym, String
+      build_attachment_keys_for name
       
       define_method(name) do
-        # open returns the correct mime-type, 
-        # read returns a string. Not sure if 
-        # this is a GridFS problem or not
         GridFS::GridStore.open(self.class.database, self["#{name}_path"], 'r') {|f| f }
       end
       
       define_method("#{name}=") do |file|
-        self['_id']                  = Mongo::ObjectID.new if _id.blank?
-        self["#{name}_size"]         = File.size(file)
-        self["#{name}_name"]         = File.basename(file.path)
-        self["#{name}_path"]         = "#{self.class.to_s.underscore}/#{name}/#{_id}"
-        self["#{name}_content_type"] = file.content_type rescue MIME::Types.type_for(self["#{name}_name"]).to_s
+        update_attachment_attributes!(name, file)
         self.class.attachment_definitions[name][:file] = file
       end
+      
+      unless opts[:versions].nil?
+        opts[:versions].each do |v,dimensions|
+
+          version_name = "#{name}_#{v}"
+          build_attachment_keys_for version_name
+          
+          define_method(version_name) do
+            GridFS::GridStore.open(self.class.database, self["#{version_name}_path"], 'r') {|f| f }
+          end
+
+          define_method("#{version_name}=") do |file|
+            update_attachment_attributes!("#{version_name}", file, true)
+            self["#{version_name}_content_type"] = self["#{name}_content_type"]
+          end
+        end
+      end
+    end
+    
+    def build_attachment_keys_for name
+      key "#{name}_size".to_sym, Integer
+      key "#{name}_path".to_sym, String
+      key "#{name}_name".to_sym, String
+      key "#{name}_content_type".to_sym, String
     end
     
     def attachment_definitions
@@ -58,23 +58,58 @@ module Grip
     end
   end
   
+  def update_attachment_attributes! name, file, is_version = false
+    raise Grip::InvalidFileException unless (file.is_a?(File) || file.is_a?(Tempfile))
+    
+    self["#{name}_size"]         = File.size(file) 
+    self["#{name}_name"]         = File.basename(file.path)
+    
+    unless is_version
+      self['_id']                  = Mongo::ObjectID.new if _id.blank?
+      self["#{name}_content_type"] = file.content_type rescue MIME::Types.type_for(self["#{name}_name"]).to_s
+      self["#{name}_path"]         = "#{self.class.to_s.underscore}/#{name}/#{_id}"
+    else
+      self["#{name}_path"]         = "#{self.class.to_s.underscore}/#{name}/#{_id}"
+    end
+  end
+  
+  # Roll through attachment definitions and check if they are a File or Tempfile. Both types are 
+  # nescessary for file uploads to work properly. Each file checks for a <attr_name>_process
+  # callback for pre-processing before save.
   def save_attachments
-    self.class.attachment_definitions.each do |attachment|
+    self.class.attachment_definitions.each do |definition|
+      attr_name, opts = definition
       
-      name, opts = attachment
-
-      if (opts[:file].is_a?(File) || opts[:file].is_a?(Tempfile))
-        GridFS::GridStore.open(self.class.database, self["#{name}_path"], 'w', :content_type => self["#{name}_content_type"]) do |f|
-          processed_or_not = self.respond_to?("process_#{name}") ? send("process_#{name}",opts) : opts[:file]
-          f.write(processed_or_not)
+      GridFS::GridStore.open(self.class.database, self["#{attr_name}_path"], 'w', :content_type => self["#{attr_name}_content_type"]) do |f|
+        f.write opts[:file].read
+      end
+      
+      unless opts[:versions].nil?
+        opts[:versions].each do |version,dimensions|
+          tmp = Tempfile.new("#{attr_name}_#{version}")
+          MojoMagick::resize(opts[:file].path, tmp.path, dimensions)
+          send("#{attr_name}_#{version}=", tmp)
+          GridFS::GridStore.open(self.class.database, self["#{attr_name}_#{version}_path"], 'w', :content_type => self["#{attr_name}_content_type"]) do |f|
+            f.write tmp.read
+          end
         end
+        save_to_collection
       end
-    end
+    end unless self.class.attachment_definitions.nil?
   end
   
   def destroy_attached_files
     self.class.attachment_definitions.each do |name, attachment|
       GridFS::GridStore.unlink(self.class.database, self["#{name}_path"])
-    end
+      unless attachment[:versions].nil?
+        attachment[:versions].each do |v,dim|
+          GridFS::GridStore.unlink(self.class.database, self["#{name}_#{v}_path"])
+        end
+      end
+    end unless self.class.attachment_definitions.nil?
+  end
+  
+  class Grip::InvalidFileException < Exception
   end
+  
 end

data/test/test_grip.rb

@@ -4,7 +4,7 @@ class Foo
   include MongoMapper::Document
   include Grip
   
-  has_grid_attachment :image, :resize => {:width=>50,:height=>50}
+  has_grid_attachment :image, :versions => {:thumb => {:width=>50,:height=>50}}
   has_grid_attachment :pdf
   
   def process_image opts
@@ -38,9 +38,11 @@ class GripTest < Test::Unit::TestCase
     assert_equal 'sample.pdf',  @doc.pdf_name
     
     assert_equal "image/png",       @doc.image_content_type
+    assert_equal "image/png",       @doc.image_thumb_content_type
     assert_equal "application/pdf", @doc.pdf_content_type
     
     assert_equal "foo/image/#{@doc.id}", @doc.image_path
+    assert_equal "foo/image_thumb/#{@doc.id}", @doc.image_thumb_path
     assert_equal "foo/pdf/#{@doc.id}",   @doc.pdf_path
     
     collection = MongoMapper.database['fs.files']
@@ -51,7 +53,8 @@ class GripTest < Test::Unit::TestCase
   
   test "responds to dynamic keys" do
     [ :pdf_size, :pdf_path, :pdf_name, :pdf_content_type,
-      :image_size, :image_path, :image_name, :image_content_type
+      :image_size, :image_path, :image_name, :image_content_type,
+      :image_thumb_size, :image_thumb_path, :image_thumb_name, :image_thumb_content_type
     ].each do |method|
       assert @doc.respond_to?(method)
     end
@@ -77,6 +80,12 @@ class GripTest < Test::Unit::TestCase
     @doc.destroy
     
     assert ! GridFS::GridStore.exist?(MongoMapper.database, @doc.image_path)
+    assert ! GridFS::GridStore.exist?(MongoMapper.database, @doc.image_thumb_path)
     assert ! GridFS::GridStore.exist?(MongoMapper.database, @doc.pdf_path)
   end
+  
+  test "should raise invalid file exception" do
+    assert_raise(Grip::InvalidFileException) {  @doc.image = ""; @doc.save! }
+  end
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grip
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors: 
 - twoism
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-23 00:00:00 -05:00
+date: 2009-12-30 00:00:00 -05:00
 default_executable: 
 dependencies: []