phocoder-rails 0.0.45 → 0.0.46

data/VERSION

@@ -1,4 +1,4 @@
-0.0.45
+0.0.46
 
 
 

data/lib/phocoder_rails/acts_as_phocodable.rb

@@ -45,6 +45,10 @@ module ActsAsPhocodable
   mattr_accessor :s3_secret_access_key
   self.s3_secret_access_key = "your-secret-access-key"
   
+  # The cloudfront host or a Proc that returns a cloud front host
+  mattr_accessor :cloudfront_host
+  self.cloudfront_host = nil
+
   # The javascript library to use for updates
   # either 'prototype' or 'jquery'
   mattr_accessor :javascript_library
@@ -62,7 +66,7 @@ module ActsAsPhocodable
   # The actual configuration parameters
   mattr_accessor :config
   self.config = nil
-  
+
   def self.phocodable_config
     #puts "checking phocodable_config for #{self.config}"
     self.read_phocodable_configuration if self.config.nil?
@@ -76,7 +80,8 @@ module ActsAsPhocodable
     self.config =  YAML.load(ERB.new(File.read(config_path)).result)[::Rails.env.to_s].symbolize_keys
     #self.apply_phocodable_configuration
   end
-  
+ 
+
   # The list of image content types that are considered web safe
   # These can be displayed directly, skipping processing if in offline mode
   mattr_accessor :web_safe_image_types
@@ -1040,7 +1045,7 @@ module ActsAsPhocodable
       if ActsAsPhocodable.storeage_mode == "local" or ActsAsPhocodable.storeage_mode == "offline" 
         base_url + local_url
       else
-        s3_url
+        self.class.cloudfront_host.present? ? cloudfront_url : s3_url
       end
     end
     
@@ -1097,6 +1102,15 @@ module ActsAsPhocodable
       self.class.s3_bucket_name
     end
     
+    def cloudfront_base_host
+      host = self.class.cloudfront_host
+      host.instance_of?(Proc) ? host.call(s3_key) : host
+    end 
+
+    def cloudfront_url
+      "#{cloudfront_base_host}/#{s3_key}"
+    end
+ 
     def save_s3_file
       #I don't think we need this return check anymore.  
       #return if !@saved_a_new_file

data/spec/dummy/config/environments/development.rb

@@ -11,7 +11,7 @@ Dummy::Application.configure do
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
+  #config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send

data/spec/dummy/config/initializers/phocodable.rb

@@ -0,0 +1,3 @@
+ActsAsPhocodable.read_phocodable_configuration
+
+

data/spec/helpers/phocoder_helper_spec.rb

@@ -3,7 +3,8 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe PhocoderHelper do #, :debug=>true
   
   before(:each) do
-    @attr = { :file => fixture_file_upload(fixture_path + '/big_eye_tiny.jpg','image/jpeg'),:width => 200,:height=>197 }
+    @fixture_path = ""
+    @attr = { :file => fixture_file_upload(@fixture_path + '/big_eye_tiny.jpg','image/jpeg'),:width => 200,:height=>197 }
     @image = ImageUpload.new(@attr)
     ActsAsPhocodable.storeage_mode = "local"
     ActsAsPhocodable.processing_mode = "automatic"
@@ -29,7 +30,7 @@ describe PhocoderHelper do #, :debug=>true
   
   describe "phocoder_link" do
     before(:each) do
-      @attr = { :file => fixture_file_upload(fixture_path + '/big_eye_tiny.jpg','image/jpeg') }
+      @attr = { :file => fixture_file_upload(@fixture_path + '/big_eye_tiny.jpg','image/jpeg') }
       @image = ImageUpload.new(@attr)
     end
     it "should return raw text if the file is not ready" do
@@ -54,7 +55,7 @@ describe PhocoderHelper do #, :debug=>true
       helper.phocoder_thumbnail(vid)
     end
     it "should delegate to phocoder_image_thumbnail for images" do
-      img = ImageUpload.new({ :file => fixture_file_upload(fixture_path + '/big_eye_tiny.jpg','image/jpeg') })
+      img = ImageUpload.new({ :file => fixture_file_upload(@fixture_path + '/big_eye_tiny.jpg','image/jpeg') })
       helper.should_receive(:phocoder_image_thumbnail).and_return(nil)
       helper.phocoder_thumbnail(img)
     end
@@ -167,7 +168,7 @@ describe PhocoderHelper do #, :debug=>true
     describe "when a thumbnail is passed" do
       it "should return an img tag for a thumbnail that can be resolved by label and is ready" do
         ActsAsPhocodable.storeage_mode = "local"
-        @tattr = { :file => fixture_file_upload(fixture_path + '/big_eye_tiny.jpg','image/jpeg'), :width => 100, :height => 100 }
+        @tattr = { :file => fixture_file_upload(@fixture_path + '/big_eye_tiny.jpg','image/jpeg'), :width => 100, :height => 100 }
         @thumb = ImageUpload.new(@tattr)
         @thumb.filename = "big_eye_tiny_small.jpg"
         @thumb.encodable_status = @image.encodable_status = "ready"
@@ -188,7 +189,7 @@ describe PhocoderHelper do #, :debug=>true
       
       it "should call pending_phcoder_thumbnail if the thumb is not ready" do
         ActsAsPhocodable.storeage_mode = "local"
-        @tattr = { :file => fixture_file_upload(fixture_path + '/big_eye_tiny.jpg','image/jpeg'), :width => 100, :height => 100 }
+        @tattr = { :file => fixture_file_upload(@fixture_path + '/big_eye_tiny.jpg','image/jpeg'), :width => 100, :height => 100 }
         @thumb = ImageUpload.new(@tattr)
         @thumb.filename = "big_eye_tiny_small.jpg"
         @thumb.encodable_status = "phocoding"
@@ -276,7 +277,7 @@ describe PhocoderHelper do #, :debug=>true
 #    
 #    it "if the thumbnail is not ready, should call pending_phocoder_thumbnail" do
 #      ActsAsPhocodable.storeage_mode = "local"
-#      @tattr = { :file => fixture_file_upload(fixture_path + '/big_eye_tiny.jpg','image/jpeg'), :width => 100, :height => 100 }
+#      @tattr = { :file => fixture_file_upload(@fixture_path + '/big_eye_tiny.jpg','image/jpeg'), :width => 100, :height => 100 }
 #      @thumb = ImageUpload.new(@tattr)
 #      @thumb.filename = "big_eye_tiny_thumbnail.jpg"
 #      @thumb.encodable_status = "phocoding"
@@ -292,7 +293,7 @@ describe PhocoderHelper do #, :debug=>true
 
 #  describe "offline_phocoder_image_thumbnail" do
 #    it "should render a thumbnail with the path to the original but the dimensions of the thumbnail" do
-#      @tattr = { :file => fixture_file_upload(fixture_path + '/big_eye_tiny.jpg','image/jpeg'),:filename=>"big_eye_tiny_thumbnail.jpg", :width => 100, :height => 100 }
+#      @tattr = { :file => fixture_file_upload(@fixture_path + '/big_eye_tiny.jpg','image/jpeg'),:filename=>"big_eye_tiny_thumbnail.jpg", :width => 100, :height => 100 }
 #      @thumb = ImageUpload.new(@tattr)
 #      @thumb.filename = "big_eye_tiny_thumbnail.jpg"
 #      output = helper.offline_phocoder_image_thumbnail(@image,@thumb,{})
@@ -304,7 +305,7 @@ describe PhocoderHelper do #, :debug=>true
   
   describe "pending_phocoder_thumbnail" do
     it "should return an image tag that points to a waiting image with the dimensions of the thumbnail" do
-      @tattr = { :file => fixture_file_upload(fixture_path + '/big_eye_tiny.jpg','image/jpeg'), :width => 100, :height => 100 }
+      @tattr = { :file => fixture_file_upload(@fixture_path + '/big_eye_tiny.jpg','image/jpeg'), :width => 100, :height => 100 }
       @thumb = ImageUpload.new(@tattr)
       @thumb.filename = "big_eye_tiny_thumbnail.jpg"
       output = helper.pending_phocoder_thumbnail(@image,@thumb,{})
@@ -372,7 +373,7 @@ describe PhocoderHelper do #, :debug=>true
   describe "video preview functions" do 
 #    before(:each) do
 #      @vid_attr = {
-#        :file => fixture_file_upload(fixture_path + '/video-test.mov', 'video/quicktime')
+#        :file => fixture_file_upload(@fixture_path + '/video-test.mov', 'video/quicktime')
 #      }
 #      Zencoder::Job.stub!(:create).and_return(mock(Zencoder::Response,:body=>{
 #        "id"=>1,

data/spec/models/acts_as_phocodable_spec.rb

@@ -9,7 +9,7 @@ include ActionDispatch::TestProcess
 #class TestMigration < ActiveRecord::Migration
 #  def self.up
 #    create_table :images, :force => true do |t|
-#      t.string   "filename"
+#      t.string   "filename
 #      t.datetime "created_at"
 #      t.datetime "updated_at"
 #      t.string   "content_type"
@@ -52,14 +52,15 @@ describe ActsAsPhocodable do
 #        ) 
 #        }
     ImageUpload.destroy_all
+    @fixture_path = ""
     @attr = {
-      :file => fixture_file_upload(fixture_path + '/big_eye_tiny.jpg','image/jpeg')
+      :file => fixture_file_upload(@fixture_path + '/big_eye_tiny.jpg','image/jpeg')
     }
     @vid_attr = {
-      :file => fixture_file_upload(fixture_path + '/video-test.mov', 'video/quicktime')
+      :file => fixture_file_upload(@fixture_path + '/video-test.mov', 'video/quicktime')
     }
     @txt_attr = {
-      :file => fixture_file_upload(fixture_path + '/test.txt', 'text/plain')
+      :file => fixture_file_upload(@fixture_path + '/test.txt', 'text/plain')
     }
   end
   
@@ -87,8 +88,9 @@ describe ActsAsPhocodable do
     ActsAsPhocodable.processing_mode = "automatic" 
   end
   
-  it "should default to the url in the config" do 
-    ActsAsPhocodable.base_url.should == "http://actsasphocodableexample.chaos.webapeel.com"
+  it "should default to the url in the config" do
+    ActsAsPhocodable.read_phocodable_configuration
+    ActsAsPhocodable.base_url.should == "http://thephotolabs-test.herokuapp.com"
   end
   
   it "should take a new base_url" do 
@@ -129,8 +131,8 @@ describe ActsAsPhocodable do
     # it is currently excluded from git since it contains an API key
     # this will fail for any one other than me.
     # what to do? 
-    iu.phocodable_config[:phocoder_url].should == "http://photoapi.chaos.webapeel.com"
-    iu.phocodable_config[:base_url].should == "http://actsasphocodableexample.chaos.webapeel.com"
+    iu.phocodable_config[:phocoder_url].should == "http://phocoder.herokuapp.com"
+    iu.phocodable_config[:base_url].should == "http://thephotolabs-test.herokuapp.com"
   end
   
   
@@ -172,11 +174,11 @@ describe ActsAsPhocodable do
   
   describe "automatically setting the content type" do
     it "should work for jpgs" do
-      iu = ImageUpload.new(:file => fixture_file_upload(fixture_path + '/big_eye_tiny.jpg'))
+      iu = ImageUpload.new(:file => fixture_file_upload(@fixture_path + '/big_eye_tiny.jpg'))
       iu.content_type.should == "image/jpeg"
     end
     it "should work for nefs" do
-      iu = ImageUpload.new(:file => fixture_file_upload(fixture_path + '/test_image.nef'))
+      iu = ImageUpload.new(:file => fixture_file_upload(@fixture_path + '/test_image.nef'))
       iu.content_type.should == "image/x-nikon-nef"
     end
   end
@@ -611,9 +613,9 @@ describe ActsAsPhocodable do
     # Now we should have a thumb
     #puts "@@@@@@@@@@@@@@@@@@@@@@@@@@@"
     #puts iu.thumbnails.map{|t| t.thumbnail }.to_json
-    iu.thumbnails.size.should == 1
+    iu.thumbnails.size.should == 2
     # Mock the AWS reqeust for deleting the file and it's thumbnail
-    AWS::S3::S3Object.should_receive(:delete).twice.and_return(nil)
+    AWS::S3::S3Object.should_receive(:delete).exactly(3).times.and_return(nil)
     iu.destroy
   end
   
@@ -640,7 +642,7 @@ describe ActsAsPhocodable do
     iu.save
     #puts "======================================="
     #puts iu.thumbnails.to_json
-    iu.thumbnails.size.should == 1 
+    iu.thumbnails.size.should == 2
     
     iu.destroy
   end
@@ -670,10 +672,23 @@ describe ActsAsPhocodable do
     
     #now store in S3 + phocode
     iu.save
-    iu.thumbnails.size.should == 1
+    iu.thumbnails.size.should == 2
     
     iu.destroy 
   end
   
+  describe "cloudfront_base_host" do
+    before(:each) do
+      @iu = ImageUpload.new(@attr)
+    end
+    it "should return a plain string" do
+      ActsAsPhocodable.cloudfront_host = "http://1234.cloudfront.net"
+      @iu.cloudfront_base_host.should == "http://1234.cloudfront.net"
+    end
+    it "should execute a Proc" do
+      ActsAsPhocodable.cloudfront_host = lambda{|path| "http://asset0.myhost.com" }
+      @iu.cloudfront_base_host.should == "http://asset0.myhost.com"
+    end
+  end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phocoder-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.45
+  version: 0.0.46
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-26 00:00:00.000000000Z
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &80437900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *80437900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: phocoder-rb
-  requirement: &80437540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80437540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: zencoder
-  requirement: &80415980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80415980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mimetype-fu
-  requirement: &80415670 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +69,15 @@ dependencies:
         version: 0.1.2
   type: :runtime
   prerelease: false
-  version_requirements: *80415670
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: aws-s3
-  requirement: &80415370 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80415370
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: spawn
-  requirement: &80415100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,21 +101,31 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *80415100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &80414790 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 2.4.1
   type: :development
   prerelease: false
-  version_requirements: *80414790
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &80414470 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80414470
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &80414120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +149,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *80414120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rails engine for easy integration with phocoder.com
 email: jagthedrummer@gmail.com
 executables: []
@@ -199,6 +244,7 @@ files:
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/phocodable.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/locales/en.yml
@@ -251,7 +297,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -971186499
+      hash: -2003942532947744819
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -260,42 +306,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Rails engine for easy integration with phocoder.com
-test_files:
-- spec/controllers/phocoder_controller_spec.rb
-- spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/app/controllers/images_controller.rb
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/helpers/images_helper.rb
-- spec/dummy/app/models/image.rb
-- spec/dummy/app/models/image_thumbnail.rb
-- spec/dummy/app/models/image_upload.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/routes.rb
-- spec/dummy/db/migrate/001_create_image_uploads.rb
-- 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
-- spec/integration/navigation_spec.rb
-- spec/models/acts_as_phocodable_spec.rb
-- spec/models/encodable_job_spec.rb
-- spec/phocoder_rails_spec.rb
-- spec/routing/phocoder_routing_spec.rb
-- spec/spec_helper.rb
+test_files: []