massive_sitemap-writer-s3 0.0.1.rc3 → 0.0.1.rc4

data/VERSION

@@ -1 +1 @@
-0.0.1.rc3
+0.0.1.rc4

data/lib/massive_sitemap/writer/s3.rb

@@ -25,6 +25,7 @@ module MassiveSitemap
             object.save
           end
         end
+        ::File.delete(@filename) unless @options[:keep]
       end
 
       def load_stream_ids

data/spec/s3_spec.rb

@@ -6,8 +6,8 @@ describe MassiveSitemap::Writer::S3 do
   let(:objects) { mock('objects', :find_all => [], :build => object) }
   let(:bucket) { mock('bucket', :objects => objects) }
   let(:service) { mock('service', :buckets => mock('buckets', :find =>  bucket)) }
-  let(:writer) { MassiveSitemap::Writer::S3.new(s3_options) }
-  let(:s3_options) { Hash.new(:access_key_id => "ak", :secret_access_key => "sa", :bucket => "bucket") }
+  let(:writer) { MassiveSitemap::Writer::S3.new(s3_cfg, :keep => true) }
+  let(:s3_cfg) { Hash.new(:access_key_id => "ak", :secret_access_key => "sa", :bucket => "bucket") }
 
   before do
     ::S3::Service.stub(:new).and_return(service)
@@ -15,7 +15,7 @@ describe MassiveSitemap::Writer::S3 do
 
   describe "initialize" do
     it "creates service" do
-      ::S3::Service.should_receive(:new).with(s3_options).and_return(service)
+      ::S3::Service.should_receive(:new).with(s3_cfg).and_return(service)
       writer
     end
 
@@ -27,10 +27,12 @@ describe MassiveSitemap::Writer::S3 do
 
   describe "close_stream" do
     let(:filename) { "sitemap.xml.gz" }
-      before do
-        writer.init!
-      end
 
+    before do
+      writer.init!
+    end
+
+    context "with keep option" do
       after do
         FileUtils.rm(filename)
       end
@@ -45,5 +47,15 @@ describe MassiveSitemap::Writer::S3 do
         object.should_receive(:"content=").once().and_return(true)
         writer.close!
       end
+    end
+
+    context "without keep option" do
+      let(:writer) { MassiveSitemap::Writer::S3.new(s3_cfg, :keep => false) }
+
+      it "deletes file on local system" do
+        writer.close!
+        File.exists?(filename).should be_false
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,60 +1,3 @@
 $:.unshift File.expand_path("../../lib", __FILE__)
 require 'bundler/setup'
 require 'massive_sitemap-writer-s3'
-
-
-  def setup
-    @buckets_list_body = <<-EOBuckets
-    <?xml version="1.0" encoding="UTF-8"?>\n<ListAllMyBucketsResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"> <Owner> <ID>123u1odhkhfoadf</ID> <DisplayName>JohnDoe</DisplayName> </Owner> <Buckets> <Bucket> <Name>data.example.com</Name> <CreationDate>2009-07-02T11:56:58.000Z</CreationDate> </Bucket> <Bucket> <Name>images</Name> <CreationDate>2009-06-05T12:26:33.000Z</CreationDate> </Bucket> </Buckets> </ListAllMyBucketsResult>
-    EOBuckets
-
-    @bucket_not_exists = <<-EOBucketNoexists
-    <?xml version="1.0" encoding="UTF-8"?>\n<Error> <Code>NoSuchBucket</Code> <Message>The specified bucket does not exists</Message> <BucketName>data2.example.com</BucketName> <RequestId>8D7519AAE74E9E99</RequestId> <HostId>DvKnnNSMnPHd1oXukyRaFNv8Lg/bpwhuUtY8Kj7eDLbaIrIT8JebSnHwi89AK1P+</HostId> </Error>
-    EOBucketNoexists
-
-    @bucket_exists = <<-EOBucketexists
-    <?xml version="1.0" encoding="UTF-8"?>\n<ListBucketResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"> <Name>data.synergypeople.net</Name> <Prefix></Prefix> <Marker></Marker> <MaxKeys>1000</MaxKeys> <IsTruncated>false</IsTruncated> </ListBucketResult>
-    EOBucketexists
-
-    @service_empty_buckets_list = S3::Service.new(
-      :access_key_id =>  "12345678901234567890",
-      :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF"
-    )
-    @response_empty_buckets_list = Net::HTTPOK.new("1.1", "200", "OK")
-    @service_empty_buckets_list.stubs(:service_request).returns(@response_empty_buckets_list)
-    @response_empty_buckets_list.stubs(:body).returns(@buckets_empty_list_body)
-
-    @service_buckets_list = S3::Service.new(
-      :access_key_id =>  "12345678901234567890",
-      :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF"
-    )
-    @response_buckets_list = Net::HTTPOK.new("1.1", "200", "OK")
-    @service_buckets_list.stubs(:service_request).returns(@response_buckets_list)
-    @response_buckets_list.stubs(:body).returns(@buckets_list_body)
-
-    @service_bucket_exists = S3::Service.new(
-      :access_key_id =>  "12345678901234567890",
-      :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF"
-    )
-    @response_bucket_exists = Net::HTTPNotFound.new("1.1", "200", "OK")
-    @service_bucket_exists.stubs(:service_request).returns(@response_bucket_exists)
-    @response_bucket_exists.stubs(:body).returns(@bucket_exists)
-
-    @service_bucket_not_exists = S3::Service.new(
-      :access_key_id =>  "12345678901234567890",
-      :secret_access_key =>  "qwertyuiopasdfghjklzxcvbnmQWERTYUIOPASDF"
-    )
-    @response_bucket_not_exists = Net::HTTPNotFound.new("1.1", "404", "Not Found")
-    @service_bucket_not_exists.stubs(:service_request).raises(S3::Error::NoSuchBucket.new(404, @response_bucket_not_exists))
-    @response_bucket_not_exists.stubs(:body).returns(@bucket_not_exists)
-
-    @buckets_empty_list = []
-    @buckets_empty_list_body = <<-EOEmptyBuckets
-    <?xml version="1.0" encoding="UTF-8"?>\n<ListAllMyBucketsResult xmlns="http://s3.amazonaws.com/doc/2006-03-01/"> <Owner> <ID>123u1odhkhfoadf</ID> <DisplayName>JohnDoe</DisplayName> </Owner> <Buckets> </Buckets> </ListAllMyBucketsResult>
-    EOEmptyBuckets
-
-    @buckets_list = [
-      S3::Bucket.send(:new, @service_buckets_list, "data.example.com"),
-      S3::Bucket.send(:new, @service_buckets_list, "images")
-    ]
-  end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: massive_sitemap-writer-s3
 version: !ruby/object:Gem::Version
-  version: 0.0.1.rc3
+  version: 0.0.1.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000Z
+date: 2012-03-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: s3
-  requirement: &70254065150480 !ruby/object:Gem::Requirement
+  requirement: &70202609466920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254065150480
+  version_requirements: *70202609466920
 - !ruby/object:Gem::Dependency
   name: massive_sitemap
-  requirement: &70254065150020 !ruby/object:Gem::Requirement
+  requirement: &70202609466460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254065150020
+  version_requirements: *70202609466460
 - !ruby/object:Gem::Dependency
   name: retryable
-  requirement: &70254065149560 !ruby/object:Gem::Requirement
+  requirement: &70202604080760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70254065149560
+  version_requirements: *70202604080760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70254068290660 !ruby/object:Gem::Requirement
+  requirement: &70202604080240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254068290660
+  version_requirements: *70202604080240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70254068290200 !ruby/object:Gem::Requirement
+  requirement: &70202604079780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70254068290200
+  version_requirements: *70202604079780
 description: Amazon S3 Writer extension for MassiveSitemap
 email:
 - tobi@soundcloud.com