progstr-filer 0.8.9 → 0.8.10

data/VERSION

@@ -1 +1 @@
-0.8.9
+0.8.10

data/lib/filer/attachment.rb

@@ -141,8 +141,17 @@ module Progstr
         }
       end
 
+      def uploaded?
+        @uploaded == true
+      end
+      def mark_uploaded!
+        @uploaded = true
+      end
+
       def need_upload?
-        if file.nil?
+        if uploaded?
+          false
+        elsif file.nil?
           false
         elsif file.kind_of?(FileLike)
           false

data/lib/filer/uploader.rb

@@ -26,6 +26,7 @@ module Progstr
 
       def upload_attachment(attachment)
         url = "#{Progstr::Filer.url_prefix}upload/new"
+        puts "upload to: #{url}"
         begin
           response = RestClient.post(url, {
                       :upload1 => attachment.file,
@@ -33,7 +34,9 @@ module Progstr
                       :uploader => self.class.name,
                       :id => attachment.id
                     }, json_headers)
-          UploadStatus.new MultiJson.decode(response)
+          result = UploadStatus.new MultiJson.decode(response)
+          attachment.mark_uploaded!
+          result
         rescue => e
           if e.respond_to?(:response) && !e.response.nil?
             raise ApiError.new(MultiJson.decode(e.response))

data/test/test_upload_on_save.rb

@@ -31,6 +31,17 @@ class TestUploadOnSave < UserTest
     assert_equal "7933ad9a0f93457ab625a070fec3544f", saved_id
   end
 
+  should "not upload already uploaded attachments" do
+    u = User.new
+    f = FileMock.new
+    u.avatar = f
+    u.save!
+
+    $lastUploadedAtachment = nil
+    u.save!
+    assert_nil $lastUploadedAtachment
+  end
+
   should "delete the previous attachment on save" do
     u = User.new
     f1 = FileMock.new

data/test/user_data.rb

@@ -25,6 +25,7 @@ $lastDeletedAtachment = nil
 class MockUploader < Progstr::Filer::Uploader
   def upload_attachment(attachment)
     $lastUploadedAtachment = attachment
+    attachment.mark_uploaded!
   end
   def delete_attachment(attachment)
     $lastDeletedAtachment = attachment

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: progstr-filer
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-10 00:00:00.000000000Z
+date: 2012-05-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &28667380 !ruby/object:Gem::Requirement
+  requirement: &26366140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *28667380
+  version_requirements: *26366140
 - !ruby/object:Gem::Dependency
   name: activemodel
-  requirement: &28666740 !ruby/object:Gem::Requirement
+  requirement: &26365420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *28666740
+  version_requirements: *26365420
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &28666120 !ruby/object:Gem::Requirement
+  requirement: &26364340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *28666120
+  version_requirements: *26364340
 - !ruby/object:Gem::Dependency
   name: uuid
-  requirement: &28665500 !ruby/object:Gem::Requirement
+  requirement: &26363520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28665500
+  version_requirements: *26363520
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &28664780 !ruby/object:Gem::Requirement
+  requirement: &26362840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28664780
+  version_requirements: *26362840
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &28658280 !ruby/object:Gem::Requirement
+  requirement: &26362100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *28658280
+  version_requirements: *26362100
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &28657500 !ruby/object:Gem::Requirement
+  requirement: &26361440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28657500
+  version_requirements: *26361440
 - !ruby/object:Gem::Dependency
   name: guard-test
-  requirement: &28656860 !ruby/object:Gem::Requirement
+  requirement: &26360420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28656860
+  version_requirements: *26360420
 - !ruby/object:Gem::Dependency
   name: rb-inotify
-  requirement: &28656040 !ruby/object:Gem::Requirement
+  requirement: &26359500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28656040
+  version_requirements: *26359500
 - !ruby/object:Gem::Dependency
   name: libnotify
-  requirement: &28655280 !ruby/object:Gem::Requirement
+  requirement: &26358600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28655280
+  version_requirements: *26358600
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &28654660 !ruby/object:Gem::Requirement
+  requirement: &26357640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28654660
+  version_requirements: *26357640
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &28653960 !ruby/object:Gem::Requirement
+  requirement: &26356560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *28653960
+  version_requirements: *26356560
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &28653300 !ruby/object:Gem::Requirement
+  requirement: &26354480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *28653300
+  version_requirements: *26354480
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &28652580 !ruby/object:Gem::Requirement
+  requirement: &26353660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *28652580
+  version_requirements: *26353660
 description: Progstr Filer is a developer-friendly file and attachment hosting service
   that lets you easily build apps that store and share files.
 email: hristo@deshev.com
@@ -217,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3689257704619090221
+      hash: 654969669640343783
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: