bulldog 0.0.9 → 0.0.10

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 0.0.10 2009-12-01
+
+ * Fix recording video frame when frame attachment already exists.
+
 == 0.0.9 2009-11-18
 
  * Allow specifying a subset of styles to process via a :styles option

data/Rakefile

@@ -42,7 +42,6 @@ namespace :spec do
   Spec::Rake::SpecTask.new(:unit) do |t|
     t.pattern = 'spec/unit/**/*_spec.rb'
     t.libs << 'lib' << 'spec'
-    t.spec_opts = ['--options', "\"#{PLUGIN_ROOT}/spec/spec.opts\""]
   end
 
   Spec::Rake::SpecTask.new(:integration) do |t|

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/bulldog.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bulldog}
-  s.version = "0.0.9"
+  s.version = "0.0.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["George Ogata"]
-  s.date = %q{2009-11-23}
+  s.date = %q{2009-12-01}
   s.description = %q{= Bulldog
 
 Flexible file attachments for active record.

data/lib/bulldog/processor/ffmpeg.rb

@@ -66,8 +66,12 @@ module Bulldog
           basename = "recorded_frame.#{params[:format]}"
           output_path = record.send(attribute).interpolate_path(:original, :basename => basename)
           @still_frame_callbacks << lambda do
-            file = SavedFile.new(output_path, :file_name => basename)
-            record.update_attribute(attribute, file)
+            if existing_frame_path(attribute) == output_path
+              attachment.reload
+            else
+              file = SavedFile.new(output_path, :file_name => basename)
+              record.update_attribute(attribute, file)
+            end
           end
         else
           output_path = output_file(style.name)
@@ -159,6 +163,11 @@ module Bulldog
           record.errors.add name, "convert failed (status #$?)"
       end
 
+      def existing_frame_path(attribute)
+        stream = record.send(attribute).stream
+        stream && stream.path
+      end
+
       def run_still_frame_callbacks
         @still_frame_callbacks.each(&:call)
       end

data/spec/unit/processor/ffmpeg_spec.rb

@@ -184,6 +184,25 @@ describe Processor::Ffmpeg do
         context.should be_a(Processor::Ffmpeg)
         argument.should == original_frame_path
       end
+
+      describe "when the frame attachment already exists" do
+        before do
+          thing = Thing.create(:frame => test_image_file('test.jpg'))
+          @thing = Thing.find(thing.id)
+          @thing.video = test_video_file('test.mov')
+          @thing.video.stubs(:duration).returns(1)
+        end
+
+        it "should update the original file of the specified attachment" do
+          lambda do
+            process_video :styles => [:original] do
+              record_frame(:format => 'jpg', :assign_to => :frame)
+            end
+          end.should modify_file(original_frame_path)
+          # file could be empty if it is destroyed before saving
+          File.size(original_frame_path).should > 0
+        end
+      end
     end
 
     describe "using style attributes" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bulldog
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - George Ogata
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 -05:00
+date: 2009-12-01 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency