grip 0.6.2 → 0.6.3

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/grip.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grip}
-  s.version = "0.6.2"
+  s.version = "0.6.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["twoism", "jnunemaker"]

data/lib/grip.rb

@@ -1,10 +1,8 @@
 %w{mongo_mapper mongo/gridfs mime/types ftools tempfile RMagick miso}.each { |lib| require lib }
 
-module MongoMapper
-  module Grip
-    class GripError < StandardError;  end
-    class InvalidFile < GripError;  end
-  end
+module Grip
+  class GripError < StandardError;  end
+  class InvalidFile < GripError;  end
 end
 
 %w{grip/attachment grip/has_attachment}.each { |lib| require lib }

data/lib/grip/attachment.rb

@@ -1,88 +1,86 @@
-module MongoMapper
-  module Grip
-    class Attachment
-      include MongoMapper::Document
+module Grip
+  class Attachment
+    include MongoMapper::Document
 
-      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
+    belongs_to  :owner, 
+                :polymorphic => true
+                
+    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
-      
-      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    = 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
-      end
-      
-      def file
-        read_from_grid grid_key
-      end
+    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))
       
-      def grid_key
-        "#{owner_type.pluralize}/#{owner_id}/#{name}".downcase
-      end
+      self.file_name    = File.basename(new_file.path)
+      self.file_size    = File.size(new_file.path)
+      self.content_type = MIME::Types.type_for(new_file.path)
       
-      def self.create_method method_name, &block
-        define_method(method_name) do |*args|
-          yield *args
-        end
+      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
-      
-      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
+    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|
             
-            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!
+            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
-          
+            write_to_grid new_attachment, file_hash[:resized_file]
           end
-        end
         
-        def destroy_file
-          GridFS::GridStore.unlink(self.class.database, grid_key)
         end
+      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.open(self.class.database, key, 'r') { |f| f }
+      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
+      end
+      
+      def read_from_grid key
+        GridFS::GridStore.open(self.class.database, key, 'r') { |f| f }
+      end
   end
-end
+end

data/lib/grip/has_attachment.rb

@@ -1,80 +1,78 @@
-module MongoMapper
-  module Grip
-   module HasAttachment
-      module ClassMethods
-        
-        def has_grid_attachment name, opts={}
-          write_inheritable_attribute(:uploaded_files, {}) if uploaded_files.nil?
-          uploaded_files[name] = opts
-          
-          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))
-            
-            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)
-            update_attachment_attributes!(new_attachment, new_file, opts)
-          end
-                    
-        end
+module Grip
+ module HasAttachment
+    module ClassMethods
+      
+      def has_grid_attachment name, opts={}
+        write_inheritable_attribute(:uploaded_files, {}) if uploaded_files.nil?
+        uploaded_files[name] = opts
         
-        def uploaded_files
-          read_inheritable_attribute(:uploaded_files)
+        define_method(name) do
+          attachments.find(:first,:conditions=>{:name=>name.to_s})
         end
-        
-      end
-      def self.included(base)
-        base.extend ClassMethods
-        base.class_eval do
-          after_save :save_attachments
-          many  :attachments, 
-                :as => :owner, 
-                :class_name => "MongoMapper::Grip::Attachment", 
-                :dependent => :destroy
+
+        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)
+          update_attachment_attributes!(new_attachment, new_file, opts)
         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!
+      def uploaded_files
+        read_inheritable_attribute(:uploaded_files)
       end
       
-      def save_attachments
-        attachments.each do |attachment|
-          attachment.variants.each do |variant,dimensions|
-            create_variant(attachment,variant,dimensions)
-          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)
         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)
       
-      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)
+        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
+end

data/test/grip_attachment_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 
-include MongoMapper::Grip
+include Grip
 
 class GripAttachmentTest < Test::Unit::TestCase
   context "An Attachment" do

data/test/has_attachment_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
 require "models"
-include MongoMapper::Grip
+include Grip
 
 class HasAttachmentTest < Test::Unit::TestCase
   context "A Doc that has_grid_attachment :image" do
@@ -33,7 +33,7 @@ class HasAttachmentTest < Test::Unit::TestCase
       end
 
       should "should return an Attachment" do
-        assert_equal(MongoMapper::Grip::Attachment, @document.image.class)
+        assert_equal(Grip::Attachment, @document.image.class)
       end
       
       should "read file from grid store" do

data/test/models.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: grip
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - twoism