citrusbyte-milton 0.1.2 → 0.1.5

data/lib/milton/attachment.rb

@@ -35,6 +35,7 @@ module Citrusbyte
         end
       end
       
+      # These get mixed in to your model when you use Milton
       module InstanceMethods
         # Sets the filename to the given filename (sanitizes the given filename
         # as well)
@@ -108,6 +109,9 @@ module Citrusbyte
         end
       end
       
+      attr_accessor :filename
+      attr_accessor :attachment
+      
       # TODO: can probably fanagle a way to only pass a reference to the model
       # and not need the filename (or better yet just the filename and 
       # decouple)
@@ -120,7 +124,7 @@ module Citrusbyte
       # If no options are given then returns the path and filename to the
       # original file.
       def path(options={})
-        options.empty? ? File.join(dirname, @filename) : Derivative.new(@filename, options).path
+        options.empty? ? File.join(dirname, filename) : Derivative.new(filename, options).path
       end
       
       # Returns the full directory path up to the file, w/o the filename.
@@ -136,7 +140,6 @@ module Citrusbyte
       # Removes the file from the underlying file system and any derivatives of
       # the file.
       def destroy
-        destroy_derivatives
         destroy_file
       end
       
@@ -149,7 +152,7 @@ module Citrusbyte
         # Returns the partitioned path segment based on the id of the model
         # this file is attached to.
         def partitioned_path
-          self.class.partition(@attachment.id)
+          self.class.partition(self.attachment.id)
         end
 
         # The full path to the root of where files will be stored on disk.
@@ -162,30 +165,18 @@ module Citrusbyte
           self.class.recreate_directory(dirname) unless File.exists?(dirname)
         end
         
-        # Removes the file from the filesystem.
+        # Removes the containing directory from the filesystem (and hence the
+        # file and any derivatives)
         def destroy_file
-          FileUtils.rm path if File.exists?(path)
+          FileUtils.rm_rf dirname if File.exists?(dirname)
         end
-
-        # Derivatives of this Attachment ====================================
         
-        # Returns an array of derivatives of this attachment
+        # Returns an array of Derivatives of this AttachableFile.
         def derivatives
-          Dir.glob(Derivative.dirname_for(path)).collect do |filename|
+          Dir.glob(dirname + '/*').reject{ |filename| filename == self.filename }.collect do |filename|
             Derivative.from_filename(filename)
           end
         end
-        
-        # Recreates the directory derivatives of this file will be stored in.
-        def recreate_derivative_directory
-          dirname = Derivative.dirname_for(path)
-          self.class.recreate_directory(dirname) unless File.exists?(dirname)
-        end
-
-        # Removes the derivatives folder for this file and all files within.
-        def destroy_derivatives
-          FileUtils.rm_rf dirname if File.exists?(dirname)
-        end
     end
 
     # Represents a file created on the file system that is a derivative of the
@@ -198,7 +189,7 @@ module Citrusbyte
     # Files created as derivatives have their creation options appended into
     # their filenames so it can be checked later if a file w/ the given
     # options already exists (so as not to create it again).
-    # 
+    #
     class Derivative
       attr_reader :options
       
@@ -231,29 +222,24 @@ module Citrusbyte
         def from_filename(filename)
           Derivative.new(filename, options_from(extract_options_from(filename)))
         end
-        
-        # Gives the path to where derivatives of this file are stored.
-        # Derivatives are any files which are based off of this file but are
-        # not Attachments themselves (i.e. thumbnails, transcoded copies, 
-        # etc...)
-        def dirname_for(path)
-          File.join(File.dirname(path), File.basename(path, File.extname(path)))
-        end
       end
       
+      # Instantiate a new Derivative, takes a reference to the AttachableFile
+      # (or specialization class) that this will be a derivative of, and a hash
+      # of the options defining the derivative.
       def initialize(file, options)
         @file    = file
         @options = options
       end
       
-      # The filename of this Derivative with embedded options.
+      # The resulting filename of this Derivative with embedded options.
       def filename
         self.class.filename_for(@file.path, options)
       end
       
       # The full path and filename to this Derivative.
       def path
-        File.join(Derivative.dirname_for(@file.path), filename)
+        File.join(@file.dirname, filename)
       end
       
       # Returns true if the file resulting from this Derivative exists.

data/lib/milton/is_uploadable.rb

@@ -112,7 +112,6 @@ module Citrusbyte
       def save
         return true if self.saved?
         recreate_directory
-        recreate_derivative_directory
         File.cp(temp_path, path)
         File.chmod(self.class.options[:chmod], path)
         @has_been_saved = true

data/spec/milton/attachment_spec.rb

@@ -4,7 +4,6 @@ describe Attachment do
   describe "being destroyed" do
     before :each do
       @attachment = Attachment.create :file => upload('milton.jpg')
-      @derivative_path = File.dirname(@attachment.path) + '/milton'
     end
 
     it "should delete the underlying file from the filesystem" do
@@ -12,13 +11,12 @@ describe Attachment do
       File.exists?(@attachment.path).should be_false
     end
     
-    it "should have a derivative path before being destroyed" do
-      File.exists?(@derivative_path).should be_true
-    end
-    
-    it "should delete the derivative folder from the filesystem" do
+    # the partitioning algorithm ensures that each attachment model has its own
+    # folder, so we can safely delete the folder, if you write a new
+    # partitioner this might change!
+    it "should delete the directory containing the file and all derivatives from the filesystem" do
       @attachment.destroy
-      File.exists?(@derivative_path).should be_false
+      File.exists?(File.dirname(@attachment.path)).should be_false
     end
   end
   

data/spec/milton/is_resizeable_spec.rb

@@ -117,15 +117,11 @@ describe Citrusbyte::Milton::IsResizeable do
     end
     
     it "should use the partitioned path when grabbing the original file" do
-      @image.path.should =~ /\/\d+\/\d+\/milton.jpg$/
+      @image.path.should =~ /\/#{Citrusbyte::Milton::AttachableFile.partition(@image.id)}\/milton.jpg$/
     end
 
-    it "should use the partitioned path and derivative path when grabbing a thubmnail" do
-      @image.path(:size => '10x10', :crop => true).should =~ /\/milton\/milton.crop=true_size=10x10.jpg$/
-    end
-    
-    it "should append source filename to thumbnail path" do
-      @image.path(:size => '10x10').should =~ /\/milton\/milton.size=10x10.jpg$/
+    it "should use the partitioned path when grabbing a thubmnail" do
+      @image.path(:size => '10x10', :crop => true).should =~ /\/#{Citrusbyte::Milton::AttachableFile.partition(@image.id)}\/milton.crop=true_size=10x10.jpg$/
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: citrusbyte-milton
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.5
 platform: ruby
 authors: 
 - Ben Alavi