pyramid_scheme 0.2.2 → 0.2.3

data/Rakefile

@@ -13,7 +13,7 @@ begin
     gem.authors = ["Dan Pickett"]
     gem.add_dependency "rake", ">= 0.8.7"
     gem.add_dependency "configatron"
-    gem.add_dependency "right_aws", ">= 1.10.0"
+    gem.add_dependency "aws-s3", ">= 0.5.1"
     gem.add_development_dependency "rspec", ">= 1.2.9"
     gem.add_development_dependency "yard", ">= 0"
     gem.add_development_dependency "mocha", "0.9.8"

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/pyramid_scheme.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 require 'configatron'
-require 'right_aws'
+require 'aws/s3'
 
 require 'pyramid_scheme/required_configuration_not_found'
 

data/lib/pyramid_scheme/index_provider/s3.rb

@@ -1,4 +1,3 @@
-require "ruby-debug"
 module PyramidScheme
   module IndexProvider
     class S3 < PyramidScheme::IndexProvider::Base
@@ -14,34 +13,35 @@ module PyramidScheme
           ]
         end
 
-        def connection
-          @connection ||= RightAws::S3.new(
-            PyramidScheme.configuration[:access_key],
-            PyramidScheme.configuration[:secret_access_key]
+        def establish_connection!
+          @connection ||= AWS::S3::Base.establish_connection!(
+            :access_key_id => PyramidScheme.configuration[:access_key],
+            :secret_access_key => PyramidScheme.configuration[:secret_access_key]
           )
         end
 
-        def bucket
-          @bucket ||= RightAws::S3::Bucket.create(
-            connection, PyramidScheme.configuration[:bucket]) 
-        end
       end
 
       def initialize(options = {})
         super
+        self.class.establish_connection!
       end
 
       def process_index
         server_copy
       end
-      
+
       def provide_client_with_index
         Configuration::INDEX_FILE_EXTENSIONS.each do |ext|
-          self.class.bucket.keys('prefix'=> @configuration[:prefix] + "/").each do |obj|
-            new_filename = File.basename(obj.name.gsub(@configuration[:prefix] + "/", '').gsub(/\./, ".new."))
+          AWS::S3::Bucket.objects(@configuration[:bucket], 
+            :prefix => @configuration[:prefix]).each do |obj|
+              
+            new_filename = File.basename(obj.key.gsub(@configuration[:prefix], '').gsub(/\./, ".new."))
             destined_path = File.join(@configuration[:client_destination_path], new_filename)
             File.open(destined_path, 'w') do |file|
-              file.write obj.data
+              AWS::S3::S3Object.stream(obj.key, @configuration[:bucket]) do |chunk|
+                file.write chunk
+              end
             end
           end
         end
@@ -55,9 +55,10 @@ module PyramidScheme
       def server_copy
         Configuration::INDEX_FILE_EXTENSIONS.each do |ext|
           Dir[File.join(@configuration[:server_source_path], "*#{ext}")].each do |f|
-            key = RightAws::S3::Key.create(self.class.bucket, 
-              "#{@configuration[:prefix]}/#{File.basename(f)}")
-            key.put(File.read(f))
+            AWS::S3::S3Object.store("#{@configuration[:prefix]}/#{File.basename(f)}",
+              File.open(f),
+              @configuration[:bucket]
+            )
           end
         end
 

data/lib/pyramid_scheme/lock/s3.rb

@@ -1,28 +1,27 @@
 module PyramidScheme
   module Lock
     class S3 < PyramidScheme::Lock::Base
-      attr_reader :bucket
-
       def initialize
-        @bucket = PyramidScheme::IndexProvider::S3.bucket
+        PyramidScheme::IndexProvider::S3.establish_connection!
       end
 
       def exists?
-        key = RightAws::S3::Key.create(bucket, key_name)
-        key.exists?
+        AWS::S3::S3Object.exists?(key_name, bucket)
       end
 
       def create
-        key = RightAws::S3::Key.create(bucket, key_name)
-        key.put("")
+        AWS::S3::S3Object.store(key_name, "", bucket)
       end
 
       def destroy
-        key = RightAws::S3::Key.create(bucket, key_name)
-        key.delete
+        AWS::S3::S3Object.delete(key_name, bucket)
       end
 
       protected
+      def bucket
+        PyramidScheme.configuration[:bucket]
+      end
+
       def key_name
         "#{PyramidScheme.configuration[:prefix]}/#{PyramidScheme.configuration[:lock_file_name]}"
       end

data/spec/integrations/s3_spec.rb

@@ -43,9 +43,8 @@ describe "S3 index provider" do
       @provider.process_index
    
       @filenames.each do |f|
-        key = RightAws::S3::Key.create(PyramidScheme::IndexProvider::S3.bucket, 
-          "#{PyramidScheme.configuration[:prefix]}/#{f}")
-        key.exists?.should be_true
+        AWS::S3::S3Object.exists?("#{PyramidScheme.configuration[:prefix]}/#{@filename}", 
+          PyramidScheme.configuration[:bucket])
       end
     end
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Dan Pickett
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-09 00:00:00 -05:00
+date: 2010-03-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,17 +44,17 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: right_aws
+  name: aws-s3
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 10
         - 0
-        version: 1.10.0
+        - 5
+        - 1
+        version: 0.5.1
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency