grip 0.6.7 → 0.6.8

data/.gitignore

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

data/Rakefile

@@ -2,27 +2,31 @@ require 'rubygems'
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
- 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |g|
-    g.name = 'grip'
-    g.summary = %(GridFS attachments for MongoMapper)
-    g.description = %(GridFS attachments for MongoMapper)
-    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 jeweler'
+require 'jeweler'
+
+Jeweler::Tasks.new do |gem|
+  gem.name = 'grip'
+  gem.summary = %(GridFS attachments for MongoMapper)
+  gem.description = %(GridFS attachments for MongoMapper)
+  gem.email = 'signalstatic@gmail.com'
+  gem.homepage = 'http://github.com/twoism/grip'
+  gem.authors = %w(twoism jnunemaker)
+
+  gem.add_dependency('mongo_mapper', '>= 0.6.10')
+  gem.add_dependency('rmagick', '>= 2.12.2')
+  gem.add_dependency('miso', '>= 0.3.1')
+
+  gem.add_development_dependency('factory_girl', '1.2.3')
+  gem.add_development_dependency('shoulda', '2.10.2')
 end
- 
-Rake::TestTask.new do |t|
-  t.libs = %w(test)
-  t.pattern = 'test/**/*_test.rb'
+
+Jeweler::GemcutterTasks.new
+
+Rake::TestTask.new do |test|
+  test.libs << 'test'
+  test.ruby_opts << '-rubygems'
+  test.pattern = 'test/**/*_test.rb'
+  test.verbose = true
 end
- 
+
 task :default => :test

data/VERSION

@@ -1 +1 @@
-0.6.7
+0.6.8

data/grip.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grip}
-  s.version = "0.6.7"
+  s.version = "0.6.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["twoism", "jnunemaker"]
@@ -31,7 +31,6 @@ Gem::Specification.new do |s|
      "test/fixtures/fennec-fox.jpg",
      "test/fixtures/sample.pdf",
      "test/grip_attachment_test.rb",
-     "test/growler.rb",
      "test/has_attachment_test.rb",
      "test/models.rb",
      "test/test_helper.rb"
@@ -44,7 +43,6 @@ Gem::Specification.new do |s|
   s.test_files = [
     "test/factories.rb",
      "test/grip_attachment_test.rb",
-     "test/growler.rb",
      "test/has_attachment_test.rb",
      "test/models.rb",
      "test/test_helper.rb"
@@ -55,15 +53,24 @@ 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"])
+      s.add_runtime_dependency(%q<mongo_mapper>, [">= 0.6.10"])
+      s.add_runtime_dependency(%q<rmagick>, [">= 2.12.2"])
+      s.add_runtime_dependency(%q<miso>, [">= 0.3.1"])
+      s.add_development_dependency(%q<factory_girl>, ["= 1.2.3"])
+      s.add_development_dependency(%q<shoulda>, ["= 2.10.2"])
     else
-      s.add_dependency(%q<rmagick>, [">= 0"])
-      s.add_dependency(%q<miso>, [">= 0"])
+      s.add_dependency(%q<mongo_mapper>, [">= 0.6.10"])
+      s.add_dependency(%q<rmagick>, [">= 2.12.2"])
+      s.add_dependency(%q<miso>, [">= 0.3.1"])
+      s.add_dependency(%q<factory_girl>, ["= 1.2.3"])
+      s.add_dependency(%q<shoulda>, ["= 2.10.2"])
     end
   else
-    s.add_dependency(%q<rmagick>, [">= 0"])
-    s.add_dependency(%q<miso>, [">= 0"])
+    s.add_dependency(%q<mongo_mapper>, [">= 0.6.10"])
+    s.add_dependency(%q<rmagick>, [">= 2.12.2"])
+    s.add_dependency(%q<miso>, [">= 0.3.1"])
+    s.add_dependency(%q<factory_girl>, ["= 1.2.3"])
+    s.add_dependency(%q<shoulda>, ["= 2.10.2"])
   end
 end
 

data/lib/grip.rb

@@ -1,8 +1,22 @@
-%w{mongo_mapper mongo/gridfs mime/types ftools tempfile RMagick miso}.each { |lib| require lib }
+if RUBY_VERSION =~ /1.9.[0-9]/
+  require 'fileutils'
+else
+  require 'ftools'
+end
+
+require 'mongo_mapper'
+require 'mongo/gridfs'
+require 'mime/types'
+require 'tempfile'
+require 'RMagick'
+require 'miso'
 
 module Grip
-  class GripError < StandardError;  end
-  class InvalidFile < GripError;  end
+  class GripError < StandardError;
+  end
+  class InvalidFile < GripError;
+  end
 end
 
-%w{grip/attachment grip/has_attachment}.each { |lib| require lib }
+require 'grip/attachment'
+require 'grip/has_attachment'

data/lib/grip/attachment.rb

@@ -2,85 +2,85 @@ module Grip
   class Attachment
     include MongoMapper::Document
 
-    belongs_to  :owner, 
+    belongs_to  :owner,
                 :polymorphic => true
-                
-    many  :attached_variants, 
-          :as => :owner, 
-          :class_name => "Grip::Attachment", 
+
+    many  :attached_variants,
+          :as => :owner,
+          :class_name => "Grip::Attachment",
           :dependent => :destroy
-          
-    key :owner_id,      ObjectId, :required => true
-    key :owner_type,    String,   :required => true
-
-    key :name,          String
-    key :file_name,     String
-    key :file_size,     Integer
-    key :content_type,  String
-    key :variants,      Hash
-    
+
+    key :owner_id, ObjectId, :required => true
+    key :owner_type, String, :required => true
+
+    key :name, String
+    key :file_name, String
+    key :file_size, Integer
+    key :content_type, String
+    key :variants, Hash
+
     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))
-      
+
       self.file_name    = new_file.is_a?(Tempfile) ? new_file.original_filename : File.basename(new_file.path)
       self.file_size    = File.size(new_file.path)
       self.content_type = MIME::Types.type_for(new_file.path)
-      
-      write_to_grid self,new_file
+
+      write_to_grid self, new_file
     end
-    
+
     def file
       read_from_grid grid_key
     end
-    
+
     def grid_key
       "#{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|
-          
-          self.class.create_method variant.to_sym do
-            attached_variants.find_or_create_by_name(:name=>"#{variant.to_s}")
-          end
-          
-          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!
-
-            write_to_grid new_attachment, file_hash[:resized_file]
-          end
-        
+    def build_variants
+      self.variants.each do |variant, dimensions|
+
+        self.class.create_method variant.to_sym do
+          attached_variants.find_or_create_by_name("#{variant.to_s}")
         end
-      end
-      
-      def destroy_file
-        GridFS::GridStore.unlink(self.class.database, grid_key)
-      end
-    
-      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
+
+        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)[0].content_type
+          new_attachment.save!
+
+          write_to_grid new_attachment, file_hash[:resized_file]
         end
+
       end
-      
-      def read_from_grid key
-        GridFS::GridStore.new(self.class.database, key, 'r')
+    end
+
+    def destroy_file
+      GridFS::GridStore.unlink(self.class.database, grid_key)
+    end
+
+    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
+
+    def read_from_grid key
+      GridFS::GridStore.new(self.class.database, key, 'r')
+    end
   end
 end

data/lib/grip/has_attachment.rb

@@ -1,29 +1,29 @@
 module Grip
- module HasAttachment
-   
-   def self.included(base)
-     base.extend ClassMethods
-     base.instance_eval do
-       many  :attachments, 
-             :as => :owner, 
-             :class_name => "Grip::Attachment", 
-             :dependent => :destroy
-     end
-   end
-   
+  module HasAttachment
+
+    def self.included(base)
+      base.extend ClassMethods
+      base.instance_eval do
+        many  :attachments,
+              :as => :owner,
+              :class_name => "Grip::Attachment",
+              :dependent => :destroy
+      end
+    end
+
     module ClassMethods
-      
+
       def has_grid_attachment name, opts={}
         set_callbacks_once
-        
+
         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})
         end
-        
+
         define_method("#{name}=") do |new_file|
           raise InvalidFile unless (new_file.is_a?(File) || new_file.is_a?(Tempfile))
           uploaded_files[name] ||= {}
@@ -32,62 +32,63 @@ module Grip
           new_attachment = attachments.find_or_create_by_name(name.to_s)
           update_attachment_attributes!(new_attachment, new_file, opts)
         end
-                  
+
       end
-      
+
       def set_callbacks_once
         after_save :save_attachments unless after_save.collect(&:method).include?(:save_attachments)
       end
-      
+
       def uploaded_file_options
         read_inheritable_attribute(:uploaded_file_options)
       end
-      
+
     end
-    
-     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
+    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)[0].content_type
+        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]
+      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.write(tmp.path)
-          rescue RuntimeError => e
-            warn "Image was not resized. #{e}"
-            tmp = tmp_file
-          end
+          image.crop(dimensions[:width], dimensions[:height])  if dimensions[:crop]
+          image.fit(dimensions[:width], dimensions[:height])   unless dimensions[:crop]
 
-          file_hash = {:resized_file => tmp,:uploaded_file => tmp_file} 
-          attachment.send("#{variant}=", file_hash)
+          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
 end

data/test/factories.rb

@@ -1,5 +1,5 @@
 require "mongo_mapper"
-variants = { :thumb => {:width=>50,:height=>50} }
+variants = { :thumb => {:width=>50, :height=>50} }
 Factory.define :attachment do |a|
   a.owner_id Mongo::ObjectID.new
   a.owner_type  'Mock'

data/test/grip_attachment_test.rb

@@ -10,22 +10,22 @@ class GripAttachmentTest < Test::Unit::TestCase
       @image        = File.open("#{@dir}/cthulhu.png", 'r')
       @file_system  = MongoMapper.database['fs.files']
     end
-    
+
     teardown do
-      @file_system.drop
+      #@file_system.drop
       @image.close
     end
 
     should "be an Attachment" do
       assert @attachment.is_a?(Attachment)
     end
-    
+
     should "belong to :owner" do
-      name,assoc = Attachment.associations.first
+      name, assoc = Attachment.associations.first
       #assert_equal(:owner, assoc.name)
       #assert_equal(:belongs_to, assoc.type)
     end
-    
+
     context "with a valid file" do
       setup do
         @attachment.file = @image
@@ -34,25 +34,25 @@ class GripAttachmentTest < Test::Unit::TestCase
       should "have correct :content_type" do
         assert_equal("image/png", @attachment.content_type)
       end
-      
+
       should "have correct :file_size" do
         assert_equal(27582, @attachment.file_size)
       end
-      
+
       should "have correct :file_name" do
         assert_equal("cthulhu.png", @attachment.file_name)
       end
-      
+
       should "read file from grid store" do
         assert_equal "image/png", @file_system.find_one(:filename => @attachment.grid_key)['contentType']
       end
-      
+
       should "return a GridStore" do
         assert_equal(GridFS::GridStore, @attachment.file.class)
       end
-      
+
     end
-    
+
     context "with an invalid file" do
       should "raise Grip::InvalidFile" do
         assert_raise(InvalidFile) { @attachment.file = Hash.new }
@@ -60,5 +60,5 @@ class GripAttachmentTest < Test::Unit::TestCase
     end
 
   end
-    
+
 end

data/test/has_attachment_test.rb

@@ -10,18 +10,18 @@ class HasAttachmentTest < Test::Unit::TestCase
       @image        = File.open("#{@dir}/cthulhu.png", 'r')
       @file_system  = MongoMapper.database['fs.files']
     end
-    
+
     teardown do
-      @file_system.drop
+      #@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
+      name, assoc = Doc.associations.first
       assert_equal(:attachments, assoc.name)
       assert_equal(:many, assoc.type)
     end
@@ -29,7 +29,7 @@ class HasAttachmentTest < Test::Unit::TestCase
     should "have :after_save callback" do
       assert_equal(1, Doc.after_save.collect(&:method).count)
     end
-    
+
     context "when assigned a file" do
       setup do
         @document.image = @image
@@ -39,19 +39,24 @@ class HasAttachmentTest < Test::Unit::TestCase
       should "should return an Attachment" do
         assert_equal(Grip::Attachment, @document.image.class)
       end
-      
+
       should "read file from grid store" do
         assert_equal "image/png", @file_system.find_one(:filename => @document.image.grid_key)['contentType']
-      end  
-      
+      end
+
       should "have :thumb variant" do
         assert @document.image.respond_to?( :thumb )
       end
-      
+
+      should "have the correct name for each variant" do
+        assert_equal "thumb", @document.image.thumb.name
+        assert_equal "super_thumb", @document.image.super_thumb.name
+      end
+
       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
@@ -60,9 +65,9 @@ class HasAttachmentTest < Test::Unit::TestCase
       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
@@ -72,12 +77,12 @@ class HasAttachmentTest < Test::Unit::TestCase
         @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/models.rb

@@ -1,5 +1,5 @@
 class Doc
   include MongoMapper::Document
   include Grip::HasAttachment
-  has_grid_attachment :image, :variants => {:thumb=>{:width=>50,:height=>50},:super_thumb=>{:width=>10,:height=>10}}
+  has_grid_attachment :image, :variants => {:thumb=>{:width=>50, :height=>50}, :super_thumb=>{:width=>10, :height=>10}}
 end

data/test/test_helper.rb

@@ -1,9 +1,10 @@
 $:.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rubygems'
-require 'grip'
-require 'growler'
-%w{test/unit shoulda factory_girl mongo_mapper factories}.each { |lib| require lib }
 
+require 'grip'
+require 'test/unit'
+require 'shoulda'
+require 'factory_girl'
+require 'factories'
 
 TEST_DB = 'test-grip'
 
@@ -12,14 +13,14 @@ MongoMapper.database = TEST_DB
 class Test::Unit::TestCase
   def teardown
     MongoMapper.database.collections.each do |coll|
-      coll.remove  
+      coll.remove
     end
   end
 
   # Make sure that each test case has a teardown
   # method to clear the db after each test.
   def inherited(base)
-    base.define_method teardown do 
+    base.define_method teardown do
       super
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grip
 version: !ruby/object:Gem::Version 
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors: 
 - twoism
@@ -13,6 +13,16 @@ cert_chain: []
 date: 2010-01-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: mongo_mapper
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.10
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rmagick
   type: :runtime
@@ -21,7 +31,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.12.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: miso
@@ -31,7 +41,27 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.3.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: factory_girl
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.2.3
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 2.10.2
     version: 
 description: GridFS attachments for MongoMapper
 email: signalstatic@gmail.com
@@ -57,7 +87,6 @@ files:
 - test/fixtures/fennec-fox.jpg
 - test/fixtures/sample.pdf
 - test/grip_attachment_test.rb
-- test/growler.rb
 - test/has_attachment_test.rb
 - test/models.rb
 - test/test_helper.rb
@@ -92,7 +121,6 @@ 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_helper.rb

data/test/growler.rb

@@ -1,9 +0,0 @@
-require 'ruby-growl'
-class Growler
-  def self.growl msg
-    g = Growl.new "localhost", "ruby-growl",
-                  ["ruby-growl Notification"]
-    g.notify "ruby-growl Notification", ":::: From Rails ::::::::",
-             "#{msg}",1,true
-  end
-end