phocoder-rails 0.0.42 → 0.0.43

data/Gemfile

@@ -14,6 +14,7 @@ gem "rails", ">=3.0.0"
 
 gem 'phocoder-rb'
 gem 'zencoder'
+gem "mimetype-fu", "~> 0.1.2"
 gem 'aws-s3', :require => 'aws/s3'
 #gem "spawn", :git => "git://github.com/jagthedrummer/spawn.git"
 gem "spawn", :git => 'git://github.com/tra/spawn', :branch => "edge"
@@ -26,9 +27,9 @@ gem "spawn", :git => 'git://github.com/tra/spawn', :branch => "edge"
  
 group :development do
   gem 'rspec-rails', '2.4.1'
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
-  gem "rcov", ">= 0"
+  gem "bundler"
+  gem "jeweler"
+  #gem "rcov", ">= 0"
 end
 
 group :test do
@@ -37,9 +38,9 @@ group :test do
   gem "sqlite3-ruby", :require => "sqlite3"
   gem 'rspec', '2.4.0'
   gem 'rspec-rails', '2.4.1'
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
-  gem "rcov", ">= 0"
+  gem "bundler"
+  gem "jeweler"
+  #gem "rcov", ">= 0"
   gem 'autotest', '4.4.4'
   gem 'redgreen', '1.2.2'
   gem "webmock"

data/README.md

@@ -0,0 +1,108 @@
+PhocoderRails
+================================
+
+PhocoderRails is a rails engine that makes it incredibly easy to integrate your rails app
+with the [Phocoder](http://www.phocoder.com/) image processing service.
+
+## Installing
+
+Add this to your Gemfile:
+
+```ruby
+gem "phocoder-rails"
+```
+
+And then run:
+
+```term
+bundle install
+```
+
+Then you need to generate a config file and a migration for tracking job status.
+
+```term
+rails g phocoder_rails:setup
+create db/migrate/xxxxxxxx_create_encodable_jobs.rb
+create config/phocodable.yml
+```
+
+## Base Configuration 
+
+TBD
+
+* Setting storage mode
+* Setting processing mode (foreground / background processing)
+* Other?
+
+## Generating a new model & scaffolding
+
+Letting PhocoderRails generate a new model and scaffold for you is probably the easiest way to get started
+and to get a feel for how Phocoder works.  
+
+```term
+rails g phocoder_rails:scaffold image_upload
+create  db/migrate/20120731022844_create_image_uploads.rb
+create  app/models/image_upload.rb
+create  app/models/image_upload_thumbnail.rb
+create  app/helpers/image_uploads_helper.rb
+create  app/controllers/image_uploads_controller.rb
+create  app/views/image_uploads
+create  app/views/image_uploads/_form.html.erb
+create  app/views/image_uploads/index.html.erb
+create  app/views/image_uploads/new.html.erb
+create  app/views/image_uploads/show.html.erb
+ route  resources :image_uploads, :except=>[:edit,:update]
+```
+
+## Updating an existing model
+
+First generate a migration that will add some extra columns to your table.  You should red the migration
+after it is generated to make sure that it makes sense within the context of your model.
+
+```term
+rails g phocoder_rails:model_update my_model
+```
+
+Then you should make sure that your form is set up for multi part encoding, and that you have a `file_field`
+in your form named `file`.
+
+```erb
+<%= f.file_field :file %>
+```
+
+## Model Configuration
+
+PhocoderRails allows you to easily set up your image processing in a simple declarative style.  The 
+`acts_as_phocodable` method hooks phocoder-rails into your model and allows you to easily decalre multiple
+thumbnails that will be generated any time a new model record is created.  Thumbnails can include cropping, 
+framing, and annotations.
+
+Here's an ImageUpload class that shows and example of how to use `acts_as_phocodable` :
+
+```ruby
+class ImageUpload < ActiveRecord::Base
+
+  acts_as_phocodable :thumbnail_class => "ImageUploadThumbnail",
+    :thumbnails => [
+      {:label=>"small",  :width=>100, :height=>100, :aspect_mode => 'crop'},
+      {:label=>"medium", :width=>400, :height=>400, :aspect_mode => 'preserve',
+        :frame=>{ :width=>20, :bottom=>50, :color=>'003' },
+        :annotations=>[
+                        {:text=>"Annotation Testing",:pointsize=>30,:fill_color=>'fff',:gravity=>"South",:y=>10},
+                        {:text=>"Howdy!",:pointsize=>10,:fill_color=>'ccc',:gravity=>"North",:y=>5}
+                      ]
+      }
+    ]
+
+end
+```
+
+This will result in two 'thumbnail' images being created every time a new image is uploaded.  One will be 
+exactly 100x100 square, and the other one will be scaled proportionally to fit inside 400x400, with a 20
+pixel border on top, left, and right, and a 50 pixel border on bottom, with text annotations added on top
+and on the bottom of the image.  
+
+[Add images]
+
+
+## Storage and Processing Modes

data/VERSION

@@ -1,4 +1,4 @@
-0.0.42
+0.0.43
 
 
 

data/app/models/encodable_job.rb

@@ -2,6 +2,65 @@ class EncodableJob < ActiveRecord::Base
   
   belongs_to :encodable, :polymorphic=>true
   
+  scope :pending, :conditions => "phocoder_status != 'ready'"
+  
+  def update_status
+    job_data = Phocoder::Job.details(phocoder_job_id).body
+    #puts job_data.to_json
+    puts "    EncodableJob #{id} = #{job_data["aasm_state"]}"
+    if phocoder_input_id
+      job_data["inputs"].each do |input|
+        #puts "input = #{input.to_json}"
+        #puts "input id = #{input["id"]} my phocoder_input_id = #{phocoder_input_id}"
+        if input["id"] == phocoder_input_id
+          input.symbolize_keys!
+          params = {
+            :class => encodable_type,
+            :id => encodable_id,
+            :job => { :id => job_data["id"] },
+            :input => input
+          }
+          EncodableJob.update_from_phocoder(params)
+        end
+      end
+    elsif phocoder_output_id
+      outputs = (job_data["thumbnails"] || []) + 
+        (job_data["hdrs"] || []) + 
+        (job_data["tone_mappings"] || []) + 
+        (job_data["composites"] || []) + 
+        (job_data["hdr_htmls"] || [])
+      outputs.each do |output|
+        if output["id"] == phocoder_output_id
+          output.symbolize_keys!
+          output[:url] = output[:base_url] + output[:filename]
+          params = {
+            :class => encodable_type,
+            :id => encodable_id,
+            :job => { :id => job_data["id"] },
+            :output => output
+          }
+          EncodableJob.update_from_phocoder(params)
+        end
+      end
+    end
+    puts "+++++++++++++++"
+    # if job_data["aasm_state"] == "complete"
+    #   self.phocoder_status = "ready"
+    #   self.encodable.encodable_status = "ready"
+    #   self.encodable.thumbnails.each do |t|
+    #     t.encodable_status = "ready"
+    #   end
+    #   self.save
+    #   self.encodable.save
+    # end
+  end
+  
+  def self.update_pending_jobs
+    EncodableJob.pending.find_each do |e|
+      e.update_status
+    end
+  end
+  
   def self.update_from_phocoder(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}"
@@ -10,15 +69,17 @@ class EncodableJob < ActiveRecord::Base
       puts "find_by_phocoder_job_id_and_phocoder_output_id_and_encodable_type #{params[:job][:id]} - #{params[:output][:id]} ,#{params[:class]}"
       job = self.find_by_phocoder_job_id_and_phocoder_output_id_and_encodable_type params[:job][:id],params[:output][:id],params[:class]
       
-      
-      Rails.logger.debug "the job = #{job}"
+      puts "the job = #{job.to_json}"
+      Rails.logger.debug "the job = #{job.to_json}"
       img_params = params[:output]
       begin
         encodable = job.encodable
       rescue NoMethodError => ex
+        puts "something went wrong..."
         # here we try to fall back if we can't find an Encodable
         encodable = params[:class].constantize.find params[:id]
       end       
+      puts "encodable = #{encodable.to_json}"
       encodable.filename = File.basename(params[:output][:url]) if encodable.filename.blank?
       if ActsAsPhocodable.storeage_mode == "local"
         encodable.save_url(params[:output][:url])

data/lib/phocoder_rails/acts_as_phocodable.rb

@@ -921,10 +921,11 @@ module ActsAsPhocodable
       cleanup
       if new_file.is_a? File
         self.filename = File.basename new_file.path
-        self.content_type = MIME::Types.type_for(self.filename).first.content_type
+        self.content_type = MIME::Types.type_for(self.filename).first.content_type || File.mime_type?(self.filename)
         self.file_size = new_file.size
       else
-        self.filename = new_file.original_filename
+        self.filename = new_file.original_filename || File.mime_type?(self.filename)
+
         self.content_type = new_file.content_type  
         self.file_size = new_file.size
       end

data/lib/tasks/phocoder_rails/phocoder_rails.rake

@@ -0,0 +1,12 @@
+namespace :phocoder_rails do
+  desc "Update pending EncodableJobs"
+  task :update_pending_jobs => :environment do
+    e = EncodableJob.first
+    e.encodable # try to load phocoder config
+    e.encodable.class.read_phocodable_configuration
+    #puts "api key = #{Phocoder.api_key}"
+    #puts "Rails.env = #{Rails.env}"
+    puts "Updating #{EncodableJob.pending.count} EncodableJobs"
+    EncodableJob.update_pending_jobs
+  end
+end

data/phocoder-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{phocoder-rails}
-  s.version = "0.0.41"
+  s.version = "0.0.42"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Jeremy Green}]
-  s.date = %q{2012-03-24}
+  s.date = %q{2012-04-23}
   s.description = %q{Rails engine for easy integration with phocoder.com}
   s.email = %q{jagthedrummer@gmail.com}
   s.extra_rdoc_files = [
@@ -105,6 +105,7 @@ Gem::Specification.new do |s|
     "spec/dummy/db/migrate/20110523165213_add_parent_type_to_image_uploads.rb",
     "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/schema.rb",
     "spec/dummy/public/404.html",
     "spec/dummy/public/422.html",
@@ -163,6 +164,7 @@ Gem::Specification.new do |s|
     "spec/dummy/db/migrate/20110523165213_add_parent_type_to_image_uploads.rb",
     "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/schema.rb",
     "spec/engine_spec.rb",
     "spec/helpers/phocoder_helper_spec.rb",

data/spec/helpers/phocoder_helper_spec.rb

@@ -408,14 +408,14 @@ describe PhocoderHelper do #, :debug=>true
   
   end # describe "video preview functions" do 
 
-  describe "offline_phocoder_video_embed" do
-    it "should render a video tag" do
-      vid = ImageUpload.new(:content_type=>'video/quicktime',:zencoder_status=>'ready',:id=>1,:filename=>"test.mov",:encodable_status=>"ready")
-      vid.stub!(:thumbnail_for).and_return(vid)
-      vid.video?.should be_true
-      offline_phocoder_video_embed(vid,"small",{}).should match("video-js")
-    end
-    
-  end
+  # describe "offline_phocoder_video_embed" do
+  #   it "should render a video tag" do
+  #     vid = ImageUpload.new(:content_type=>'video/quicktime',:zencoder_status=>'ready',:id=>1,:filename=>"test.mov",:encodable_status=>"ready")
+  #     vid.stub!(:thumbnail_for).and_return(vid)
+  #     vid.video?.should be_true
+  #     offline_phocoder_video_embed(vid,"small",{}).should match("video-js")
+  #   end
+  #   
+  # end
   
 end

data/spec/integration/navigation_spec.rb

@@ -1,10 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 
-describe "Navigation" do
-  include Capybara
+#describe "Navigation" do
+  #include Capybara
   
-  it "should be a valid app" do
-    ::Rails.application.should be_a(Dummy::Application)
-  end
-end
+  #it "should be a valid app" do
+    #::Rails.application.should be_a(Dummy::Application)
+  #end
+#end

data/spec/models/acts_as_phocodable_spec.rb

@@ -47,7 +47,7 @@ describe ActsAsPhocodable do
   before(:each) do
 #        @attr = {
 #        :file => ActionDispatch::Http::UploadedFile.new(
-#          :tempfile=> Rack::Test::UploadedFile.new(fixture_path + '/big_eye_tiny.jpg', 'image/jpeg'),
+#          :tempfile=> Rack::Test::UploadedFile.new('/big_eye_tiny.jpg', 'image/jpeg'),
 #          :filename=>"big_eye_tiny.jpg"
 #        ) 
 #        }
@@ -599,6 +599,8 @@ describe ActsAsPhocodable do
     
     iu.save_s3_file
     # Now we should have a thumb
+    puts "@@@@@@@@@@@@@@@@@@@@@@@@@@@"
+    puts iu.thumbnails.map{|t| t.thumbnail }.to_json
     iu.thumbnails.size.should == 1
     # Mock the AWS reqeust for deleting the file and it's thumbnail
     AWS::S3::S3Object.should_receive(:delete).twice.and_return(nil)

data/spec/models/encodable_job_spec.rb

@@ -5,22 +5,61 @@ include ActionDispatch::TestProcess
 
 describe EncodableJob do
   
-  describe "update_from_phocoder" do
-    
-    before(:each) do
-      @image_upload = ImageUpload.create(:phocoder_job_id=>1,:phocoder_input_id=>1,:phocoder_output_id=>1,
-                                         :zencoder_job_id=>1,:zencoder_input_id=>1,:zencoder_output_id=>1,
-                                         :file_size=>1,:width=>1,:height=>1,:filename=>"test.png",:content_type=>"image/png")
-      @encodable_job = EncodableJob.create(:phocoder_job_id=>1,:phocoder_input_id=>1,:phocoder_output_id=>1,
-                                           :zencoder_job_id=>1,:zencoder_input_id=>1,:zencoder_output_id=>1,
-                                           :encodable=>@image_upload)
+  before(:each) do
+    ImageUpload.destroy_all
+    EncodableJob.destroy_all
+    @image_upload = ImageUpload.create(:phocoder_job_id=>1,:phocoder_input_id=>1,:phocoder_output_id=>1,
+      :zencoder_job_id=>1,:zencoder_input_id=>1,:zencoder_output_id=>1,
+      :file_size=>1,:width=>1,:height=>1,:filename=>"test.png",:content_type=>"image/png")
+    @image_upload2 = ImageUpload.create(:phocoder_job_id=>2,:phocoder_input_id=>2,:phocoder_output_id=>2,
+      :zencoder_job_id=>1,:zencoder_input_id=>1,:zencoder_output_id=>1,
+      :file_size=>1,:width=>1,:height=>1,:filename=>"test.png",:content_type=>"image/png")
+    @encodable_job = EncodableJob.create(:phocoder_job_id=>1,:phocoder_input_id=>1,:phocoder_output_id=>nil,
+      :zencoder_job_id=>nil,:zencoder_input_id=>nil,:zencoder_output_id=>nil,
+      :encodable=>@image_upload)
+    @encodable_job2 = EncodableJob.create(:phocoder_job_id=>2,:phocoder_input_id=>nil,:phocoder_output_id=>2,
+      :zencoder_job_id=>nil,:zencoder_input_id=>nil,:zencoder_output_id=>nil,
+      :encodable=>@image_upload2)
+    @job_params_json = %[{"aasm_state":"complete","api_key":"idYSHSxL98zxPab21q8y8VtL3Wti1lIR","created_at":"2012-08-07T04:41:09Z","end_load_1":0.0,"end_load_15":0.05,"end_load_5":0.01,"error_msg":null,"id":1,"lock_version":3,"pixels":276400,"processing_cores":2,"processing_ended_at":"2012-08-07T04:43:24Z","processing_host":"domU-12-31-39-18-21-1E","processing_started_at":"2012-08-07T04:43:23Z","queue_name":null,"start_load_1":0.0,"start_load_15":0.05,"start_load_5":0.01,"updated_at":"2012-08-07T04:43:24Z","user_id":1,"thumbnails":[{"aasm_state":"complete","analyze_ended_at":"2012-08-07T04:43:23Z","analyze_started_at":"2012-08-07T04:43:23Z","aspect_mode":"preserve","base_url":"s3://development.phocoder.com/image_thumbnails/6/","created_at":"2012-08-07T04:41:09Z","error_msg":null,"filename":"small_super_small_dsc_7428.jpg","format":"jpg","height":100,"id":349266,"job_id":1,"label":"small","lock_version":7,"output_content_type":"image/jpeg","output_file_size":19379,"output_height":67,"output_width":100,"quality":95,"resize_ended_at":"2012-08-07T04:43:23Z","resize_started_at":"2012-08-07T04:43:23Z","updated_at":"2012-08-07T04:43:23Z","upload_ended_at":"2012-08-07T04:43:23Z","upload_started_at":"2012-08-07T04:43:23Z","upscale":null,"user_id":null,"width":100},{"aasm_state":"complete","analyze_ended_at":"2012-08-07T04:43:24Z","analyze_started_at":"2012-08-07T04:43:24Z","aspect_mode":"preserve","base_url":"s3://development.phocoder.com/image_thumbnails/6/","created_at":"2012-08-07T04:41:09Z","error_msg":null,"filename":"medium_super_small_dsc_7428.jpg","format":"jpg","height":400,"id":349267,"job_id":1,"label":"medium","lock_version":7,"output_content_type":"image/jpeg","output_file_size":54356,"output_height":309,"output_width":400,"quality":95,"resize_ended_at":"2012-08-07T04:43:24Z","resize_started_at":"2012-08-07T04:43:23Z","updated_at":"2012-08-07T04:43:24Z","upload_ended_at":"2012-08-07T04:43:24Z","upload_started_at":"2012-08-07T04:43:24Z","upscale":null,"user_id":null,"width":400}],"inputs":[{"aasm_state":"complete","analyze_ended_at":"2012-08-07T04:43:23Z","analyze_started_at":"2012-08-07T04:43:23Z","bits_per_pixel":8,"camera_make":"NIKON CORPORATION","camera_model":"NIKON D300","content_type":"image/jpeg","created_at":"2012-08-07T04:41:09Z","download_ended_at":"2012-08-07T04:43:23Z","download_started_at":"2012-08-07T04:43:23Z","error_msg":null,"exposure_bias_value":"0","exposure_time":"0.016666666","f_number":"16.000000000","file_size":93974,"focal_length":"200.000000000","focal_length_in_35mm_film":"300","height":266,"id":1,"iso_speed_rating":"400","job_id":1,"lat":null,"lng":null,"lock_version":6,"orientation":1,"subsec_time":42,"taken_at":"2009-10-12T15:17:42Z","updated_at":"2012-08-07T04:43:23Z","url":"http://development.phocoder.com.s3.amazonaws.com/images/6/super_small_dsc_7428.jpg","user_id":1,"width":400}],"hdr_thumbnails":[]}]
+    @job_params_json2 = %[{"aasm_state":"complete","api_key":"idYSHSxL98zxPab21q8y8VtL3Wti1lIR","created_at":"2012-08-07T04:41:09Z","end_load_1":0.0,"end_load_15":0.05,"end_load_5":0.01,"error_msg":null,"id":2,"lock_version":3,"pixels":276400,"processing_cores":2,"processing_ended_at":"2012-08-07T04:43:24Z","processing_host":"domU-12-31-39-18-21-1E","processing_started_at":"2012-08-07T04:43:23Z","queue_name":null,"start_load_1":0.0,"start_load_15":0.05,"start_load_5":0.01,"updated_at":"2012-08-07T04:43:24Z","user_id":1,"thumbnails":[{"aasm_state":"complete","analyze_ended_at":"2012-08-07T04:43:23Z","analyze_started_at":"2012-08-07T04:43:23Z","aspect_mode":"preserve","base_url":"s3://development.phocoder.com/image_thumbnails/6/","created_at":"2012-08-07T04:41:09Z","error_msg":null,"filename":"small_super_small_dsc_7428.jpg","format":"jpg","height":100,"id":2,"job_id":1,"label":"small","lock_version":7,"output_content_type":"image/jpeg","output_file_size":19379,"output_height":67,"output_width":100,"quality":95,"resize_ended_at":"2012-08-07T04:43:23Z","resize_started_at":"2012-08-07T04:43:23Z","updated_at":"2012-08-07T04:43:23Z","upload_ended_at":"2012-08-07T04:43:23Z","upload_started_at":"2012-08-07T04:43:23Z","upscale":null,"user_id":null,"width":100},{"aasm_state":"complete","analyze_ended_at":"2012-08-07T04:43:24Z","analyze_started_at":"2012-08-07T04:43:24Z","aspect_mode":"preserve","base_url":"s3://development.phocoder.com/image_thumbnails/6/","created_at":"2012-08-07T04:41:09Z","error_msg":null,"filename":"medium_super_small_dsc_7428.jpg","format":"jpg","height":400,"id":349267,"job_id":1,"label":"medium","lock_version":7,"output_content_type":"image/jpeg","output_file_size":54356,"output_height":309,"output_width":400,"quality":95,"resize_ended_at":"2012-08-07T04:43:24Z","resize_started_at":"2012-08-07T04:43:23Z","updated_at":"2012-08-07T04:43:24Z","upload_ended_at":"2012-08-07T04:43:24Z","upload_started_at":"2012-08-07T04:43:24Z","upscale":null,"user_id":null,"width":400}],"inputs":[{"aasm_state":"complete","analyze_ended_at":"2012-08-07T04:43:23Z","analyze_started_at":"2012-08-07T04:43:23Z","bits_per_pixel":8,"camera_make":"NIKON CORPORATION","camera_model":"NIKON D300","content_type":"image/jpeg","created_at":"2012-08-07T04:41:09Z","download_ended_at":"2012-08-07T04:43:23Z","download_started_at":"2012-08-07T04:43:23Z","error_msg":null,"exposure_bias_value":"0","exposure_time":"0.016666666","f_number":"16.000000000","file_size":93974,"focal_length":"200.000000000","focal_length_in_35mm_film":"300","height":266,"id":2,"iso_speed_rating":"400","job_id":1,"lat":null,"lng":null,"lock_version":6,"orientation":1,"subsec_time":42,"taken_at":"2009-10-12T15:17:42Z","updated_at":"2012-08-07T04:43:23Z","url":"http://development.phocoder.com.s3.amazonaws.com/images/6/super_small_dsc_7428.jpg","user_id":1,"width":400}],"hdr_thumbnails":[]}]
+  end
+  
+  after(:each) do
+    @image_upload.destroy
+    @encodable_job.destroy
+  end
+  
+  
+  describe "update_status" do
+    it "should update inputs" do
+      Phocoder::Job.should_receive(:details).and_return(double :body => JSON(@job_params_json) )
+      @encodable_job.update_status
+      @encodable_job.reload
+      @image_upload.reload
+      #@encodable_job.phocoder_status.should == "ready"
+      @image_upload.encodable_status.should == "ready"
     end
     
-    after(:each) do
-      @image_upload.destroy
-      @encodable_job.destroy
+    it "should update outputs" do
+      puts "//////////////////////"
+      stub_request(:get, "http://production.webapeel.com/octolabs/themes/octolabs/images/octologo.png").
+        with(:headers => {'Accept'=>'*/*'}).
+        to_return(:status => 200, :body => webmock_file("octologo.png"), :headers => {})
+      Phocoder::Job.should_receive(:details).and_return(double :body => JSON(@job_params_json2) )
+      @encodable_job2.update_status
+      @encodable_job2.reload
+      @image_upload2.reload
+      #@encodable_job.phocoder_status.should == "ready"
+      @image_upload2.encodable_status.should == "ready"
     end
     
+  end
+  
+  
+  
+  
+  describe "update_from_phocoder" do
+      
     it "should fupdate inputs" do
       params = {  :class=>"ImageUpload", 
                   :id=>1, 
@@ -64,20 +103,26 @@ describe EncodableJob do
     end
     
     
-    
-    it "should update outpus" do
+        
+    it "should update outputs" do
       stub_request(:get, "http://production.webapeel.com/octolabs/themes/octolabs/images/octologo.png").
         with(:headers => {'Accept'=>'*/*'}).
         to_return(:status => 200, :body => webmock_file("octologo.png"), :headers => {})
-      params =  {:class=>"ImageUpload",:id=>1, :job=>{:id => 1}, :output=>{:id=>1,:file_size=>2,:width=>2,:height=>2,:url=>"http://production.webapeel.com/octolabs/themes/octolabs/images/octologo.png"},:format=>"json" }
+      params =  {:class=>"ImageUpload",
+                  :id=>2, 
+                  :job=>{:id => 2}, 
+                  :output=>{:id=>2,:file_size=>2,:width=>2,:height=>2,:url=>"http://production.webapeel.com/octolabs/themes/octolabs/images/octologo.png"},
+                  :format=>"json" 
+                }
       EncodableJob.update_from_phocoder(params);
       
-      @image_upload.reload
-      @image_upload.encodable_status.should == "ready"
-      @image_upload.file_size.should == 2
+      @image_upload2.reload
+      @image_upload2.encodable_status.should == "ready"
+      @image_upload2.file_size.should == 2
     end
     
+        
   end
-  
+    
   
 end

data/spec/spec_helper.rb

@@ -41,6 +41,7 @@ RSpec.configure do |config|
 
   config.fixture_path = "#{File.dirname(__FILE__)}/fixtures"
   
+  
   config.before(:all){
     
     #change this if sqlite is unavailable
@@ -72,4 +73,4 @@ end
 def webmock_file(f = nil)
   f ||= "%s.xml" % @site.anchor
   File.new webmock_filename(f)
-end
+end

metadata

@@ -1,173 +1,130 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: phocoder-rails
-version: !ruby/object:Gem::Version 
-  hash: 75
+version: !ruby/object:Gem::Version
+  version: 0.0.43
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 42
-  version: 0.0.42
 platform: ruby
-authors: 
+authors:
 - Jeremy Green
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-23 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-26 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &72774960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
-  prerelease: false
-  requirement: *id001
   type: :runtime
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *72774960
+- !ruby/object:Gem::Dependency
   name: phocoder-rb
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &72774570 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  requirement: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *72774570
+- !ruby/object:Gem::Dependency
   name: zencoder
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &72774250 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
   prerelease: false
-  requirement: *id003
+  version_requirements: *72774250
+- !ruby/object:Gem::Dependency
+  name: mimetype-fu
+  requirement: &72752830 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.2
   type: :runtime
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *72752830
+- !ruby/object:Gem::Dependency
   name: aws-s3
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &72752530 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  requirement: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *72752530
+- !ruby/object:Gem::Dependency
   name: spawn
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &72752230 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
-  requirement: *id005
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *72752230
+- !ruby/object:Gem::Dependency
   name: rspec-rails
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &72751980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 2
-        - 4
-        - 1
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 2.4.1
-  prerelease: false
-  requirement: *id006
   type: :development
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *72751980
+- !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &72751710 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  prerelease: false
-  requirement: *id007
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *72751710
+- !ruby/object:Gem::Dependency
   name: jeweler
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &72751400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 5
-        - 1
-        version: 1.5.1
-  prerelease: false
-  requirement: *id008
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  name: rcov
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   prerelease: false
-  requirement: *id009
-  type: :development
+  version_requirements: *72751400
 description: Rails engine for easy integration with phocoder.com
 email: jagthedrummer@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
-- README.rdoc
-files: 
+- README.md
+files:
 - .autotest
 - .document
 - .rspec
 - Gemfile
 - LICENSE.txt
 - MIT-LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - app/controllers/phocoder_controller.rb
@@ -198,6 +155,7 @@ files:
 - lib/phocoder_rails/acts_as_phocodable.rb
 - lib/phocoder_rails/engine.rb
 - lib/phocoder_rails/errors.rb
+- lib/tasks/phocoder_rails/phocoder_rails.rake
 - phocoder-rails.gemspec
 - public/images/building.gif
 - public/images/error.png
@@ -278,39 +236,34 @@ files:
 - spec/routing/phocoder_routing_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/jagthedrummer/phocoder-rails
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -916334765
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.7
 signing_key: 
 specification_version: 3
 summary: Rails engine for easy integration with phocoder.com
-test_files: 
+test_files:
 - spec/controllers/phocoder_controller_spec.rb
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/controllers/images_controller.rb

data/README.rdoc

@@ -1,3 +0,0 @@
-= PhocoderRails
-
-This project rocks and uses MIT-LICENSE.