attachment-san 0.0.1 → 0.0.2

data/TODO

@@ -1,6 +1,3 @@
-* Make it actually work with more than one attachment class.
-  * has_attachment :watermark, :superclass => WatermarkSuperclass
-  * has_attachment :watermark, :class => WatermarkClass
-* Nest created classes under the superclass.
+* Allow the user to override any of the attachment_san_options on the dynamically created attachment subclasses.
 * Do we need to sanitize the original filename, eg lowercase.
 * Make :filename_scheme => :record_identifier also use nesting under parent resources. Eg /resources/1/images/2/filename

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/attachment-san.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{attachment-san}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Eloy Duran", "Manfred Stienstra"]
-  s.date = %q{2009-11-19}
+  s.date = %q{2009-12-01}
   s.description = %q{Rails plugin for easy and rich attachment manipulation.}
   s.email = ["eloy@fngtps.com", "manfred@fngtps.com"]
   s.extra_rdoc_files = [
@@ -22,10 +22,12 @@ Gem::Specification.new do |s|
      "Rakefile",
      "TODO",
      "VERSION",
+     "attachment-san.gemspec",
      "examples/photo.rb",
      "examples/photos_controller.rb",
      "examples/post.rb",
      "lib/attachment_san.rb",
+     "lib/attachment_san/core_ext.rb",
      "lib/attachment_san/has.rb",
      "lib/attachment_san/test/helper.rb",
      "lib/attachment_san/test/rails.png",
@@ -33,6 +35,7 @@ Gem::Specification.new do |s|
      "napkin.rb",
      "rails/init.rb",
      "test/attachment_san_test.rb",
+     "test/core_ext_test.rb",
      "test/fixtures/models/attachment.rb",
      "test/fixtures/models/document.rb",
      "test/fixtures/models/options_stub.rb",
@@ -48,6 +51,7 @@ Gem::Specification.new do |s|
   s.summary = %q{Rails plugin for easy and rich attachment manipulation.}
   s.test_files = [
     "test/attachment_san_test.rb",
+     "test/core_ext_test.rb",
      "test/fixtures/models/attachment.rb",
      "test/fixtures/models/document.rb",
      "test/fixtures/models/options_stub.rb",

data/lib/attachment_san.rb

@@ -1,3 +1,4 @@
+require "attachment_san/core_ext"
 require "attachment_san/has"
 require "attachment_san/variant"
 
@@ -35,7 +36,7 @@ module AttachmentSan
     
     @uploaded_file    = uploaded_file
     self.filename     = uploaded_file.original_filename
-    self.content_type = uploaded_file.content_type
+    self.content_type = uploaded_file.content_type.strip
     
     callback :after_upload
   end

data/lib/attachment_san/core_ext.rb

@@ -0,0 +1,32 @@
+module AttachmentSan
+  module ModuleExt
+    # Retrieve a Module/Class bfor the given +name+. It differentiates from
+    # +const_get+ in that it _only_ searches in the mod it’s called on.
+    #
+    #   class A
+    #     class B
+    #     end
+    #   end
+    #
+    #   class C; end
+    #
+    #   # If the requested mod exists in the namespace, the result is the same:
+    #   A.const_get('B') # => A::B
+    #   A.modulized_mod_get('B') # => A::B
+    #
+    #   # Now notice that const_get finds the mod outside the `A' namespace:
+    #   A.const_get('C') # => C
+    #   A.modulized_mod_get('C') # => NameError
+    def modulized_mod_get(name)
+      const = const_get(name)
+      modulized_name = "#{self.name}::#{name}"
+      
+      if const.is_a?(Module) && const.name == modulized_name
+        const
+      else
+        raise NameError, "uninitialized mod constant #{modulized_name}"
+      end
+    end
+  end
+  Module.send(:include, ModuleExt)
+end

data/lib/attachment_san/has.rb

@@ -1,6 +1,7 @@
 module AttachmentSan
   module Has
-    VALID_OPTIONS = [:name, :process, :class, :variants, :filename_scheme]
+    MODEL_OPTIONS   = [:base_path, :public_base_path, :extension, :filename_scheme]
+    VARIANT_OPTIONS = [:name, :process, :class, :variants, :filename_scheme]
     
     def has_attachment(name, options = {})
       define_attachment_association :has_one, name, options
@@ -13,37 +14,43 @@ module AttachmentSan
     private
     
     def define_attachment_association(macro, name, options)
-      define_variants(name, extract_variant_options!(options))
-      send(macro, name, options) unless reflect_on_association(name)
+      model_options = extract_options!(options, MODEL_OPTIONS)
+      model = create_model(name, model_options)
+      
+      variant_options = extract_options!(options, VARIANT_OPTIONS)
+      define_variants(model, variant_options)
+      
+      send(macro, name, options.merge(:class_name => model.name)) unless reflect_on_association(name)
     end
     
-    def extract_variant_options!(options)
+    def extract_options!(options, keys)
       options.symbolize_keys!
-      variant_options = options.slice(*VALID_OPTIONS)
-      options.except!(*VALID_OPTIONS)
-      variant_options
+      extracted_options = options.slice(*keys)
+      options.except!(*keys)
+      extracted_options
     end
     
-    def define_variants(name, options)
-      model = create_model(name)
-      
-      original = { :class => Variant::Original }
-      original.merge!(options) unless options.has_key?(:variants)
+    def define_variants(model, options)
+      original = options[:variants] ? (options[:variants][:original] || {}) : options
+      original[:class] ||= Variant::Original if original.is_a?(Hash)
       model.send(:define_variant, :original, original)
       
       if variants = options[:variants]
-        variants.each do |name, options|
-          model.send(:define_variant, name, options)
+        variants.each do |name, variant_options|
+          model.send(:define_variant, name, variant_options)
         end
       end
+      
+      model
     end
     
-    # TODO: Currently creates these classes in the top level namespace
-    def create_model(name)
+    def create_model(name, options)
       name = name.to_s.classify
-      ::Object.const_get(name)
+      modulized_mod_get(name)
     rescue NameError
-      ::Object.const_set name, Class.new(AttachmentSan.attachment_class)
+      model = const_set(name, Class.new(AttachmentSan.attachment_class))
+      model.attachment_san_options.merge!(options)
+      model
     end
   end
 end

data/lib/attachment_san/variant.rb

@@ -27,7 +27,7 @@ module AttachmentSan
           when Proc
             { :class => Variant, :process => x }
           when nil
-            { :class => const_get(name.to_s.camelize) }
+            { :class => modulized_mod_get(name.to_s.camelize) }
           else
             raise TypeError, "Please specify a options hash, variant class, or process proc. Can't use `#{x.inspect}'."
           end
@@ -65,11 +65,11 @@ module AttachmentSan
     end
     
     def base_path
-      base_options[:base_path]
+      @reflection[:base_path] || base_options[:base_path]
     end
     
     def public_base_path
-      base_options[:public_base_path]
+      @reflection[:public_base_path] || base_options[:public_base_path]
     end
     
     def filename_scheme
@@ -92,6 +92,11 @@ module AttachmentSan
       @record.token.scan(/.{2}/)
     end
     
+    # Returns the original filename, without extension, and appends the variant name.
+    def filename_with_variant_name
+      "#{@record.filename_without_extension}.#{name}"
+    end
+    
     def filename
       unless @filename
         @filename = 
@@ -99,12 +104,13 @@ module AttachmentSan
           when :variant_name
             name.to_s
           when :keep_original
-            @record.filename
+            filename_with_variant_name
           when :record_identifier
-            @record_class_name ||= @record.class.name.underscore.pluralize
+            # For now we take only the demodulized attachment class name.
+            @record_class_name ||= @record.class.name.demodulize.underscore.pluralize
             "/#{@record_class_name}/#{@record.to_param}/#{name}"
           when :token
-            File.join(token, "#{@record.filename_without_extension}.#{name}")
+            File.join(token, filename_with_variant_name)
           else
             raise ArgumentError, "The :filename_scheme option should be one of `:token', `:filename_scheme', `:record_identifier', or `:variant_name', it currently is `#{filename_scheme.inspect}'."
           end
@@ -140,7 +146,15 @@ module AttachmentSan
       end
       
       def filename
-        @filename ||= (filename_scheme == :token ? File.join(token, @record.filename) : super)
+        @filename ||=
+          case filename_scheme
+          when :token
+            File.join(token, @record.filename)
+          when :keep_original
+            @record.filename
+          else
+            super
+          end
       end
       
       def process!

data/rails/init.rb

@@ -1,4 +1,5 @@
 require 'attachment_san'
 ActiveRecord::Base.extend AttachmentSan::Initializer
+ActiveRecord::Base.extend AttachmentSan::Has
 
 require 'attachment_san/test/helper' if Rails.env == 'test'

data/test/attachment_san_test.rb

@@ -76,8 +76,8 @@ describe "AttachmentSan, class methods" do
   end
   
   it "should define a variant with options" do
-    Logo.variant_reflections.map { |r| r[:name] }.should == [:original, :header]
-    Logo.new.header.should.be.instance_of MyVariant
+    Document::Logo.variant_reflections.map { |r| r[:name] }.should == [:original, :header]
+    Document::Logo.new.header.should.be.instance_of MyVariant
   end
 end
 
@@ -95,8 +95,10 @@ describe "AttachmentSan, instance methods" do
     @attachment.filename.should == @upload.original_filename
   end
   
-  it "should assign the content type to the model" do
-    @attachment.content_type.should == @upload.content_type
+  it "should strip the content type and assign to the model" do
+    @upload.stubs(:content_type).returns("\simage/png\r\n")
+    @attachment = Attachment.new(:uploaded_file => @upload)
+    @attachment.content_type.should == 'image/png'
   end
   
   it "should return the original file's extension" do

data/test/core_ext_test.rb

@@ -0,0 +1,17 @@
+require File.expand_path('../test_helper', __FILE__)
+
+module CoreExtSpecs
+  class Foo
+    class Bar; end
+  end
+  
+  class Baz; end
+end
+
+describe "Module" do
+  it "should try to retrieve a constant by the full modulized name of the mod it’s called on" do
+    # ActiveSupport::Dependencies raises an ArgumentError instead of NameError... :(
+    lambda { CoreExtSpecs::Foo.modulized_mod_get('Baz') }.should.raise ArgumentError
+    CoreExtSpecs::Foo.modulized_mod_get('Bar').should.be CoreExtSpecs::Foo::Bar
+  end
+end

data/test/fixtures/models/document.rb

@@ -1,39 +1,35 @@
 class MyVariant < AttachmentSan::Variant
-  def process!
-  end
+  def process!; end
 end
 
-class MyProcessor
-  def initialize(variant)
-  end
+class MyOtherVariant < AttachmentSan::Variant
+  def process!; end
 end
 
-class AddressCard < Attachment
-  class SmallCard < AttachmentSan::Variant
-    def process!
-      puts 'SMALL!'
-    end
-  end
-  
-  class BigCard < AttachmentSan::Variant
-    def process!
-      puts 'BIG!'
-    end
-  end
+class MyOriginal < AttachmentSan::Variant::Original
+end
+
+class MyProcessor
+  def initialize(variant); end
 end
 
 class Document < ActiveRecord::Base
-  extend AttachmentSan::Has
-  
   has_attachment  :watermark
   has_attachment  :logo, :variants => { :header => MyVariant }
   
-  has_attachments :misc_files, :filename_scheme => :keep_original, :process => proc { :from_process_proc }
+  has_attachments :misc_files, :class => MyOriginal, :filename_scheme => :keep_original, :process => proc { :from_process_proc }
   has_attachments :images, :variants => {
     :thumbnail => proc { |v| MyProcessor.new(v) },
     :medium_sized => proc {},
     :download => proc {}
   }
+end
+
+class OtherDocument < ActiveRecord::Base
+  has_attachment  :logo, :variants => { :header => MyOtherVariant }
+  has_attachments :misc_files, :filename_scheme => :keep_original, :process => proc { :from_other_process_proc }
   
-  has_attachments :address_cards, :variants => [:small_card, :big_card]
+  has_attachments :images, :base_path => '/other/base', :public_base_path => '/other/public', :variants => {
+    :normal => { :base_path => '/yet/another/base', :process => proc {} }
+  }
 end

data/test/has_test.rb

@@ -1,34 +1,71 @@
 require File.expand_path('../test_helper', __FILE__)
 
 describe "AttachmentSan::Has" do
+  process_proc = proc {}
+  
   it "should pass on any unknown options to the has_one macro" do
-    Document.expects(:has_one).with(:other_file, :as => :attachable, :order => :updated_at)
-    Document.expects(:define_variants).with(:other_file, :process => proc {}, :class => MyVariant, :filename_scheme => :token, :variants => [:hoge, :fuga])
+    Document.expects(:has_one).with(:other_file, :as => :attachable, :order => :updated_at, :class_name => 'Document::OtherFile')
+    Document.expects(:define_variants).with do |model, options|
+      model == Document::OtherFile && options == { :process => process_proc, :class => MyVariant }
+    end
     
     Document.has_attachment :other_file, :as => :attachable, :order => :updated_at,
-                                         :process => proc {}, :class => MyVariant, :filename_scheme => :token, :variants => [:hoge, :fuga]
+                                         :process => process_proc, :class => MyVariant, :filename_scheme => :token
   end
   
   it "should pass on any unknown options to the has_many macro" do
-    Document.expects(:has_many).with(:other_files, :as => :attachable, :order => :updated_at)
-    Document.expects(:define_variants).with(:other_files, :process => proc {}, :class => MyVariant, :filename_scheme => :token, :variants => [:hoge, :fuga])
+    Document.expects(:has_many).with(:other_files, :as => :attachable, :order => :updated_at, :class_name => 'Document::OtherFile')
+    Document.expects(:define_variants).with do |model, options|
+      model == Document::OtherFile && options == { :process => process_proc, :class => MyVariant }
+    end
     
     Document.has_attachments :other_files, :as => :attachable, :order => :updated_at,
-                                           :process => proc {}, :class => MyVariant, :filename_scheme => :token, :variants => [:hoge, :fuga]
+                                           :process => process_proc, :class => MyVariant, :filename_scheme => :token
   end
   
   it "should not define an association if an association for the given name exists" do
     Document.expects(:has_one).never
-    Document.expects(:define_variants).with(:watermark, {})
+    Document.expects(:define_variants).with do |model, options|
+      model == Document::Watermark && options == {}
+    end
     
     Document.expects(:has_many).never
-    Document.expects(:define_variants).with(:images, {})
+    Document.expects(:define_variants).with do |model, options|
+      model == Document::Image && options == {}
+    end
     
     Document.has_attachment :watermark, :as => :attachable
     Document.has_attachments :images, :as => :attachable
   end
 end
 
+describe "AttachmentSan::Has, concerning defining attachment model subclasses" do
+  it "should create an attachment model class when defining a single attachment association" do
+    Document.reflect_on_association(:logo).klass.should.be Document::Logo
+    Document::Logo.superclass.should.be AttachmentSan.attachment_class
+  end
+  
+  it "should create an attachment model class when defining a collection attachment association" do
+    Document.reflect_on_association(:images).klass.should.be Document::Image
+    Document::Image.superclass.should.be AttachmentSan.attachment_class
+  end
+  
+  it "should create different attachment model classes for different defining model classes" do
+    Document::Logo.reflect_on_variant(:header)[:class].should.be MyVariant
+    
+    OtherDocument.reflect_on_association(:logo).klass.should.be OtherDocument::Logo
+    OtherDocument::Logo.reflect_on_variant(:header)[:class].should.be MyOtherVariant
+  end
+  
+  it "should not look for existing constants outside the defining class's namespace" do
+    class TotallyDifferent; end
+    class Foo < TotallyDifferent; end
+    
+    Document.has_attachment :foo
+    Document.reflect_on_association(:foo).klass.should.be Document::Foo
+  end
+end
+
 describe "AttachmentSan::Has, concerning a single associated attachment" do
   before do
     @document = Document.new
@@ -36,21 +73,18 @@ describe "AttachmentSan::Has, concerning a single associated attachment" do
     @document.build_watermark :uploaded_file => rails_icon
   end
   
-  it "should create a model class and a has_one association" do
-    reflection = Document.reflect_on_association(:logo)
-    reflection.macro.should == :has_one
-    reflection.klass.should == Logo
-    Logo.superclass.should.be AttachmentSan.attachment_class
+  it "should define a has_one association" do
+    Document.reflect_on_association(:logo).macro.should == :has_one
   end
   
   it "should store the variant options on the new model class" do
-    Watermark.variant_reflections.length.should == 1
-    Watermark.variant_reflections.first[:name].should == :original
-    Watermark.variant_reflections.first[:class].should == AttachmentSan::Variant::Original
+    Document::Watermark.variant_reflections.length.should == 1
+    Document::Watermark.variant_reflections.first[:name].should == :original
+    Document::Watermark.variant_reflections.first[:class].should == AttachmentSan::Variant::Original
     
-    Logo.variant_reflections.length.should == 2
-    Logo.variant_reflections.last[:name].should == :header
-    Logo.variant_reflections.last[:class].should == MyVariant
+    Document::Logo.variant_reflections.length.should == 2
+    Document::Logo.variant_reflections.last[:name].should == :header
+    Document::Logo.variant_reflections.last[:class].should == MyVariant
   end
   
   it "should define only a default original variant if no other variants are given" do
@@ -63,7 +97,7 @@ describe "AttachmentSan::Has, concerning a single associated attachment" do
     %w{ original header }.each do |name|
       variant = @document.logo.send(name)
       variant.name.to_s.should == name
-      variant.should.be.instance_of Logo.reflect_on_variant(name)[:class]
+      variant.should.be.instance_of Document::Logo.reflect_on_variant(name)[:class]
     end
   end
 end
@@ -75,10 +109,8 @@ describe "AttachmentSan::Has, concerning a collection of associated attachments"
     2.times { @document.misc_files.build :uploaded_file => rails_icon }
   end
   
-  it "should create a model class and a has_many association" do
-    reflection = Document.reflect_on_association(:images)
-    reflection.macro.should == :has_many
-    reflection.klass.should == Image
+  it "should define a has_many association" do
+    Document.reflect_on_association(:images).macro.should == :has_many
   end
   
   it "should define only a default original variant if no others are given" do
@@ -98,19 +130,17 @@ end
 
 describe "AttachmentSan::Has, concerning attachment definitions with only a default original variant" do
   it "should pass the options hash on to the variant" do
-    MiscFile.variant_reflections.length.should == 1
-    MiscFile.variant_reflections.first[:name].should == :original
-    MiscFile.variant_reflections.first[:class].should == AttachmentSan::Variant::Original
-    MiscFile.variant_reflections.first[:filename_scheme].should == :keep_original
-    MiscFile.variant_reflections.first[:process].call.should == :from_process_proc
+    Document::MiscFile.variant_reflections.length.should == 1
+    Document::MiscFile.variant_reflections.first[:name].should == :original
+    Document::MiscFile.variant_reflections.first[:class].should == MyOriginal
+    # Document::MiscFile.variant_reflections.first[:filename_scheme].should == :keep_original
+    Document::MiscFile.variant_reflections.first[:process].call.should == :from_process_proc
   end
 end
 
-describe "AttachmentSan::Has, concerning attachment definitions with an array of variants" do
-  it "should simply assume the variant class exists" do
-    @document = Document.new
-    card = @document.address_cards.build(:uploaded_file => rails_icon)
-    card.small_card.should.be.instance_of AddressCard::SmallCard
-    card.big_card.should.be.instance_of AddressCard::BigCard
+describe "AttachmentSan::Has, concerning attachment definitions overriding attachment base class options" do
+  it "should merge the options onto the attachment_san_options of the attachment model subclass" do
+    OtherDocument::Image.attachment_san_options[:base_path].should == '/other/base'
+    OtherDocument::Image.attachment_san_options[:public_base_path].should == '/other/public'
   end
 end

data/test/lib/schema.rb

@@ -1,6 +1,5 @@
 ActiveRecord::Migration.verbose = false
 ActiveRecord::Schema.define(:version => 1) do
-
   create_table :attachments, :force => true do |t|
     t.string  :filename
     t.string  :content_type
@@ -10,5 +9,7 @@ ActiveRecord::Schema.define(:version => 1) do
   
   create_table :documents, :force => true do |t|
   end
-
+  
+  create_table :other_documents, :force => true do |t|
+  end
 end

data/test/variant_test.rb

@@ -2,19 +2,19 @@ require File.expand_path('../test_helper', __FILE__)
 
 describe "AttachmentSan's variant class methods" do
   it "should return the variant class to use" do
-    reflection = Logo.reflect_on_variant(:header)
+    reflection = Document::Logo.reflect_on_variant(:header)
     reflection[:class].should.be MyVariant
   end
   
   it "should by default use the AttachmentSan::Variant class" do
-    reflection = Image.reflect_on_variant(:thumbnail)
+    reflection = Document::Image.reflect_on_variant(:thumbnail)
     reflection[:class].should.be AttachmentSan::Variant
   end
   
   it "should not define a variant twice" do
-    count_before = Logo.variant_reflections.length
+    count_before = Document::Logo.variant_reflections.length
     Document.has_attachment :logo, :variants => { :header => MyVariant }
-    Logo.variant_reflections.length.should == count_before
+    Document::Logo.variant_reflections.length.should == count_before
   end
 end
 
@@ -51,17 +51,28 @@ describe "A AttachmentSan::Variant instance in general" do
   end
   
   it "should return the extension of the original file" do
-    Image.attachment_san_options[:extension] = :keep_original
+    Document::Image.attachment_san_options[:extension] = :keep_original
     @thumbnail.extension.should == 'png'
   end
   
   it "should use the extension specified in the attachment_san_options" do
-    Image.attachment_san_options[:extension] = :jpeg
+    Document::Image.attachment_san_options[:extension] = :jpeg
     @thumbnail.extension.should == :jpeg
   end
   
+  it "should should use the base_path and public_base_path that were overridden on the has_attachment(s) definition" do
+    @document = OtherDocument.new
+    @image = @document.images.build(:uploaded_file => @upload)
+    
+    @image.original.base_path.should == '/other/base'
+    @image.original.public_base_path.should == '/other/public'
+    
+    @image.normal.base_path.should == '/yet/another/base'
+    @image.normal.public_base_path.should == '/other/public'
+  end
+  
   it "should create the directory that the file_path returns" do
-    Image.attachment_san_options[:filename_scheme] = :record_identifier
+    Document::Image.attachment_san_options[:filename_scheme] = :record_identifier
     
     @thumbnail.dir_path.should == File.dirname(@thumbnail.file_path)
     File.should.not.exist @thumbnail.dir_path
@@ -79,8 +90,8 @@ describe "A AttachmentSan::Variant instance in general" do
   
   { :keep_original => 'png', :jpg => 'jpg' }.each do |setting, ext|
     it "should return a filename named after the variant name plus #{setting}" do
-      Image.attachment_san_options[:filename_scheme] = :variant_name
-      Image.attachment_san_options[:extension] = setting
+      Document::Image.attachment_san_options[:filename_scheme] = :variant_name
+      Document::Image.attachment_san_options[:extension] = setting
       
       @thumbnail.filename.should == "thumbnail.#{ext}"
       @thumbnail.file_path.should == File.join(@thumbnail.base_path, "thumbnail.#{ext}")
@@ -91,9 +102,22 @@ describe "A AttachmentSan::Variant instance in general" do
       @medium_sized.public_path.should == File.join(@thumbnail.public_base_path, "medium_sized.#{ext}")
     end
     
+    it "should return the original filename and use extension #{setting}" do
+      Document::Image.attachment_san_options[:filename_scheme] = :keep_original
+      Document::Image.attachment_san_options[:extension] = setting
+      
+      @image.original.filename.should == "rails.png"
+      @image.original.file_path.should == File.join(@thumbnail.base_path, "rails.png")
+      @image.original.public_path.should == File.join(@thumbnail.public_base_path, "rails.png")
+      
+      @thumbnail.filename.should == "rails.thumbnail.#{ext}"
+      @thumbnail.file_path.should == File.join(@thumbnail.base_path, "rails.thumbnail.#{ext}")
+      @thumbnail.public_path.should == File.join(@thumbnail.public_base_path, "rails.thumbnail.#{ext}")
+    end
+    
     it "should return a filename which should be a random token from the record and append #{setting}" do
-      Image.attachment_san_options[:filename_scheme] = :token
-      Image.attachment_san_options[:extension] = setting
+      Document::Image.attachment_san_options[:filename_scheme] = :token
+      Document::Image.attachment_san_options[:extension] = setting
       @image.stubs(:token).returns('556d2e8e')
       
       @image.original.filename.should == "55/6d/2e/8e/rails.png"
@@ -108,8 +132,8 @@ describe "A AttachmentSan::Variant instance in general" do
     it "should return a filename which is based on the record identifier and variant name plus #{setting}" do
       Attachment.reset!
       
-      Image.attachment_san_options[:extension] = setting
-      Image.attachment_san_options[:filename_scheme] = :record_identifier
+      Document::Image.attachment_san_options[:extension] = setting
+      Document::Image.attachment_san_options[:filename_scheme] = :record_identifier
       @image.save!
       
       @thumbnail.filename.should == "/images/#{@image.id}/thumbnail.#{ext}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: attachment-san
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Eloy Duran
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-19 00:00:00 +01:00
+date: 2009-12-01 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +36,7 @@ files:
 - examples/photos_controller.rb
 - examples/post.rb
 - lib/attachment_san.rb
+- lib/attachment_san/core_ext.rb
 - lib/attachment_san/has.rb
 - lib/attachment_san/test/helper.rb
 - lib/attachment_san/test/rails.png
@@ -43,6 +44,7 @@ files:
 - napkin.rb
 - rails/init.rb
 - test/attachment_san_test.rb
+- test/core_ext_test.rb
 - test/fixtures/models/attachment.rb
 - test/fixtures/models/document.rb
 - test/fixtures/models/options_stub.rb
@@ -80,6 +82,7 @@ specification_version: 3
 summary: Rails plugin for easy and rich attachment manipulation.
 test_files: 
 - test/attachment_san_test.rb
+- test/core_ext_test.rb
 - test/fixtures/models/attachment.rb
 - test/fixtures/models/document.rb
 - test/fixtures/models/options_stub.rb