raws 0.0.10 → 0.0.11

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Jun Kikuchi
+Copyright (c) 2009, 2010 Jun Kikuchi
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -19,7 +19,7 @@ RAWS is a Ruby library for Amazon Web Service (AWS).
   RAWS::SQS['test_queue'].send('hello2')
   RAWS::SQS['test_queue'].send('hello3')
   
-  RAWS::SQS['test_queue'].receive(:limit => 10).each do |msg|
+  RAWS::SQS['test_queue'].receive.each do |msg|
     p msg.body
     msg.delete
   end
@@ -28,8 +28,6 @@ RAWS is a Ruby library for Amazon Web Service (AWS).
 
 === SDB (Amazon SimpleDB)
 
-プリミティブな使い方
-
   require 'rubygems'
   require 'raws'
   
@@ -61,8 +59,6 @@ RAWS is a Ruby library for Amazon Web Service (AWS).
   
   RAWS::SDB.delete_domain('test_domain')
 
-クラスとして使う場合
-
   require 'rubygems'
   require 'raws'
   
@@ -72,8 +68,6 @@ RAWS is a Ruby library for Amazon Web Service (AWS).
   class Foo
     include RAWS::SDB::Model
     self.domain_name = 'test_domain'
-
-    sdb_accessor 'a', 'b'
   end
   
   Foo.create_domain
@@ -88,27 +82,14 @@ RAWS is a Ruby library for Amazon Web Service (AWS).
   foo2['c'] = '2000'
   foo2.save
   
-  foo3 = Foo.new
-  foo3.a = ['30a', '30b']
-  foo3.b = '300'
-  foo3['c'] = '3000'
-  foo3.save
-  
   Foo.all.each do |a|
-    p [a.a, a['b'], a['c']]
-  end
-  
-  Foo.all.filter('a = ?', '10').each do |a|
-    p [a.a, a.b, a['c']]
-    a.delete
+    p [a['a'], a['b'], a['c']]
   end
-  
+    
   Foo.delete_domain
 
 === S3 (Amazon Simple Storage Service)
 
-プリミティブな使い方
-
   require 'rubygems'
   require 'raws'
   
@@ -118,11 +99,12 @@ RAWS is a Ruby library for Amazon Web Service (AWS).
   RAWS::S3.create_bucket('test-bucket')
   
   RAWS::S3['test-bucket'].put('helloworld') do |request|
+    request.header['x-amz-acl'] = 'public-read'
     request.header['content-type'] = 'text/plain'
-    request.header['content-length'] = ("Hello World\n".size * 1000).to_i
+    request.header['content-length'] = "Hello World\n".size * 1000
     request.send do |io|
       1000.times do
-        io.write "Hellow World\n"
+        io.write "Hello World\n"
       end
     end
   end
@@ -136,11 +118,29 @@ RAWS is a Ruby library for Amazon Web Service (AWS).
       end
     end
   end
+
+  acl = RAWS::S3['test-bucket'].acl
+  p [acl.owner.id, acl.owner.name]
+  acl.grants.each do |grant|
+    p [grant.permission, grant.class.name]
+  end
+
+  acl = RAWS::S3['test-bucket'].acl('helloworld')
+  p [acl.owner.id, acl.owner.name]
+  acl.grants.each do |grant|
+    p [grant.permission, grant.class.name]
+  end
+
+  acl.grants.delete_if do |grant|
+    grant.is_a? RAWS::S3::ACL::AllUsers
+  end
+  acl.save
+
+  acl.grants << RAWS::S3::ACL::AllUsers.new('READ')
+  acl.save
   
   RAWS::S3.delete_bucket('test-bucket')
 
-クラスとして使う場合
-
   require 'rubygems'
   require 'raws'
   
@@ -157,11 +157,12 @@ RAWS is a Ruby library for Amazon Web Service (AWS).
   foo = Foo.new('helloworld')
   foo.metadata['ja'] = 'こんにちは'
   foo.send(
+    'x-amz-acl' => 'public-read',
     'content-type' => 'text/plain',
-    'content-length' => ("Hello World\n".size * 1000).to_i
+    'content-length' => "Hello World\n".size * 1000
   ) do |io|
     1000.times do
-      io.write "Hellow World\n"
+      io.write "Hello World\n"
     end
   end
   
@@ -173,6 +174,26 @@ RAWS is a Ruby library for Amazon Web Service (AWS).
       print chunk
     end
   end
+
+  acl = Foo.acl
+  p [acl.owner.id, acl.owner.name]
+  acl.grants.each do |grant|
+    p [grant.permission, grant.class.name]
+  end
+
+  acl = foo.acl
+  p [acl.owner.id, acl.owner.name]
+  acl.grants.each do |grant|
+    p [grant.permission, grant.class.name]
+  end
+
+  acl.grants.delete_if do |grant|
+    grant.is_a? RAWS::S3::ACL::AllUsers
+  end
+  acl.save
+
+  acl.grants << RAWS::S3::ACL::AllUsers.new('READ')
+  acl.save
   
   Foo.delete_bucket
 
@@ -189,4 +210,4 @@ RAWS is a Ruby library for Amazon Web Service (AWS).
 
 == Copyright
 
-Copyright (c) 2009 Jun Kikuchi. See LICENSE for details.
+Copyright (c) 2009, 2010 Jun Kikuchi. See LICENSE for details.

data/Rakefile

@@ -10,11 +10,11 @@ begin
     gem.email = "kikuchi@bonnou.com"
     gem.homepage = "http://github.com/JunKikuchi/raws"
     gem.authors = ["Jun Kikuchi"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_dependency 'typhoeus',  '>=0.1.9'
-    gem.add_dependency 'ht2p',      '>=0.0.5'
-    gem.add_dependency 'nokogiri',  '>=1.3.3'
-    gem.add_dependency 'uuidtools', '>=2.0.0'
+    gem.add_development_dependency "rspec"
+    gem.add_dependency 'typhoeus',  '>=0.1.14'
+    gem.add_dependency 'ht2p',      '>=0.0.7'
+    gem.add_dependency 'nokogiri',  '>=1.4.1'
+    gem.add_dependency 'uuidtools', '>=2.1.1'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/lib/raws/http.rb

@@ -12,6 +12,7 @@ module RAWS
       attr_reader :response
 
       def initialize(response)
+        super("code=#{response.code},body=#{response.body}")
         @response = response
       end
     end

data/lib/raws/s3.rb

@@ -2,6 +2,8 @@ class RAWS::S3
   autoload :Metadata, 'raws/s3/metadata'
   autoload :Adapter, 'raws/s3/adapter'
   autoload :Model, 'raws/s3/model'
+  autoload :Owner, 'raws/s3/owner'
+  autoload :ACL, 'raws/s3/acl'
 
   class << self
     include Enumerable
@@ -12,80 +14,97 @@ class RAWS::S3
       @http ||= RAWS.http
     end
 
+    # Creates a new bucket and returns the instance of RAWS::S3.
     def create_bucket(bucket_name, location=nil, header={})
-      Adapter.put_bucket(bucket_name, location, header)
+      Adapter.put_bucket bucket_name, location, header
+      self[bucket_name]
     end
 
+    # Delete the bucket.
     def delete_bucket(bucket_name, force=nil)
-      filter(bucket_name).each do |val|
-        delete(bucket_name, val['Key'])
-      end if force == :force
+      begin
+        objects = filter(bucket_name)
+        objects.each do |val|
+          delete(bucket_name, val['Key'])
+        end
+      end until objects.empty? if force == :force
 
       Adapter.delete_bucket(bucket_name)
     end
 
+    # Returns the instance of RAWS::S3::Owner.
     def owner
-      Adapter.get_service.doc['ListAllMyBucketsResult']['Owner']
+      Owner.new Adapter.get_service.doc['ListAllMyBucketsResult']['Owner']
     end
 
-    def list
-      Adapter.get_service.doc['ListAllMyBucketsResult']
+    # Returns an array of RAWS::S3 objects.
+    def list_buckets
+      doc = Adapter.get_service.doc['ListAllMyBucketsResult']['Buckets']
+      if doc
+        doc['Bucket'].map do |val|
+          self[val['Name']]
+        end
+      else
+        []
+      end
     end
 
-    def buckets
-      begin
-        response = list
-        @owner ||= response['Owner']
-        response['Buckets']['Bucket'] || []
-      end.map do |val|
-        self[val['Name']]
+    def buckets(&block)
+      if block_given?
+        each(&block)
+      else
+        map
       end
     end
 
     def each(&block)
-      buckets.each(&block)
+      list_buckets.each(&block)
     end
 
+    # Returns the instance of RAWS::S3.
     def [](bucket_name)
-      @cache ||= {}
-      @cache[bucket_name] ||= self.new(bucket_name)
+      self.new bucket_name
     end
 
     def location(bucket_name)
-      response = Adapter.get_bucket_location(bucket_name)
-      location = response.doc['LocationConstraint']
-      location.empty? ? 'US' : location
+      doc = Adapter.get_bucket_location(bucket_name).doc['LocationConstraint']
+      doc || 'US'
     end
 
-    def filter(bucket_name, params={})
-      begin
-        response = Adapter.get_bucket(bucket_name, params)
-        response.doc['ListBucketResult']['Contents'] || []
-      end.map do |val|
-        val
-      end
+    def acl(bucket_name, key=nil)
+      ACL.new bucket_name, key
+    end
+
+    def filter(bucket_name, query={})
+      vals = Adapter.get_bucket(bucket_name, query).doc['ListBucketResult']
+      vals['Contents'] || []
     end
     alias :all :filter
 
-    def put(bucket_name, name, header={}, &block)
-      Adapter.put_object(bucket_name, name, header, &block)
+    def put_object(bucket_name, key, header={}, &block)
+      Adapter.put_object bucket_name, key, header, &block
     end
+    alias :put :put_object
 
-    def copy(src_bucket, src_name, dest_bucket, dest_name, header={})
-      Adapter.copy_object(src_bucket, src_name, dest_bucket, dest_name, header)
+    def copy_object(src_bucket, src_key, dest_bucket, dest_key, header={})
+      Adapter.copy_object src_bucket, src_key, dest_bucket, dest_key, header
     end
+    alias :copy :copy_object
 
-    def get(bucket_name, name, header={}, &block)
-      Adapter.get_object(bucket_name, name, header, &block)
+    def get_object(bucket_name, key, header={}, &block)
+      Adapter.get_object bucket_name, key, header, &block
     end
+    alias :get :get_object
 
-    def head(bucket_name, name)
-      Adapter.head_object(bucket_name, name)
+    def head_object(bucket_name, key)
+      Adapter.head_object bucket_name, key
     end
+    alias :head :head_object
 
-    def delete(bucket_name, name)
-      Adapter.delete_object(bucket_name, name)
+    def delete_object(bucket_name, key)
+      Adapter.delete_object bucket_name, key
     end
+    alias :delete :delete_object
   end
 
   attr_reader :bucket_name
@@ -96,41 +115,54 @@ class RAWS::S3
   end
 
   def create_bucket(location=nil)
-    self.class.create_bucket(@bucket_name, location)
+    self.class.create_bucket @bucket_name, location
   end
 
   def delete_bucket(force=nil)
-    self.class.delete_bucket(@bucket_name, force)
+    self.class.delete_bucket @bucket_name, force
+  end
+
+  def owner
+    self.class.owner
   end
 
   def location
-    self.class.location(@bucket_name)
+    self.class.location @bucket_name
+  end
+
+  def acl(key=nil)
+    self.class.acl @bucket_name, key
   end
 
-  def filter(params={})
-    self.class.filter(@bucket_name, params)
+  def filter(query={})
+    self.class.filter @bucket_name, query
   end
   alias :all :filter
 
-  def put(name, header={}, &block)
-    self.class.put(@bucket_name, name, header, &block)
+  def put_object(key, header={}, &block)
+    self.class.put_object @bucket_name, key, header, &block
   end
+  alias :put :put_object
 
-  def copy(name, dest_bucket, dest_name)
-    self.class.copy(@bucket_name, name, dest_bucket, dest_name)
+  def copy_object(key, dest_bucket, dest_key)
+    self.class.copy_object @bucket_name, key, dest_bucket, dest_key
   end
+  alias :copy :copy_object
 
-  def get(name, header={}, &block)
-    self.class.get(@bucket_name, name, header, &block)
+  def get_object(key, header={}, &block)
+    self.class.get_object @bucket_name, key, header, &block
   end
+  alias :get :get_object
 
-  def head(name)
-    self.class.head(@bucket_name, name)
+  def head_object(key)
+    self.class.head_object @bucket_name, key
   end
+  alias :head :head_object
 
-  def delete(name)
-    self.class.delete(@bucket_name, name)
+  def delete_object(key)
+    self.class.delete_object @bucket_name, key
   end
+  alias :delete :delete_object
 
   def <=>(a)
     bucket_name <=> a.bucket_name

data/lib/raws/s3/acl.rb

@@ -0,0 +1,144 @@
+class RAWS::S3::ACL
+  class Owner
+    attr_accessor :id, :name
+
+    alias :display_name :name
+
+    def initialize(owner)
+      @id, @name = owner['ID'], owner['DisplayName']
+    end
+
+    def to_xml
+      '<Owner>' <<
+        "<ID>#{@id}</ID>" <<
+        "<DisplayName>#{@name}</DisplayName>" <<
+      '</Owner>'
+    end
+  end
+
+  class Grant
+    attr_accessor :permission
+
+    def initialize(permission)
+      @permission = permission
+    end
+
+    def to_xml
+      "<Permission>#{@permission}</Permission>"
+    end
+  end
+
+  class ID < Grant
+    attr_accessor :id, :name
+
+    def initialize(id, permission, name=nil)
+      super(permission)
+      @id, @name = id, name
+    end
+
+    def to_xml
+      '<Grant>' <<
+        '<Grantee' <<
+        ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' <<
+        ' xsi:type="CanonicalUser">' <<
+          "<ID>#{@id}</ID>" <<
+          (@name ? "<DisplayName>#{@name}</DisplayName>" : '') <<
+        '</Grantee>' <<
+        super <<
+      '</Grant>'
+    end
+  end
+
+  class Email < Grant
+    attr_accessor :email
+
+    def initialize(email, permission)
+      super(permission)
+      @email = email
+    end
+
+    def to_xml
+      '<Grant>' <<
+        '<Grantee' <<
+        ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' <<
+        ' xsi:type="AmazonCustomerByEmail">' <<
+          "<EmailAddress>#{@email}</EmailAddress>" <<
+        '</Grantee>' <<
+        super <<
+      '</Grant>'
+    end
+  end
+
+  class Group < Grant
+    def to_xml
+      '<Grant>' <<
+        '<Grantee' <<
+        ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"' <<
+        ' xsi:type="Group">' <<
+          "<URI>http://acs.amazonaws.com/groups/global/#{
+            self.class.name.split('::').last
+          }</URI>" <<
+        '</Grantee>' <<
+        super <<
+      '</Grant>'
+    end
+  end
+
+  class AuthenticatedUsers < Group; end
+
+  class AllUsers < Group; end
+
+  class Grants < Array
+    def initialize(grants)
+      super()
+      grants.each do |grant|
+        grantee, permission = grant['Grantee'], grant['Permission']
+        if id = grantee['ID']
+          push ID.new(id, permission, grantee['DisplayName'])
+        elsif email = grantee['EmailAddress']
+          push Email.new(email, permission)
+        else
+          case grantee['URI']
+          when 'http://acs.amazonaws.com/groups/global/AuthenticatedUsers'
+            push AuthenticatedUsers.new(permission)
+          when 'http://acs.amazonaws.com/groups/global/AllUsers'
+            push AllUsers.new(permission)
+          end
+        end
+      end
+    end
+
+    def to_xml
+      '<AccessControlList>' <<
+        map do |grant|
+          grant.to_xml
+        end.join <<
+      '</AccessControlList>'
+    end
+  end
+
+  attr_reader :bucket_name, :key, :owner, :grants
+
+  def initialize(bucket_name, key=nil)
+    @bucket_name, @key = bucket_name, key
+    reload
+  end
+
+  def save
+    RAWS::S3::Adapter.put_acl(@bucket_name, @key, to_xml)
+  end
+
+  def reload
+    doc = RAWS::S3::Adapter.get_acl(@bucket_name, @key).doc
+    acp = doc['AccessControlPolicy']
+    @owner  = Owner.new(acp['Owner'])
+    @grants = Grants.new(acp['AccessControlList']['Grant'])
+  end
+
+  def to_xml
+    '<AccessControlPolicy>' <<
+      owner.to_xml  <<
+      grants.to_xml <<
+    '</AccessControlPolicy>'
+  end
+end