grip 0.6.1 → 0.6.2

data/README.markdown

@@ -0,0 +1,71 @@
+grip
+====
+
+GridFS attachments for MongoMapper.
+
+Installation
+------------
+
+The grip gem is hosted on gemcutter.org and uses Miso (http://github.com/Fingertips/Miso) for image resizing
+
+    gem install miso grip
+
+Setup (Rails)
+-------------
+
+    # config/environment.rb
+
+    config.gem 'grip'
+
+Then:
+
+    rake gems:install
+
+
+
+
+
+Usage (See tests for better docs)
+---------------------------------
+
+Create a MongoMapper model and `include MongoMapper::Grip::HasAttachment` and call `has_grid_attachment :<attachment_name>` to the model. Then if your attachment is an image, you can specify a hash of variants along with their :width & :height.
+
+
+    class Doc
+      include MongoMapper::Document
+      include MongoMapper::Grip::HasAttachment
+      has_grid_attachment :image, :variants => {:thumb => {:width=>50,:height=>50}}
+    end
+    
+To save a file to your model, just send any file to the symbol that you specified.
+
+    image = File.open('foo.png', 'r')
+    @doc = Doc.create(:image => image)
+    
+Alternately just set it on the model and save:
+
+    @doc.image = image
+    
+Each attachment as well as variants respond to the following methods:
+
+    puts @doc.image.name 
+    => "image"
+    
+    puts @doc.image.file_size
+    => 100
+    
+    puts @doc.image.file_name
+    => "foo.png"
+    
+    puts @doc.image.grid_key
+    => "docs/<id>/image"    
+    
+    @doc.image.file # contents read from gridfs for serving from rack/metal/controller 
+    
+Variants are created `after_save` and can be referenced through the attachment they belong to:
+
+    @doc.image.thumb.name
+    @doc.image.thumb.file_name
+    @doc.image.thumb.grid_key
+    @doc.image.thumb.content_type
+

data/Rakefile

@@ -12,10 +12,12 @@ begin
     g.email = 'signalstatic@gmail.com'
     g.homepage = 'http://github.com/twoism/grip'
     g.authors = %w(twoism jnunemaker)
+    g.add_dependency 'rmagick'
+    g.add_dependency 'miso'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts 'Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com'
+  puts 'Jeweler not available. Install it with: sudo gem install jeweler'
 end
  
 Rake::TestTask.new do |t|

data/VERSION

@@ -1 +1 @@
-0.6.1
+0.6.2

data/grip.gemspec

@@ -5,22 +5,22 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grip}
-  s.version = "0.6.1"
+  s.version = "0.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["twoism", "jnunemaker"]
-  s.date = %q{2009-12-31}
+  s.date = %q{2010-01-07}
   s.description = %q{GridFS attachments for MongoMapper}
   s.email = %q{signalstatic@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+     "README.markdown"
   ]
   s.files = [
     ".DS_Store",
      ".gitignore",
      "LICENSE",
-     "README.rdoc",
+     "README.markdown",
      "Rakefile",
      "VERSION",
      "grip.gemspec",
@@ -30,10 +30,10 @@ Gem::Specification.new do |s|
      "test/factories.rb",
      "test/fixtures/cthulhu.png",
      "test/fixtures/sample.pdf",
+     "test/grip_attachment_test.rb",
      "test/growler.rb",
+     "test/has_attachment_test.rb",
      "test/models.rb",
-     "test/test_grip_attachment.rb",
-     "test/test_has_attachment.rb",
      "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/twoism/grip}
@@ -43,10 +43,10 @@ Gem::Specification.new do |s|
   s.summary = %q{GridFS attachments for MongoMapper}
   s.test_files = [
     "test/factories.rb",
+     "test/grip_attachment_test.rb",
      "test/growler.rb",
+     "test/has_attachment_test.rb",
      "test/models.rb",
-     "test/test_grip_attachment.rb",
-     "test/test_has_attachment.rb",
      "test/test_helper.rb"
   ]
 
@@ -55,9 +55,15 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rmagick>, [">= 0"])
+      s.add_runtime_dependency(%q<miso>, [">= 0"])
     else
+      s.add_dependency(%q<rmagick>, [">= 0"])
+      s.add_dependency(%q<miso>, [">= 0"])
     end
   else
+    s.add_dependency(%q<rmagick>, [">= 0"])
+    s.add_dependency(%q<miso>, [">= 0"])
   end
 end
 

data/lib/grip.rb

@@ -1,4 +1,4 @@
-%w{mongo_mapper mongo/gridfs mime/types ftools tempfile rmagick miso}.each { |lib| require lib }
+%w{mongo_mapper mongo/gridfs mime/types ftools tempfile RMagick miso}.each { |lib| require lib }
 
 module MongoMapper
   module Grip

data/lib/grip/attachment.rb

@@ -3,8 +3,13 @@ module MongoMapper
     class Attachment
       include MongoMapper::Document
 
-      belongs_to :owner, :polymorphic => true
-      many :attached_variants, :as => :owner, :class_name => "MongoMapper::Grip::Attachment", :dependent => :destroy
+      belongs_to  :owner, 
+                  :polymorphic => true
+                  
+      many  :attached_variants, 
+            :as => :owner, 
+            :class_name => "MongoMapper::Grip::Attachment", 
+            :dependent => :destroy
             
       key :owner_id,      ObjectId, :required => true
       key :owner_type,    String,   :required => true
@@ -15,8 +20,8 @@ module MongoMapper
       key :content_type,  String
       key :variants,      Hash
       
-      after_save :build_variants
-      before_destroy :destroy_file
+      after_save      :build_variants
+      before_destroy  :destroy_file
       
       def file=new_file
         raise InvalidFile unless (new_file.is_a?(File) || new_file.is_a?(Tempfile))
@@ -25,7 +30,7 @@ module MongoMapper
         self.file_size    = File.size(new_file.path)
         self.content_type = MIME::Types.type_for(new_file.path)
         
-        write_to_grid new_file
+        write_to_grid self,new_file
       end
       
       def file
@@ -36,32 +41,32 @@ module MongoMapper
         "#{owner_type.pluralize}/#{owner_id}/#{name}".downcase
       end
       
+      def self.create_method method_name, &block
+        define_method(method_name) do |*args|
+          yield *args
+        end
+      end
+      
       private
         def build_variants
           self.variants.each do |variant, dimensions|
             
-            eval <<-EOF
-              def #{variant}
-                Attachment.find_or_initialize_by_name_and_owner_id("#{variant.to_s}",self._id)
-              end
-            EOF
+            self.class.create_method variant.to_sym do
+              attached_variants.find_or_create_by_name(:name=>"#{variant.to_s}")
+            end
             
-            eval <<-EOF
-              def #{variant}=(file_hash)
-                new_attachment  = Attachment.find_or_initialize_by_name_and_owner_id("#{variant.to_s}",self._id)
-                new_attachment.owner_type   = self.class.to_s
-                new_attachment.file_name    = File.basename(file_hash[:uploaded_file].path)
-                new_attachment.file_size    = File.size(file_hash[:resized_file].path)
-                new_attachment.content_type = MIME::Types.type_for(file_hash[:uploaded_file].path)
-                new_attachment.save!
+            self.class.create_method "#{variant}=".to_sym do |file_hash|
+              
+              new_attachment              = Attachment.find_or_initialize_by_name_and_owner_id("#{variant.to_s}",self._id)
+              new_attachment.owner_type   = self.class.to_s
+              new_attachment.file_name    = File.basename(file_hash[:uploaded_file].path)
+              new_attachment.file_size    = File.size(file_hash[:resized_file].path)
+              new_attachment.content_type = MIME::Types.type_for(file_hash[:uploaded_file].path)
+              new_attachment.save!
 
-                GridFS::GridStore.open(self.class.database, new_attachment.grid_key, 'w', :content_type => new_attachment.content_type) do |f|
-                  f.write file_hash[:resized_file].read
-                end
-
-              end
-            EOF
-            
+              write_to_grid new_attachment, file_hash[:resized_file]
+            end
+          
           end
         end
         
@@ -69,8 +74,8 @@ module MongoMapper
           GridFS::GridStore.unlink(self.class.database, grid_key)
         end
       
-        def write_to_grid new_file
-          GridFS::GridStore.open(self.class.database, grid_key, 'w', :content_type => content_type) do |f|
+        def write_to_grid attachment, new_file
+          GridFS::GridStore.open(self.class.database, attachment.grid_key, 'w', :content_type => attachment.content_type) do |f|
             f.write new_file.read
           end
         end

data/lib/grip/has_attachment.rb

@@ -13,11 +13,11 @@ module MongoMapper
 
           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  = Attachment.find_or_initialize_by_name_and_owner_id(name.to_s,self._id)
+            new_attachment  = attachments.find_or_create_by_name(name.to_s)
             update_attachment_attributes!(new_attachment, new_file, opts)
-            self.class.uploaded_files[name][:file] = new_file
           end
                     
         end
@@ -31,8 +31,10 @@ module MongoMapper
         base.extend ClassMethods
         base.class_eval do
           after_save :save_attachments
-          
-          many :attachments, :as => :owner, :class_name => "MongoMapper::Grip::Attachment", :dependent => :destroy
+          many  :attachments, 
+                :as => :owner, 
+                :class_name => "MongoMapper::Grip::Attachment", 
+                :dependent => :destroy
         end
       end
       
@@ -56,16 +58,20 @@ module MongoMapper
       
       def create_variant attachment, variant, dimensions
         tmp_file = self.class.uploaded_files[attachment.name.to_sym][:file]
-        tmp   = Tempfile.new("#{attachment.name}_#{variant}")
-        image = Miso::Image.new(tmp_file.path)
+        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.crop(dimensions[:width], dimensions[:height])  if dimensions[:crop]
+          image.fit(dimensions[:width], dimensions[:height])   unless dimensions[:crop]
         
-        image.write(tmp.path)
+          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
       

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 %w{test/unit shoulda factory_girl mongo_mapper factories}.each { |lib| require lib }
 require 'growler'
 require File.expand_path(File.dirname(__FILE__) + '/../lib/grip')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grip
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - twoism
@@ -10,10 +10,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-31 00:00:00 -05:00
+date: 2010-01-07 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rmagick
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: miso
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: GridFS attachments for MongoMapper
 email: signalstatic@gmail.com
 executables: []
@@ -22,12 +41,12 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.rdoc
+- README.markdown
 files: 
 - .DS_Store
 - .gitignore
 - LICENSE
-- README.rdoc
+- README.markdown
 - Rakefile
 - VERSION
 - grip.gemspec
@@ -37,10 +56,10 @@ files:
 - test/factories.rb
 - test/fixtures/cthulhu.png
 - test/fixtures/sample.pdf
+- test/grip_attachment_test.rb
 - test/growler.rb
+- test/has_attachment_test.rb
 - test/models.rb
-- test/test_grip_attachment.rb
-- test/test_has_attachment.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/twoism/grip
@@ -72,8 +91,8 @@ specification_version: 3
 summary: GridFS attachments for MongoMapper
 test_files: 
 - test/factories.rb
+- test/grip_attachment_test.rb
 - test/growler.rb
+- test/has_attachment_test.rb
 - test/models.rb
-- test/test_grip_attachment.rb
-- test/test_has_attachment.rb
 - test/test_helper.rb

data/README.rdoc

@@ -1,47 +0,0 @@
-= grip
-
-GridFS attachments for MongoMapper
-
-= installation
-
-The grip gem is hosted on gemcutter.org:
-
-    gem install miso grip
-
-
-= Usage (See tests for better docs)
-
-    class Doc
-      include MongoMapper::Document
-      include MongoMapper::Grip::HasAttachment
-
-      has_grid_attachment :image, :versions => {:thumb => {:width=>50,:height=>50}}
-      
-    end
-
-    image = File.open('foo.png', 'r')
-    @doc = Doc.create(:image => image)
-
-    puts @doc.image.name 
-    => "image"
-    puts @doc.image.file_size
-    => 100
-    puts @doc.image.file_name
-    => "foo.png"
-    puts @doc.image.grid_key
-    => "docs/<id>/image"
-    
-    # works on nested variants as well
-    
-    puts @doc.image.thumb.name 
-    => "thumb"
-    puts @doc.image.thumb.file_size
-    => 50
-    puts @doc.image.thumb.file_name
-    => "foo.png"
-    puts @doc.image.thumb.grid_key
-    => "attachments/<id>/thumb"
-    
-    
-    @doc.image.file # contents read from gridfs for serving from rack/metal/controller 
-