phocoder-rails 0.0.48 → 0.0.49

data/Gemfile

@@ -24,6 +24,8 @@ gem "spawn", :git => 'git://github.com/tra/spawn', :branch => "edge"
  
 #gem "rspec", "~> 2.1.0"
 #gem "rspec-rails", ">= 2.0.0.beta"
+
+gem 'simplecov', :require => false, :group => :test
  
 group :development do
   gem 'rspec-rails', '2.4.1'

data/VERSION

@@ -1,4 +1,4 @@
-0.0.48
+0.0.49
 
 
 

data/app/models/encodable_job.rb

@@ -3,6 +3,13 @@ class EncodableJob < ActiveRecord::Base
   belongs_to :encodable, :polymorphic=>true
   
   scope :pending, :conditions => "phocoder_status != 'ready'"
+  scope :for_components, :conditions => "tracking_mode = 'component'"
+  scope :for_jobs, :conditions => "tracking_mode = 'job'"
+
+  def initialize(params = {}, options={})
+    super
+    self.tracking_mode = "component" unless self.tracking_mode
+  end
   
   def update_status
     job_data = Phocoder::Job.details(phocoder_job_id).body
@@ -61,7 +68,101 @@ class EncodableJob < ActiveRecord::Base
     end
   end
   
+
   def self.update_from_phocoder(params)
+    if params[:outputs] && params[:inputs]
+      update_from_phocoder_job_style(params)
+    else
+      update_from_phocoder_component_style(params)
+    end
+  end
+
+  def self.update_from_phocoder_job_style(params)
+    if params[:job][:type] == 'ThumbnailJob'
+      update_from_phocoder_thumbnail_job(params)
+    elsif params[:job][:type] == 'CompositeJob' || params[:job][:type] == 'ToneMappingJob'
+      update_from_phocoder_generic_job_with_thumbnails(params)
+    else
+      update_from_phocoder_generic_job(params)
+    end
+  end
+
+  def self.update_from_phocoder_thumbnail_job(params)
+    #debugger
+    job = self.for_jobs.find_by_phocoder_job_id params[:job][:id]
+    encodable = job.encodable
+    
+    img_params = params[:inputs].first
+    update_encodable_and_job_from_img_params(encodable,job,img_params)
+
+    params[:outputs].each do |thumb_params|
+      thumbnail = encodable.thumbnail_for(thumb_params[:label])
+      update_encodable_and_job_from_img_params(thumbnail,job,thumb_params)
+      thumbnail.encodable_status = "ready" if thumbnail.respond_to?(:encodable_status=)
+      thumbnail.phocoder_status = "ready" if thumbnail.respond_to?(:phocoder_status=)
+      thumbnail.save!
+    end
+
+    encodable.encodable_status = "ready" if encodable.respond_to?(:encodable_status=)
+    encodable.phocoder_status = "ready" if encodable.respond_to?(:phocoder_status=)
+    encodable.save!
+    encodable.fire_ready_callback
+    
+    job.phocoder_status = "ready"
+    job.save
+    job
+  end
+
+  def self.update_from_phocoder_generic_job(params)
+    #debugger
+    job = self.for_jobs.find_by_phocoder_job_id params[:job][:id]
+    encodable = job.encodable
+    
+    img_params = params[:outputs].first
+    update_encodable_and_job_from_img_params(encodable,job,img_params)
+
+    encodable.encodable_status = "ready" if encodable.respond_to?(:encodable_status=)
+    encodable.phocoder_status = "ready" if encodable.respond_to?(:phocoder_status=)
+    encodable.save!
+    encodable.fire_ready_callback
+
+    job.phocoder_status = "ready"
+    job.save
+    job
+  end
+
+  def self.update_from_phocoder_generic_job_with_thumbnails(params)
+    #debugger
+    job = self.for_jobs.find_by_phocoder_job_id params[:job][:id]
+    encodable = job.encodable
+    
+    img_params = {}
+    
+
+    params[:outputs].each do |thumb_params|
+      if thumb_params[:label].blank?
+        img_params = thumb_params
+        next
+      end
+      thumbnail = encodable.thumbnail_for(thumb_params[:label])
+      update_encodable_and_job_from_img_params(thumbnail,job,thumb_params)
+      thumbnail.encodable_status = "ready" if thumbnail.respond_to?(:encodable_status=)
+      thumbnail.phocoder_status = "ready" if thumbnail.respond_to?(:phocoder_status=)
+      thumbnail.save!
+    end
+
+    update_encodable_and_job_from_img_params(encodable,job,img_params)
+    encodable.encodable_status = "ready" if encodable.respond_to?(:encodable_status=)
+    encodable.phocoder_status = "ready" if encodable.respond_to?(:phocoder_status=)
+    encodable.save!
+    encodable.fire_ready_callback
+    
+    job.phocoder_status = "ready"
+    job.save
+    job
+  end
+
+  def self.update_from_phocoder_component_style(params)
     Rails.logger.debug "tying to call update from phocoder for params = #{params.to_json}"
     puts "tying to call update from phocoder for params = #{params.to_json}"
     if !params[:output].blank?
@@ -92,24 +193,21 @@ class EncodableJob < ActiveRecord::Base
       img_params = params[:input]
       encodable = job.encodable
     end
-    [:file_size,:width,:height,:taken_at,:lat,:lng,:saturated_pixels,:gauss,:bits_per_pixel,:camera_make, 
-     :camera_model, :orientation, :exposure_time, :f_number, :iso_speed_rating, :exposure_bias_value, 
-     :focal_length, :focal_length_in_35mm_film, :subsec_time, :pixels, :processing_time].each do |att|
-      setter = att.to_s + "="
-      if encodable.respond_to? setter and !img_params[att].blank?
-        encodable.send setter, img_params[att]
-      end
-      if job.respond_to? setter and !img_params[att].blank?
-        job.send setter, img_params[att]
-      end
-    end
-    
+      
+    update_encodable_and_job_from_img_params(encodable,job,img_params)
     #job.file_size = img_params[:file_size]
     #job.width = img_params[:width]
     #job.height = img_params[:height]
     encodable.encodable_status = "ready"
+    
     encodable.save
-    encodable.fire_ready_callback
+
+    if params[:output].blank? && params[:input].blank?
+      # Do nothing?  Only for tracking job status, not components...
+    else
+      encodable.fire_ready_callback
+    end
+    
     # may not have a job if the EncodableJob didn't get created for some reason
     if job
       job.phocoder_status = "ready"
@@ -118,6 +216,20 @@ class EncodableJob < ActiveRecord::Base
     end
   end
   
+
+  def self.update_encodable_and_job_from_img_params(encodable,job,img_params)
+    [ :file_size,:width,:height,:taken_at,:lat,:lng,:saturated_pixels,:gauss,:bits_per_pixel,:camera_make, 
+      :camera_model, :orientation, :exposure_time, :f_number, :iso_speed_rating, :exposure_bias_value, 
+      :focal_length, :focal_length_in_35mm_film, :subsec_time, :pixels, :processing_time].each do |att|
+      setter = att.to_s + "="
+      if encodable.respond_to? setter and !img_params[att].blank?
+        encodable.send setter, img_params[att]
+      end
+      if job.respond_to? setter and !img_params[att].blank?
+        job.send setter, img_params[att]
+      end
+    end
+  end
   
   
   # Updating from zencoder is a two pass operation.

data/lib/generators/phocoder_rails/templates/migration.rb

@@ -12,6 +12,8 @@ class CreateEncodableJobs < ActiveRecord::Migration
       t.integer  "zencoder_output_id"
       t.string   "zencoder_status"
       t.string   "zencoder_url"
+      t.string   "tracking_mode"
+      t.integer  "user_id"
       t.timestamps
     end
     add_index :encodable_jobs, [:encodable_type, :encodable_id]
@@ -21,4 +23,4 @@ class CreateEncodableJobs < ActiveRecord::Migration
   def self.down
     drop_table :encodable_jobs
   end
-end
+end

data/lib/phocoder_rails/acts_as_phocodable.rb

@@ -58,6 +58,14 @@ module ActsAsPhocodable
   mattr_accessor :local_base_dir
   self.local_base_dir = '/tmp'
   
+  # Whether to track progress at the job level
+  mattr_accessor :track_jobs
+  self.track_jobs = true
+
+  # Whether to track progress at the component level
+  mattr_accessor :track_components
+  self.track_components = false
+
   # The config file that tells phocoder where to find
   # config options.
   mattr_accessor :config_file
@@ -376,6 +384,12 @@ module ActsAsPhocodable
     if self.phocodable_configuration[:local_base_dir]
       ActsAsPhocodable.local_base_dir = phocodable_configuration[:local_base_dir]
     end
+    if self.phocodable_configuration[:track_jobs]
+      ActsAsPhocodable.track_jobs = phocodable_configuration[:track_jobs]
+    end
+    if self.phocodable_configuration[:track_components]
+      ActsAsPhocodable.track_components = phocodable_configuration[:track_components]
+    end
     
     
     if self.phocodable_configuration[:phocoder_url]
@@ -387,6 +401,8 @@ module ActsAsPhocodable
     if self.phocodable_configuration[:zencoder_api_key]
       ::Zencoder.api_key = phocodable_configuration[:zencoder_api_key]
     end
+
+
     if ActsAsPhocodable.storeage_mode == "s3"
       self.establish_aws_connection
     end
@@ -485,13 +501,14 @@ module ActsAsPhocodable
         thumb.filename = thumb_params["filename"]
         thumb.width = thumb_params["width"]
         thumb.height = thumb_params["height"]
-        tjob = thumb.encodable_jobs.new
-        
-        tjob.phocoder_output_id = thumb_params["id"]
-        tjob.phocoder_job_id = job_id
-        #thumb.parent_id = self.id
-        tjob.phocoder_status  =  "phocoding"
-        thumb.encodable_jobs << tjob
+        if ActsAsPhocodable.track_components
+          tjob = thumb.encodable_jobs.new
+          tjob.phocoder_output_id = thumb_params["id"]
+          tjob.phocoder_job_id = job_id
+          #thumb.parent_id = self.id
+          tjob.phocoder_status  =  "phocoding"
+          thumb.encodable_jobs << tjob
+        end
         thumb.encodable_status = "phocoding"
         thumb.save
         new_thumbs << thumb
@@ -536,11 +553,24 @@ module ActsAsPhocodable
       response = Phocoder::Job.create(phocoder_params(input_thumbs))
       Rails.logger.debug "the phocode response = #{response.to_json}" if Rails.env != "test"
       #puts "the phocode response = #{response.to_json}" if Rails.env != "test"
-      job = self.encodable_jobs.new
-      job.phocoder_input_id = response.body["job"]["inputs"].first["id"]
-      job.phocoder_job_id = response.body["job"]["id"]
-      job.phocoder_status = "phocoding"
-      self.encodable_jobs << job
+      if ActsAsPhocodable.track_components
+        job = self.encodable_jobs.new
+        job.phocoder_input_id = response.body["job"]["inputs"].first["id"]
+        job.phocoder_job_id = response.body["job"]["id"]
+        job.phocoder_status = "phocoding"
+        job.user_id = self.user_id if (self.respond_to?(:user_id) && self.user_id)
+        self.encodable_jobs << job
+      end
+      if ActsAsPhocodable.track_jobs
+        job = self.encodable_jobs.new
+        job.tracking_mode = 'job'
+        job.phocoder_input_id = response.body["job"]["inputs"].first["id"]
+        job.phocoder_job_id = response.body["job"]["id"]
+        job.phocoder_status = "phocoding"
+        job.user_id = self.user_id if (self.respond_to?(:user_id) && self.user_id)
+        self.encodable_jobs << job
+      end
+
       self.encodable_status = "phocoding" unless self.encodable_status == "ready" # the unless clause allows new thumbs to be created on the fly without jacking with the status
       self.save #false need to do save(false) here if we're calling phocode on after_save
       response_thumbs = response.body["job"]["thumbnails"]
@@ -564,11 +594,23 @@ module ActsAsPhocodable
         Rails.logger.debug "callback url = #{callback_url}"
         response = Phocoder::Job.create(phocoder_hdr_params)
         Rails.logger.debug "the response from phocode_hdr = #{response.body.to_json}"
-        job = self.encodable_jobs.new
-        job.phocoder_output_id = response.body["job"]["hdr"]["id"]
-        job.phocoder_job_id = response.body["job"]["id"]
-        job.phocoder_status = "phocoding"
-        self.encodable_jobs << job
+        if ActsAsPhocodable.track_components
+          job = self.encodable_jobs.new
+          job.phocoder_output_id = response.body["job"]["hdr"]["id"]
+          job.phocoder_job_id = response.body["job"]["id"]
+          job.phocoder_status = "phocoding"
+          job.user_id = self.user_id if (self.respond_to?(:user_id) && self.user_id)
+          self.encodable_jobs << job
+        end
+        if ActsAsPhocodable.track_jobs
+          job = self.encodable_jobs.new
+          job.tracking_mode = 'job'
+          job.phocoder_output_id = response.body["job"]["hdr"]["id"]
+          job.phocoder_job_id = response.body["job"]["id"]
+          job.phocoder_status = "phocoding"
+          job.user_id = self.user_id if (self.respond_to?(:user_id) && self.user_id)
+          self.encodable_jobs << job
+        end
         self.encodable_status = "phocoding"
         self.save #false need to do save(false) here if we're calling phocode on after_save
       end
@@ -591,11 +633,23 @@ module ActsAsPhocodable
         Rails.logger.debug "callback url = #{callback_url}"
         response = Phocoder::Job.create(phocoder_hdrhtml_params)
         Rails.logger.debug "the response from phocode_hdrhtml = #{response.body.to_json}"
-        job = self.encodable_jobs.new
-        job.phocoder_output_id = response.body["job"]["hdrhtml"]["id"]
-        job.phocoder_job_id = response.body["job"]["id"]
-        job.phocoder_status = "phocoding"
-        self.encodable_jobs << job
+        if ActsAsPhocodable.track_components
+          job = self.encodable_jobs.new
+          job.phocoder_output_id = response.body["job"]["hdrhtml"]["id"]
+          job.phocoder_job_id = response.body["job"]["id"]
+          job.phocoder_status = "phocoding"
+          job.user_id = self.user_id if (self.respond_to?(:user_id) && self.user_id)
+          self.encodable_jobs << job
+        end
+        if ActsAsPhocodable.track_jobs
+          job = self.encodable_jobs.new
+          job.tracking_mode = 'job'
+          job.phocoder_output_id = response.body["job"]["hdrhtml"]["id"]
+          job.phocoder_job_id = response.body["job"]["id"]
+          job.phocoder_status = "phocoding"
+          job.user_id = self.user_id if (self.respond_to?(:user_id) && self.user_id)
+          self.encodable_jobs << job
+        end
         self.encodable_status = "phocoding"
         self.save #false need to do save(false) here if we're calling phocode on after_save
       end
@@ -620,11 +674,23 @@ module ActsAsPhocodable
         response = Phocoder::Job.create(phocoder_tone_mapping_params)
         Rails.logger.debug "tone_mapping response = #{response.body.to_json}"
         #puts "tone_mapping response = #{response.body.to_json}"
-        job = self.encodable_jobs.new
-        job.phocoder_output_id = response.body["job"]["tone_mapping"]["id"]
-        job.phocoder_job_id = response.body["job"]["id"]
-        job.phocoder_status = "phocoding"
-        self.encodable_jobs << job
+        if ActsAsPhocodable.track_components
+          job = self.encodable_jobs.new
+          job.phocoder_output_id = response.body["job"]["tone_mapping"]["id"]
+          job.phocoder_job_id = response.body["job"]["id"]
+          job.phocoder_status = "phocoding"
+          job.user_id = self.user_id if (self.respond_to?(:user_id) && self.user_id)
+          self.encodable_jobs << job
+        end
+        if ActsAsPhocodable.track_jobs
+          job = self.encodable_jobs.new
+          job.tracking_mode = 'job'
+          job.phocoder_output_id = response.body["job"]["tone_mapping"]["id"]
+          job.phocoder_job_id = response.body["job"]["id"]
+          job.phocoder_status = "phocoding"
+          job.user_id = self.user_id if (self.respond_to?(:user_id) && self.user_id)
+          self.encodable_jobs << job
+        end
         self.encodable_status = "phocoding"
         self.save #false need to do save(false) here if we're calling phocode on after_save
         response_thumbs = response.body["job"]["thumbnails"]
@@ -651,11 +717,23 @@ module ActsAsPhocodable
         response = Phocoder::Job.create(phocoder_composite_params)
         Rails.logger.debug "composite response = #{response.body.to_json}"
         #puts "composite response = #{response.body.to_json}"
-        job = self.encodable_jobs.new
-        job.phocoder_output_id = response.body["job"]["composite"]["id"]
-        job.phocoder_job_id = response.body["job"]["id"]
-        job.phocoder_status = "phocoding"
-        self.encodable_jobs << job
+        if ActsAsPhocodable.track_components
+          job = self.encodable_jobs.new
+          job.phocoder_output_id = response.body["job"]["composite"]["id"]
+          job.phocoder_job_id = response.body["job"]["id"]
+          job.phocoder_status = "phocoding"
+          job.user_id = self.user_id if (self.respond_to?(:user_id) && self.user_id)
+          self.encodable_jobs << job
+        end
+        if ActsAsPhocodable.track_jobs
+          job = self.encodable_jobs.new
+          job.tracking_mode = 'job'
+          job.phocoder_output_id = response.body["job"]["composite"]["id"]
+          job.phocoder_job_id = response.body["job"]["id"]
+          job.phocoder_status = "phocoding"
+          job.user_id = self.user_id if (self.respond_to?(:user_id) && self.user_id)
+          self.encodable_jobs << job
+        end
         self.encodable_status = "phocoding"
         self.save #false need to do save(false) here if we're calling phocode on after_save
         response_thumbs = response.body["job"]["thumbnails"]
@@ -676,21 +754,33 @@ module ActsAsPhocodable
       Rails.logger.debug "callback url = #{callback_url}"
       response = Zencoder::Job.create(zencoder_params)
       Rails.logger.debug "response from Zencoder = #{response.body.to_json}"
-      job = self.encodable_jobs.new
-      job.zencoder_job_id = response.body["id"]
-      self.encodable_jobs << job
-      
+      if ActsAsPhocodable.track_components
+        job = self.encodable_jobs.new
+        job.zencoder_job_id = response.body["id"]
+        job.user_id = self.user_id if (self.respond_to?(:user_id) && self.user_id)
+        self.encodable_jobs << job
+      end
+      if ActsAsPhocodable.track_jobs
+        job = self.encodable_jobs.new
+        job.tracking_mode = 'job'
+        job.zencoder_job_id = response.body["id"]
+        job.user_id = self.user_id if (self.respond_to?(:user_id) && self.user_id)
+        self.encodable_jobs << job
+      end
+
       response.body["outputs"].each do |output_params|
         thumb = self.thumbnails.new()
         thumb.thumbnail = output_params["label"]
         
-        tjob = thumb.encodable_jobs.new
-        tjob.zencoder_output_id = output_params["id"]
-        tjob.zencoder_url = output_params["url"]
-        tjob.zencoder_job_id = response.body["id"]
-        tjob.zencoder_status  =  "zencoding"
-        thumb.encodable_jobs << tjob
-        
+        if ActsAsPhocodable.track_components
+          tjob = thumb.encodable_jobs.new
+          tjob.zencoder_output_id = output_params["id"]
+          tjob.zencoder_url = output_params["url"]
+          tjob.zencoder_job_id = response.body["id"]
+          tjob.zencoder_status  =  "zencoding"
+          tjob.user_id = self.user_id if (self.respond_to?(:user_id) && self.user_id)
+          thumb.encodable_jobs << tjob
+        end
         self.thumbnails << thumb
         thumb.encodable_status = "zencoding"
         thumb.save

data/spec/controllers/phocoder_controller_spec.rb

@@ -57,6 +57,35 @@ describe PhocoderController do
       #@image_upload.file_size.should == 2
     end
     
+
+    it "should handle job tracking updates" do
+      @encodable_job.tracking_mode = 'job'
+      @encodable_job.save
+      post 'phocoder_notification_update', {:class=>"ImageUpload",:id=>1, :job=>{:id => 1,:type=>"ThumbnailJob"},:format=>"json", :inputs => [{}], :outputs => []}
+      response.should be_success
+    end
+
+    it "should update all the things for job tracking updates" do
+      @encodable_job.tracking_mode = 'job'
+      @encodable_job.save
+      @thumbnail = @image_upload.thumbnails.create!(:thumbnail => "small")
+      params = {
+        :class=>@image_upload.class.name.to_s,:id=>@image_upload.id,
+        "job"=>{"state"=>"complete", "id"=>1, "type"=>"ThumbnailJob", "pixels"=>26379158, "processing_time"=>43.0}, 
+        "inputs"=>[{"id"=>50, "state"=>"complete", "file_size"=>4742478, "width"=>4288, "height"=>2848, "pixels"=>12212224, "processing_time"=>5.0, "url"=>"http://development.thephotolabs.com.s3.amazonaws.com/photos/150/dsc_8400.jpg", "lat"=>nil, "lng"=>nil, "taken_at"=>"2010-03-08T17:04:29Z", "camera_make"=>0, "camera_model"=>0, "bits_per_pixel"=>8, "exposure_time"=>"0.008000000", "f_number"=>"13.000000000", "iso_speed_rating"=>"1000", "exposure_bias_value"=>"-1.000000000", "focal_length"=>"10.000000000", "focal_length_in_35mm_film"=>"15", "subsec_time"=>74}], 
+        "outputs"=>[{"id"=>85, "state"=>"complete", "file_size"=>69735, "label"=>"small", "url"=>"s3://development.thephotolabs.com/photo_thumbnails/150/small_dsc_8400.jpg", "pixels"=>6600, "processing_time"=>2.0, "width"=>100, "height"=>66}]
+      }
+      post 'phocoder_notification_update', params.symbolize_keys
+      @encodable_job.reload
+      @image_upload.reload
+      @thumbnail.reload
+      puts @image_upload.to_json
+      @encodable_job.phocoder_status.should == 'ready'
+      @image_upload.phocoder_status.should == 'ready'
+      @image_upload.width.should == 4288
+      @thumbnail.phocoder_status.should == 'ready'
+    end
+
   end
   
  
@@ -120,4 +149,4 @@ describe PhocoderController do
   
   
   
-end
+end

data/spec/dummy/db/migrate/20110523165522_create_encodable_jobs.rb

@@ -12,6 +12,7 @@ class CreateEncodableJobs < ActiveRecord::Migration
       t.integer  "zencoder_output_id"
       t.string   "zencoder_status"
       t.string   "zencoder_url"
+      t.string   "tracking_mode"
       t.timestamps
     end
     add_index :encodable_jobs, [:encodable_type, :encodable_id]
@@ -21,4 +22,4 @@ class CreateEncodableJobs < ActiveRecord::Migration
   def self.down
     drop_table :encodable_jobs
   end
-end
+end

data/spec/dummy/db/migrate/20121230165930_add_tracking_mode_to_encodable_jobs.rb

@@ -0,0 +1,5 @@
+class AddTrackingModeToEncodableJobs < ActiveRecord::Migration
+  def change
+    #add_column :encodable_jobs, :tracking_mode, :string
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120423030345) do
+ActiveRecord::Schema.define(:version => 20121230165930) do
 
   create_table "encodable_jobs", :force => true do |t|
     t.string   "encodable_type"
@@ -27,6 +27,7 @@ ActiveRecord::Schema.define(:version => 20120423030345) do
     t.string   "zencoder_url"
     t.datetime "created_at",         :null => false
     t.datetime "updated_at",         :null => false
+    t.string   "tracking_mode"
   end
 
   add_index "encodable_jobs", ["encodable_type", "encodable_id"], :name => "index_encodable_jobs_on_encodable_type_and_encodable_id"

data/spec/models/acts_as_phocodable_spec.rb

@@ -52,6 +52,7 @@ describe ActsAsPhocodable do
 #        ) 
 #        }
     ImageUpload.destroy_all
+    EncodableJob.destroy_all
     @fixture_path = ""
     @attr = {
       :file => fixture_file_upload(@fixture_path + '/big_eye_tiny.jpg','image/jpeg')
@@ -62,6 +63,8 @@ describe ActsAsPhocodable do
     @txt_attr = {
       :file => fixture_file_upload(@fixture_path + '/test.txt', 'text/plain')
     }
+    ActsAsPhocodable.track_jobs = true
+    ActsAsPhocodable.track_components = false
   end
   
   
@@ -97,6 +100,27 @@ describe ActsAsPhocodable do
     ActsAsPhocodable.base_url = "http://new-domain.com"
     ActsAsPhocodable.base_url.should == "http://new-domain.com"
   end
+
+  it "should default to tracking jobs" do
+    ActsAsPhocodable.track_jobs.should be_true
+  end
+
+  it "should be able to be set to not track jobs" do
+    ActsAsPhocodable.track_jobs = false
+    ActsAsPhocodable.track_jobs.should_not be_true
+  end
+
+  it "should default to not tracking components" do
+    ActsAsPhocodable.track_components.should_not be_true
+  end
+
+  it "should be able to be set to to track components" do
+    ActsAsPhocodable.track_components = true
+    ActsAsPhocodable.track_components.should be_true
+    ActsAsPhocodable.track_components = false
+  end
+
+
     
   it "should default to the normal config file" do 
     ActsAsPhocodable.config_file.should == "config/phocodable.yml"
@@ -255,6 +279,34 @@ describe ActsAsPhocodable do
   end
 #  
   it "should call phocoder for images" do
+    ActsAsPhocodable.track_components = true
+    iu = ImageUpload.new(@attr)
+    
+    Phocoder::Job.should_receive(:create).and_return(mock(Phocoder::Response,:body=>{
+      "job"=>{
+        "id"=>1,
+        "inputs"=>["id"=>1],
+        "thumbnails"=>[{"label"=>"small","filename"=>"small-test-file.jpg","id"=>1}]
+      }
+    }))
+    iu.save
+    expected_local_path = File.join('/tmp','image_uploads',iu.id.to_s,iu.filename)
+    File.exists?(expected_local_path).should be_true
+    #iu.phocode
+    ImageUpload.count.should == 2 #it should have created a thumbnail record
+    EncodableJob.count.should == 3
+    iu.destroy
+    ImageUpload.count.should == 0
+    EncodableJob.count.should == 3
+    EncodableJob.for_jobs.count.should == 1
+    EncodableJob.for_components.count.should == 2
+    File.exists?(expected_local_path).should_not be_true
+    ActsAsPhocodable.track_components = false
+  end
+
+
+  it "should call phocoder for images and not create encodable_jobs if we're not tracking components" do
+    ActsAsPhocodable.track_components = false
     iu = ImageUpload.new(@attr)
     
     Phocoder::Job.should_receive(:create).and_return(mock(Phocoder::Response,:body=>{
@@ -269,9 +321,12 @@ describe ActsAsPhocodable do
     File.exists?(expected_local_path).should be_true
     #iu.phocode
     ImageUpload.count.should == 2 #it should have created a thumbnail record
+    EncodableJob.count.should == 1
     iu.destroy
     ImageUpload.count.should == 0
+    EncodableJob.count.should == 1
     File.exists?(expected_local_path).should_not be_true
+    ActsAsPhocodable.track_components = false
   end
     
     

data/spec/models/encodable_job_spec.rb

@@ -125,4 +125,4 @@ describe EncodableJob do
   end
     
   
-end
+end

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
 # Configure Rails Envinronment
 ENV["RAILS_ENV"] = "test"
 
+require 'simplecov'
+SimpleCov.start
+
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rspec/rails"
 require 'webmock/rspec'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phocoder-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.48
+  version: 0.0.49
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-19 00:00:00.000000000 Z
+date: 2013-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -254,6 +254,7 @@ files:
 - spec/dummy/db/migrate/20110523165522_create_encodable_jobs.rb
 - spec/dummy/db/migrate/20111101024507_create_images.rb
 - spec/dummy/db/migrate/20120423030345_add_exif_data_to_image_uploads.rb
+- spec/dummy/db/migrate/20121230165930_add_tracking_mode_to_encodable_jobs.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -297,7 +298,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4355286825974465509
+      hash: -2014735189134116916
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: