bulldog 0.0.8 → 0.0.9

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 0.0.9 2009-11-18
+
+ * Allow specifying a subset of styles to process via a :styles option
+   to #process.
+
 == 0.0.8 2009-11-18
 
  * Fix invocations of ffmpeg over multiple styles.

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.9

data/bulldog.gemspec

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

data/lib/bulldog/attachment/base.rb

@@ -23,15 +23,18 @@ module Bulldog
       #
       # Return true if no errors were encountered, false otherwise.
       #
-      def process(event_name)
+      def process(event_name, options={})
         reflection.events[event_name].each do |event|
           if (types = event.attachment_types)
             next unless types.include?(type)
           end
           processor_type = event.processor_type || default_processor_type
           processor_class = Processor.const_get(processor_type.to_s.camelize)
-          processor = processor_class.new(self, styles_for_event(event), stream.path)
-          processor.process(&event.callback)
+          processor = processor_class.new(self, stream.path)
+          styles = reflection.styles
+          names = options[:styles] || event.styles and
+            styles = reflection.styles.slice(*names)
+          processor.process(styles, options, &event.callback)
         end
         record.errors.empty?
       end
@@ -144,14 +147,6 @@ module Bulldog
 
       private  # -------------------------------------------------------
 
-      def styles_for_event(event)
-        if event.styles
-          styles = reflection.styles.slice(*event.styles)
-        else
-          styles = reflection.styles
-        end
-      end
-
       #
       # Remove the files for this attachment, along with any parent
       # directories.

data/lib/bulldog/processor/base.rb

@@ -1,9 +1,8 @@
 module Bulldog
   module Processor
     class Base
-      def initialize(attachment, styles, input_file)
+      def initialize(attachment, input_file)
         @attachment = attachment
-        @styles = styles
         @input_file = input_file
       end
 
@@ -61,8 +60,13 @@ module Bulldog
       # #style will be set to the current style each time the block is
       # called.
       #
-      def process(&block)
-        return if styles.empty?
+      # Return true if any styles were processed, false otherwise.
+      # Subclasses can use this to determine if any processing
+      # commands need to be run.
+      #
+      def process(styles, options={}, &block)
+        @styles = styles
+        return false if styles.empty?
         styles.each do |style|
           @style = style
           begin
@@ -71,6 +75,7 @@ module Bulldog
             @style = nil
           end
         end
+        true
       end
 
       #

data/lib/bulldog/processor/ffmpeg.rb

@@ -7,21 +7,21 @@ module Bulldog
 
       def initialize(*args)
         super
-        @arguments = style_list_map
-        @still_frame_callbacks = style_list_map
       end
 
-      def process
-        return if styles.empty?
-        super
-        run_still_frame_callbacks
+      def process(styles, options={})
+        super or
+          return
       end
 
       def process_style(*args)
         @operation = nil
+        @arguments = []
+        @still_frame_callbacks = []
         super
         set_default_operation
         run_ffmpeg
+        run_still_frame_callbacks
       end
 
       def use_threads(num_threads)
@@ -65,7 +65,7 @@ module Bulldog
         if (attribute = params[:assign_to])
           basename = "recorded_frame.#{params[:format]}"
           output_path = record.send(attribute).interpolate_path(:original, :basename => basename)
-          @still_frame_callbacks[style] << lambda do
+          @still_frame_callbacks << lambda do
             file = SavedFile.new(output_path, :file_name => basename)
             record.update_attribute(attribute, file)
           end
@@ -75,7 +75,7 @@ module Bulldog
 
         operate '-y', output_path
         if block
-          @still_frame_callbacks[style] << lambda{instance_exec(output_path, &block)}
+          @still_frame_callbacks << lambda{instance_exec(output_path, &block)}
         end
       end
 
@@ -88,7 +88,7 @@ module Bulldog
       end
 
       def operate(*args)
-        @arguments[style].concat args.map(&:to_s)
+        @arguments.concat args.map(&:to_s)
       end
 
       def set_default_operation
@@ -154,15 +154,13 @@ module Bulldog
       def run_ffmpeg
         command = [self.class.ffmpeg_path]
         command << '-i' << input_file
-        command.concat(@arguments[style])
+        command.concat(@arguments)
         Bulldog.run(*command) or
           record.errors.add name, "convert failed (status #$?)"
       end
 
       def run_still_frame_callbacks
-        @still_frame_callbacks.each do |style, callbacks|
-          callbacks.each{|c| c.call}
-        end
+        @still_frame_callbacks.each(&:call)
       end
     end
   end

data/lib/bulldog/processor/image_magick.rb

@@ -10,12 +10,12 @@ module Bulldog
 
       def initialize(*args)
         super
-        @tree = ArgumentTree.new(styles)
       end
 
-      def process
-        return if styles.empty?
-        super
+      def process(styles, options={})
+        @tree = ArgumentTree.new(styles)
+        super or
+          return
         run_convert
       end
 

data/lib/bulldog/processor/one_shot.rb

@@ -6,7 +6,7 @@ module Bulldog
         @styles = StyleSet.new
       end
 
-      def process(&block)
+      def process(*args, &block)
         @style = nil
         process_style(&block)
       end

data/spec/unit/processor/ffmpeg_spec.rb

@@ -51,7 +51,7 @@ describe Processor::Ffmpeg do
     configure(:video) do
       process(options.merge(:on => :event, :with => :ffmpeg), &block)
     end
-    @thing.video.process(:event)
+    @thing.video.process(:event, options)
   end
 
   describe "#process" do
@@ -61,6 +61,20 @@ describe Processor::Ffmpeg do
       process_video
     end
 
+    it "should process the specified set of styles, if given, even those not in the configured style set" do
+      video_style :one
+      video_style :two
+      video_style :three
+      styles = []
+      configure :video do
+        process(:on => :event, :with => :image_magick, :styles => [:one, :two]) do
+          styles << style.name
+        end
+      end
+      @thing.video.process(:event, :styles => [:two, :three])
+      styles.should == [:two, :three]
+    end
+
     it "should log the command run" do
       video_style :output
       log_path = "#{temporary_directory}/log"

data/spec/unit/processor/image_magick_spec.rb

@@ -34,11 +34,11 @@ describe Processor::ImageMagick do
     end
   end
 
-  def process(&block)
+  def process(*args, &block)
     configure do
       process(:on => :event, :with => :image_magick, &block)
     end
-    @thing.attachment.process(:event)
+    @thing.attachment.process(:event, *args)
   end
 
   describe "#dimensions" do
@@ -78,6 +78,20 @@ describe Processor::ImageMagick do
       process
     end
 
+    it "should process the specified set of styles, if given, even those not in the configured style set" do
+      style :one
+      style :two
+      style :three
+      styles = []
+      configure do
+        process(:on => :event, :with => :image_magick, :styles => [:one, :two]) do
+          styles << style.name
+        end
+      end
+      @thing.attachment.process(:event, :styles => [:two, :three])
+      styles.should == [:two, :three]
+    end
+
     it "should add an error to the record if convert fails" do
       style :output
       Bulldog.stubs(:run).returns(nil)

data/spec/unit/processor/one_shot_spec.rb

@@ -72,8 +72,8 @@ describe Processor::OneShot do
     it "should not affect the other processes' styles" do
       style = Style.new(:style)
       styles = StyleSet[style]
-      processor = Processor::OneShot.new(mock, styles, mock)
-      processor.process{}
+      processor = Processor::OneShot.new(mock, mock)
+      processor.process(styles){}
       styles.should have(1).style
     end
   end

metadata

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