griddle 0.0.0 → 0.1.2

data/README.markdown

@@ -0,0 +1,112 @@
+Griddle: GridFileSystem made simple
+=======================================
+
+Griddle is a file attachment gem for use with `mongo-ruby-driver`.
+
+Installation
+------------------
+
+Install the gem:
+
+    gem install griddle
+
+
+Usage
+---------------------------------------
+
+A class with a grid attachment:
+
+    class Document
+      
+      include Griddle::HasGridAttachment
+      
+      has_grid_attachment :image, :styles=>{
+        :thumb => "50x50#"
+      }
+      
+    end
+
+Or, alternately if you're using an object model
+
+    class Document
+      
+      include MongoMapper::Document
+      include Griddle::HasGridAttachment
+      
+      has_grid_attachment :image, :styles=>{
+        :thumb => "50x50#"
+      }
+      
+    end
+      
+Create a document:
+    
+    @document = Document.new
+    @document.image = File.new("attached_file.jpg", 'rb')
+    @document.save_attached_files
+    
+Or, if you're using an object model, `saved_attached_files` is called `after_save`:
+
+    image = File.new("attached_file.jpg", 'rb')
+    @document = Document.new(:image => image)
+    @document.save
+    
+Retrieving A File
+-----------------
+
+The contents of a file stored in GridFileSystem can be retrieved using `Mongo::GridIO` accessed by the `file` method:
+
+    @document.image.file
+    => <#Mongo::GridIO>
+    
+    @document.image.file.read
+    => contents of file
+
+Some other methods that may be helpful to know:
+  
+    # does the attachment exist?
+    @document.image.exist?
+    => true
+    
+    # attachment file name
+    @document.image.file_name
+    => attached_file.jpg
+    
+    # attachment grid key
+    @document.image.grid_key
+    => document/12345/image/attached_file.jpg
+    
+Styles
+------
+
+Griddle makes use of `ImageMagik` processor to fit and/or crop images and store different image `styles`:
+
+    @document.image.styles
+    => {:thumb => '50x50#'}
+
+Each style is saved as a `Griddle::Attachment` as well:
+
+    @document.image.thumb.exist?
+    => true
+    
+    @document.image.thumb.file_name
+    => attached_file.jpg
+    
+    @document.image.thumb.grid_key
+    => documents/12345/images/attached_file.jpg
+
+Note on Patches/Pull Requests
+-----------------------------
+ 
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+Copyright
+---------
+
+Copyright (c) 2010 Matt Matt san Mongeau. See LICENSE for details.

data/Rakefile

@@ -9,9 +9,9 @@ begin
     gem.description = %Q{GridFS made simple...}
     gem.email = "matt@toastyapps.com"
     gem.homepage = "http://github.com/toastyapps/griddle"
-    gem.authors = ["Matt Mongeau"]
+    gem.authors = ["Matt Mongeau","meanmarcus"]
     gem.add_development_dependency "shoulda", ">= 0"
-    gem.add_dependency "mongo_mapper", ">= 0"
+    gem.add_development_dependency "mongo_mapper", ">= 0"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.1.2

data/griddle.gemspec

@@ -5,37 +5,43 @@
 
 Gem::Specification.new do |s|
   s.name = %q{griddle}
-  s.version = "0.0.0"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Matt Mongeau"]
-  s.date = %q{2010-03-03}
+  s.authors = ["Matt Mongeau", "meanmarcus"]
+  s.date = %q{2010-05-30}
   s.description = %q{GridFS made simple...}
   s.email = %q{matt@toastyapps.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+     "README.markdown"
   ]
   s.files = [
     ".document",
      ".gitignore",
      "LICENSE",
-     "README.rdoc",
+     "README.markdown",
      "Rakefile",
      "VERSION",
      "griddle.gemspec",
      "lib/griddle.rb",
      "lib/griddle/attachment.rb",
      "lib/griddle/has_grid_attachment.rb",
+     "lib/griddle/processor.rb",
+     "lib/griddle/processor/image_magick.rb",
      "lib/griddle/style.rb",
      "lib/griddle/upfile.rb",
      "rails/init.rb",
      "test/attachment_test.rb",
      "test/fixtures/baboon.jpg",
+     "test/fixtures/climenole.jpeg",
      "test/fixtures/fox.jpg",
      "test/fixtures/sample.pdf",
+     "test/fixtures/squid.png",
      "test/has_attachment_test.rb",
      "test/models.rb",
+     "test/mongo_mapper_models.rb",
+     "test/processor_test.rb",
      "test/style_test.rb",
      "test/test_helper.rb",
      "test/upfile_test.rb"
@@ -43,12 +49,14 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/toastyapps/griddle}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{GridFS made simple.}
   s.test_files = [
     "test/attachment_test.rb",
      "test/has_attachment_test.rb",
      "test/models.rb",
+     "test/mongo_mapper_models.rb",
+     "test/processor_test.rb",
      "test/style_test.rb",
      "test/test_helper.rb",
      "test/upfile_test.rb"
@@ -58,9 +66,9 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_runtime_dependency(%q<mongo_mapper>, [">= 0"])
+      s.add_development_dependency(%q<mongo_mapper>, [">= 0"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<mongo_mapper>, [">= 0"])

data/lib/griddle/attachment.rb

@@ -1,71 +1,242 @@
 module Griddle
   class Attachment
-    include MongoMapper::Document
     
-    belongs_to :owner, :polymorphic => true
-    key :name, String
-    key :owner_id, ObjectId, :required => true
-    key :owner_type, String, :required => true
-    key :file_name, String
-    key :file_size, Integer
-    key :content_type, String
-    key :styles, Hash
-    key :options, Hash
-    
-    before_destroy :destroy_file
-    before_save :save_file
+    include Mongo
+
+    def self.attachment_for(options)
+      options = self.clean_options(options)
+      options_for_search = {:name => options[:name], :owner_type => options[:owner_type], :owner_id => options[:owner_id]}
+      record = collection.find_one(options_for_search)
+      return new(record) unless record.nil?
+      return new(options)
+    end
+
+    def self.collection
+      @collection ||= Griddle.database.collection('griddle.attachments')
+    end
     
     def self.for(name, owner, options = {})
-      a = Attachment.find_or_create_by_name_and_owner_type_and_owner_id(name, owner.class.to_s, owner.id)
-      if options.has_key?(:styles)
-        a.styles = (options[:styles] || {}).inject({}) do |h, value|
-          h[value.first] = Style.new value.first, value.last, a
-          h
+      attachment_for(options.merge({
+        :name => name,
+        :owner_type => owner.class,
+        :owner_id => owner.id
+      }))
+    end
+
+    def self.valid_attributes
+      [:name, :owner_id, :owner_type, :file_name, :file_size, :content_type, :styles, :options]
+    end
+    #     belongs_to :owner, :polymorphic => true
+    
+    attr_accessor :attributes
+
+    def initialize(attributes = {})
+      @grid = GridFileSystem.new(Griddle.database)
+      @attributes = attributes.symbolize_keys
+      initialize_processor
+      initialize_styles
+      create_attachments_for_styles
+    end
+    
+    def assign(uploaded_file)
+      if valid_assignment?(uploaded_file)
+        self.file = uploaded_file
+        self.dirty!
+      end
+    end
+    
+    def attributes
+      @attributes
+    end
+
+    def attributes=(attributes)
+      @attributes.merge!(attributes).symbolize_keys
+    end
+
+    def collection
+      @collection ||= self.class.collection
+    end
+    
+    def destroy
+      destroy_file
+      collection.remove({:name => name, :owner_type => owner_type, :owner_id => owner_id})
+    end
+    
+    def method_missing(method, *args, &block)
+      key = method.to_s.gsub(/\=$/, '').to_sym
+      if self.class.valid_attributes.include?(key)
+        if key != method
+          @attributes[key] = args[0]
+        else
+          @attributes[key]
         end
+      else
+        super
       end
-      a
+    end
+    
+    def destroy_file
+      @grid.delete(grid_key)
+      destroy_styles
+    end
+    
+    def dirty?
+      @dirty ||= false
+      @dirty
+    end
+    
+    def exists?
+      Griddle.database['fs.files'].find({'filename' => self.grid_key}).count > 0
     end
     
     def grid_key
-      @grid_key ||= "#{owner_type.tableize}/#{owner_id}/#{name}/#{file_name}".downcase
+      "#{owner_type.tableize}/#{owner_id}/#{name}/#{self.file_name}".downcase
     end
     
-    def assign(uploaded_file)
-      return nil unless valid_assignment?(uploaded_file)
-      @tmp_file = uploaded_file
+    def file
+      @grid.open(grid_key, 'r') if exists?
     end
     
     def file=(new_file)
-      file_name = new_file.respond_to?(:original_filename) ? new_file.original_filename : File.basename(new_file.path)
-      self.file_name = file_name
-      self.file_size = File.size(new_file)
+      filename = clean_filename(new_file.respond_to?(:original_filename) ? new_file.original_filename : File.basename(new_file.path))
+      self.file_name = filename
+      self.file_size = File.size(new_file.path)
       self.content_type = new_file.content_type
-      
-      GridFS::GridStore.open(self.class.database, grid_key, 'w', :content_type => self.content_type) do |f|
-        f.write new_file.read
+      @tmp_file = new_file
+    end
+    
+    def name= name
+      @attributes[:name] = name.to_sym
+    end
+    
+    def owner_id= id
+      @attributes[:owner_id] = id.to_s
+    end
+    
+    def owner_type= str
+      @attributes[:owner_type] = str.to_s
+    end
+    
+    def processor
+      @processor
+    end
+    
+    def processor= processor
+      @attributes[:processor] = processor
+      initialize_processor
+    end
+
+    def save
+      if valid?
+        destroy
+        save_file
+        collection.insert(valid_attributes(@attributes).stringify_keys)
       end
     end
     
-    def file
-      GridFS::GridStore.new(self.class.database, grid_key, 'r') unless file_name.blank?
+    def styles
+      @styles
     end
     
-    def destroy_file
-      GridFS::GridStore.unlink(self.class.database, grid_key)
+    def styles= styles
+      @attributes[:styles] = styles
+      initialize_styles
     end
     
-    def exists?
-      !file_name.nil?
+    def valid?
+      dirty? && valid_assignment?(@tmp_file)
+    end
+
+    def valid_attributes(attributes)
+      Hash[*attributes.select{|key, value| self.class.valid_attributes.include?(key) }.flatten]
+    end
+    
+    protected
+    
+    def dirty!
+      @dirty = true
     end
     
     private
     
+    def self.clean_options(options)
+      options.symbolize_keys!
+      options.merge({
+        :name => options[:name].to_sym,
+        :owner_type => options[:owner_type].to_s,
+        :owner_id => options[:owner_id].to_s
+      })
+    end
+    
+    def clean_filename str
+      tmp_file_reg = /\.([a-z]{2}[a-z0-9]{0,2})#{Time.now.strftime('%Y%m%d')}-.+/
+      str.gsub(tmp_file_reg,'.\1').gsub(/[?:\/*""<>|]+/,'_')
+    end
+    
+    def create_attachments_for_styles
+      self.styles.each do |h|
+        create_style_attachment h[0]
+      end
+    end
+    
+    def create_style_attachment style_name
+      raise "Invalid style name :#{style_name}. #{style_name} is a reserved word." if respond_to?(style_name) || !attributes[style_name.to_sym].nil?
+      
+      attrs = attributes.merge({
+        :name => "#{name}/#{style_name}",
+        :owner_id => @attributes[:owner_id].to_s,
+        :styles => {}
+      })
+      self.class_eval do
+        
+        define_method(style_name) do |*args|
+          Attachment.attachment_for(attrs)
+        end
+      
+        define_method("#{style_name}=") do |file|
+          Attachment.attachment_for(attrs).assign(file)
+        end
+        
+      end
+    end
+    
+    def destroy_styles
+      styles.each{|s| send(s[0]).destroy }
+    end
+    
+    def initialize_processor
+      @processor = Processor.new @attributes[:processor]
+    end
+    
+    def initialize_styles
+      @styles = {} 
+      if @attributes[:styles] && @attributes[:styles].is_a?(Hash)
+        @styles = @attributes[:styles].inject({}) do |h, value|
+          h[value.first.to_sym] = Style.new value.first, value.last, self
+          h
+        end
+      end
+    end
+    
     def save_file
-      self.file = @tmp_file if @tmp_file
+      @tmp_file.rewind
+      @grid.open(grid_key, 'w', :content_type => self.content_type) do |f|
+        f.write @tmp_file.read
+      end
+      save_styles
+    end
+    
+    def save_styles
+      styles.each do |h|
+        processed_file = processor.process_image(@tmp_file, h[1])
+        style_attachment = send(h[0])
+        style_attachment.assign(processed_file)
+        style_attachment.save
+      end
     end
     
     def valid_assignment?(file)
-      file.nil? || (file.respond_to?(:original_filename) && file.respond_to?(:content_type))
+      (file.respond_to?(:original_filename) && file.respond_to?(:content_type))
     end
     
   end

data/lib/griddle/has_grid_attachment.rb

@@ -1,4 +1,3 @@
-require 'mongo/gridfs'
 module Griddle
   module HasGridAttachment
     def self.included(base)
@@ -13,14 +12,15 @@ module Griddle
         write_inheritable_attribute(:attachment_definitions, {}) if attachment_definitions.nil?
         attachment_definitions[name] = options
 
-        after_save :save_attached_files
+        after_save :save_attached_files if respond_to? :after_save
+        after_destroy :destroy_attached_files if respond_to? :after_destroy
         
         define_method(name) do |*args|
-          attachment_for(name)
+          attachment_for(name, options)
         end
         
         define_method("#{name}=") do |file|
-          attachment_for(name).assign(file)
+          attachment_for(name, options).assign(file)
         end        
       end
       
@@ -31,9 +31,13 @@ module Griddle
     
     module InstanceMethods
       
-      def attachment_for name
+      def attachment_for name, options = {}
         @_gripster_attachments ||= {}
-        @_gripster_attachments[name] ||= Attachment.for(name, self)
+        @_gripster_attachments[name] ||= Attachment.for(name, self, options)
+      end
+      
+      def destroy_attached_files
+        each_attachment{|name, attachment| attachment.destroy }
       end
       
       def each_attachment

data/lib/griddle/processor/image_magick.rb

@@ -0,0 +1,74 @@
+module Griddle
+  class Processor
+    class ImageMagick
+      
+      def crop
+        `convert #{File.expand_path(@destination_file.path)} -crop #{geometry} -gravity Center #{@destination_file.path}`
+      end
+      
+      def crop?
+        @style.geometry =~ /#/
+      end
+      
+      def file_width
+        file_dimensions.first
+      end
+      
+      def fit(geo = geometry)
+        `convert #{File.expand_path(@file.path)} -resize #{geo} #{@destination_file.path}`
+      end
+      
+      def geometry
+        @geometry ||= @style.geometry.gsub(/#/,'')
+      end
+      
+      def file_height
+        file_dimensions.last
+      end
+      
+      def height
+        dimensions.last
+      end
+      
+      def process_image file, style
+        @style = style
+        @file = file
+        @destination_file = Tempfile.new @file.original_filename
+        if crop?
+          fit(resize_geometry_for_crop)
+          crop
+        else
+          fit
+        end
+        @destination_file
+      end
+      
+      def width
+        dimensions.first
+      end
+      
+      private
+      
+      def dimensions
+        @dimensions ||= dimensions_for(geometry)
+      end
+      
+      def dimensions_for geo
+        geo.scan(/([0-9]*)x([0-9]*)/).flatten.collect{|v|v.to_f}
+      end
+      
+      def file_dimensions
+        @file_dimensions ||= dimensions_for(`identify -format "%[fx:w]x%[fx:h]" #{File.expand_path(@file.path)}`)
+      end
+      
+      def resize_for_width?
+        file_height*(width/file_width) >= height
+      end
+      
+      def resize_geometry_for_crop
+        resize_for_width? ? "#{width}x" : "x#{height}"
+      end
+      
+    end
+  end
+end

data/lib/griddle/processor.rb

@@ -0,0 +1,23 @@
+module Griddle
+  class Processor
+    
+    attr_accessor :klass
+    
+    def initialize( processor_class = :ImageMagick )
+      processor_class = :ImageMagick unless valid_processors.include? processor_class
+      self.klass = self.class.const_get "#{processor_class}"
+    end
+    
+    def process_image file, style
+      processor = self.klass.new
+      raise "Define in subclass" unless processor.respond_to? :process_image
+      processor.process_image(file, style)
+    end
+    
+    protected
+    def valid_processors
+      [:ImageMagick]
+    end
+    
+  end
+end

data/lib/griddle.rb

@@ -3,16 +3,35 @@ if RUBY_VERSION =~ /1.9.[0-9]/
 else
   require 'ftools'
 end
+require 'rubygems'
 require 'mime/types'
+require 'tempfile'
 require 'griddle/has_grid_attachment'
 require 'griddle/attachment'
 require 'griddle/upfile'
 require 'griddle/style'
+require 'griddle/processor/image_magick'
+require 'griddle/processor'
 
 module Griddle
+  
   def self.version
-    "0.0.1"
+    @version ||= File.read(File.join(File.dirname(__FILE__), "..", "VERSION")).chomp
   end
+  
+  def self.database
+    @database ||= if(defined?(MongoMapper))
+      MongoMapper.database
+    else
+      nil
+    end
+  end
+  
+  def self.database=(database)
+    @database = database
+  end
+  
 end
 
-File.send(:include, Griddle::Upfile)
+File.send(:include, Griddle::Upfile)
+

data/test/attachment_test.rb

@@ -1,6 +1,8 @@
 require "test_helper"
 require "models"
 
+include Mongo
+
 class AttachmentTest < Test::Unit::TestCase
   
   context "An Attachment" do
@@ -19,8 +21,8 @@ class AttachmentTest < Test::Unit::TestCase
     should "#assign a valid assignment" do
       @attachment.assign(@image)
       @attachment.save
-      assert  @attachment.file.is_a? GridFS::GridStore
-      assert GridFS::GridStore.exist?(DocNoAttachment.database, @attachment.grid_key)
+      assert_kind_of Mongo::GridIO, @attachment.file 
+      assert @attachment.exists?
     end
     
     context "with a file" do
@@ -31,7 +33,7 @@ class AttachmentTest < Test::Unit::TestCase
     
       should "#destroy_file" do
         @attachment.destroy_file
-        assert !GridFS::GridStore.exist?(DocNoAttachment.database, @attachment.grid_key)
+        assert !@attachment.exists?
       end
       
     end

data/test/has_attachment_test.rb

@@ -1,5 +1,6 @@
 require "test_helper"
 require "models"
+include Mongo
  
 class HasAttachmentTest < Test::Unit::TestCase
   context "A Doc that has_grid_attachment :image" do
@@ -28,20 +29,83 @@ class HasAttachmentTest < Test::Unit::TestCase
       should "should return an Attachment" do
         assert_equal(Griddle::Attachment, @document.image.class)
       end
- 
+       
       should "read file from grid store" do
         assert_equal "image/jpeg", @file_system.find_one(:filename => @document.image.grid_key)['contentType']
       end
+      
+      should "exist" do
+        assert @document.image.exists?
+      end
+      
+      context "when assigned a new file" do
+      
+        setup do
+          @new_file = File.new("#{@dir}/climenole.jpeg", 'rb')
+          @document.image = @new_file
+          @document.save!
+          @document = Doc.find(@document.id)
+        end
+      
+        should "be the new file" do
+          assert_equal "climenole.jpeg", @document.image.file_name
+          @new_file.rewind
+          assert_equal @new_file.read.length, @document.image.file.read.length
+        end
+      
+      end 
+      
+      context "when save is called without a new file" do
+      
+        setup do
+          @document = Doc.find(@document.id)
+          @document.save!
+        end
+      
+        should "be the original image" do
+          assert @document.image.exists?
+          assert_equal "baboon.jpg", @document.image.file_name
+          @image.rewind
+          assert_equal @image.read.length, @document.image.file.read.length
+        end
+      
+      end 
  
     end
     
+    context "when assigned nil" do
+      
+      setup do
+        @document.image = nil
+        @document.save!
+      end
+      
+      should "not exist" do
+        assert !@document.image.exists?
+      end
+      
+    end
+    
+    context "when assigned blank" do
+      
+      setup do
+        @document.image = ""
+        @document.save!
+      end
+      
+      should "not exist" do
+        assert !@document.image.exists?
+      end
+      
+    end
+    
     context "with styles" do
       
       setup do
         @document = DocWithStyles.new
       end
       
-      context "when assigned a file" do
+      context "when assigned an image" do
         
         setup do
           @document.image = @image
@@ -50,23 +114,171 @@ class HasAttachmentTest < Test::Unit::TestCase
         
         should "have a styles" do
           assert_kind_of Hash, @document.image.styles
-        end 
+        end
+        
+        should "have a method for each style" do
+          assert @document.image.respond_to? :cropped_wide
+        end
+        
+        should "be a kind of attachment" do
+          assert_kind_of Griddle::Attachment, @document.image.cropped_wide
+        end
+        
+        should "style should have a grid_key for cropped" do
+          assert_equal "doc_with_styles/#{@document.id}/image/cropped_wide/baboon.jpg", @document.image.cropped_wide.grid_key
+        end
+        
+        should "style should have a file for cropped" do
+          assert @document.image.cropped_wide.exists?
+          assert !@document.image.cropped_wide.file.read.blank?
+        end
+        
+        should "delete an image and its styles" do
+          grid_keys = @document.image.styles.inject([]) do |a,style|
+            a << @document.image.send(style[0]).grid_key
+            a
+          end
+          
+          grid_keys << @document.image.grid_key
+          
+          @document.image.destroy
+          
+          grid_keys.each do |grid_key|
+            assert Griddle.database['fs.files'].find({'filename' => grid_key}).count == 0
+          end
+        end
+        
+      end
+      
+      image_varations = {
+        "wider than taller" => {
+          :file_name => "baboon.jpg",
+          :expected_dimensions => {
+            :resized => "150 x 100",
+            :fitted => "150 x 114",
+            :cropped_wide => '60 x 50',
+            :cropped_tall => '50 x 60',
+            :cropped_square => '50 x 50'
+          }
+        },
+        "taller than wider" => {
+          :file_name =>"climenole.jpeg",
+          :expected_dimensions => {
+            :resized => "150 x 100",
+            :fitted => "94 x 150",
+            :cropped_wide => '60 x 50',
+            :cropped_tall => '50 x 60',
+            :cropped_square => '50 x 50'
+          }
+        },
+        "square" => {
+          :file_name => "squid.png",
+          :expected_dimensions => {
+            :resized => "150 x 100",
+            :fitted => "150 x 150",
+            :cropped_wide => '60 x 50',
+            :cropped_tall => '50 x 60',
+            :cropped_square => '50 x 50'
+          }
+        },
+      }
+      
+      image_varations.each do |variant|
+        description, variant = variant
+      
+        context "when assigned an image that is #{description}" do
+        
+          setup do
+            @document.image = File.new("#{@dir}/#{variant[:file_name]}", 'rb')
+            @document.save!
+          end
+        
+          variant[:expected_dimensions].each do |style|
+            style_name, dimensions = style
+        
+            should "have the correct dimensions for #{style_name}" do
+              temp = Tempfile.new "#{style[0]}.jpg"
+              style_attachment = @document.image.send(style_name)
+            
+              file_path = File.dirname(temp.path) + '/' + style_attachment.file_name
+              File.open(file_path, 'w') do |f|
+                f.write style_attachment.file.read
+              end
+              cmd = %Q[identify -format "%[fx:w] x %[fx:h]" #{file_path}]
+              assert_equal dimensions, `#{cmd}`.chomp
+            end
+          
+          end
+        
+        end  
         
       end
       
     end
- 
-    context "when multiple instances" do
+    
+    context "with a invalid style name" do
+      
       setup do
-        @document2 = Doc.new
-        @image2 = File.open("#{@dir}/fox.jpg", 'r')
-        @document3 = Doc.new
-        @image3 = File.open("#{@dir}/baboon.jpg", 'r')
-        @document2.image = @image2
-        @document3.image = @image3
+        @document = DocWithInvalidStyles.new
+      end
+      
+      should "raise an error indicating an invalid style name" do
+        assert_raise RuntimeError do
+          @document.image = @image
+        end
       end
+      
     end
- 
+    
+  end
+  
+  context "A Document with multiple attachments" do
+    
+    setup do
+      @document = DocWithMultipleAttachments.new
+      @dir = File.dirname(__FILE__) + '/fixtures'
+      @document.image = File.open("#{@dir}/baboon.jpg", 'r')
+      @document.pdf = File.open("#{@dir}/sample.pdf", 'r')
+      @document.save
+      
+      @grid_keys = [@document.image.grid_key, @document.pdf.grid_key]
+    end
+    
+    should "destroy_attached_files" do
+      @document.destroy_attached_files
+      @grid_keys.each do |grid_key|
+        assert Griddle.database['fs.files'].find({'filename' => grid_key}).count == 0
+      end
+    end
+    
+    should "destroy on after_destroy" do
+      @document.destroy
+      @grid_keys.each do |grid_key|
+        assert Griddle.database['fs.files'].find({'filename' => grid_key}).count == 0
+      end
+    end
+    
+  end
+  
+  context "A Document with no object model" do
+    
+    setup do
+      @document = Document.new
+      @dir = File.dirname(__FILE__) + '/fixtures'
+      @image = File.open("#{@dir}/baboon.jpg", 'r')
+    end
+    
+    should "have a method for save_attached_files" do
+      assert @document.respond_to? :save_attached_files
+    end
+    
+    should "save_attached_files" do
+      @document.save_attached_files
+      attachment = Griddle::Attachment.for(:image, @document)
+      attachment.attributes.delete(:_id)
+      assert_equal @document.image.attributes, attachment.attributes
+    end
+    
   end
  
 end

data/test/models.rb

@@ -1,19 +1,16 @@
-class Doc
-  include MongoMapper::Document
-  include Griddle::HasGridAttachment
-  has_grid_attachment :image
-end
-
-class DocNoAttachment
-  include MongoMapper::Document
-end
-
-class DocWithStyles
-  include MongoMapper::Document
+class Document
   include Griddle::HasGridAttachment
   
   has_grid_attachment :image, :styles => {
-    :thumb => '50x50#'
+    :resized => "150x100!",
+    :fitted => "150x150",
+    :cropped_wide => '60x50#',
+    :cropped_tall => '50x60#',
+    :cropped_square => '50x50#'
   }
   
+  def id
+    object_id
+  end
+  
 end

data/test/mongo_mapper_models.rb

@@ -0,0 +1,46 @@
+MongoMapper.database = Griddle.database.name
+
+class Doc
+  include MongoMapper::Document
+  include Griddle::HasGridAttachment
+  has_grid_attachment :image
+end
+
+class DocNoAttachment
+  include MongoMapper::Document
+end
+
+class DocWithStyles
+  include MongoMapper::Document
+  include Griddle::HasGridAttachment
+  
+  has_grid_attachment :image, :styles => {
+    :resized => "150x100!",
+    :fitted => "150x150",
+    :cropped_wide => '60x50#',
+    :cropped_tall => '50x60#',
+    :cropped_square => '50x50#'
+  }
+  
+end
+
+# invalid because one of the styles is a reserved word
+class DocWithInvalidStyles
+  include MongoMapper::Document
+  include Griddle::HasGridAttachment
+  
+  has_grid_attachment :image, :styles => {
+    :file => "50x50#",
+    :thumb => '50x50#'
+  }
+  
+end
+
+class DocWithMultipleAttachments
+  include MongoMapper::Document
+  include Griddle::HasGridAttachment
+  
+  has_grid_attachment :image
+  has_grid_attachment :pdf
+  
+end

data/test/processor_test.rb

@@ -0,0 +1,56 @@
+require "test_helper"
+require "models"
+
+class ProcessorTest < Test::Unit::TestCase
+  
+  context "A Processor" do
+    
+    setup do
+      @processor = Griddle::Processor.new
+    end
+    
+    should "be a type of processor" do
+      assert_kind_of Griddle::Processor, @processor
+    end
+    
+  end
+  
+  context "An Attachment" do
+    
+    setup do
+      @dir = File.dirname(__FILE__) + '/fixtures'
+      @image = File.open("#{@dir}/baboon.jpg", 'r')
+      @options = {
+        :processor => :ImageMagick
+      }
+      @doc = DocNoAttachment.create
+      
+    end
+    
+    context "without processor options" do
+      
+      setup do
+        @attachment = Griddle::Attachment.for(:image, @doc)
+      end
+      
+      should "have default to processor ImageMagick" do
+        assert_equal Griddle::Processor::ImageMagick, @attachment.processor.klass
+      end
+      
+    end
+    
+    context "and a file" do
+      
+      setup do
+        @attachment = Griddle::Attachment.for(:image, @doc, @options)
+      end
+      
+      should "have a processor of ImageMagick" do
+        assert_equal Griddle::Processor::ImageMagick, @attachment.processor.klass
+      end
+      
+    end
+    
+  end
+  
+end

data/test/style_test.rb

@@ -44,6 +44,14 @@ class StyleTest < Test::Unit::TestCase
         assert_equal @options[:styles][:thumb], @attachment.styles[:thumb].geometry
       end
       
+      should "save styles with the attachment" do
+        @attachment.save
+        options = {:name => @attachment.name, :owner_id => @attachment.owner_id, :owner_type => @attachment.owner_type }
+        record = Griddle::Attachment.collection.find_one(options)
+        attachment = Griddle::Attachment.new record
+        assert_equal  @attachment.styles[:thumb][:geometry], attachment.styles[:thumb][:geometry]
+      end
+      
     end
     
   end

data/test/test_helper.rb

@@ -2,17 +2,22 @@ $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'rubygems'
 require 'mongo_mapper'
+require 'mongo'
+gem 'activesupport', '2.3.5'
+require 'active_support'
 require 'griddle'
 require 'test/unit'
 require 'shoulda'
+require 'tempfile'
+require 'rack'
 
 TEST_DB = 'griddle-test' unless Object.const_defined?("TEST_DB")
  
-MongoMapper.database = TEST_DB
+Griddle.database = Mongo::Connection.new.db(TEST_DB)
  
 class Test::Unit::TestCase
   def teardown
-    MongoMapper.database.collections.each do |coll|
+    Griddle.database.collections.each do |coll|
       coll.remove
     end
   end
@@ -24,4 +29,7 @@ class Test::Unit::TestCase
       super
     end
   end
-end
+end
+
+require 'models'
+require 'mongo_mapper_models'

metadata

@@ -1,37 +1,52 @@
 --- !ruby/object:Gem::Specification 
 name: griddle
 version: !ruby/object:Gem::Version 
-  version: 0.0.0
+  hash: 31
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Matt Mongeau
+- meanmarcus
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-03 00:00:00 -05:00
+date: 2010-05-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mongo_mapper
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 description: GridFS made simple...
 email: matt@toastyapps.com
 executables: []
@@ -40,27 +55,33 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.rdoc
+- README.markdown
 files: 
 - .document
 - .gitignore
 - LICENSE
-- README.rdoc
+- README.markdown
 - Rakefile
 - VERSION
 - griddle.gemspec
 - lib/griddle.rb
 - lib/griddle/attachment.rb
 - lib/griddle/has_grid_attachment.rb
+- lib/griddle/processor.rb
+- lib/griddle/processor/image_magick.rb
 - lib/griddle/style.rb
 - lib/griddle/upfile.rb
 - rails/init.rb
 - test/attachment_test.rb
 - test/fixtures/baboon.jpg
+- test/fixtures/climenole.jpeg
 - test/fixtures/fox.jpg
 - test/fixtures/sample.pdf
+- test/fixtures/squid.png
 - test/has_attachment_test.rb
 - test/models.rb
+- test/mongo_mapper_models.rb
+- test/processor_test.rb
 - test/style_test.rb
 - test/test_helper.rb
 - test/upfile_test.rb
@@ -74,21 +95,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: GridFS made simple.
@@ -96,6 +123,8 @@ test_files:
 - test/attachment_test.rb
 - test/has_attachment_test.rb
 - test/models.rb
+- test/mongo_mapper_models.rb
+- test/processor_test.rb
 - test/style_test.rb
 - test/test_helper.rb
 - test/upfile_test.rb

data/README.rdoc

@@ -1,17 +0,0 @@
-= griddle
-
-Description goes here.
-
-== Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-== Copyright
-
-Copyright (c) 2010 Matt Matt san Mongeau. See LICENSE for details.