mm-attach-it 0.1.2 → 0.1.3

data/README

@@ -1,11 +1,15 @@
 = Mm-attach-it
 
-Attach files (images, videos, pdfs, txts, zips and etc) to a MongoMapper record. You can choose if you to store it on file system or GridFS.
+Attach files (images, videos, pdfs, txts, zips and etc) to a MongoMapper record. You can even choose to store them on file system or GridFS.
 
 == Install
 
   sudo gem install mm-attach-it
 
+Or add it to your Rails’s Gemfile::
+
+  gem "mm-attach-it"
+
 == Usage
 
 === Model
@@ -19,7 +23,7 @@ Declare the plugin and use the attachment method to make attachments.
     has_attachment :photo
   end
 
-The default storage is the file system, if you want to change for GridFS you should do:
+The default storage destination is the file system, if you want to change it to GridFS you should add the following: 
 
   class Bar
     include MongoMapper::Document
@@ -28,7 +32,7 @@ The default storage is the file system, if you want to change for GridFS you sho
     has_attachment :photo, { :storage => 'gridfs' }
   end
 
-If you want to resize the images (you can store resized images on both: file system or GridFS)
+If you want to resize the images (you can store resized images on both: file systems or GridFS): 
 
   class Foo
     include MongoMapper::Document
@@ -37,7 +41,7 @@ If you want to resize the images (you can store resized images on both: file sys
     has_attachment :photo, { :styles => { :small => '100x100>', :medium => '200x200>' } }
   end
 
-If you want to validate the attached file (again you can validate attaches on both: file system or GridFS)
+If you want to validate the attached file (again, you can validate attachments on both: file system or GridFS):
 
   class Foo
     include MongoMapper::Document
@@ -46,13 +50,13 @@ If you want to validate the attached file (again you can validate attaches on bo
     has_attch :photo
 
     validates_attachment_presence :photo
-    validates_attachment_content_type: photo, :content_type => ['image/jpeg', 'image/gif', 'image/png']
+    validates_attachment_content_type :photo, :content_type => ['image/jpeg', 'image/gif', 'image/png']
     validates_attachment_size :photo, { :less_than => 1.megabyte, :greater_than => 500.kilobytes }
   end
 
-OBS: But remember, you can attach whatever kind of file!
+OBS: But remember! You can attach any desirable file.
 
-If you are using the file system to store the files you can specify the storage directory
+If you are using the file system to store files, you can specify the directory/folder to store them.
 
   class Foo
     include MongoMapper::Document
@@ -61,13 +65,13 @@ If you are using the file system to store the files you can specify the storage
     has_attachment :photo, { :path => '/:rails_root/public/images/foos/:id/:style/:filename' }
   end
 
-OBS: The default directory is '/:rails_root/public/system/:attachment/:id/:style/:filename'
+OBS: The default directory is ’/:rails_root/public/system/:attachment/:id/:style/:filename’
 
 Where:
 * :rails_root - is the root directory of your Rails application
 * :environment - can be "production", "test" or "development"
-* :class - the name of the class ('foo' the example above)
-* :attachment - is the name of the column's collection ('photo' the example above)
+* :class - the name of the class (in the example given above, ‘foo’) 
+* :attachment - is the name of the column’s collection (in the example given above, ‘photo’) 
 * :id - the "id" of the record on MongoDB
 * :style - if you specified the styles
 * :filename - the name of the file
@@ -83,19 +87,19 @@ Check the model below
 
     # on file system
     has_attachment :photo, { 
-      :style => { :thumb => '100x100>' },
+      :styles => { :thumb => '100x100>' },
       :url => '/assets/groups/:id/:style/:filename', 
-      :path => '/:rails_root/public/image/foos/:id/:style/:filename', :storage => 'gridfs',
+      :path => '/:rails_root/public/image/foos/:id/:style/:filename'
     }
 
     # on GridFS
     has_attachment :avatar, {
-      :style => { :thumb => '100x100>' }, 
+      :styles => { :thumb => '100x100>' }, 
       :storage => 'gridfs', 
     }
   end
 
-On form you must set the "multipart" option and the field as "file_field":
+Within forms you must set the "multipart" option and the field as "file_field":
 
   <%= form_for(@foo, :html => { :multipart => true }) do |f| %>
 
@@ -115,7 +119,7 @@ On form you must set the "multipart" option and the field as "file_field":
   <% end %>
 
 
-The safest way to show the images is using Base64, doesn't matter if you are using the file system or GridFS.
+Regardless of using the file system or GridFS the safest way to present the images is using Base64.
 
   <img src="<%= foo.photo.base64 %>">
   <img src="<%= foo.photo.base64('thumb') %>">
@@ -123,16 +127,16 @@ The safest way to show the images is using Base64, doesn't matter if you are usi
   <img src="<%= foo.avatar.base64 %>">
   <img src="<%= foo.avatar.base64('thumb') %>">
 
-Also, only for file system, if you specify the 'url' option you can do:
+Also, specifically when using the file system, if you specify the ‘url’ option, you can do:
 
   <%= image_tag foo.photo.url %>
   <%= image_tag foo.photo.url('thumb') %>
 
 === Controller
 
-If you are using the GridFS to store your files and youn don't want to use Base64 data to show the images you've got to create a action on a controller.
+If you are using the GridFS to store files, and you don’t want to use Base64 data to present the images, you’ve got to create an action on a controller.
 
-But first create a new route on the route's file:
+But first create a new route on the route’s file:
   
   match '/foos/avatar/:id(/:style)', :to => 'foos#avatar'
   
@@ -153,7 +157,7 @@ Now the controller:
 
   end
 
-And the view do that:
+And, for the view, do that:
   
   <%= image_tag  "/foos/avatar/#{foo.id.to_s}/small" %>
 

data/README.rdoc

@@ -1,11 +1,15 @@
 = Mm-attach-it
 
-Attach files (images, videos, pdfs, txts, zips and etc) to a MongoMapper record. You can choose if you to store it on file system or GridFS.
+Attach files (images, videos, pdfs, txts, zips and etc) to a MongoMapper record. You can even choose to store them on file system or GridFS.
 
 == Install
 
   sudo gem install mm-attach-it
 
+Or add it to your Rails’s Gemfile::
+
+  gem "mm-attach-it"
+
 == Usage
 
 === Model
@@ -19,7 +23,7 @@ Declare the plugin and use the attachment method to make attachments.
     has_attachment :photo
   end
 
-The default storage is the file system, if you want to change for GridFS you should do:
+The default storage destination is the file system, if you want to change it to GridFS you should add the following: 
 
   class Bar
     include MongoMapper::Document
@@ -28,7 +32,7 @@ The default storage is the file system, if you want to change for GridFS you sho
     has_attachment :photo, { :storage => 'gridfs' }
   end
 
-If you want to resize the images (you can store resized images on both: file system or GridFS)
+If you want to resize the images (you can store resized images on both: file systems or GridFS): 
 
   class Foo
     include MongoMapper::Document
@@ -37,7 +41,7 @@ If you want to resize the images (you can store resized images on both: file sys
     has_attachment :photo, { :styles => { :small => '100x100>', :medium => '200x200>' } }
   end
 
-If you want to validate the attached file (again you can validate attaches on both: file system or GridFS)
+If you want to validate the attached file (again, you can validate attachments on both: file system or GridFS):
 
   class Foo
     include MongoMapper::Document
@@ -46,13 +50,13 @@ If you want to validate the attached file (again you can validate attaches on bo
     has_attch :photo
 
     validates_attachment_presence :photo
-    validates_attachment_content_type: photo, :content_type => ['image/jpeg', 'image/gif', 'image/png']
+    validates_attachment_content_type :photo, :content_type => ['image/jpeg', 'image/gif', 'image/png']
     validates_attachment_size :photo, { :less_than => 1.megabyte, :greater_than => 500.kilobytes }
   end
 
-OBS: But remember, you can attach whatever kind of file!
+OBS: But remember! You can attach any desirable file.
 
-If you are using the file system to store the files you can specify the storage directory
+If you are using the file system to store files, you can specify the directory/folder to store them.
 
   class Foo
     include MongoMapper::Document
@@ -61,13 +65,13 @@ If you are using the file system to store the files you can specify the storage
     has_attachment :photo, { :path => '/:rails_root/public/images/foos/:id/:style/:filename' }
   end
 
-OBS: The default directory is '/:rails_root/public/system/:attachment/:id/:style/:filename'
+OBS: The default directory is ’/:rails_root/public/system/:attachment/:id/:style/:filename’
 
 Where:
 * :rails_root - is the root directory of your Rails application
 * :environment - can be "production", "test" or "development"
-* :class - the name of the class ('foo' the example above)
-* :attachment - is the name of the column's collection ('photo' the example above)
+* :class - the name of the class (in the example given above, ‘foo’) 
+* :attachment - is the name of the column’s collection (in the example given above, ‘photo’) 
 * :id - the "id" of the record on MongoDB
 * :style - if you specified the styles
 * :filename - the name of the file
@@ -83,19 +87,19 @@ Check the model below
 
     # on file system
     has_attachment :photo, { 
-      :style => { :thumb => '100x100>' },
+      :styles => { :thumb => '100x100>' },
       :url => '/assets/groups/:id/:style/:filename', 
-      :path => '/:rails_root/public/image/foos/:id/:style/:filename', :storage => 'gridfs',
+      :path => '/:rails_root/public/image/foos/:id/:style/:filename'
     }
 
     # on GridFS
     has_attachment :avatar, {
-      :style => { :thumb => '100x100>' }, 
+      :styles => { :thumb => '100x100>' }, 
       :storage => 'gridfs', 
     }
   end
 
-On form you must set the "multipart" option and the field as "file_field":
+Within forms you must set the "multipart" option and the field as "file_field":
 
   <%= form_for(@foo, :html => { :multipart => true }) do |f| %>
 
@@ -115,7 +119,7 @@ On form you must set the "multipart" option and the field as "file_field":
   <% end %>
 
 
-The safest way to show the images is using Base64, doesn't matter if you are using the file system or GridFS.
+Regardless of using the file system or GridFS the safest way to present the images is using Base64.
 
   <img src="<%= foo.photo.base64 %>">
   <img src="<%= foo.photo.base64('thumb') %>">
@@ -123,16 +127,16 @@ The safest way to show the images is using Base64, doesn't matter if you are usi
   <img src="<%= foo.avatar.base64 %>">
   <img src="<%= foo.avatar.base64('thumb') %>">
 
-Also, only for file system, if you specify the 'url' option you can do:
+Also, specifically when using the file system, if you specify the ‘url’ option, you can do:
 
   <%= image_tag foo.photo.url %>
   <%= image_tag foo.photo.url('thumb') %>
 
 === Controller
 
-If you are using the GridFS to store your files and youn don't want to use Base64 data to show the images you've got to create a action on a controller.
+If you are using the GridFS to store files, and you don’t want to use Base64 data to present the images, you’ve got to create an action on a controller.
 
-But first create a new route on the route's file:
+But first create a new route on the route’s file:
   
   match '/foos/avatar/:id(/:style)', :to => 'foos#avatar'
   
@@ -153,7 +157,7 @@ Now the controller:
 
   end
 
-And the view do that:
+And, for the view, do that:
   
   <%= image_tag  "/foos/avatar/#{foo.id.to_s}/small" %>
 

data/lib/attach_it/attach_it.rb

@@ -7,7 +7,7 @@ module AttachIt
 
   module ClassMethods
     def has_attachment(name, options = {})
-      options.symbolize_keys!
+      options = options.symbolize_keys
       name = name.to_sym
 
       after_save     :save_attachments
@@ -25,7 +25,7 @@ module AttachIt
       define_method("#{name}") do
         information_for(name, options)
       end
-
+  
       validates_each name, :logic => lambda { information_for(name, options).send(:flush_errors) }
     end
 
@@ -74,8 +74,10 @@ module AttachIt
     end
 
     def destroy_attachments
-      @attachment_options.keys.each do |name|
-        @attachment_options[name].delete
+      unless @attachment_options.nil?
+        @attachment_options.keys.each do |name|
+          @attachment_options[name].delete
+        end
       end
     end
 

data/lib/attach_it/storage/filesystem.rb

@@ -4,7 +4,7 @@ class Filesystem < Storage
     image_options.styles.each do |style_name, style_value|
       begin        
         FileUtils.mkdir_p(File.dirname(image_options.path(style_name)))
-        resize(style_value, image_options.assigned_file.path).write(image_options.path(style_name)) 
+        transform(style_value, image_options.assigned_file.path).write(image_options.path(style_name)) 
         FileUtils.chmod(0644, image_options.path(style_name))
       rescue Exception => exception
         image_options.add_error(exception.to_s)

data/lib/attach_it/storage/gridfs.rb

@@ -7,7 +7,7 @@ class Gridfs < Storage
   def flush_write(image_options = nil)
     image_options.styles.each do |style_name, style_value|
       begin
-        gridfs_id = @grid.put(resize(style_value, image_options.assigned_file.path).to_blob, :filename => style_name.to_s + '_' + image_options.file_name, :_id => "#{image_options.object_id}_#{image_options.name}_#{style_name}")
+        gridfs_id = @grid.put(transform(style_value, image_options.assigned_file.path).to_blob, :filename => style_name.to_s + '_' + image_options.file_name, :_id => "#{image_options.object_id}_#{image_options.name}_#{style_name}")
       rescue Exception => exception
         image_options.add_error(exception.to_s)
       end

data/lib/attach_it/storage/storage.rb

@@ -2,9 +2,29 @@ require 'RMagick'
 
 class Storage
 
+  def transform(style_value = nil, filename = nil)
+    style_value.gsub!(/\s+/, '')
+
+    if style_value.match(/^(\d+)x(\d+)\#$/)
+      crop($1.to_i, $2.to_i, filename)
+    else
+      resize(style_value, filename)
+    end
+  end
+
+  private
   def resize(style_value = nil, filename = nil)
     new_image = Magick::Image.read(filename).first
     new_image.change_geometry!(style_value) { |cols, rows, img| img.resize!(cols, rows) }
+    new_image
+  end
+
+  def crop(new_width = nil, new_height = nil, filename = nil)
+    new_image = Magick::Image.read(filename).first
+    width = new_image.columns
+    height = new_image.rows
+    new_image.crop!(width/2 - new_width/2, height/2 - new_height/2, new_width, new_height)
+    new_image
   end
 
 end

data/lib/attach_it/version.rb

@@ -1,3 +1,3 @@
 module AttachIt
-  Version = '0.1.2'
+  Version = '0.1.3'
 end

data/test/test_helper.rb

@@ -3,7 +3,7 @@ require 'tempfile'
 require 'mongo_mapper'
 require 'shoulda'
 require 'mocha'
-require File.expand_path(File.dirname(__FILE__) + '/../lib/mm_attach_it')
+require File.expand_path(File.dirname(__FILE__) + '/../lib/mm-attach-it')
 
 MongoMapper.database = "testing_mm_attach_it"
 

data/test/unit/test_attach_it.rb

@@ -60,9 +60,7 @@ class TestAttachIt < Test::Unit::TestCase
   end
 
 
-  context "Attaching not an image on file system" do
-    
-  end
+  context "Attaching not an image on file system" do    
     setup do
       @doc = DocumentOne.new
       @doc.name = 'Mydocument'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mm-attach-it
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Adilson Chacon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-30 00:00:00 Z
+date: 2011-06-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: wand