s33r 0.4.2 → 0.5

data/test/files/acl.xml

@@ -25,12 +25,6 @@
 			</Grantee>
 			<Permission>READ</Permission>
 		</Grant>
-		<Grant>
-			<Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="AmazonCustomerByEmail">
-				<EmailAddress>bingo@blinky.com</EmailAddress>
-			</Grantee>
-			<Permission>WRITE</Permission>
-		</Grant>
 		<Grant>
 			<Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="Group">
 				<URI>http://acs.amazonaws.com/groups/global/AllUsers</URI>

data/test/files/config.yaml

@@ -0,0 +1,5 @@
+access: '44CF9590006BF252F707'
+secret: <%= Testing::SECRET_ACCESS_KEY %>
+use_ssl: false
+options:
+  email_to: 'elliot@somedomain.com'

data/test/files/logging_status_disabled.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<BucketLoggingStatus xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
+</BucketLoggingStatus>

data/test/files/logging_status_enabled.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<BucketLoggingStatus xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
+	<LoggingEnabled>
+		<TargetBucket>mylogs</TargetBucket>
+		<TargetPrefix>mybucket-access_log-</TargetPrefix>
+	</LoggingEnabled>
+</BucketLoggingStatus>

data/test/test_setup.rb

@@ -4,14 +4,19 @@ require_gem 'rspec'
 
 require File.dirname(__FILE__) + '/../lib/s33r'
 include S33r
-include S33r::S33rException
-include S33r::Sync
+include S33r::S3Exception
 include S33r::S3ACL
+include S33r::S3Logging
 
 # set up some constants
 module Testing
   ACCESS_KEY = '44CF9590006BF252F707'
   SECRET_ACCESS_KEY = 'OtxrzxIsfpFjA7SwPzILwy8Bw21TLhquhboDYROV'
+  EMAIL = 'elliot@somedomain.com'
+end
+
+def load_test_xml(filename)
+  clean_xml(File.open(File.join(File.dirname(__FILE__), '/files', filename)).read)
 end
 
 # convenience for highlighting tasks

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: s33r
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
-date: 2007-01-03 00:00:00 +00:00
+  version: "0.5"
+date: 2007-01-17 00:00:00 +00:00
 summary: A library for accessing Amazon S3
 require_paths: 
 - lib
@@ -44,7 +44,6 @@ files:
 - examples/fores33r/vendor
 - examples/fores33r/public
 - examples/fores33r/Rakefile
-- examples/fores33r/README
 - examples/fores33r/test/unit
 - examples/fores33r/test/functional
 - examples/fores33r/test/integration
@@ -73,6 +72,8 @@ files:
 - examples/fores33r/tmp/cache
 - examples/fores33r/tmp/sessions
 - examples/fores33r/tmp/sockets
+- examples/fores33r/log/development.log
+- examples/fores33r/log/mongrel.log
 - examples/fores33r/script/performance
 - examples/fores33r/script/process
 - examples/fores33r/script/breakpointer
@@ -116,38 +117,34 @@ files:
 - examples/fores33r/public/javascripts/controls.js
 - examples/fores33r/public/stylesheets/core.css
 - examples/cli/simple.rb
-- examples/cli/logging_x.rb
 - examples/cli/s3cli.rb
-- examples/cli/acl_x.rb
+- examples/cli/instant_download_server.rb
 - lib/s33r
 - lib/s33r.rb
 - lib/s33r/bucket_listing.rb
 - lib/s33r/libxml_loader.rb
-- lib/s33r/client.rb
-- lib/s33r/named_bucket.rb
+- lib/s33r/utility.rb
 - lib/s33r/s3_acl.rb
 - lib/s33r/s3_obj.rb
 - lib/s33r/builder.rb
-- lib/s33r/logging.rb
+- lib/s33r/client.rb
 - lib/s33r/libxml_extensions.rb
-- lib/s33r/core.rb
 - lib/s33r/s33r_http.rb
 - lib/s33r/s33r_exception.rb
 - lib/s33r/mimetypes.rb
-- lib/s33r/sync.rb
+- lib/s33r/bucket.rb
+- lib/s33r/networking.rb
+- lib/s33r/s3_logging.rb
 - test/files
 - test/cases
-- test/test_bucket_setup.rb
 - test/test_setup.rb
 - test/files/textfile.txt
 - test/files/wave.jpg
-- test/files/namedbucket_config2.yml
 - test/files/bucket_listing2.xml
-- test/files/all_buckets.xml
+- test/files/config.yaml
 - test/files/bucket_listing3.xml
 - test/files/acl.xml
-- test/files/namedbucket_config.yml
-- test/files/client_config.yml
+- test/files/logging_status_enabled.xml
 - test/files/logging_acl.xml
 - test/files/bucket_listing.xml
 - test/files/bucket_listing_broken.xml
@@ -157,89 +154,14 @@ files:
 - test/files/suspect_bucket_listing.xml
 - test/files/acl_grant3.xml
 - test/files/acl_grant4.xml
+- test/files/logging_status_disabled.xml
 - test/cases/spec_bucket_listing.rb
 - test/cases/spec_s3_object.rb
-- test/cases/spec_all_buckets.rb
-- test/cases/spec_core.rb
-- test/cases/spec_sync.rb
-- test/cases/spec_client.rb
+- test/cases/spec_logging.rb
 - test/cases/spec_acl.rb
 - test/cases/spec_xml.rb
-- test/cases/spec_namedbucket.rb
-- html/created.rid
-- html/rdoc-style.css
-- html/files
-- html/classes
-- html/fr_file_index.html
-- html/fr_class_index.html
-- html/fr_method_index.html
-- html/index.html
-- html/files/README_txt.html
-- html/files/MIT-LICENSE.html
-- html/files/CHANGELOG.html
-- html/files/lib
-- html/files/lib/s33r_rb.html
-- html/files/lib/s33r
-- html/files/lib/s33r/bucket_listing_rb.html
-- html/files/lib/s33r/libxml_loader_rb.html
-- html/files/lib/s33r/client_rb.html
-- html/files/lib/s33r/named_bucket_rb.html
-- html/files/lib/s33r/s3_acl_rb.html
-- html/files/lib/s33r/s3_obj_rb.html
-- html/files/lib/s33r/builder_rb.html
-- html/files/lib/s33r/logging_rb.html
-- html/files/lib/s33r/libxml_extensions_rb.html
-- html/files/lib/s33r/core_rb.html
-- html/files/lib/s33r/s33r_http_rb.html
-- html/files/lib/s33r/s33r_exception_rb.html
-- html/files/lib/s33r/mimetypes_rb.html
-- html/files/lib/s33r/sync_rb.html
-- html/classes/XML.html
-- html/classes/XML
-- html/classes/Net.html
-- html/classes/Net
-- html/classes/MIME.html
-- html/classes/MIME
-- html/classes/S33r.html
-- html/classes/S33r
-- html/classes/XML/Node.html
-- html/classes/XML/Document.html
-- html/classes/Net/HTTPGenericRequest.html
-- html/classes/Net/HTTPResponse.html
-- html/classes/MIME/Types.html
-- html/classes/MIME/InvalidContentType.html
-- html/classes/MIME/Type.html
-- html/classes/S33r/Sync.html
-- html/classes/S33r/S33rException.html
-- html/classes/S33r/S33rException
-- html/classes/S33r/S3ACL.html
-- html/classes/S33r/S3ACL
-- html/classes/S33r/LoggingResource.html
-- html/classes/S33r/S3Object.html
-- html/classes/S33r/NamedBucket.html
-- html/classes/S33r/Client.html
-- html/classes/S33r/BucketListing.html
-- html/classes/S33r/OrderlyXmlMarkup.html
-- html/classes/S33r/S33rException/MissingResource.html
-- html/classes/S33r/S33rException/InvalidBucketListing.html
-- html/classes/S33r/S33rException/BucketListingMaxKeysError.html
-- html/classes/S33r/S33rException/MissingBucketName.html
-- html/classes/S33r/S33rException/MalformedBucketName.html
-- html/classes/S33r/S33rException/MissingRequiredHeaders.html
-- html/classes/S33r/S33rException/MethodNotAvailable.html
-- html/classes/S33r/S33rException/InvalidPermission.html
-- html/classes/S33r/S33rException/InvalidS3GroupType.html
-- html/classes/S33r/S33rException/S3FallenOver.html
-- html/classes/S33r/S33rException/UnsupportedCannedACL.html
-- html/classes/S33r/S33rException/TryingToPutEmptyResource.html
-- html/classes/S33r/S33rException/UnsupportedHTTPMethod.html
-- html/classes/S33r/S33rException/BucketNotLogTargetable.html
-- html/classes/S33r/S3ACL/Group.html
-- html/classes/S33r/S3ACL/CanonicalUser.html
-- html/classes/S33r/S3ACL/AmazonCustomer.html
-- html/classes/S33r/S3ACL/ACLDoc.html
-- html/classes/S33r/S3ACL/Grantee.html
-- html/classes/S33r/S3ACL/Grant.html
+- test/cases/spec_utility.rb
+- test/cases/spec_networking.rb
 test_files: []
 
 rdoc_options: []

data/examples/cli/acl_x.rb

@@ -1,41 +0,0 @@
-# Example of how to manipulate ACLs (see s3_acl.rb or rdoc for all ACL classes)
-
-require File.join(File.dirname(__FILE__), '../../lib/s33r')
-include S33r
-include S33r::S3ACL
-
-# initialise the client from a config file 
-# (see s3.yaml in examples directory)
-c = Client.init('/home/ell/.s33r')
-
-# bucket whose ACL we're going to manipulate
-bucket = 'es-test'
-
-# get the ACL for the bucket
-acl = c.get_acl(bucket)
-
-# add a new grant to the ACL (allow all users read access)
-acl.add_grant(Grant.for_group(:all_users, :read))
-
-# remove a grant from the ACL;
-# note that s33r is able to compare existing grants in
-# an ACL with newly-minted ones
-acl.remove_grant(Grant.for_group(:authenticated_users, :read))
-
-# put the ACL back
-c.set_acl(acl, bucket)
-
-# get the ACL for a resource inside the bucket
-# and make it readable by a specific Amazon customer
-resource = 'test'
-
-# NB this method raises an error if the resource doesn't exist
-acl = c.get_acl(bucket, resource)
-
-# the email address you set here needs to be a valid Amazon customer
-acl.add_grant(Grant.for_amazon_customer('elliot@example.com', :read))
-p c.set_acl(acl, bucket, resource)
-
-# short-hand for making a resource public
-# c.make_public(bucket)
-# c.make_public(bucket, resource)

data/examples/cli/logging_x.rb

@@ -1,20 +0,0 @@
-# Example of how to set up logging on a bucket or resource.
-
-require File.join(File.dirname(__FILE__), '../../lib/s33r')
-include S33r
-
-# initialise the client from a config file 
-# (see s3.yaml in examples directory)
-c = Client.init('/home/ell/.s33r')
-
-# Make a logging destination
-# This sets the required ACLs on a bucket to make it writeable by the
-# logging processes.
-c.enable_log_target('my-logging-bucket')
-
-# Set up logging for a bucket.
-c.enable_logging('es-test', 'my-logging-bucket')
-
-# Set up logging for a bucket with a custom log prefix.
-# (Default prefix is the name of the bucket which has logging enabled + "'")
-c.enable_logging('es-test2', 'my-logging-bucket', :prefix => 'special-logs-')

data/examples/fores33r/README

@@ -1,183 +0,0 @@
-== Welcome to Rails
-
-Rails is a web-application and persistence framework that includes everything
-needed to create database-backed web-applications according to the
-Model-View-Control pattern of separation. This pattern splits the view (also
-called the presentation) into "dumb" templates that are primarily responsible
-for inserting pre-built data in between HTML tags. The model contains the
-"smart" domain objects (such as Account, Product, Person, Post) that holds all
-the business logic and knows how to persist themselves to a database. The
-controller handles the incoming requests (such as Save New Account, Update
-Product, Show Post) by manipulating the model and directing data to the view.
-
-In Rails, the model is handled by what's called an object-relational mapping
-layer entitled Active Record. This layer allows you to present the data from
-database rows as objects and embellish these data objects with business logic
-methods. You can read more about Active Record in 
-link:files/vendor/rails/activerecord/README.html.
-
-The controller and view are handled by the Action Pack, which handles both
-layers by its two parts: Action View and Action Controller. These two layers
-are bundled in a single package due to their heavy interdependence. This is
-unlike the relationship between the Active Record and Action Pack that is much
-more separate. Each of these packages can be used independently outside of
-Rails.  You can read more about Action Pack in 
-link:files/vendor/rails/actionpack/README.html.
-
-
-== Getting started
-
-1. Start the web server: <tt>ruby script/server</tt> (run with --help for options)
-2. Go to http://localhost:3000/ and get "Welcome aboard: You’re riding the Rails!"
-3. Follow the guidelines to start developing your application
-
-
-== Web servers
-
-Rails uses the built-in web server in Ruby called WEBrick by default, so you don't
-have to install or configure anything to play around. 
-
-If you have lighttpd installed, though, it'll be used instead when running script/server.
-It's considerably faster than WEBrick and suited for production use, but requires additional
-installation and currently only works well on OS X/Unix (Windows users are encouraged
-to start with WEBrick). We recommend version 1.4.11 and higher. You can download it from
-http://www.lighttpd.net.
-
-If you want something that's halfway between WEBrick and lighttpd, we heartily recommend
-Mongrel. It's a Ruby-based web server with a C-component (so it requires compilation) that
-also works very well with Windows. See more at http://mongrel.rubyforge.org/.
-
-But of course its also possible to run Rails with the premiere open source web server Apache.
-To get decent performance, though, you'll need to install FastCGI. For Apache 1.3, you want
-to use mod_fastcgi. For Apache 2.0+, you want to use mod_fcgid.
-
-See http://wiki.rubyonrails.com/rails/pages/FastCGI for more information on FastCGI.
-
-== Example for Apache conf
-
-  <VirtualHost *:80>
-    ServerName rails
-    DocumentRoot /path/application/public/
-    ErrorLog /path/application/log/server.log
-  
-    <Directory /path/application/public/>
-      Options ExecCGI FollowSymLinks
-      AllowOverride all
-      Allow from all
-      Order allow,deny
-    </Directory>
-  </VirtualHost>
-
-NOTE: Be sure that CGIs can be executed in that directory as well. So ExecCGI
-should be on and ".cgi" should respond. All requests from 127.0.0.1 go
-through CGI, so no Apache restart is necessary for changes. All other requests
-go through FCGI (or mod_ruby), which requires a restart to show changes.
-
-
-== Debugging Rails
-
-Have "tail -f" commands running on both the server.log, production.log, and
-test.log files. Rails will automatically display debugging and runtime
-information to these files. Debugging info will also be shown in the browser
-on requests from 127.0.0.1.
-
-
-== Breakpoints
-
-Breakpoint support is available through the script/breakpointer client. This
-means that you can break out of execution at any point in the code, investigate
-and change the model, AND then resume execution! Example:
-
-  class WeblogController < ActionController::Base
-    def index
-      @posts = Post.find_all
-      breakpoint "Breaking out from the list"
-    end
-  end
-  
-So the controller will accept the action, run the first line, then present you
-with a IRB prompt in the breakpointer window. Here you can do things like:
-
-Executing breakpoint "Breaking out from the list" at .../webrick_server.rb:16 in 'breakpoint'
-
-  >> @posts.inspect
-  => "[#<Post:0x14a6be8 @attributes={\"title\"=>nil, \"body\"=>nil, \"id\"=>\"1\"}>, 
-       #<Post:0x14a6620 @attributes={\"title\"=>\"Rails you know!\", \"body\"=>\"Only ten..\", \"id\"=>\"2\"}>]"
-  >> @posts.first.title = "hello from a breakpoint"
-  => "hello from a breakpoint"
-
-...and even better is that you can examine how your runtime objects actually work:
-
-  >> f = @posts.first 
-  => #<Post:0x13630c4 @attributes={"title"=>nil, "body"=>nil, "id"=>"1"}>
-  >> f.
-  Display all 152 possibilities? (y or n)
-
-Finally, when you're ready to resume execution, you press CTRL-D
-
-
-== Console
-
-You can interact with the domain model by starting the console through script/console. 
-Here you'll have all parts of the application configured, just like it is when the
-application is running. You can inspect domain models, change values, and save to the
-database. Starting the script without arguments will launch it in the development environment.
-Passing an argument will specify a different environment, like <tt>script/console production</tt>.
-
-To reload your controllers and models after launching the console run <tt>reload!</tt>
-
-
-
-== Description of contents
-
-app
-  Holds all the code that's specific to this particular application.
-
-app/controllers
-  Holds controllers that should be named like weblog_controller.rb for
-  automated URL mapping. All controllers should descend from
-  ActionController::Base.
-
-app/models
-  Holds models that should be named like post.rb.
-  Most models will descend from ActiveRecord::Base.
-  
-app/views
-  Holds the template files for the view that should be named like
-  weblog/index.rhtml for the WeblogController#index action. All views use eRuby
-  syntax. This directory can also be used to keep stylesheets, images, and so on
-  that can be symlinked to public.
-  
-app/helpers
-  Holds view helpers that should be named like weblog_helper.rb.
-
-app/apis
-  Holds API classes for web services.
-
-config
-  Configuration files for the Rails environment, the routing map, the database, and other dependencies.
-
-components
-  Self-contained mini-applications that can bundle together controllers, models, and views.
-
-db
-  Contains the database schema in schema.rb.  db/migrate contains all
-  the sequence of Migrations for your schema.
-
-lib
-  Application specific libraries. Basically, any kind of custom code that doesn't
-  belong under controllers, models, or helpers. This directory is in the load path.
-    
-public
-  The directory available for the web server. Contains subdirectories for images, stylesheets,
-  and javascripts. Also contains the dispatchers and the default HTML files.
-
-script
-  Helper scripts for automation and generation.
-
-test
-  Unit and functional tests along with fixtures.
-
-vendor
-  External libraries that the application depends on. Also includes the plugins subdirectory.
-  This directory is in the load path.