attachment_saver 1.0.0 → 1.0.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 5a22b412009475caf986f038cc3613ce59ff940c
+  data.tar.gz: 072903d7678d8305718b416d62058623f4e7bc2d
+SHA512:
+  metadata.gz: b945b2d6f38082b9bd9befa2fb20f9f58ba150c63382d46d2860228b573a1851f6a0197ce43866052dd5f1a089d1226e88faeae706d81990b39a0a52ad71e19c
+  data.tar.gz: cbabbc1710ec1bf2547104eb825baaa96939c73a8a4182dee0e4500fc067988292d562e52c923e8a81c5987ca11c0cd1cf821b33cab78a77aaf31581faf46261

data/Rakefile

@@ -11,6 +11,6 @@ desc 'Test the columns_on_demand plugin.'
 Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
-  t.pattern = 'test/*_test.rb'
+  t.test_files = FileList['test/*_test.rb']
   t.verbose = true
 end

data/lib/attachment_saver.rb

@@ -46,7 +46,7 @@ module AttachmentSaver
       # until we have all the attributes, and then until validation passes - so we just retain
       # the data or file reference for now.
       if uploaded.is_a?(String) # we allow people to upload into the file field using a normal input element (eg. a textarea)
-        return if uploaded.blank? # this handles the case when a form has a file field but no file is selected - most browsers submit an empty string then (annoyingly)
+        return if uploaded.empty? # this handles the case when a form has a file field but no file is selected - most browsers submit an empty string then (annoyingly)
         @uploaded_data = uploaded
         @uploaded_file = nil
       elsif uploaded.is_a?(StringIO)
@@ -62,7 +62,7 @@ module AttachmentSaver
       end
       @save_upload = true
 
-      self.size =              uploaded.size                                      if respond_to?(:size=)
+      self.size =              uploaded.respond_to?(:bytesize) ? uploaded.bytesize : uploaded.size if respond_to?(:size=)
       self.content_type =      uploaded.content_type.strip.downcase               if respond_to?(:content_type=) && uploaded.respond_to?(:content_type)
       self.original_filename = trim_original_filename(uploaded.original_filename) if respond_to?(:original_filename=) && uploaded.respond_to?(:original_filename)
     end

data/lib/attachment_saver/version.rb

@@ -1,3 +1,3 @@
 module AttachmentSaver
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/test/attachment_saver_test.rb

@@ -79,6 +79,23 @@ class AttachmentSaverTest < Test::Unit::TestCase
     model.file_extension = 'ext'
     assert_equal 'ext', model.file_extension
     
+    model = SomeModel.new
+    data = File.open(ImageFixtures::valid[:path], "rb").read
+    model.uploaded_data = data
+    assert_equal ImageFixtures::valid[:size], model.size
+    assert_equal nil, model.content_type
+    assert_equal nil, model.original_filename
+    assert_equal data, model.uploaded_data # before converting to an uploaded_file
+    assert_not_equal nil, model.uploaded_file
+    assert model.uploaded_file.is_a?(Tempfile)
+    assert_equal model.uploaded_file.object_id, model.uploaded_file.object_id, 'uploaded_file should return the same instance each time'
+    assert_equal data, model.uploaded_data # after converting to an uploaded_file
+    assert_equal data, contents_of(model.uploaded_file)
+    assert_equal data, model.uploaded_data
+    assert_equal 'bin', model.file_extension
+    model.file_extension = 'ext'
+    assert_equal 'ext', model.file_extension
+    
     model = SomeModel.new
     model.uploaded_data = StringIO.new('test #2')
     assert_equal 7, model.size

data/test/image_fixtures.rb

@@ -10,7 +10,8 @@ class ImageFixtures
       :width => 448,
       :height => 600,
       :expected_content_type => 'image/jpeg',
-      :expected_extension => 'jpg' }
+      :expected_extension => 'jpg',
+      :size => 66335 }
   end
   
   def self.wrong_extension

data/test/model_test.rb

@@ -72,7 +72,7 @@ class ModelTest < Test::Unit::TestCase
   end
   
   def uploaded_file_from(fixture)
-    f = File.open(fixture[:path])
+    f = File.open(fixture[:path], "rb")
     f.extend ValidUploadedFileAttributes
     f.fixture = fixture
     f
@@ -83,6 +83,7 @@ class ModelTest < Test::Unit::TestCase
     assert_equal ImageFixtures::valid[:expected_content_type], model.content_type
     assert_equal ImageFixtures::valid[:expected_extension], model.file_extension
     assert_equal ImageFixtures::valid[:expected_extension], AttachmentSaver::split_filename(model.storage_filename).last
+    assert_equal ImageFixtures::valid[:size], model.size
     assert File.read(ImageFixtures::valid[:path]) == File.read(model.storage_filename), "stored data doesn't match!"
   end
   

metadata

@@ -1,106 +1,99 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: attachment_saver
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+version: !ruby/object:Gem::Version
+  version: 1.0.1
 platform: ruby
-authors: 
+authors:
 - Will Bryant
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-04-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: image_science
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: image_science
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rmagick
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rmagick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: mini_magick
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mini_magick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   This plugin implements attachment storage and processing, integrated with
   ActiveRecord models and Ruby CGI/Rails-style uploads.  Image processing
@@ -108,24 +101,20 @@ description: |
   provided, and the architecture simplifies clean implementation of other types
   of processing.  Errors are carefully handled to minimize the possibility of
   broken uploads leaving incomplete or corrupt data.
-  
+
   RMagick, MiniMagick, and ImageScience image processors are supported.
-  
-  
+
+
   Compatibility
   =============
-  
+
   Currently tested against Rails 3.2.13 and 3.1.8, on Ruby 1.8.7 and 2.0.0p0.
   Was also tested compatible with 2.3.14 and 3.0.17.
-
 email: will.bryant@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - MIT-LICENSE
 - README
@@ -168,38 +157,28 @@ files:
 - test/test_helper.rb
 homepage: http://github.com/willbryant/attachment_saver
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Saves attachments in files, models, or columns.
-test_files: 
+test_files:
 - test/attachment_saver_test.rb
 - test/database.yml
 - test/file_system_datastore_test.rb