has_moderated 1.1.4 → 1.1.5

data/test/dummy/spec/models/photo_spec.rb

@@ -11,7 +11,7 @@ describe Photo do
     FileUtils.rm_rf(TEMPDIR) # remove temp dir
     FileUtils.rm_rf(File.expand_path("../../../public/uploads", __FILE__)) # remove uploads dir
   end
-  
+
   context "create moderated:" do
     before do
       reload_models.photo {
@@ -21,7 +21,7 @@ describe Photo do
         has_moderated_carrierwave_field :avatar
       }
     end
-    
+
     it "should upload photo" do
       photo = Photo.create!(:avatar => carrierwave_test_photo)
 
@@ -36,6 +36,17 @@ describe Photo do
       photo = Photo.first
       assert_photo_uploaded(photo.avatar)
     end
+
+    it "should not move temp file when doing preview" do
+      photo = Photo.create!(:avatar => carrierwave_test_photo)
+
+      Photo.count.should eq(0)
+      tmpEmpty?.should be_false
+      uploadEmpty?.should be_true
+      Moderation.last.preview
+      tmpEmpty?.should be_false
+      uploadEmpty?.should be_true
+    end
   end
 
   context "not moderated:" do
@@ -44,7 +55,7 @@ describe Photo do
         mount_uploader :avatar, GenericUploader
       }
     end
-    
+
     it "should upload photo" do
       photo = Photo.create!(:avatar => carrierwave_test_photo)
 
@@ -56,7 +67,7 @@ describe Photo do
       assert_photo_uploaded(photo.avatar)
     end
   end
-  
+
   context "update moderated:" do
     before do
       reload_models.photo {
@@ -70,11 +81,11 @@ describe Photo do
     it "should moderate photo (on create)" do
       photo = Photo.create! :avatar => carrierwave_test_photo
       Photo.count.should eq(1)
-      
+
       Photo.first.avatar.file.should be_nil
       tmpEmpty?.should be_false
       uploadEmpty?.should be_true
-      
+
       Moderation.last.accept
       tmpEmpty?.should be_true
       uploadEmpty?.should be_false
@@ -83,11 +94,11 @@ describe Photo do
       photo = Photo.first
       assert_photo_uploaded(photo.avatar)
     end
-    
+
     it "should moderate photo (on update)" do
       photo = Photo.create!
       Photo.count.should eq(1)
-      
+
       Photo.first.update_attributes :avatar => carrierwave_test_photo
       tmpEmpty?.should be_false
       uploadEmpty?.should be_true
@@ -99,7 +110,7 @@ describe Photo do
       photo = Photo.first
       assert_photo_uploaded(photo.avatar)
     end
-    
+
     it "should delete temporary files if moderation is discarded" do
       photo = Photo.create! :avatar => carrierwave_test_photo
       tmpEmpty?.should be_false
@@ -108,8 +119,17 @@ describe Photo do
       tmpEmpty?.should be_true
       uploadEmpty?.should be_true
     end
+
+    it "should not move temp file when doing preview" do
+      photo = Photo.create! :avatar => carrierwave_test_photo
+      tmpEmpty?.should be_false
+      uploadEmpty?.should be_true
+      Moderation.last.preview
+      tmpEmpty?.should be_false
+      uploadEmpty?.should be_true
+    end
   end
-  
+
   context "moderated as association to has_moderated_create:" do
     before do
       reload_models.task {
@@ -124,9 +144,9 @@ describe Photo do
         has_moderated_carrierwave_field :avatar
         belongs_to :task, :class_name => task_class_name, :foreign_key => "parentable_id"
       }
-      
+
     end
-    
+
     it "should upload photo" do
       task = Task.new :title => "Task 1"
       task.photos.build :avatar => carrierwave_test_photo
@@ -144,12 +164,12 @@ describe Photo do
       photo = Task.first.photos.first
       assert_photo_uploaded(photo.avatar)
     end
-    
+
     it "should not add any photos if none were added" do
       task = Task.new :title => "Task 1"
       task.renamed_subtasks.build :title => "Subtask 1"
       task.save
-      
+
       Moderation.last.parsed_data[:create][:associations][:photos].should be_nil
 
       Task.count.should eq(0)
@@ -159,5 +179,41 @@ describe Photo do
       Task.first.photos.count.should eq(0)
       Photo.count.should eq(0)
     end
+
+    it "should not move temp file when doing preview" do
+      task = Task.new :title => "Task 1"
+      task.photos.build :avatar => carrierwave_test_photo
+      task.save
+
+      tmpEmpty?.should be_false
+      uploadEmpty?.should be_true
+      Moderation.last.preview
+      tmpEmpty?.should be_false
+      uploadEmpty?.should be_true
+    end
+  end
+
+  context "moderation preview" do
+    it "should show the temporary file as the photo" do
+      reload_models.photo {
+        mount_uploader :avatar, GenericUploader
+        send :include, HasModerated::CarrierWave
+        has_moderated_carrierwave_field :avatar
+        has_moderated :avatar
+      }
+
+      photo_file = carrierwave_test_photo
+      photo = Photo.create! :avatar => photo_file
+      tmpEmpty?.should be_false
+      uploadEmpty?.should be_true
+      preview = Moderation.last.preview
+      preview.avatar.url.should match(/\A\/uploads\/tmp\/.+\/test.jpg\z/)
+      preview.avatar.current_path.should eq(Moderation.last.parsed_data[:attributes]["avatar_tmp_file"])
+      preview.avatar_url.should eq(preview.avatar.url)
+      preview.avatar.frozen?.should be_true
+
+      Photo.last.avatar.current_path.should be_blank
+      Photo.last.avatar_url.should be_blank
+    end
   end
 end

data/test/dummy/spec/models/task_spec.rb

@@ -566,6 +566,12 @@ describe Task do
       Moderation.last.accept
       Task.count.should eq(0)
     end
+
+    it "returns nil for #preview" do
+      Task.create! :title => "Task 1"
+      Task.first.destroy
+      Moderation.last.preview.should be_nil
+    end
   end
 
   #
@@ -652,7 +658,7 @@ describe Task do
     it "calls moderation callbacks on destroy" do
       reload_models.task {
         has_moderated_create
-        def self.moderatable_discard(m)
+        def self.moderatable_discard(m, opts)
           raise "moderatable_discard"
         end
       }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_moderated
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-23 00:00:00.000000000 Z
+date: 2012-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -241,6 +241,8 @@ files:
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/dummy/public/test.jpg
+- test/dummy/public/uploads/tmp/20121024-1607-1557-8676/test.jpg
+- test/dummy/public/uploads/tmp/20121024-1607-1557-8676/thumb_test.jpg
 - test/dummy/Rakefile
 - test/dummy/script/rails
 - test/dummy/spec/models/photo_spec.rb
@@ -262,7 +264,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1102405584291945894
+      hash: -2367943572117376893
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -271,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1102405584291945894
+      hash: -2367943572117376893
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -314,6 +316,8 @@ test_files:
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
 - test/dummy/public/test.jpg
+- test/dummy/public/uploads/tmp/20121024-1607-1557-8676/test.jpg
+- test/dummy/public/uploads/tmp/20121024-1607-1557-8676/thumb_test.jpg
 - test/dummy/Rakefile
 - test/dummy/script/rails
 - test/dummy/spec/models/photo_spec.rb