phocoder-rails 0.0.40 → 0.0.41

data/VERSION

@@ -1,4 +1,4 @@
-0.0.40
+0.0.41
 
 
 

data/lib/phocoder_rails/acts_as_phocodable.rb

@@ -59,6 +59,23 @@ module ActsAsPhocodable
   mattr_accessor :config_file
   self.config_file = "config/phocodable.yml"
   
+  # 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?
+    self.config
+  end
+  
+  def self.read_phocodable_configuration
+    
+    config_path =  File.join(::Rails.root.to_s, ActsAsPhocodable.config_file)
+    puts "#{self.config} - looking for a config in #{config_path}"
+    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
@@ -319,14 +336,16 @@ module ActsAsPhocodable
   end
   
   
-  
   def read_phocodable_configuration
-    config_path =  File.join(::Rails.root.to_s, ActsAsPhocodable.config_file)
-    puts "looking for a config in #{config_path}"
-    self.phocodable_configuration =  YAML.load(ERB.new(File.read(config_path)).result)[::Rails.env.to_s].symbolize_keys
+    #raise "This method is going away!"
+    #puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+    #puts "This method is going away!"
+    #puts "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
+    self.phocodable_configuration = ActsAsPhocodable.phocodable_config
     self.apply_phocodable_configuration
   end
   
+  
   def apply_phocodable_configuration
     if self.phocodable_configuration[:base_url]
       ActsAsPhocodable.base_url = phocodable_configuration[:base_url]
@@ -442,7 +461,7 @@ module ActsAsPhocodable
     def create_thumbnails_from_response(response_thumbs,job_id)
       new_thumbs = []
       response_thumbs.each do |thumb_params|
-        puts "creating a thumb for #{thumb_params["label"]}"
+        #puts "creating a thumb for #{thumb_params["label"]}"
         # we do this the long way around just in case some of these
         # atts are attr_protected
         thumb = nil
@@ -472,7 +491,7 @@ module ActsAsPhocodable
         thumb.save
         new_thumbs << thumb
         Rails.logger.debug "    thumb.errors = #{thumb.errors.to_json}"
-        puts "    thumb.errors = #{thumb.errors.to_json}"
+        #puts "    thumb.errors = #{thumb.errors.to_json}"
       end
       new_thumbs
     end
@@ -493,9 +512,9 @@ module ActsAsPhocodable
     end
     
     def phocode(input_thumbs = self.parent_class.phocoder_thumbnails)
-      puts " input_thumbs.count = #{input_thumbs.size}"
+      #puts " input_thumbs.count = #{input_thumbs.size}"
       input_thumbs = dedupe_input_thumbs(input_thumbs)
-      puts " after dedupe input_thumbs.count = #{input_thumbs.size}"
+      #puts " after dedupe input_thumbs.count = #{input_thumbs.size}"
       #if self.thumbnails.count >= self.class.phocoder_thumbnails.size
       #  raise "This item already has thumbnails!"
       #  return
@@ -511,7 +530,7 @@ module ActsAsPhocodable
       Rails.logger.debug "callback url = #{callback_url}"
       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"
+      #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"]
@@ -521,7 +540,7 @@ module ActsAsPhocodable
       self.save #false need to do save(false) here if we're calling phocode on after_save
       response_thumbs = response.body["job"]["thumbnails"]
       Rails.logger.debug "trying to decode #{response_thumbs.size} response_thumbs = #{response_thumbs.to_json}"
-      puts "trying to decode #{response_thumbs.size} response_thumbs = #{response_thumbs.to_json}"
+      #puts "trying to decode #{response_thumbs.size} response_thumbs = #{response_thumbs.to_json}"
       create_thumbnails_from_response(response_thumbs,response.body["job"]["id"])
     end
     
@@ -595,7 +614,7 @@ module ActsAsPhocodable
         Rails.logger.debug "callback url = #{callback_url}"
         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}"
+        #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"]
@@ -626,7 +645,7 @@ module ActsAsPhocodable
         Rails.logger.debug "callback url = #{callback_url}"
         response = Phocoder::Job.create(phocoder_composite_params)
         Rails.logger.debug "composite response = #{response.body.to_json}"
-        puts "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"]
@@ -636,7 +655,7 @@ module ActsAsPhocodable
         self.save #false need to do save(false) here if we're calling phocode on after_save
         response_thumbs = response.body["job"]["thumbnails"]
         Rails.logger.debug "trying to decode #{response_thumbs.size} response_thumbs = #{response_thumbs.to_json}"
-        puts "trying to decode #{response_thumbs.size} response_thumbs = #{response_thumbs.to_json}"
+        #puts "trying to decode #{response_thumbs.size} response_thumbs = #{response_thumbs.to_json}"
         create_thumbnails_from_response(response_thumbs,response.body["job"]["id"])
       end
     end
@@ -670,7 +689,7 @@ module ActsAsPhocodable
         self.thumbnails << thumb
         thumb.encodable_status = "zencoding"
         thumb.save
-        puts "    thumb.errors = #{thumb.errors.to_json}"
+        #puts "    thumb.errors = #{thumb.errors.to_json}"
       end
       
       self.save
@@ -826,7 +845,7 @@ module ActsAsPhocodable
     end
     
     def phocodable_config
-      puts "looking for config!"
+      #puts "looking for config!"
       self.class.config
     end
     
@@ -845,7 +864,7 @@ module ActsAsPhocodable
     
     def destroy_thumbnails
       if self.class.phocoder_thumbnails.size == 0 and self.class.zencoder_videos.size == 0 
-        puts "we're skipping destory_thumbnails since we don't do any processing "
+        #puts "we're skipping destory_thumbnails since we don't do any processing "
         return
       end
       #puts "calling destory thumbnails for #{self.thumbnails.count} - #{self.thumbnails.size}"
@@ -870,7 +889,7 @@ module ActsAsPhocodable
       end
       if thumbnail_name.blank? and thumbnail_hash_or_name.is_a?(Hash)
         thumbnail_name = "#{thumbnail_hash_or_name[:width]}x#{thumbnail_hash_or_name[:height]}"
-        puts "thumbnail_name = #{thumbnail_name}"
+        #puts "thumbnail_name = #{thumbnail_name}"
         thumbnail_hash_or_name[:label] = thumbnail_name
       end
       thumb = thumbnails.find_by_thumbnail(thumbnail_name)
@@ -924,7 +943,7 @@ module ActsAsPhocodable
     
     def save_local_file
       return if @saved_file.blank?
-      puts "saving the local file!!!!!!"
+      #puts "saving the local file!!!!!!"
       Rails.logger.debug "==================================================================================================="
       Rails.logger.debug "about to save the local file"
       run_callbacks :file_saved do
@@ -946,10 +965,10 @@ module ActsAsPhocodable
         if ActsAsPhocodable.storeage_mode == "s3" and ActsAsPhocodable.processing_mode == "spawn"
           spawn do # :method => :thread # <-- I think that should be set at the config/environment level
             Rails.logger.debug "------------beginning of spawn block"
-            puts               "------------beginning of spawn block"
+            #puts               "------------beginning of spawn block"
             self.save_s3_file
             Rails.logger.debug "------------end of spawn block"
-            puts               "------------end of spawn block"
+            #puts               "------------end of spawn block"
           end
         end
         if ActsAsPhocodable.storeage_mode == "local" and ActsAsPhocodable.processing_mode == "automatic" 
@@ -1017,7 +1036,7 @@ module ActsAsPhocodable
     # This should generate a fully qualified http://something-something
     # type of a reference.  Depending on storeage_mode/base_url settings.
     def public_url
-      puts "our base_url = #{base_url} and our local_url = #{local_url}"
+      #puts "our base_url = #{base_url} and our local_url = #{local_url}"
       if ActsAsPhocodable.storeage_mode == "local" or ActsAsPhocodable.storeage_mode == "offline" 
         base_url + local_url
       else

data/phocoder-rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{phocoder-rails}
-  s.version = "0.0.39"
+  s.version = "0.0.41"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Jeremy Green}]
-  s.date = %q{2012-02-15}
+  s.date = %q{2012-03-24}
   s.description = %q{Rails engine for easy integration with phocoder.com}
   s.email = %q{jagthedrummer@gmail.com}
   s.extra_rdoc_files = [

data/spec/models/acts_as_phocodable_spec.rb

@@ -95,8 +95,7 @@ describe ActsAsPhocodable do
     ActsAsPhocodable.base_url = "http://new-domain.com"
     ActsAsPhocodable.base_url.should == "http://new-domain.com"
   end
-  
-  
+    
   it "should default to the normal config file" do 
     ActsAsPhocodable.config_file.should == "config/phocodable.yml"
   end
@@ -108,15 +107,20 @@ describe ActsAsPhocodable do
     ActsAsPhocodable.config_file = "config/phocodable.yml"
     ActsAsPhocodable.config_file.should == "config/phocodable.yml"
   end
-  
-    
+      
   it "should read the config file" do
     ActsAsPhocodable.config_file == "config/phocodable.yml"
-    iu = ImageUpload.new
-    iu.phocodable_config.should_not be_nil
+    ActsAsPhocodable.config = nil
+    ActsAsPhocodable.config.should be_nil
+    
+    ActsAsPhocodable.read_phocodable_configuration
+    ActsAsPhocodable.config.should_not be_nil
+    ActsAsPhocodable.config.to_json.should_not == "{}"
+    #iu = ImageUpload.new
+    #iu.phocodable_config.should_not be_nil
   end
-  
-  
+        
+        
   it "should read actual configs" do
     ActsAsPhocodable.config_file == "config/phocodable.yml"
     iu = ImageUpload.new()
@@ -147,8 +151,7 @@ describe ActsAsPhocodable do
       atts[:aspect_mode].should == "crop"
     end
   end
-  
-  
+      
   it "should create phocoder params based on the acts_as_phocodable :thumbnail options" do
     iu = ImageUpload.new(@attr)
     phorams = iu.phocoder_params
@@ -171,7 +174,7 @@ describe ActsAsPhocodable do
   it "should create zencooder params based on the acts_as_phocodable :videos options" do
     iu = ImageUpload.new(@vid_attr)
     zenrams = iu.zencoder_params
-    puts zenrams.to_json
+    #puts zenrams.to_json
     zenrams.should_not be_nil
     zenrams[:input].should == iu.public_url
     zenrams[:outputs].size.should == 2
@@ -187,7 +190,7 @@ describe ActsAsPhocodable do
     ActsAsPhocodable.storeage_mode = "s3"
     iu = ImageUpload.new(@vid_attr)
     zenrams = iu.zencoder_params
-    puts zenrams.to_json
+    #puts zenrams.to_json
     zenrams.should_not be_nil
     zenrams[:input].should == iu.public_url
     zenrams[:outputs].size.should == 2
@@ -501,7 +504,7 @@ describe ActsAsPhocodable do
     
     #iu.reload #make sure it knows aobut the thumbnail
     iu.destroy
-    puts "ImageUpload.first = #{ImageUpload.first.to_json}"
+    #puts "ImageUpload.first = #{ImageUpload.first.to_json}"
     ImageUpload.count.should == 0
     File.exists?(expected_local_path).should_not be_true
   end
@@ -558,7 +561,7 @@ describe ActsAsPhocodable do
     
     thumb.reload
     #expected_local_path = File.expand_path(File.join(File.dirname(File.expand_path(__FILE__)),'..','dummy','public','ImageUpload',iu.id.to_s,thumb.filename))
-    puts "thumb.local_path = #{thumb.local_path} - #{thumb.id}"
+    #puts "thumb.local_path = #{thumb.local_path} - #{thumb.id}"
     File.exists?(thumb.local_path).should be_true
     thumb.width.should == 10
     thumb.height.should == 20
@@ -607,7 +610,7 @@ describe ActsAsPhocodable do
     ActsAsPhocodable.storeage_mode = "s3"
     ActsAsPhocodable.processing_mode = "automatic"
     ImageUpload.establish_aws_connection
-    puts "======================================="
+    #puts "======================================="
     iu = ImageUpload.new(@attr)
     Phocoder::Job.stub!(:create).and_return(mock(Phocoder::Response,:body=>{
       "job"=>{
@@ -623,8 +626,8 @@ describe ActsAsPhocodable do
     AWS::S3::S3Object.should_receive(:find).and_return( mock(:size => 19494) )
     #now store in S3 + phocode
     iu.save
-    puts "======================================="
-    puts iu.thumbnails.to_json
+    #puts "======================================="
+    #puts iu.thumbnails.to_json
     iu.thumbnails.size.should == 1 
     
     iu.destroy

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: phocoder-rails
 version: !ruby/object:Gem::Version 
-  hash: 79
-  prerelease: false
+  hash: 77
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 40
-  segments_generated: true
-  version: 0.0.40
+  - 41
+  version: 0.0.41
 platform: ruby
 authors: 
 - Jeremy Green
@@ -16,11 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-16 00:00:00 -05:00
-default_executable: 
+date: 2012-03-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: rails
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,14 +29,13 @@ dependencies:
         - 3
         - 0
         - 0
-        segments_generated: true
         version: 3.0.0
-  type: :runtime
-  name: rails
   prerelease: false
-  version_requirements: *id001
+  requirement: *id001
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: phocoder-rb
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -45,14 +43,13 @@ dependencies:
         hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  type: :runtime
-  name: phocoder-rb
   prerelease: false
-  version_requirements: *id002
+  requirement: *id002
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: zencoder
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -60,14 +57,13 @@ dependencies:
         hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  type: :runtime
-  name: zencoder
   prerelease: false
-  version_requirements: *id003
+  requirement: *id003
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: aws-s3
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -75,14 +71,13 @@ dependencies:
         hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  type: :runtime
-  name: aws-s3
   prerelease: false
-  version_requirements: *id004
+  requirement: *id004
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: spawn
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -90,14 +85,13 @@ dependencies:
         hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  type: :runtime
-  name: spawn
   prerelease: false
-  version_requirements: *id005
+  requirement: *id005
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: rspec-rails
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -107,14 +101,13 @@ dependencies:
         - 2
         - 4
         - 1
-        segments_generated: true
         version: 2.4.1
-  type: :development
-  name: rspec-rails
   prerelease: false
-  version_requirements: *id006
+  requirement: *id006
+  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: bundler
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -124,14 +117,13 @@ dependencies:
         - 1
         - 0
         - 0
-        segments_generated: true
         version: 1.0.0
-  type: :development
-  name: bundler
   prerelease: false
-  version_requirements: *id007
+  requirement: *id007
+  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  name: jeweler
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -141,14 +133,13 @@ dependencies:
         - 1
         - 5
         - 1
-        segments_generated: true
         version: 1.5.1
-  type: :development
-  name: jeweler
   prerelease: false
-  version_requirements: *id008
+  requirement: *id008
+  type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  name: rcov
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -156,12 +147,10 @@ dependencies:
         hash: 3
         segments: 
         - 0
-        segments_generated: true
         version: "0"
-  type: :development
-  name: rcov
   prerelease: false
-  version_requirements: *id009
+  requirement: *id009
+  type: :development
 description: Rails engine for easy integration with phocoder.com
 email: jagthedrummer@gmail.com
 executables: []
@@ -287,7 +276,6 @@ files:
 - spec/phocoder_rails_spec.rb
 - spec/routing/phocoder_routing_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/jagthedrummer/phocoder-rails
 licenses: 
 - MIT
@@ -304,7 +292,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
       hash: 3
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
@@ -314,12 +301,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       hash: 3
       segments: 
       - 0
-      segments_generated: true
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Rails engine for easy integration with phocoder.com