grip 0.6.3 → 0.6.4

data/.gitignore

@@ -1,2 +1,3 @@
 *.gem
-pkg/*
+pkg/*
+.DS_Store

data/VERSION

@@ -1 +1 @@
-0.6.3
+0.6.4

data/grip.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grip}
-  s.version = "0.6.3"
+  s.version = "0.6.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["twoism", "jnunemaker"]
-  s.date = %q{2010-01-07}
+  s.date = %q{2010-01-09}
   s.description = %q{GridFS attachments for MongoMapper}
   s.email = %q{signalstatic@gmail.com}
   s.extra_rdoc_files = [
@@ -17,8 +17,7 @@ Gem::Specification.new do |s|
      "README.markdown"
   ]
   s.files = [
-    ".DS_Store",
-     ".gitignore",
+    ".gitignore",
      "LICENSE",
      "README.markdown",
      "Rakefile",
@@ -29,6 +28,7 @@ Gem::Specification.new do |s|
      "lib/grip/has_attachment.rb",
      "test/factories.rb",
      "test/fixtures/cthulhu.png",
+     "test/fixtures/fennec-fox.jpg",
      "test/fixtures/sample.pdf",
      "test/grip_attachment_test.rb",
      "test/growler.rb",

data/lib/grip/has_attachment.rb

@@ -1,78 +1,86 @@
 module Grip
  module HasAttachment
+   
+   def self.included(base)
+     base.extend ClassMethods
+     base.instance_eval do
+       after_save :save_attachments
+       many  :attachments, 
+             :as => :owner, 
+             :class_name => "Grip::Attachment", 
+             :dependent => :destroy
+     end
+   end
+   
     module ClassMethods
       
       def has_grid_attachment name, opts={}
-        write_inheritable_attribute(:uploaded_files, {}) if uploaded_files.nil?
-        uploaded_files[name] = opts
-        
+        write_inheritable_attribute(:uploaded_file_options, {}) if uploaded_file_options.nil?
+        uploaded_file_options[name] = opts
+        self.send(:include, InstanceMethods)
         define_method(name) do
-          attachments.find(:first,:conditions=>{:name=>name.to_s})
+          attachments.find(:first, :conditions=>{:name => name.to_s})
         end
-
-        define_method("#{name}=") do |new_file| 
+        define_method("#{name}=") do |new_file|
           raise InvalidFile unless (new_file.is_a?(File) || new_file.is_a?(Tempfile))
-          
-          self.class.uploaded_files[name][:file] = new_file
-          self['_id']     = Mongo::ObjectID.new if _id.blank?
-          new_attachment  = attachments.find_or_create_by_name(name.to_s)
+          uploaded_files[name] ||= {}
+          uploaded_files[name][:file] = new_file
+          self['_id'] = Mongo::ObjectID.new if _id.blank?
+          new_attachment = attachments.find_or_create_by_name(name.to_s)
           update_attachment_attributes!(new_attachment, new_file, opts)
         end
                   
       end
       
-      def uploaded_files
-        read_inheritable_attribute(:uploaded_files)
+      def uploaded_file_options
+        read_inheritable_attribute(:uploaded_file_options)
       end
       
     end
-    def self.included(base)
-      base.extend ClassMethods
-      base.class_eval do
-        after_save :save_attachments
-        many  :attachments, 
-              :as => :owner, 
-              :class_name => "Grip::Attachment", 
-              :dependent => :destroy
-      end
-    end
-    
-    def update_attachment_attributes! new_attachment, new_file, opts
-      new_attachment.owner_type   = self.class.to_s
-      new_attachment.file_name    = File.basename(new_file.path)
-      new_attachment.file_size    = File.size(new_file.path)
-      new_attachment.content_type = MIME::Types.type_for(new_file.path)
-      new_attachment.file         = new_file
-      new_attachment.variants     = opts[:variants] || {}
-      new_attachment.save!
-    end
     
-    def save_attachments
-      attachments.each do |attachment|
-        attachment.variants.each do |variant,dimensions|
-          create_variant(attachment,variant,dimensions)
+     module InstanceMethods
+        def uploaded_files
+          @uploaded_files ||= {}
+        end
+        def update_attachment_attributes! new_attachment, new_file, opts
+          new_attachment.owner_type   = self.class.to_s
+          new_attachment.file_name    = File.basename(new_file.path)
+          new_attachment.file_size    = File.size(new_file.path)
+          new_attachment.content_type = MIME::Types.type_for(new_file.path)
+          new_attachment.file         = new_file
+          new_attachment.variants     = opts[:variants] || {}
+          new_attachment.save!
+        end
+
+        def save_attachments
+          attachments.each do |attachment|
+            attachment.variants.each do |variant,dimensions|
+              create_variant(attachment,variant,dimensions)
+            end
+          end
+        end
+
+        def create_variant attachment, variant, dimensions
+          tmp_file = uploaded_files[attachment.name.to_sym][:file]
+          begin 
+            tmp   = Tempfile.new("#{attachment.name}_#{variant}")
+            image = Miso::Image.new(tmp_file.path)
+
+            image.crop(dimensions[:width], dimensions[:height])  if dimensions[:crop]
+            image.fit(dimensions[:width], dimensions[:height])   unless dimensions[:crop]
+
+            image.write(tmp.path)
+          rescue RuntimeError => e
+            warn "Image was not resized. #{e}"
+            tmp = tmp_file
+          end
+
+          file_hash = {:resized_file => tmp,:uploaded_file => tmp_file} 
+          attachment.send("#{variant}=", file_hash)
         end
+
       end
-    end
     
-    def create_variant attachment, variant, dimensions
-      tmp_file = self.class.uploaded_files[attachment.name.to_sym][:file]
-      begin 
-        tmp   = Tempfile.new("#{attachment.name}_#{variant}")
-        image = Miso::Image.new(tmp_file.path)
-      
-        image.crop(dimensions[:width], dimensions[:height])  if dimensions[:crop]
-        image.fit(dimensions[:width], dimensions[:height])   unless dimensions[:crop]
-      
-        image.write(tmp.path)
-      rescue RuntimeError => e
-        warn "Image was not resized. #{e}"
-        tmp = tmp_file
-      end
-      
-      file_hash = {:resized_file => tmp,:uploaded_file => tmp_file} 
-      attachment.send("#{variant}=", file_hash)
-    end
     
   end
 end

data/test/has_attachment_test.rb

@@ -15,13 +15,17 @@ class HasAttachmentTest < Test::Unit::TestCase
       @file_system.drop
       @image.close
     end
+    
+    should "respond to uploaded files" do
+      assert @document.respond_to?(:uploaded_files)
+    end
 
     should "have many attachments" do
       name,assoc = Doc.associations.first
       assert_equal(:attachments, assoc.name)
       assert_equal(:many, assoc.type)
     end
-    
+
     should "have :after_save callback" do
       assert_equal(1, Doc.after_save.collect(&:method).count)
     end
@@ -47,18 +51,33 @@ class HasAttachmentTest < Test::Unit::TestCase
       should "have 2 variants" do
         assert_equal(2, @document.image.attached_variants.count)
       end
-      
+            
       should "be resized" do
         assert @document.image.file_size > @document.image.thumb.file_size
         assert @document.image.file_size > @document.image.super_thumb.file_size
       end
-      
+
       should "retrieve variants from grid" do
         assert_equal "image/png", @file_system.find_one(:filename => @document.image.thumb.grid_key)['contentType']
       end
       
     end
     
+    context "when multiple instances" do
+      setup do
+        @document2     = Doc.new
+        @image2        = File.open("#{@dir}/fennec-fox.jpg", 'r')
+        @document3     = Doc.new
+        @image3        = File.open("#{@dir}/cthulhu.png", 'r')
+        @document2.image = @image2
+        @document3.image = @image3
+      end
+      
+      should "not overwrite each other" do
+        assert_not_equal @document2.uploaded_files[:image][:file], @document3.uploaded_files[:image][:file]
+      end
+    end
+    
   end
     
 end

data/test/test_helper.rb

@@ -1,7 +1,9 @@
+$:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'rubygems'
-%w{test/unit shoulda factory_girl mongo_mapper factories}.each { |lib| require lib }
+require 'grip'
 require 'growler'
-require File.expand_path(File.dirname(__FILE__) + '/../lib/grip')
+%w{test/unit shoulda factory_girl mongo_mapper factories}.each { |lib| require lib }
+
 
 TEST_DB = 'test-grip'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grip
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors: 
 - twoism
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-07 00:00:00 -05:00
+date: 2010-01-09 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,6 @@ extra_rdoc_files:
 - LICENSE
 - README.markdown
 files: 
-- .DS_Store
 - .gitignore
 - LICENSE
 - README.markdown
@@ -55,6 +54,7 @@ files:
 - lib/grip/has_attachment.rb
 - test/factories.rb
 - test/fixtures/cthulhu.png
+- test/fixtures/fennec-fox.jpg
 - test/fixtures/sample.pdf
 - test/grip_attachment_test.rb
 - test/growler.rb