phocoder-rails 0.0.41 → 0.0.42

data/VERSION

@@ -1,4 +1,4 @@
-0.0.41
+0.0.42
 
 
 

data/app/models/encodable_job.rb

@@ -31,7 +31,9 @@ class EncodableJob < ActiveRecord::Base
       img_params = params[:input]
       encodable = job.encodable
     end
-    [:file_size,:width,:height,:taken_at,:lat,:lng,:saturated_pixels,:gauss].each do |att|
+    [: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].each do |att|
       setter = att.to_s + "="
       if encodable.respond_to? setter and !img_params[att].blank?
         encodable.send setter, img_params[att]
@@ -88,4 +90,4 @@ class EncodableJob < ActiveRecord::Base
   
   
   
-end
+end

data/spec/dummy/db/migrate/20120423030345_add_exif_data_to_image_uploads.rb

@@ -0,0 +1,29 @@
+class AddExifDataToImageUploads < ActiveRecord::Migration
+  def self.up
+    add_column :image_uploads, :bits_per_pixel, :integer
+    add_column :image_uploads, :camera_make, :string
+    add_column :image_uploads, :camera_model, :string
+    add_column :image_uploads, :orientation, :integer
+    add_column :image_uploads, :exposure_time, :string
+    add_column :image_uploads, :f_number, :string
+    add_column :image_uploads, :iso_speed_rating, :string
+    add_column :image_uploads, :exposure_bias_value, :string
+    add_column :image_uploads, :focal_length, :string
+    add_column :image_uploads, :focal_length_in_35mm_film, :string
+    add_column :image_uploads, :subsec_time, :integer
+  end
+
+  def self.down
+    remove_column :image_uploads, :subsec_time
+    remove_column :image_uploads, :focal_length_in_35mm_film
+    remove_column :image_uploads, :focal_length
+    remove_column :image_uploads, :exposure_bias_value
+    remove_column :image_uploads, :iso_speed_rating
+    remove_column :image_uploads, :f_number
+    remove_column :image_uploads, :exposure_time
+    remove_column :image_uploads, :orientation
+    remove_column :image_uploads, :camera_model
+    remove_column :image_uploads, :camera_make
+    remove_column :image_uploads, :bits_per_pixel
+  end
+end

data/spec/dummy/db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20111101024507) do
+ActiveRecord::Schema.define(:version => 20120423030345) do
 
   create_table "encodable_jobs", :force => true do |t|
     t.string   "encodable_type"
@@ -76,6 +76,17 @@ ActiveRecord::Schema.define(:version => 20111101024507) do
     t.string   "upload_host"
     t.string   "parent_type"
     t.string   "encodable_status"
+    t.integer  "bits_per_pixel"
+    t.string   "camera_make"
+    t.string   "camera_model"
+    t.integer  "orientation"
+    t.string   "exposure_time"
+    t.string   "f_number"
+    t.string   "iso_speed_rating"
+    t.string   "exposure_bias_value"
+    t.string   "focal_length"
+    t.string   "focal_length_in_35mm_film"
+    t.integer  "subsec_time"
   end
 
   create_table "images", :force => true do |t|

data/spec/models/encodable_job_spec.rb

@@ -22,12 +22,45 @@ describe EncodableJob do
     end
     
     it "should fupdate inputs" do
-      params = {:class=>"ImageUpload",:id=>1, :job=>{:id => 1},:input=>{: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=>1, 
+                  :format=>"json",
+                  :job=>{ :id => 1 },
+                  :input=>{   :id=>1,
+                              :file_size=>2,
+                              :width=>2,
+                              :height=>2,
+                              :url=>"http://production.webapeel.com/octolabs/themes/octolabs/images/octologo.png",
+                              :bits_per_pixel => "8",
+                              :camera_make => "NIKON CORPORATION",
+                              :camera_model => "NIKON D300",
+                              :orientation => "1",
+                              :exposure_time => "(1/60)",
+                              :f_number => "16",
+                              :iso_speed_rating => "200",
+                              :exposure_bias_value => "(0/1)",
+                              :focal_length => "20",
+                              :focal_length_in_35mm_film => "30",
+                              :subsec_time => "23"
+                          },
+                
+              }
       EncodableJob.update_from_phocoder(params);
       
       @image_upload.reload
       @image_upload.encodable_status.should == "ready"
       @image_upload.file_size.should == 2
+      @image_upload.bits_per_pixel.should == 8
+      @image_upload.camera_make.should == "NIKON CORPORATION"
+      @image_upload.camera_model.should == "NIKON D300"
+      @image_upload.orientation.should == 1
+      @image_upload.exposure_time.should == "(1/60)"
+      @image_upload.f_number.should == "16"
+      @image_upload.iso_speed_rating.should == "200"
+      @image_upload.exposure_bias_value.should == "(0/1)"
+      @image_upload.focal_length.should == "20"
+      @image_upload.focal_length_in_35mm_film.should == "30"
+      @image_upload.subsec_time.should == 23
     end
     
     

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: phocoder-rails
 version: !ruby/object:Gem::Version 
-  hash: 77
+  hash: 75
   prerelease: 
   segments: 
   - 0
   - 0
-  - 41
-  version: 0.0.41
+  - 42
+  version: 0.0.42
 platform: ruby
 authors: 
 - Jeremy Green
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-24 00:00:00 Z
+date: 2012-04-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -249,6 +249,7 @@ files:
 - 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
@@ -334,6 +335,7 @@ test_files:
 - 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