has_moderated 1.1.5 → 1.1.6

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

@@ -35,6 +35,7 @@ describe Photo do
       Photo.count.should eq(1)
       photo = Photo.first
       assert_photo_uploaded(photo.avatar)
+      File.exist?(photo.avatar.versions[:thumb].file.file).should be_true
     end
 
     it "should not move temp file when doing preview" do
@@ -210,10 +211,121 @@ describe Photo do
       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
+      preview.avatar.file.class.should eq(::CarrierWave::HasModeratedTempFile)
 
       Photo.last.avatar.current_path.should be_blank
       Photo.last.avatar_url.should be_blank
     end
+
+    it "should show the temporary file as the photo (create moderation)" do
+      reload_models.photo {
+        mount_uploader :avatar, GenericUploader
+        send :include, HasModerated::CarrierWave
+        has_moderated_create
+        has_moderated_carrierwave_field :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[:create][:attributes]["avatar_tmp_file"])
+      preview.avatar_url.should eq(preview.avatar.url)
+      preview.avatar.file.class.should eq(::CarrierWave::HasModeratedTempFile)
+      tmpEmpty?.should be_false
+      uploadEmpty?.should be_true
+    end
+
+    it "should not move image to uploads when calling save on live_preview" do
+      reload_models.photo {
+        mount_uploader :avatar, GenericUploader
+        send :include, HasModerated::CarrierWave
+        has_moderated_create
+        has_moderated_carrierwave_field :avatar
+      }
+
+      photo_file = carrierwave_test_photo
+      photo = Photo.create! :avatar => photo_file
+      tmpEmpty?.should be_false
+      uploadEmpty?.should be_true
+      Moderation.last.live_preview do |m|
+        m.save
+        uploadEmpty?.should be_true
+      end
+      tmpEmpty?.should be_false
+      uploadEmpty?.should be_true
+    end
+
+    it "should not move image to uploads when calling save on preview" do
+      reload_models.photo {
+        mount_uploader :avatar, GenericUploader
+        send :include, HasModerated::CarrierWave
+        has_moderated_create
+        has_moderated_carrierwave_field :avatar
+      }
+
+      photo_file = carrierwave_test_photo
+      photo = Photo.create! :avatar => photo_file
+      tmpEmpty?.should be_false
+      uploadEmpty?.should be_true
+      m = Moderation.last.preview
+      m.save
+      tmpEmpty?.should be_false
+      uploadEmpty?.should be_true
+    end
+
+    it "should show the temporary file as the photo (create assoc moderation)" do
+      reload_models.task {
+        has_many :photos, :class_name => photo_class_name, :foreign_key => "parentable_id"
+        has_moderated_create :with_associations => [:photos]
+      }.photo {
+        mount_uploader :avatar, GenericUploader
+        send :include, HasModerated::CarrierWave
+        has_moderated_carrierwave_field :avatar
+        belongs_to :task, :class_name => task_class_name, :foreign_key => "parentable_id"
+      }
+
+      photo_file = carrierwave_test_photo
+      task = Task.new
+      photo = task.photos.build :avatar => photo_file
+      task.save
+      tmpEmpty?.should be_false
+      uploadEmpty?.should be_true
+      preview = Moderation.last.preview.photos.first
+      preview.avatar.url.should match(/\A\/uploads\/tmp\/.+\/test.jpg\z/)
+      preview.avatar.current_path.should eq(Moderation.last.parsed_data[:create][:associations][:photos].first["avatar_tmp_file"])
+      preview.avatar_url.should eq(preview.avatar.url)
+      preview.avatar.file.class.should eq(::CarrierWave::HasModeratedTempFile)
+      tmpEmpty?.should be_false
+      uploadEmpty?.should be_true
+    end
+
+    it "should show the temporary file as the photo (assoc moderation)" do
+      reload_models.task {
+        has_many :photos, :class_name => photo_class_name, :foreign_key => "parentable_id"
+        has_moderated_association :photos
+      }.photo {
+        mount_uploader :avatar, GenericUploader
+        send :include, HasModerated::CarrierWave
+        has_moderated_carrierwave_field :avatar
+        belongs_to :task, :class_name => task_class_name, :foreign_key => "parentable_id"
+      }
+
+      photo_file = carrierwave_test_photo
+      task = Task.new
+      photo = task.photos.build :avatar => photo_file
+      task.save
+      tmpEmpty?.should be_false
+      uploadEmpty?.should be_true
+      preview = Moderation.last.preview.photos.first
+      preview.avatar.url.should match(/\A\/uploads\/tmp\/.+\/test.jpg\z/)
+      preview.avatar.current_path.should eq(Moderation.last.parsed_data[:associations][:photos].first["avatar_tmp_file"])
+      preview.avatar_url.should eq(preview.avatar.url)
+      preview.avatar.file.class.should eq(::CarrierWave::HasModeratedTempFile)
+      tmpEmpty?.should be_false
+      uploadEmpty?.should be_true
+    end
   end
 end

data/test/dummy/spec/support/photos.rb

@@ -19,15 +19,15 @@ TEMPDIR = File.expand_path("../../../public/uploads/tmp", __FILE__)
 
 def carrierwave_test_photo
   test_photo_path = File.expand_path("../../../public/test.jpg", __FILE__)
-  File.open(test_photo_path, "r")
+  File.open(test_photo_path, "rb")
 end
 
 def assert_photo_uploaded photo
   photo.should_not be_nil
   photo.file.should_not be_nil
   photo.file.file.should_not be_nil
-  
+
   filename = photo.file.file
   File.exist?(filename)
   assert(filename =~ /avatar\/1\/test.jpg\Z/)
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_moderated
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-24 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -241,8 +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/public/uploads/tmp/20121031-1115-2165-7602/test.jpg
+- test/dummy/public/uploads/tmp/20121031-1115-2165-7602/thumb_test.jpg
 - test/dummy/Rakefile
 - test/dummy/script/rails
 - test/dummy/spec/models/photo_spec.rb
@@ -264,7 +264,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2367943572117376893
+      hash: -1072446703184255041
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -273,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2367943572117376893
+      hash: -1072446703184255041
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -316,8 +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/public/uploads/tmp/20121031-1115-2165-7602/test.jpg
+- test/dummy/public/uploads/tmp/20121031-1115-2165-7602/thumb_test.jpg
 - test/dummy/Rakefile
 - test/dummy/script/rails
 - test/dummy/spec/models/photo_spec.rb