raws 0.0.9 → 0.0.10

data/.gitignore

@@ -0,0 +1,22 @@
+## MAC OS
+.DS_Store
+
+## TEXTMATE
+*.tmproj
+tmtags
+
+## EMACS
+*~
+\#*
+.\#*
+
+## VIM
+*.swp
+
+## PROJECT::GENERAL
+coverage
+rdoc
+pkg
+
+## PROJECT::SPECIFIC
+/spec/spec_config.rb

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2009 Jun Kikuchi
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -2,7 +2,9 @@
 
 RAWS is a Ruby library for Amazon Web Service (AWS).
 
-== SQS (Amazon Simple Queue Service)
+== Usage
+
+=== SQS (Amazon Simple Queue Service)
 
   require 'rubygems'
   require 'raws'
@@ -22,9 +24,9 @@ RAWS is a Ruby library for Amazon Web Service (AWS).
     msg.delete
   end
   
-  RAWS::SQS['test_queue'].delete_queue
+  RAWS::SQS.delete_queue('test_queue')
 
-== SDB (Amazon SimpleDB)
+=== SDB (Amazon SimpleDB)
 
 プリミティブな使い方
 
@@ -57,7 +59,7 @@ RAWS is a Ruby library for Amazon Web Service (AWS).
   RAWS::SDB['test_domain'].delete('2')
   RAWS::SDB['test_domain'].delete('3')
   
-  RAWS::SDB['test_domain'].delete_domain
+  RAWS::SDB.delete_domain('test_domain')
 
 クラスとして使う場合
 
@@ -103,14 +105,88 @@ RAWS is a Ruby library for Amazon Web Service (AWS).
   
   Foo.delete_domain
 
-== S3 (Amazon Simple Storage Service)
+=== S3 (Amazon Simple Storage Service)
+
+プリミティブな使い方
 
   require 'rubygems'
   require 'raws'
   
   RAWS.aws_access_key_id = _AWS_ACCESS_KEY_ID_
   RAWS.aws_secret_access_key = _AWS_SECRET_ACCESS_KEY_
+  
+  RAWS::S3.create_bucket('test-bucket')
+  
+  RAWS::S3['test-bucket'].put('helloworld') do |request|
+    request.header['content-type'] = 'text/plain'
+    request.header['content-length'] = ("Hello World\n".size * 1000).to_i
+    request.send do |io|
+      1000.times do
+        io.write "Hellow World\n"
+      end
+    end
+  end
+  
+  RAWS::S3['test-bucket'].get('helloworld') do |request|
+    response = request.send
+    p response.header
+    response.receive do |io|
+      while chunk = io.read
+        print chunk
+      end
+    end
+  end
+  
+  RAWS::S3.delete_bucket('test-bucket')
+
+クラスとして使う場合
 
-  RAWS::S3.create_bucket('test_bucket')
+  require 'rubygems'
+  require 'raws'
   
-  RAWS::S3['test_bucket'].delete_bucket
+  RAWS.aws_access_key_id = _AWS_ACCESS_KEY_ID_
+  RAWS.aws_secret_access_key = _AWS_SECRET_ACCESS_KEY_
+  
+  class Foo
+    include RAWS::S3::Model
+    self.bucket_name = 'test-bucket'
+  end
+  
+  Foo.create_bucket
+  
+  foo = Foo.new('helloworld')
+  foo.metadata['ja'] = 'こんにちは'
+  foo.send(
+    'content-type' => 'text/plain',
+    'content-length' => ("Hello World\n".size * 1000).to_i
+  ) do |io|
+    1000.times do
+      io.write "Hellow World\n"
+    end
+  end
+  
+  foo = Foo.find('helloworld')
+  p foo.header
+  p foo.metadata
+  foo.receive do |io|
+    while chunk = io.read
+      print chunk
+    end
+  end
+  
+  Foo.delete_bucket
+
+== Note on Patches/Pull Requests
+ 
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but
+   bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+== Copyright
+
+Copyright (c) 2009 Jun Kikuchi. See LICENSE for details.

data/Rakefile

@@ -1,35 +1,49 @@
 require 'rubygems'
-require 'spec/rake/spectask'
-
-NAME = 'raws'
+require 'rake'
 
 begin
   require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = NAME
-    s.platform = Gem::Platform::RUBY
-    s.summary = NAME
-    s.description = NAME
-    s.author = "Jun Kikuchi"
-    s.email = "kikuchi@bonnou.com"
-    s.homepage = "http://github.com/JunKikuchi/raws"
-    s.files = %w(
-      COPYING CHANGELOG README.rdoc Rakefile VERSION
-    ) + Dir.glob("{bin,doc,lib}/**/*")
-    s.require_path = "lib"
-    s.has_rdoc = true
-    s.add_dependency('typhoeus', '>=0.1.9')
-    s.add_dependency('ht2p',     '>=0.0.5')
-    s.add_dependency('nokogiri', '>=1.3.3')
-    s.add_dependency('uuidtools', '>=2.0.0')
+  Jeweler::Tasks.new do |gem|
+    gem.name = 'raws'
+    gem.summary = %Q{raws}
+    gem.description = %Q{raws}
+    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 is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
+end
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new do |t|
-  #t.spec_opts = ['-c --format specdoc']
-  t.spec_opts = ['-c']
-  t.spec_files = FileList['spec/**/*_spec.rb']
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :spec => :check_dependencies
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "ht2p #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.0.9
+0.0.10

data/lib/raws/http/typhoeus.rb

@@ -31,7 +31,7 @@ class RAWS::HTTP::Typhoeus
       @before_send && @before_send.call(self)
       response = Response.new(
         ::Typhoeus::Request.__send__(
-          @method.downcase.to_sym,
+          @method.to_s.downcase.to_sym,
           @uri,
           :headers => @header,
           :body => if block_given?

data/lib/raws/s3/adapter.rb

@@ -175,9 +175,7 @@ class RAWS::S3::Adapter
         :path   => '/' << name
       ) do |request|
         request.header.merge!(header)
-        response = request.send(&block)
-        response.receive
-        response
+        block.call(request)
       end
     end
 
@@ -200,9 +198,13 @@ class RAWS::S3::Adapter
         :path   => "/#{name}"
       ) do |request|
         request.header.merge! header
-        response = request.send
-        response.receive(&block)
-        response
+        if block_given?
+          block.call(request)
+        else
+          response = request.send
+          response.receive
+          response
+        end
       end
     end
 

data/lib/raws/s3/metadata.rb

@@ -0,0 +1,39 @@
+class RAWS::S3::Metadata < Hash
+  X_AMZ_META = 'x-amz-meta-'
+
+  def initialize(header={})
+    super()
+    decode(header)
+  end
+
+  def decode(header)
+    clear
+    header.select do |key, val|
+      key.match(/^#{X_AMZ_META}/)
+    end.each do |key, val|
+      self[key.sub(X_AMZ_META, '')] = begin
+        a = val.split(',').map do |val|
+          RAWS.unescape(val)
+        end
+        1 < a.size ? a : a.first
+      end
+    end
+    self
+  end
+
+  def encode
+    self.inject({}) do |ret, (key, val)|
+      key = X_AMZ_META + key
+
+      if val.is_a? Array
+        ret[key] = val.map do |v|
+          RAWS.escape(v.strip)
+        end.join(',')
+      else
+        ret[key] = RAWS.escape(val.strip)
+      end
+
+      ret
+    end
+  end
+end

data/lib/raws/s3/model.rb

@@ -9,9 +9,75 @@ module RAWS::S3::Model
     def delete_bucket(force=nil)
       RAWS::S3.delete_bucket(self.bucket_name, force)
     end
+
+    def filter(query={})
+      RAWS::S3.filter(self.bucket_name, query).map do |val|
+        self.new(val['Key'])
+      end
+    end
+    alias :all :filter
+
+    def find(key, header={})
+      begin
+        self.new(key, RAWS::S3.head(self.bucket_name, key).header)
+      rescue RAWS::HTTP::Error => e
+        if e.response.code == 404
+          nil
+        else
+          raise e
+        end
+      end
+    end
   end
 
   module InstanceMethods
+    attr_reader :key
+
+    def initialize(key, header=nil)
+      @key, @header = key, header
+      @metadata = RAWS::S3::Metadata.new(header || {})
+      after_initialize
+    end
+
+    def header
+      begin
+        @header = RAWS::S3.head(self.class.bucket_name, @key).header
+      rescue RAWS::HTTP::Error => e
+        if e.response.code == 404
+          {}
+        else
+          raise e
+        end
+      end
+    end
+
+    def metadata
+      @header ? @metadata : @metadata.decode(header)
+    end
+
+    def receive(header={}, &block)
+      RAWS::S3.get(
+        self.class.bucket_name,
+        @key,
+        header
+      ) do |request|
+        response = request.send
+        response.receive(&block)
+        @metadata.decode(response.header)
+        response
+      end
+    end
+
+    def send(header={}, &block)
+      RAWS::S3.put(
+        self.class.bucket_name,
+        @key,
+        @metadata.encode.merge!(header)
+      ) do |request|
+        request.send(&block)
+      end
+    end
+
     def after_initialize; end
     def before_delete; end
     def after_delete; end
@@ -29,43 +95,4 @@ module RAWS::S3::Model
       extend ClassMethods
     end
   end
-
-  class Metadata < Hash
-    X_AMZ_META = 'x-amz-meta-'
-
-    def initialize(object)
-      super()
-      @object = object
-      decode(@object.header)
-    end
-
-    def decode(header)
-      header.select do |key, val|
-        key.match(/^#{X_AMZ_META}/)
-      end.each do |key, val|
-        self[key.sub(X_AMZ_META, '')] = begin
-          a = val.split(',').map do |val|
-            RAWS.unescape(val)
-          end
-          1 < a.size ? a : a.first
-        end
-      end
-    end
-
-    def encode
-      self.inject({}) do |ret, (key, val)|
-        key = X_AMZ_META + key
-
-        if val.is_a? Array
-          ret[key] = val.map do |v|
-            RAWS.escape(v.strip)
-          end.join(',')
-        else
-          ret[key] = RAWS.escape(val.strip)
-        end
-
-        ret
-      end
-    end
-  end
 end

data/lib/raws/s3.rb

@@ -1,5 +1,5 @@
 class RAWS::S3
-  autoload :S3Object, 'raws/s3/s3object'
+  autoload :Metadata, 'raws/s3/metadata'
   autoload :Adapter, 'raws/s3/adapter'
   autoload :Model, 'raws/s3/model'
 
@@ -25,12 +25,16 @@ class RAWS::S3
     end
 
     def owner
-      @owner ||= Adapter.get_service.doc['ListAllMyBucketsResult']['Owner']
+      Adapter.get_service.doc['ListAllMyBucketsResult']['Owner']
+    end
+
+    def list
+      Adapter.get_service.doc['ListAllMyBucketsResult']
     end
 
     def buckets
       begin
-        response = Adapter.get_service.doc['ListAllMyBucketsResult']
+        response = list
         @owner ||= response['Owner']
         response['Buckets']['Bucket'] || []
       end.map do |val|
@@ -38,6 +42,10 @@ class RAWS::S3
       end
     end
 
+    def each(&block)
+      buckets.each(&block)
+    end
+
     def [](bucket_name)
       @cache ||= {}
       @cache[bucket_name] ||= self.new(bucket_name)
@@ -59,7 +67,7 @@ class RAWS::S3
     end
     alias :all :filter
 
-    def put(bucket_name, name, header, &block)
+    def put(bucket_name, name, header={}, &block)
       Adapter.put_object(bucket_name, name, header, &block)
     end
 
@@ -67,8 +75,8 @@ class RAWS::S3
       Adapter.copy_object(src_bucket, src_name, dest_bucket, dest_name, header)
     end
 
-    def get(bucket_name, name, params={}, &block)
-      Adapter.get_object(bucket_name, name, params, &block)
+    def get(bucket_name, name, header={}, &block)
+      Adapter.get_object(bucket_name, name, header, &block)
     end
 
     def head(bucket_name, name)
@@ -80,12 +88,11 @@ class RAWS::S3
     end
   end
 
-  attr_reader :bucket_name, :creation_date
+  attr_reader :bucket_name
   alias :name :bucket_name
 
-  def initialize(bucket_name, creation_date=nil)
+  def initialize(bucket_name)
     @bucket_name = bucket_name
-    @creation_date = Time.parse(creation_date) if creation_date
   end
 
   def create_bucket(location=nil)
@@ -105,7 +112,7 @@ class RAWS::S3
   end
   alias :all :filter
 
-  def put(name, header, &block)
+  def put(name, header={}, &block)
     self.class.put(@bucket_name, name, header, &block)
   end
 

data/lib/raws/sdb.rb

@@ -21,27 +21,30 @@ class RAWS::SDB
     end
 
     def metadata(domain_name)
-      Adapter.domain_metadata(
-        domain_name
-      )['DomainMetadataResponse']['DomainMetadataResult']
+      doc = Adapter.domain_metadata(domain_name)
+      doc['DomainMetadataResponse']['DomainMetadataResult']
     end
 
     def list(next_token=nil, max_num=nil)
-      Adapter.list_domains(
-        next_token,
-        max_num
-      )['ListDomainsResponse']['ListDomainsResult']
+      doc = Adapter.list_domains(next_token, max_num)
+      doc['ListDomainsResponse']['ListDomainsResult']
+    end
+
+    def domains(next_token=nil, max_num=nil)
+      data = list(next_token, max_num)
+      {
+        'Domains' => (data['DomainName'] || []).map do |val|
+          self.new(val)
+        end,
+        'NextToken' => data['NextToken']
+      }
     end
 
     def each(&block)
       next_token = nil
       begin
-        data = list(next_token)
-        if domain = data['DomainName']
-          domain.each do |val|
-            block.call(self.new(val))
-          end
-        end
+        data = domains(next_token)
+        data['Domains'].each(&block)
       end while next_token = data['NextToken']
     end
 

data/lib/raws/sqs.rb

@@ -37,17 +37,18 @@ class RAWS::SQS
     end
 
     def list(prefix=nil)
-      (
-        Adapter.list_queues(
-          prefix
-        )['ListQueuesResponse']['ListQueuesResult']['QueueUrl'] || []
-      ).map do |val|
+      doc = Adapter.list_queues(prefix)
+      doc['ListQueuesResponse']['ListQueuesResult']['QueueUrl'] || []
+    end
+
+    def queues(prefix=nil)
+      list.map do |val|
         self.new(val)
       end
     end
 
     def each(&block)
-      list.each(&block)
+      queues.each(&block)
     end
 
     def [](queue_name)

data/raws.gemspec

@@ -0,0 +1,93 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{raws}
+  s.version = "0.0.10"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jun Kikuchi"]
+  s.date = %q{2009-11-23}
+  s.description = %q{raws}
+  s.email = %q{kikuchi@bonnou.com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "CHANGELOG",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "lib/raws.rb",
+     "lib/raws/http.rb",
+     "lib/raws/http/ht2p.rb",
+     "lib/raws/http/typhoeus.rb",
+     "lib/raws/s3.rb",
+     "lib/raws/s3/adapter.rb",
+     "lib/raws/s3/metadata.rb",
+     "lib/raws/s3/model.rb",
+     "lib/raws/sdb.rb",
+     "lib/raws/sdb/adapter.rb",
+     "lib/raws/sdb/model.rb",
+     "lib/raws/sdb/select.rb",
+     "lib/raws/sqs.rb",
+     "lib/raws/sqs/adapter.rb",
+     "lib/raws/xml.rb",
+     "lib/raws/xml/nokogiri.rb",
+     "raws.gemspec",
+     "spec/raws/s3/model_spec.rb",
+     "spec/raws/s3_spec.rb",
+     "spec/raws/sdb/model_spec.rb",
+     "spec/raws/sdb_spec.rb",
+     "spec/raws/sqs_spec.rb",
+     "spec/raws_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_config.rb.example",
+     "spec/spec_helper.rb"
+  ]
+  s.homepage = %q{http://github.com/JunKikuchi/raws}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{raws}
+  s.test_files = [
+    "spec/raws/s3/model_spec.rb",
+     "spec/raws/s3_spec.rb",
+     "spec/raws/sdb/model_spec.rb",
+     "spec/raws/sdb_spec.rb",
+     "spec/raws/sqs_spec.rb",
+     "spec/raws_spec.rb",
+     "spec/spec_helper.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_runtime_dependency(%q<typhoeus>, [">= 0.1.9"])
+      s.add_runtime_dependency(%q<ht2p>, [">= 0.0.5"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 1.3.3"])
+      s.add_runtime_dependency(%q<uuidtools>, [">= 2.0.0"])
+    else
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<typhoeus>, [">= 0.1.9"])
+      s.add_dependency(%q<ht2p>, [">= 0.0.5"])
+      s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
+      s.add_dependency(%q<uuidtools>, [">= 2.0.0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<typhoeus>, [">= 0.1.9"])
+    s.add_dependency(%q<ht2p>, [">= 0.0.5"])
+    s.add_dependency(%q<nokogiri>, [">= 1.3.3"])
+    s.add_dependency(%q<uuidtools>, [">= 2.0.0"])
+  end
+end
+

data/spec/raws/s3/model_spec.rb

@@ -0,0 +1,40 @@
+require 'spec/spec_config'
+
+class S3Object
+  include RAWS::S3::Model
+  self.bucket_name = RAWS_S3_BUCKETS[0][0]
+end
+
+describe RAWS::S3::Model do
+  describe 'class' do
+    it 'methods' do
+      %w'
+        create_bucket
+        delete_bucket
+        filter
+        all
+        find
+      '.each do |val|
+        S3Object.should respond_to val.to_sym
+      end
+    end
+  end
+
+  describe 'object' do
+    before do
+      @model = S3Object.all.first
+    end
+
+    it 'methods' do
+      %w'
+        header
+        metadata
+        send
+        receive
+      '.each do |val|
+        @model.should respond_to val.to_sym
+      end
+    end
+  end
+end
+

data/spec/raws/s3_spec.rb

@@ -8,41 +8,36 @@ RAWS_S3_BUCKETS.each do |bucket_name, location, acl|
   describe RAWS::S3 do
     describe 'class' do
       before(:all) do
-        response = RAWS::S3.create_bucket(bucket_name, location)
-        response.should be_kind_of(RAWS::HTTP::Response)
+        #response = RAWS::S3.create_bucket(bucket_name, location)
+        #response.should be_kind_of(RAWS::HTTP::Response)
 
-        RAWS::S3.put(
-          bucket_name,
-          'aaa',
-          'content-length' => 3
-        ) do |io|
-          io.write 'AAA'
+        begin
+          RAWS::S3.put(bucket_name, 'aaa') do |request|
+            request.send 'AAA'
+          end
+
+        RAWS::S3.put(bucket_name, 'bbb') do |request|
+          request.header['content-length'] = 3
+          request.send do |io|
+           io.write 'BBB'
+          end
         end
 
-        RAWS::S3.put(
-          bucket_name,
-          'bbb',
-          'content-length' => 3
-        ) do |io|
-          io.write 'BBB'
+        RAWS::S3.put(bucket_name, 'ccc') do |request|
+          request.send 'CCC'
         end
-
-        RAWS::S3.put(
-          bucket_name,
-          'ccc',
-          'content-length' => 3
-        ) do |io|
-          io.write 'CCC'
+        rescue => e
+          d e
         end
       end
-
+=begin
       after(:all) do
         response = RAWS::S3.delete_bucket(bucket_name, :force)
         response.should be_kind_of(RAWS::HTTP::Response)
 
         sleep 30
       end
-
+=end
       it "owner should return a owner information of the bucket" do
         RAWS::S3.owner.should be_instance_of(Hash)
         RAWS::S3.owner['DisplayName'].should be_instance_of(String)
@@ -79,15 +74,22 @@ RAWS_S3_BUCKETS.each do |bucket_name, location, acl|
       end
 
       it 'put, get and delete method should put, get and delete the object' do
-        response = RAWS::S3.put(bucket_name, 'a', 'content-length' => 1) do |io|
-          io.write 'A'
+        RAWS::S3.put(bucket_name, 'a') do |request|
+          request.should be_kind_of(RAWS::HTTP::Request)
+
+          response = request.send('AAA')
+
+          response.should be_kind_of(RAWS::HTTP::Response)
         end
-        response.should be_kind_of(RAWS::HTTP::Response)
 
-        response = RAWS::S3.get(bucket_name, 'a') do |io|
-          io.read
+        RAWS::S3.get(bucket_name, 'a') do |request|
+          request.should be_kind_of(RAWS::HTTP::Request)
+
+          response = request.send
+          response.receive.should == 'AAA'
+
+          response.should be_kind_of(RAWS::HTTP::Response)
         end
-        response.should be_kind_of(RAWS::HTTP::Response)
 
         response = RAWS::S3.delete(bucket_name, 'a')
         response.should be_kind_of(RAWS::HTTP::Response)
@@ -102,13 +104,13 @@ RAWS_S3_BUCKETS.each do |bucket_name, location, acl|
         response.should be_kind_of(RAWS::HTTP::Response)
 
         src = nil
-        RAWS::S3.get(bucket_name, 'aaa') do |io|
-          src = io.read
+        RAWS::S3.get(bucket_name, 'aaa') do |request|
+          src = request.send.receive
         end
 
         dest = nil
-        RAWS::S3.get(bucket_name, 'AAA') do |io|
-          dest = io.read
+        RAWS::S3.get(bucket_name, 'AAA') do |request|
+          dest = request.send.receive
         end
 
         dest.should == src
@@ -126,20 +128,25 @@ RAWS_S3_BUCKETS.each do |bucket_name, location, acl|
     describe 'object' do
       before(:all) do
         @bucket = RAWS::S3[bucket_name]
-        @bucket.create_bucket.should be_kind_of(RAWS::HTTP::Response)
-
-        @bucket.put('aaa', 'content-length' => 3) do |io| io.write 'AAA' end
-        @bucket.put('bbb', 'content-length' => 3) do |io| io.write 'BBB' end
-        @bucket.put('ccc', 'content-length' => 3) do |io| io.write 'CCC' end
+        #@bucket.create_bucket.should be_kind_of(RAWS::HTTP::Response)
+
+        @bucket.put('aaa') do |request| request.send 'AAA' end
+        @bucket.put('bbb') do |request|
+          request.header['content-length'] = 3
+          request.send do |io|
+            io.write 'AAA'
+          end
+        end
+        @bucket.put('ccc') do |request| request.send 'CCC' end
       end
-
+=begin
       after(:all) do
         response = @bucket.delete_bucket(:force)
         response.should be_kind_of(RAWS::HTTP::Response)
 
         sleep 30
       end
-
+=end
       it "location should return location of the bucket" do
         @bucket.location.should == location_label
       end
@@ -152,13 +159,22 @@ RAWS_S3_BUCKETS.each do |bucket_name, location, acl|
       end
 
       it 'put, get and delete method should put, get and delete the object' do
-        @bucket.put('a', 'content-length' => 1) do |io|
-          io.write 'A'
-        end.should be_kind_of(RAWS::HTTP::Response)
+        @bucket.put('a') do |request|
+          request.should be_kind_of(RAWS::HTTP::Request)
 
-        @bucket.get('a') do |io|
-          io.read
-        end.should be_kind_of(RAWS::HTTP::Response)
+          response = request.send('AAA')
+
+          response.should be_kind_of(RAWS::HTTP::Response)
+        end
+
+        @bucket.get('a') do |request|
+          request.should be_kind_of(RAWS::HTTP::Request)
+
+          response = request.send
+          response.receive.should == 'AAA'
+
+          response.should be_kind_of(RAWS::HTTP::Response)
+        end
 
         @bucket.delete('a').should be_kind_of(RAWS::HTTP::Response)
 
@@ -172,13 +188,13 @@ RAWS_S3_BUCKETS.each do |bucket_name, location, acl|
         response.should be_kind_of(RAWS::HTTP::Response)
 
         src = nil
-        @bucket.get('aaa') do |io|
-          src = io.read
+        @bucket.get('aaa') do |request|
+          src = request.send.receive
         end
 
         dest = nil
-        @bucket.get('AAA') do |io|
-          dest = io.read
+        @bucket.get('AAA') do |request|
+          dest = request.send.receive
         end
 
         dest.should == src

data/spec/raws/sdb_spec.rb

@@ -2,19 +2,22 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe RAWS::SDB do
   before :all do
-    RAWS::SDB.create_domain(RAWS_SDB_DOMAIN)
+    RAWS_SDB_DOMAINS.each do |name|
+      RAWS::SDB.create_domain(name)
+    end
     puts '[sleep 60 secs]'
     sleep 60
-    RAWS::SDB[RAWS_SDB_DOMAIN].put(
+    @domain_name = RAWS_SDB_DOMAINS.first
+    RAWS::SDB[@domain_name].put(
       '100', 'a' => 10
     )
-    RAWS::SDB[RAWS_SDB_DOMAIN].put(
+    RAWS::SDB[@domain_name].put(
       '200', 'a' => [10, 20],     'b' => 20
     )
-    RAWS::SDB[RAWS_SDB_DOMAIN].put(
+    RAWS::SDB[@domain_name].put(
       '300', 'a' => [10, 20, 30], 'b' => 20, 'c' => 30
     )
-    RAWS::SDB[RAWS_SDB_DOMAIN].batch_put(
+    RAWS::SDB[@domain_name].batch_put(
       "400" => {"a"=>["10", "20", "30", "40"]},
       "500" => {"a"=>["10", "20", "30", "40", "50"]},
       "600" => {"a"=>["10", "20", "30", "40", "50", "60"]}
@@ -22,7 +25,9 @@ describe RAWS::SDB do
   end
 
   after :all do
-    RAWS::SDB.delete_domain(RAWS_SDB_DOMAIN)
+    RAWS_SDB_DOMAINS.each do |name|
+      RAWS::SDB.delete_domain(name)
+    end
     puts '[sleep 60 secs]'
     sleep 60
   end
@@ -34,6 +39,7 @@ describe RAWS::SDB do
         delete_domain
         metadata
         list
+        domains
         each
         []
         select
@@ -54,7 +60,7 @@ describe RAWS::SDB do
     end
 
     it 'metadata' do
-      data = RAWS::SDB.metadata(RAWS_SDB_DOMAIN)
+      data = RAWS::SDB.metadata(@domain_name)
       data.should have_key('Timestamp')
       data.should have_key('ItemCount')
       data.should have_key('AttributeValueCount')
@@ -71,6 +77,18 @@ describe RAWS::SDB do
       data = RAWS::SDB.list(nil, 1)
       data['DomainName'].should be_kind_of(Array)
       data['DomainName'].size.should == 1
+      data['DomainName'].first.should be_kind_of(String)
+      data.should have_key('NextToken')
+    end
+
+    it 'domains' do
+      domains = RAWS::SDB.domains
+      domains.should have_key('Domains')
+
+      data = RAWS::SDB.domains(nil, 1)
+      data['Domains'].should be_kind_of(Array)
+      data['Domains'].size.should == 1
+      data['Domains'].first.should be_kind_of(RAWS::SDB)
       data.should have_key('NextToken')
     end
 
@@ -81,62 +99,62 @@ describe RAWS::SDB do
     end
 
     it '[]' do
-      RAWS::SDB[RAWS_SDB_DOMAIN].should be_kind_of(RAWS::SDB)
+      RAWS::SDB[@domain_name].should be_kind_of(RAWS::SDB)
     end
 
     it 'select' do
-      RAWS::SDB[RAWS_SDB_DOMAIN].select do |val|
+      RAWS::SDB[@domain_name].select do |val|
         val.first.should be_kind_of(String)
         val.last.should be_kind_of(Hash)
       end
 
-      RAWS::SDB[RAWS_SDB_DOMAIN].select.where('b = ?', 20) do |val|
+      RAWS::SDB[@domain_name].select.where('b = ?', 20) do |val|
         val.first.should be_kind_of(String)
         val.last.should be_kind_of(Hash)
       end
     end
 
     it 'all' do
-      RAWS::SDB[RAWS_SDB_DOMAIN].all do |val|
+      RAWS::SDB[@domain_name].all do |val|
         val.first.should be_kind_of(String)
         val.last.should be_kind_of(Hash)
       end
 
-      RAWS::SDB[RAWS_SDB_DOMAIN].all.filter('b = ?', 20) do |val|
+      RAWS::SDB[@domain_name].all.filter('b = ?', 20) do |val|
         val.first.should be_kind_of(String)
         val.last.should be_kind_of(Hash)
       end
     end
 
     it 'get' do
-      RAWS::SDB[RAWS_SDB_DOMAIN].get('000').should be_nil
+      RAWS::SDB[@domain_name].get('000').should be_nil
 
-      data = RAWS::SDB[RAWS_SDB_DOMAIN].get('100')
+      data = RAWS::SDB[@domain_name].get('100')
       data.should == {'a' => '10'}
 
-      data = RAWS::SDB[RAWS_SDB_DOMAIN].get('200')
+      data = RAWS::SDB[@domain_name].get('200')
       data.should == {'a' => ['10', '20'], 'b' => '20'}
 
-      data = RAWS::SDB[RAWS_SDB_DOMAIN].get('300')
+      data = RAWS::SDB[@domain_name].get('300')
       data.should == {'a' => ['10', '20', '30'], 'b' => '20', 'c' => '30'}
     end
 
     it 'put, get & delete' do
-      RAWS::SDB[RAWS_SDB_DOMAIN].put('10', 'a' => [1])
-      RAWS::SDB[RAWS_SDB_DOMAIN].put('10', 'a' => 2)
+      RAWS::SDB[@domain_name].put('10', 'a' => [1])
+      RAWS::SDB[@domain_name].put('10', 'a' => 2)
 
       5.times do
-        data = RAWS::SDB[RAWS_SDB_DOMAIN].get('10')
+        data = RAWS::SDB[@domain_name].get('10')
         if data == {'a' => ['1', '2']}
           data.should == {'a' => ['1', '2']}
           break;
         end
       end
 
-      RAWS::SDB[RAWS_SDB_DOMAIN].delete('10')
+      RAWS::SDB[@domain_name].delete('10')
 
       5.times do
-        data = RAWS::SDB[RAWS_SDB_DOMAIN].get('10')
+        data = RAWS::SDB[@domain_name].get('10')
         unless data
           data.should be_nil
         end
@@ -144,41 +162,41 @@ describe RAWS::SDB do
     end
 
     it 'batch_put & delete' do
-      RAWS::SDB[RAWS_SDB_DOMAIN].batch_put(
+      RAWS::SDB[@domain_name].batch_put(
         "1" => {"a"=>["10"]},
         "2" => {"a"=>["20"]},
         "3" => {"a"=>["30"]}
       )
 
       5.times do
-        data = RAWS::SDB[RAWS_SDB_DOMAIN].get('1')
+        data = RAWS::SDB[@domain_name].get('1')
         if data
           data.should == {'a' => '10'}
-          RAWS::SDB[RAWS_SDB_DOMAIN].delete('1')
+          RAWS::SDB[@domain_name].delete('1')
           break
         end
       end
 
       5.times do
-        data = RAWS::SDB[RAWS_SDB_DOMAIN].get('2')
+        data = RAWS::SDB[@domain_name].get('2')
         if data
           data.should == {'a' => '20'}
-          RAWS::SDB[RAWS_SDB_DOMAIN].delete('2')
+          RAWS::SDB[@domain_name].delete('2')
           break
         end
       end
 
       5.times do
-        data = RAWS::SDB[RAWS_SDB_DOMAIN].get('3')
+        data = RAWS::SDB[@domain_name].get('3')
         if data
           data.should == {'a' => '30'}
-          RAWS::SDB[RAWS_SDB_DOMAIN].delete('3')
+          RAWS::SDB[@domain_name].delete('3')
           break
         end
       end
 
       5.times do
-        data = RAWS::SDB[RAWS_SDB_DOMAIN].get('1')
+        data = RAWS::SDB[@domain_name].get('1')
         unless data
           data.should be_nil
           break
@@ -186,7 +204,7 @@ describe RAWS::SDB do
       end
 
       5.times do
-        data = RAWS::SDB[RAWS_SDB_DOMAIN].get('2')
+        data = RAWS::SDB[@domain_name].get('2')
         unless data
           data.should be_nil
           break
@@ -194,7 +212,7 @@ describe RAWS::SDB do
       end
 
       5.times do
-        data = RAWS::SDB[RAWS_SDB_DOMAIN].get('3')
+        data = RAWS::SDB[@domain_name].get('3')
         unless data
           data.should be_nil
           break
@@ -205,7 +223,8 @@ describe RAWS::SDB do
 
   describe 'object' do
     before do
-      @sdb = RAWS::SDB[RAWS_SDB_DOMAIN]
+      @domain_name = RAWS_SDB_DOMAINS.first
+      @sdb = RAWS::SDB[@domain_name]
     end
 
     it 'method' do

data/spec/raws/sqs_spec.rb

@@ -1,7 +1,6 @@
 require 'spec/spec_config'
 
 describe RAWS::SQS do
-=begin
   before :all do
     begin
       RAWS::SQS.create_queue(RAWS_SQS_QUEUE)
@@ -29,6 +28,7 @@ describe RAWS::SQS do
         create_queue
         delete_queue
         list
+        queues
         each
         []
         get_attrs
@@ -41,7 +41,11 @@ describe RAWS::SQS do
     end
 
     it 'list' do
-      RAWS::SQS.list.each do |queue|
+      RAWS::SQS.list
+    end
+
+    it 'queues' do
+      RAWS::SQS.queues.each do |queue|
         queue.should be_kind_of RAWS::SQS
       end
     end
@@ -56,7 +60,7 @@ describe RAWS::SQS do
       RAWS::SQS[RAWS_SQS_QUEUE].should be_kind_of RAWS::SQS
     end
   end
-=end
+
   describe 'object' do
     before do
       @queue = RAWS::SQS[RAWS_SQS_QUEUE]
@@ -128,7 +132,6 @@ describe RAWS::SQS do
     end
 
     it 'change_message_visibility' do
-=begin
       5.times do |i|
         p i
         @queue.receive.each do |msg|
@@ -136,7 +139,6 @@ describe RAWS::SQS do
         end
         sleep 5
       end
-=end
       @queue.send('change message visibility')
 
       msg_id, time = nil, nil

data/spec/spec.opts

@@ -0,0 +1 @@
+--color

data/spec/spec_config.rb.example

@@ -0,0 +1,14 @@
+require 'rubygems'
+require 'lib/raws'
+
+require 'yaml'
+def d(val)
+  puts val.to_yaml
+end
+
+RAWS.aws_access_key_id = AWS_ACCESS_KEY_ID
+RAWS.aws_secret_access_key = AWS_SECRET_ACCESS_KEY
+
+RAWS_SDB_DOMAIN = AWS_SDB_DOMAIN
+RAWS_SQS_QUEUE  = AWS_SQS_QUEUE
+RAWS_S3_BUCKETS = %w'AWS_S3_BUCKET AWS.S3.BUCKET'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: raws
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors: 
 - Jun Kikuchi
@@ -9,9 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-19 00:00:00 +09:00
+date: 2009-11-23 00:00:00 +09:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
 - !ruby/object:Gem::Dependency 
   name: typhoeus
   type: :runtime
@@ -59,10 +69,12 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- LICENSE
 - README.rdoc
 files: 
+- .gitignore
 - CHANGELOG
-- COPYING
+- LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
@@ -72,8 +84,8 @@ files:
 - lib/raws/http/typhoeus.rb
 - lib/raws/s3.rb
 - lib/raws/s3/adapter.rb
+- lib/raws/s3/metadata.rb
 - lib/raws/s3/model.rb
-- lib/raws/s3/s3object.rb
 - lib/raws/sdb.rb
 - lib/raws/sdb/adapter.rb
 - lib/raws/sdb/model.rb
@@ -82,6 +94,16 @@ files:
 - lib/raws/sqs/adapter.rb
 - lib/raws/xml.rb
 - lib/raws/xml/nokogiri.rb
+- raws.gemspec
+- spec/raws/s3/model_spec.rb
+- spec/raws/s3_spec.rb
+- spec/raws/sdb/model_spec.rb
+- spec/raws/sdb_spec.rb
+- spec/raws/sqs_spec.rb
+- spec/raws_spec.rb
+- spec/spec.opts
+- spec/spec_config.rb.example
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/JunKikuchi/raws
 licenses: []
@@ -111,6 +133,7 @@ signing_key:
 specification_version: 3
 summary: raws
 test_files: 
+- spec/raws/s3/model_spec.rb
 - spec/raws/s3_spec.rb
 - spec/raws/sdb/model_spec.rb
 - spec/raws/sdb_spec.rb

data/COPYING

@@ -1,18 +0,0 @@
-Copyright (c) 2009 Jun Kikuchi
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/raws/s3/s3object.rb

@@ -1,3 +0,0 @@
-class RAWS::S3::S3Object
-  include ::RAWS::S3::Model
-end