jnunemaker-grip 0.1 → 0.1.1

data/.gitignore

@@ -7,3 +7,4 @@ tmp/**/*
 config/database.yml
 coverage/*
 coverage/**/*
+pkg

data/jnunemaker-grip.gemspec

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

data/lib/grip.rb

@@ -22,8 +22,12 @@ module Grip
       define_method("#{name}=") do |file|
         self["#{name}_id"]   = Mongo::ObjectID.new
         self["#{name}_size"] = File.size(file)
-        self["#{name}_name"] = File.basename(file.path)
         self["#{name}_type"] = Wand.wave(file.path)
+        self["#{name}_name"] = if file.respond_to?(:original_filename)
+          file.original_filename
+        else
+          File.basename(file.path)
+        end
         self.class.attachment_definitions[name] = file
       end
     end

data/lib/grip/version.rb

@@ -1,3 +1,3 @@
 module Grip
-  Version = '0.1'
+  Version = '0.1.1'
 end

data/test/helper.rb

@@ -1,4 +1,5 @@
 require 'test/unit'
+require 'tempfile'
 require 'pp'
 
 require 'mongo_mapper'

data/test/test_grip.rb

@@ -32,9 +32,6 @@ class GripTest < Test::Unit::TestCase
     assert_equal 27582, @doc.image_size
     assert_equal 8775,  @doc.pdf_size
 
-    assert_equal 'cthulhu.png', @doc.image_name
-    assert_equal 'sample.pdf',  @doc.pdf_name
-
     assert_equal "image/png",       @doc.image_type
     assert_equal "application/pdf", @doc.pdf_type
 
@@ -47,6 +44,25 @@ class GripTest < Test::Unit::TestCase
     assert_equal "application/pdf", @grid.get(@doc.pdf_id).content_type
   end
 
+  test "assigns file name from path if original file name not available" do
+    assert_equal 'cthulhu.png', @doc.image_name
+    assert_equal 'sample.pdf',  @doc.pdf_name
+  end
+
+  test "assigns file name from original filename if available" do
+    begin
+      file = Tempfile.new('testing.txt')
+      def file.original_filename
+        'testing.txt'
+      end
+      
+      doc = Foo.create(:image => file)
+      assert_equal 'testing.txt', doc.image_name
+    ensure
+      file.close
+    end
+  end
+
   test "responds to keys" do
     [ :pdf_size,   :pdf_id,   :pdf_name,   :pdf_type,
       :image_size, :image_id, :image_name, :image_type

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jnunemaker-grip
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: 0.1.1
 platform: ruby
 authors: 
 - John Nunemaker