phocoder-rails 0.0.56 → 0.0.57

data/VERSION

@@ -1,4 +1,4 @@
-0.0.56
+0.0.57
 
 
 

data/lib/phocoder_rails/acts_as_phocodable.rb

@@ -411,10 +411,14 @@ module ActsAsPhocodable
   end
   
   def establish_aws_connection
-    AWS::S3::Base.establish_connection!(
-                                        :access_key_id     => ActsAsPhocodable.s3_access_key_id,
-                                        :secret_access_key => ActsAsPhocodable.s3_secret_access_key
-    )
+    AWS.config({
+      :access_key_id     => ActsAsPhocodable.s3_access_key_id,
+      :secret_access_key => ActsAsPhocodable.s3_secret_access_key
+    })
+  #  AWS::S3::Base.establish_connection!(
+  #                                      :access_key_id     => ActsAsPhocodable.s3_access_key_id,
+  #                                      :secret_access_key => ActsAsPhocodable.s3_secret_access_key
+  #  )
   end
   
   
@@ -1224,22 +1228,38 @@ module ActsAsPhocodable
       "#{cloudfront_base_host}/#{s3_key}"
     end
  
+    def unused_s3_demo_stuff
+      s3 = AWS::S3.new
+      key,bucket = get_s3_key_and_bucket
+      obj = s3.buckets[bucket].objects[key]
+      obj.write(Pathname.new(tmpFile),{:acl=>:public_read,"Cache-Control"=>'max-age=315360000'})
+    end
+
+    def s3
+      @s3 ||= AWS::S3.new
+    end
+
+    def s3_obj
+      s3.buckets[s3_bucket_name].objects[s3_key]
+    end
+
     def save_s3_file
       #I don't think we need this return check anymore.  
       #return if !@saved_a_new_file
       #@saved_a_new_file = false
-      AWS::S3::S3Object.store(
-                              s3_key, 
-                              open(local_path),
-      s3_bucket_name,
-      :access => :public_read,
-      "Cache-Control" => 'max-age=315360000'
-      )
+      #AWS::S3::S3Object.store(
+                              #s3_key, 
+                              #open(local_path),
+      #s3_bucket_name,
+      #:access => :public_read,
+      #"Cache-Control" => 'max-age=315360000'
+      #)
+      s3_obj.write(Pathname.new(local_path),{:acl=>:public_read,"Cache-Control"=>'max-age=315360000'})
       self.encodable_status = "s3"
       self.save
-      obj_data = AWS::S3::S3Object.find(s3_key,s3_bucket_name)
+      #obj_data = AWS::S3::S3Object.find(s3_key,s3_bucket_name)
       Rails.logger.debug "----------------------------------------------------------------------------------------------------"
-      if obj_data.size == file_size # it made it into s3 safely
+      if s3_obj.content_length == file_size # it made it into s3 safely
         Rails.logger.debug " we are about to remove local file!"
         remove_local_file
       else
@@ -1254,8 +1274,9 @@ module ActsAsPhocodable
     def remove_s3_file
       #puts "trying to delete #{s3_key} #{s3_bucket_name}"
       #if ActsAsPhocodable.storeage_mode == "s3"
-        AWS::S3::S3Object.delete s3_key, s3_bucket_name
+        #AWS::S3::S3Object.delete s3_key, s3_bucket_name
       #end
+      s3_obj.delete
     rescue Exception => e
       #this probably means that the file never made it to S3
     end

data/phocoder-rails.gemspec

@@ -21,7 +21,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'phocoder-rb'
   gem.add_dependency 'zencoder'
   gem.add_dependency "mimetype-fu", "~> 0.1.2"#, :require => 'mimetype_fu'
-  gem.add_dependency 'aws-s3'#, :require => 'aws/s3'
+  #gem.add_dependency 'aws-s3'#, :require => 'aws/s3'
+  gem.add_dependency "aws-sdk", "~> 1.8.3.1"
   gem.add_dependency "spawn"#, :git => 'git://github.com/tra/spawn', :branch => "edge"
 
   gem.add_development_dependency "sqlite3"
@@ -29,8 +30,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "webrat"
   gem.add_development_dependency "capybara", ">= 0.3.9"
   gem.add_development_dependency "sqlite3-ruby"#, :require => "sqlite3"
-  gem.add_development_dependency 'rspec', '2.4.0'
-  gem.add_development_dependency 'rspec-rails', '2.4.1'
+  #gem.add_development_dependency 'rspec', '2.4.0'
+  gem.add_development_dependency 'rspec-rails', '2.13.0'
   gem.add_development_dependency 'autotest', '4.4.4'
   gem.add_development_dependency 'redgreen', '1.2.2'
   gem.add_development_dependency "webmock"

data/spec/models/acts_as_phocodable_spec.rb

@@ -65,6 +65,9 @@ describe ActsAsPhocodable do
     }
     ActsAsPhocodable.track_jobs = true
     ActsAsPhocodable.track_components = false
+
+    @obj = mock(AWS::S3::S3Object)
+    AWS::S3.any_instance.stub_chain(:buckets,:[],:objects,:[]){ @obj }
   end
   
   
@@ -644,7 +647,7 @@ describe ActsAsPhocodable do
   it "in delayed s3 mode it should save the file to an AWS S3 storage location, call phocoder, then destroy" do
     ActsAsPhocodable.storeage_mode = "s3"
     ActsAsPhocodable.processing_mode = "delayed"
-    ImageUpload.establish_aws_connection
+    #ImageUpload.establish_aws_connection
     
     iu = ImageUpload.new(@attr)
     Phocoder::Job.stub!(:create).and_return(mock(Phocoder::Response,:body=>{
@@ -660,9 +663,10 @@ describe ActsAsPhocodable do
     # No thumbnail should be created yet
     iu.thumbnails.size.should == 0
     # Mock the AWS reqeust for storing 
-    AWS::S3::S3Object.should_receive(:store).and_return(nil)
+    @obj.should_receive(:write).and_return(nil)
+    @obj.should_receive(:content_length).and_return(19494)
     # Mock the AWS request for checking file size
-    AWS::S3::S3Object.should_receive(:find).and_return( mock(:size => 19494) )
+    #AWS::S3::S3Object.should_receive(:find).and_return( mock(:size => 19494) )
     
     iu.save_s3_file
     # Now we should have a thumb
@@ -670,7 +674,7 @@ describe ActsAsPhocodable do
     #puts iu.thumbnails.map{|t| t.thumbnail }.to_json
     iu.thumbnails.size.should == 2
     # Mock the AWS reqeust for deleting the file and it's thumbnail
-    AWS::S3::S3Object.should_receive(:delete).exactly(3).times.and_return(nil)
+    @obj.should_receive(:delete).exactly(3).times.and_return(nil)
     iu.destroy
   end
   
@@ -678,7 +682,7 @@ describe ActsAsPhocodable do
   it "in automatic s3 mode it should save the file to an AWS S3 storage location, call phocoder, then destroy" do
     ActsAsPhocodable.storeage_mode = "s3"
     ActsAsPhocodable.processing_mode = "automatic"
-    ImageUpload.establish_aws_connection
+    #ImageUpload.establish_aws_connection
     #puts "======================================="
     iu = ImageUpload.new(@attr)
     Phocoder::Job.stub!(:create).and_return(mock(Phocoder::Response,:body=>{
@@ -690,9 +694,9 @@ describe ActsAsPhocodable do
     }))
     
     # Mock the AWS reqeust for storing 
-    AWS::S3::S3Object.should_receive(:store).and_return(nil)
+    @obj.should_receive(:write).and_return(nil)
     # Mock the AWS request for checking file size
-    AWS::S3::S3Object.should_receive(:find).and_return( mock(:size => 19494) )
+    @obj.should_receive(:content_length).and_return( 19494 )
     #now store in S3 + phocode
     iu.save
     #puts "======================================="
@@ -709,7 +713,7 @@ describe ActsAsPhocodable do
     # Hopefully...
     ActsAsPhocodable.storeage_mode = "s3"
     ActsAsPhocodable.processing_mode = "spawn"
-    ImageUpload.establish_aws_connection
+    #ImageUpload.establish_aws_connection
     
     iu = ImageUpload.new(@attr)
     Phocoder::Job.stub!(:create).and_return(mock(Phocoder::Response,:body=>{
@@ -721,9 +725,9 @@ describe ActsAsPhocodable do
     }))
     
     # Mock the AWS reqeust for storing 
-    AWS::S3::S3Object.should_receive(:store).and_return(nil)
+    @obj.should_receive(:write).and_return(nil)
     # Mock the AWS request for checking file size
-    AWS::S3::S3Object.should_receive(:find).and_return( mock(:size => 19494) )
+    @obj.should_receive(:content_length).and_return( 19494 )
     
     #now store in S3 + phocode
     iu.save

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: phocoder-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.56
+  version: 0.0.57
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-09 00:00:00.000000000 Z
+date: 2013-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -76,21 +76,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: aws-s3
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.3.1
 - !ruby/object:Gem::Dependency
   name: spawn
   requirement: !ruby/object:Gem::Requirement
@@ -187,22 +187,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +194,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 2.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -218,7 +202,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: autotest
   requirement: !ruby/object:Gem::Requirement
@@ -425,7 +409,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3998073261859968829
+      hash: -832447145253874651
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -434,7 +418,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3998073261859968829
+      hash: -832447145253874651
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24