grip 0.4.2 → 0.4.3

data/README.rdoc

@@ -15,8 +15,16 @@ The grip gem is hosted on gemcutter.org:
       include MongoMapper::Document
       include Grip
 
-      has_grid_attachment :image
+      has_grid_attachment :image, :resize => {:width=>50,:height=>50}
       has_grid_attachment :pdf
+      
+      # Hook for resizing or whatever gets you there.
+      # any specified options are passed back to you
+      # at this point. 
+      # Just return the file when you're done.
+      def grip_process_file opts
+        opts[:file]
+      end
     end
 
     image = File.open('foo.png', 'r')

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

data/grip.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grip}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["twoism", "jnunemaker"]

data/lib/grip.rb

@@ -27,9 +27,9 @@ module Grip
   end
   
   module ClassMethods
-    def has_grid_attachment(name)
+    def has_grid_attachment(name,opts={})
       write_inheritable_attribute(:attachment_definitions, {}) if attachment_definitions.nil?
-      attachment_definitions[name] = {}
+      attachment_definitions[name] = opts
       
       key "#{name}_size".to_sym, Integer
       key "#{name}_path".to_sym, String
@@ -40,7 +40,7 @@ module Grip
         # 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.read }
+        GridFS::GridStore.open(self.class.database, self["#{name}_path"], 'r') {|f| f }
       end
       
       define_method("#{name}=") do |file|
@@ -49,7 +49,7 @@ module Grip
         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
-        self.class.attachment_definitions[name] = file
+        self.class.attachment_definitions[name][:file] = file
       end
     end
     
@@ -60,16 +60,21 @@ module Grip
   
   def save_attachments
     self.class.attachment_definitions.each do |attachment|
-      name, file = attachment
       
-      if (file.is_a?(File) || file.is_a?(Tempfile))
+      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|
-          f.write(file.read)
+          f.write( grip_process_file(opts))
         end
       end
     end
   end
   
+  def grip_process_file opts
+    opts[:file]
+  end
+  
   def destroy_attached_files
     self.class.attachment_definitions.each do |name, attachment|
       GridFS::GridStore.unlink(self.class.database, self["#{name}_path"])

data/test/test_grip.rb

@@ -4,8 +4,12 @@ class Foo
   include MongoMapper::Document
   include Grip
   
-  has_grid_attachment :image
+  has_grid_attachment :image, :resize => {:width=>50,:height=>50}
   has_grid_attachment :pdf
+  
+  def grip_process_file opts
+    opts[:file]
+  end
 end
 
 class GripTest < Test::Unit::TestCase
@@ -59,11 +63,8 @@ class GripTest < Test::Unit::TestCase
   end
   
   test "saves attachments correctly" do
-    # can't get these to pass locally but the 
-    # files are there and working. WTF??
-    
-    #assert_equal @image.read, @doc.image
-    #assert_equal @pdf.read,   @doc.pdf
+    assert_equal "image/png",       @doc.image.content_type
+    assert_equal "application/pdf", @doc.pdf.content_type
     
     assert GridFS::GridStore.exist?(MongoMapper.database, @doc.image_path)
     assert GridFS::GridStore.exist?(MongoMapper.database, @doc.pdf_path)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grip
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors: 
 - twoism