raws 0.0.10 → 0.0.11

data/lib/raws/sqs/adapter.rb

@@ -44,6 +44,21 @@ class RAWS::SQS::Adapter
       params
     end
 
+    def pack_permission(params)
+      ret = {}
+
+      i = 1
+      params.each do |id, permissions|
+        permissions.each do |permission|
+          ret["AWSAccountId.#{i}"] = id
+          ret["ActionName.#{i}"]   = permission
+          i += 1
+        end
+      end
+
+      ret
+    end
+
     def sign(method, base_uri, params)
       path = {
         'AWSAccessKeyId'   => RAWS.aws_access_key_id,
@@ -81,12 +96,15 @@ class RAWS::SQS::Adapter
       doc
     end
 
-    def create_queue(queue_name, timeout=nil)
+    def create_queue(queue_name, default_visibility_timeout=nil)
       params = {
         'Action'    => 'CreateQueue',
         'QueueName' => queue_name
       }
-      params['DefaultVisibilityTimeout'] = timeout if timeout
+
+      if default_visibility_timeout
+        params['DefaultVisibilityTimeout'] = default_visibility_timeout
+      end
 
       connect('GET', URI, PARAMS.merge(params))
     end
@@ -121,7 +139,7 @@ class RAWS::SQS::Adapter
       )
     end
 
-    def set_queue_attributes(queue_url, attrs={})
+    def set_queue_attributes(queue_url, attrs)
       params = {'Action' => 'SetQueueAttributes'}
       params.merge!(pack_nv_attrs(attrs))
 
@@ -137,11 +155,9 @@ class RAWS::SQS::Adapter
       connect('GET', queue_url, PARAMS.merge(params))
     end
 
-    def receive_message(queue_url, limit=nil, timeout=nil, *attrs)
-      params = {'Action' => 'ReceiveMessage'}
-      params['MaxNumberOfMessages'] = limit   if limit
-      params['VisibilityTimeout']   = timeout if timeout
-      params.merge!(pack_attrs(attrs))
+    def receive_message(queue_url, params={}, *attrs)
+      params.merge! 'Action' => 'ReceiveMessage'
+      params.merge! pack_attrs(attrs)
 
       connect(
         'GET',
@@ -152,11 +168,11 @@ class RAWS::SQS::Adapter
       )
     end
 
-    def change_message_visibility(queue_url, receipt_handle, timeout)
+    def change_message_visibility(queue_url, receipt_handle, visibility_timeout)
       params = {
         'Action'            => 'ChangeMessageVisibility',
         'ReceiptHandle'     => receipt_handle,
-        'VisibilityTimeout' => timeout
+        'VisibilityTimeout' => visibility_timeout
       }
 
       connect('GET', queue_url, PARAMS.merge(params))
@@ -171,27 +187,12 @@ class RAWS::SQS::Adapter
       connect('GET', queue_url, PARAMS.merge(params))
     end
 
-    def pack_permission(params)
-      ret = {}
-
-      i = 1
-      params.each do |id, permissions|
-        permissions.each do |permission|
-          ret["AWSAccountId.#{i}"] = id
-          ret["ActionName.#{i}"]   = permission
-          i += 1
-        end
-      end
-
-      ret
-    end
-
-    def add_permission(queue_url, label, permission)
+    def add_permission(queue_url, label, permissions)
       params = {
         'Action' => 'AddPermission',
         'Label'  => label
       }
-      params.merge!(pack_permission(permission))
+      params.merge!(pack_permission(permissions))
 
       connect('GET', queue_url, PARAMS.merge(params))
     end

data/lib/raws/sqs/message.rb

@@ -0,0 +1,39 @@
+class RAWS::SQS::Message
+  attr_reader :queue
+  attr_reader :data
+
+  def initialize(queue, data)
+    @queue, @data = queue, data
+  end
+
+  def message_id
+    data['MessageId']
+  end
+  alias :id :message_id
+
+  def receipt_handle
+    data['ReceiptHandle']
+  end
+
+  def md5_of_body
+    data['MD5OfBody']
+  end
+
+  def attributes
+    data['Attribute']
+  end
+  alias :attrs :attributes
+
+  def body
+    data['Body']
+  end
+
+  def change_visibility(visibility_timeout)
+    queue.change_message_visibility receipt_handle, visibility_timeout
+  end
+  alias :visibility= :change_visibility
+
+  def delete
+    queue.delete_message receipt_handle
+  end
+end

data/lib/raws/sqs/model.rb

@@ -0,0 +1,33 @@
+require 'forwardable'
+
+module RAWS::SQS::Model
+  module ClassMethods
+    extend Forwardable
+    def_delegators :queue,
+      :delete_queue,
+      :get_queue_attributes,
+      :set_queue_attributes,
+      :send_message,
+      :send,
+      :receive_message,
+      :receive,
+      :add_permission,
+      :remove_permission
+
+    attr_accessor :queue_name
+
+    def queue
+      RAWS::SQS[self.queue_name]
+    end
+
+    def create_queue
+      RAWS::SQS.create_queue(self.queue_name)
+    end
+  end
+
+  def self.included(mod)
+    mod.class_eval do
+      extend ClassMethods
+    end
+  end
+end

data/lib/raws/xml.rb

@@ -1,5 +1,3 @@
-require 'nokogiri'
-
 module RAWS
   module XML
     def self.unpack_attrs(attrs)

data/lib/raws/xml/nokogiri.rb

@@ -19,7 +19,10 @@ module RAWS
             end
           end
 
-          if tag.child.is_a? ::Nokogiri::XML::Text
+          case tag.child
+          when nil
+            ret[name] = nil
+          when ::Nokogiri::XML::Text
             if ret.key? name
               ret[name] << tag.content
             else

data/raws.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{raws}
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   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.date = %q{2010-01-25}
   s.description = %q{raws}
   s.email = %q{kikuchi@bonnou.com}
   s.extra_rdoc_files = [
@@ -28,25 +28,29 @@ Gem::Specification.new do |s|
      "lib/raws/http/ht2p.rb",
      "lib/raws/http/typhoeus.rb",
      "lib/raws/s3.rb",
+     "lib/raws/s3/acl.rb",
      "lib/raws/s3/adapter.rb",
      "lib/raws/s3/metadata.rb",
      "lib/raws/s3/model.rb",
+     "lib/raws/s3/owner.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/sqs/message.rb",
+     "lib/raws/sqs/model.rb",
      "lib/raws/xml.rb",
      "lib/raws/xml/nokogiri.rb",
      "raws.gemspec",
+     "spec/raws/s3/acl_spec.rb",
      "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"
   ]
@@ -56,7 +60,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{raws}
   s.test_files = [
-    "spec/raws/s3/model_spec.rb",
+    "spec/raws/s3/acl_spec.rb",
+     "spec/raws/s3/model_spec.rb",
      "spec/raws/s3_spec.rb",
      "spec/raws/sdb/model_spec.rb",
      "spec/raws/sdb_spec.rb",
@@ -70,24 +75,24 @@ Gem::Specification.new do |s|
     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"])
+      s.add_development_dependency(%q<rspec>, [">= 0"])
+      s.add_runtime_dependency(%q<typhoeus>, [">= 0.1.14"])
+      s.add_runtime_dependency(%q<ht2p>, [">= 0.0.7"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.1"])
+      s.add_runtime_dependency(%q<uuidtools>, [">= 2.1.1"])
     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"])
+      s.add_dependency(%q<rspec>, [">= 0"])
+      s.add_dependency(%q<typhoeus>, [">= 0.1.14"])
+      s.add_dependency(%q<ht2p>, [">= 0.0.7"])
+      s.add_dependency(%q<nokogiri>, [">= 1.4.1"])
+      s.add_dependency(%q<uuidtools>, [">= 2.1.1"])
     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"])
+    s.add_dependency(%q<rspec>, [">= 0"])
+    s.add_dependency(%q<typhoeus>, [">= 0.1.14"])
+    s.add_dependency(%q<ht2p>, [">= 0.0.7"])
+    s.add_dependency(%q<nokogiri>, [">= 1.4.1"])
+    s.add_dependency(%q<uuidtools>, [">= 2.1.1"])
   end
 end
 

data/spec/raws/s3/acl_spec.rb

@@ -0,0 +1,30 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe RAWS::S3::ACL::Grants do
+  before :all do
+    acp = '<AccessControlPolicy><Owner><ID>a9a7b886d6fd24a52fe8ca5bef65f89a64e0193f23000e241bf9b1c61be666e9</ID><DisplayName>chriscustomer</DisplayName></Owner><AccessControlList><Grant><Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="CanonicalUser"><ID>a9a7b886d6fd24a52fe8ca5bef65f89a64e0193f23000e241bf9b1c61be666e9</ID><DisplayName>chriscustomer</DisplayName></Grantee><Permission>FULL_CONTROL</Permission></Grant><Grant><Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="CanonicalUser"><ID>79a59df900b949e55d96a1e698fbacedfd6e09d98eacf8f8d5218e7cd47ef2be</ID><DisplayName>Frank</DisplayName></Grantee><Permission>WRITE</Permission></Grant><Grant><Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="CanonicalUser"><ID>79a59df900b949e55d96a1e698fbacedfd6e09d98eacf8f8d5218e7cd47ef2be</ID><DisplayName>Frank</DisplayName></Grantee><Permission>READ_ACP</Permission></Grant><Grant><Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="CanonicalUser"><ID>e019164ebb0724ff67188e243eae9ccbebdde523717cc312255d9a82498e394a</ID><DisplayName>Jose</DisplayName></Grantee><Permission>WRITE</Permission></Grant><Grant><Grantee xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="CanonicalUser"><ID>e019164ebb0724ff67188e243eae9ccbebdde523717cc312255d9a82498e394a</ID><DisplayName>Jose</DisplayName></Grantee><Permission>READ_ACP</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></Grantee><Permission>READ</Permission></Grant></AccessControlList></AccessControlPolicy>'
+
+    @grants = RAWS::S3::ACL::Grants.new(
+      RAWS.xml.parse(
+        acp,
+        :multiple => ['Grant']
+      )['AccessControlPolicy']['AccessControlList']['Grant']
+    )
+  end
+
+  it 'grants should return array of grant' do
+    @grants.should be_instance_of RAWS::S3::ACL::Grants
+
+    @grants[0].should be_instance_of RAWS::S3::ACL::ID
+    @grants[0].id.should == 'a9a7b886d6fd24a52fe8ca5bef65f89a64e0193f23000e241bf9b1c61be666e9'
+    @grants[0].name.should == 'chriscustomer'
+    @grants[0].permission.should == 'FULL_CONTROL'
+
+    @grants.last.should be_instance_of RAWS::S3::ACL::AllUsers
+    @grants.last.permission.should == 'READ'
+  end
+
+  it 'to_xml should return access controll policy' do
+    @grants.to_xml.should == "<AccessControlList><Grant><Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"CanonicalUser\"><ID>a9a7b886d6fd24a52fe8ca5bef65f89a64e0193f23000e241bf9b1c61be666e9</ID><DisplayName>chriscustomer</DisplayName></Grantee><Permission>FULL_CONTROL</Permission></Grant><Grant><Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"CanonicalUser\"><ID>79a59df900b949e55d96a1e698fbacedfd6e09d98eacf8f8d5218e7cd47ef2be</ID><DisplayName>Frank</DisplayName></Grantee><Permission>WRITE</Permission></Grant><Grant><Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"CanonicalUser\"><ID>79a59df900b949e55d96a1e698fbacedfd6e09d98eacf8f8d5218e7cd47ef2be</ID><DisplayName>Frank</DisplayName></Grantee><Permission>READ_ACP</Permission></Grant><Grant><Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"CanonicalUser\"><ID>e019164ebb0724ff67188e243eae9ccbebdde523717cc312255d9a82498e394a</ID><DisplayName>Jose</DisplayName></Grantee><Permission>WRITE</Permission></Grant><Grant><Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"CanonicalUser\"><ID>e019164ebb0724ff67188e243eae9ccbebdde523717cc312255d9a82498e394a</ID><DisplayName>Jose</DisplayName></Grantee><Permission>READ_ACP</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></Grantee><Permission>READ</Permission></Grant></AccessControlList>"
+  end
+end

data/spec/raws/s3/model_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_config'
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 class S3Object
   include RAWS::S3::Model
@@ -22,7 +22,7 @@ describe RAWS::S3::Model do
 
   describe 'object' do
     before do
-      @model = S3Object.all.first
+      @model = S3Object.new('a')
     end
 
     it 'methods' do
@@ -37,4 +37,3 @@ describe RAWS::S3::Model do
     end
   end
 end
-

data/spec/raws/s3_spec.rb

@@ -8,24 +8,25 @@ 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)
-
+=begin
+        response = RAWS::S3.create_bucket(bucket_name, location)
+        response.should be_kind_of(RAWS::HTTP::Response)
+=end
         begin
-          RAWS::S3.put(bucket_name, 'aaa') do |request|
+          RAWS::S3.put_object(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'
+          RAWS::S3.put_object(bucket_name, 'bbb') do |request|
+            request.header['content-length'] = 3
+            request.send do |io|
+             io.write 'BBB'
+            end
           end
-        end
 
-        RAWS::S3.put(bucket_name, 'ccc') do |request|
-          request.send 'CCC'
-        end
+          RAWS::S3.put_object(bucket_name, 'ccc') do |request|
+            request.send 'CCC'
+          end
         rescue => e
           d e
         end
@@ -39,17 +40,16 @@ RAWS_S3_BUCKETS.each do |bucket_name, location, acl|
       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)
-        RAWS::S3.owner['ID'].should be_instance_of(String)
+        RAWS::S3.owner.should be_instance_of(RAWS::S3::Owner)
+        RAWS::S3.owner.display_name.should be_instance_of(String)
+        RAWS::S3.owner.id.should be_instance_of(String)
       end
 
       it "buckets should return an array of RAWS::S3" do
-       RAWS::S3.buckets.should be_instance_of(Array)
-       RAWS::S3.buckets.each do |bucket|
+       RAWS::S3.list_buckets.should be_instance_of(Array)
+       RAWS::S3.list_buckets.each do |bucket|
          bucket.should be_instance_of(RAWS::S3)
        end
-       RAWS::S3.buckets.should include(RAWS::S3[bucket_name])
       end
 
       it "self['#{bucket_name}'] should be instance of RAWS::S3" do
@@ -66,15 +66,14 @@ RAWS_S3_BUCKETS.each do |bucket_name, location, acl|
         end
       end
 
-      it "filter('#{bucket_name}') should return an array of RAWS::HTTP::Response" do
-        RAWS::S3.filter(bucket_name).should be_instance_of(Array)
-        RAWS::S3.filter(bucket_name).each do |object|
+      it "filter('#{bucket_name}')" do
+        RAWS::S3.filter(bucket_name) do |object|
           object.should be_instance_of(Hash)
         end
       end
 
-      it 'put, get and delete method should put, get and delete the object' do
-        RAWS::S3.put(bucket_name, 'a') do |request|
+      it 'put_object, get_object and delete_object method should put, get and delete the object' do
+        RAWS::S3.put_object(bucket_name, 'a') do |request|
           request.should be_kind_of(RAWS::HTTP::Request)
 
           response = request.send('AAA')
@@ -82,7 +81,7 @@ RAWS_S3_BUCKETS.each do |bucket_name, location, acl|
           response.should be_kind_of(RAWS::HTTP::Response)
         end
 
-        RAWS::S3.get(bucket_name, 'a') do |request|
+        RAWS::S3.get_object(bucket_name, 'a') do |request|
           request.should be_kind_of(RAWS::HTTP::Request)
 
           response = request.send
@@ -91,36 +90,36 @@ RAWS_S3_BUCKETS.each do |bucket_name, location, acl|
           response.should be_kind_of(RAWS::HTTP::Response)
         end
 
-        response = RAWS::S3.delete(bucket_name, 'a')
+        response = RAWS::S3.delete_object(bucket_name, 'a')
         response.should be_kind_of(RAWS::HTTP::Response)
 
         lambda do
-          RAWS::S3.get(bucket_name, 'a')
+          RAWS::S3.get_object(bucket_name, 'a')
         end.should raise_error(RAWS::HTTP::Error)
       end
 
-      it "copy method should copy the object" do
-        response = RAWS::S3.copy(bucket_name, 'aaa', bucket_name, 'AAA')
+      it "copy_object method should copy the object" do
+        response = RAWS::S3.copy_object(bucket_name, 'aaa', bucket_name, 'AAA')
         response.should be_kind_of(RAWS::HTTP::Response)
 
         src = nil
-        RAWS::S3.get(bucket_name, 'aaa') do |request|
+        RAWS::S3.get_object(bucket_name, 'aaa') do |request|
           src = request.send.receive
         end
 
         dest = nil
-        RAWS::S3.get(bucket_name, 'AAA') do |request|
+        RAWS::S3.get_object(bucket_name, 'AAA') do |request|
           dest = request.send.receive
         end
 
         dest.should == src
 
-        response = RAWS::S3.delete(bucket_name, 'AAA')
+        response = RAWS::S3.delete_object(bucket_name, 'AAA')
         response.should be_kind_of(RAWS::HTTP::Response)
       end
 
-      it "head method should return header information of the object" do
-        response = RAWS::S3.head(bucket_name, 'aaa')
+      it "head_object method should return header information of the object" do
+        response = RAWS::S3.head_object(bucket_name, 'aaa')
         response.should be_kind_of(RAWS::HTTP::Response)
       end
     end
@@ -151,9 +150,8 @@ RAWS_S3_BUCKETS.each do |bucket_name, location, acl|
         @bucket.location.should == location_label
       end
 
-      it "filter should return an array of RAWS::HTTP::Response" do
-        @bucket.filter.should be_instance_of(Array)
-        @bucket.filter.each do |object|
+      it "filter should" do
+        @bucket.filter do |object|
           object.should be_instance_of(Hash)
         end
       end