raws 0.0.8 → 0.0.9

data/lib/raws.rb

@@ -1,149 +1,48 @@
 require 'uri'
 require 'time'
+require 'logger'
 require 'openssl'
-
 require 'rubygems'
-require 'typhoeus'
-require 'nokogiri'
 
 module RAWS
-  include Typhoeus
-
-  class Error < StandardError
-    attr_reader :response
-    attr_reader :data
-
-    def initialize(response, data)
-      super()
-      @response, @data = response, data
-    end
-  end
-
   class << self
     attr_accessor :aws_access_key_id
     attr_accessor :aws_secret_access_key
+    attr_accessor :http
+    attr_accessor :xml
+  end
 
-    def escape(val)
-      URI.escape(val.to_s, /([^a-zA-Z0-9\-_.~]+)/n)
-    end
-
-    def sign(http_verb, base_uri, params)
-      path = {
-        'AWSAccessKeyId'   => aws_access_key_id,
-        'SignatureMethod'  => 'HmacSHA256',
-        'SignatureVersion' => '2',
-        'Timestamp'        => Time.now.utc.iso8601
-      }.merge(params).map do |key, val|
-        "#{escape(key)}=#{escape(val)}"
-      end.sort.join('&')
-
-      uri = URI.parse(base_uri)
-      "#{path}&Signature=" + escape(
-        [
-          ::OpenSSL::HMAC.digest(
-            ::OpenSSL::Digest::SHA256.new,
-            aws_secret_access_key,
-            "#{http_verb.upcase}\n#{uri.host.downcase}\n#{uri.path}\n#{path}"
-          )
-        ].pack('m').strip
-      )
-    end
-
-    def pack_attrs(attrs, replaces=nil, prefix=nil)
-      params = {}
+  def self.escape(val)
+    URI.escape(val.to_s, /([^a-zA-Z0-9\-_.~]+)/n)
+  end
 
-      i = 1
-      attrs.each do |key, val|
-        if !replaces.nil? && replaces.include?(key)
-          params["#{prefix}Attribute.#{i}.Replace"] = 'true'
-        end
+  def self.unescape(val)
+    URI.unescape(val.to_s)
+  end
 
-        if val.is_a? Array
-          val.each do |v|
-            params["#{prefix}Attribute.#{i}.Name"]  = key
-            params["#{prefix}Attribute.#{i}.Value"] = v
-            i += 1
-          end
-        else
-          params["#{prefix}Attribute.#{i}.Name"]  = key
-          params["#{prefix}Attribute.#{i}.Value"] = val
-          i += 1
-        end
+  def self.logger
+    @logger ||= begin
+      logger = Logger.new(STDERR)
+      logger.progname = self.name
+      logger.level = Logger::INFO
+      def logger.debug(val)
+        require 'yaml'
+        super(val.to_yaml)
       end
-
-      params
+      logger
     end
+  end
 
-    def unpack_attrs(attrs)
-      ret = {}
-
-      if attrs.is_a? Array
-        attrs
-      else
-        [attrs]
-      end.map do |val|
-        name, value = val['Name'], val['Value']
-
-        if ret.key? name
-          ret[name] = [ret[name]] unless ret[name].is_a? Array
-          ret[name] << value
-        else
-          ret[name] = value
-        end
-      end if attrs
-
-      ret
-    end
-
-    def parse(doc, params={}, ret={})
-      multiple = params[:multiple] || []
-      unpack   = params[:unpack]   || []
-
-      name = nil
-      doc.children.each do |tag|
-        name = tag.name #.gsub(/([A-Z])/, '_\1').gsub(/^_/, '').downcase.to_sym
-
-        unless ret[name].is_a? Array
-          if ret.key?(name)
-            ret[name] = [ret[name]]
-          elsif multiple.include? name
-            ret[name] = []
-          end
-        end
+  autoload :HTTP, 'raws/http'
+  autoload :XML,  'raws/xml'
 
-        if tag.child.is_a? Nokogiri::XML::Text
-          if ret.key? name
-            ret[name] << tag.content
-          else
-            ret[name] = tag.content
-          end
-        else
-          if ret.key? name
-            ret[name] << {}
-            parse(tag, params, ret[name].last)
-          else
-            ret[name] = {}
-            parse(tag, params, ret[name])
-          end
-        end
-      end
-      ret[name] = unpack_attrs(ret[name]) if unpack.include?(name)
+  autoload :SDB,  'raws/sdb'
+  autoload :SQS,  'raws/sqs'
+  autoload :S3,   'raws/s3'
+end
 
-      ret
-    end
+RAWS.http = RAWS::HTTP::Typhoeus
+RAWS.xml = RAWS::XML::Nokogiri
 
-    def fetch(http_verb, base_uri, params, options={})
-      r = get("#{base_uri}?#{sign(http_verb, base_uri, params)}")
-      data = parse(Nokogiri::XML.parse(r.body), options)
-      if 200 <= r.code && r.code <= 299
-        data
-      else
-        raise Error.new(r, data)
-      end
-    end
-  end
-
-  autoload :SDB, 'raws/sdb'
-  autoload :SQS, 'raws/sqs'
-  autoload :S3,  'raws/s3'
-end
+# 今のところ S3 で Typhoeus を使うのは無理っぽい
+RAWS::S3.http = RAWS::HTTP::HT2P

data/spec/raws/s3_spec.rb

@@ -1,28 +1,219 @@
-require 'spec/spec_config'
-
-describe RAWS::S3::Adapter do
-  describe 'class' do
-    it 'get_service' do
-      begin
-        p RAWS::S3::Adapter.get_service
-      rescue RAWS::Error => e
-        p e.response.code
-        p e.data
-      rescue => e
-        p e
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+RAWS::S3.http = RAWS::HTTP::HT2P
+
+RAWS_S3_BUCKETS.each do |bucket_name, location, acl|
+  location_label = location ? location : 'US'
+
+  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)
+
+        RAWS::S3.put(
+          bucket_name,
+          'aaa',
+          'content-length' => 3
+        ) do |io|
+          io.write 'AAA'
+        end
+
+        RAWS::S3.put(
+          bucket_name,
+          'bbb',
+          'content-length' => 3
+        ) do |io|
+          io.write 'BBB'
+        end
+
+        RAWS::S3.put(
+          bucket_name,
+          'ccc',
+          'content-length' => 3
+        ) do |io|
+          io.write 'CCC'
+        end
+      end
+
+      after(:all) do
+        response = RAWS::S3.delete_bucket(bucket_name, :force)
+        response.should be_kind_of(RAWS::HTTP::Response)
+
+        sleep 30
+      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)
+      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|
+         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
+        RAWS::S3[bucket_name].should be_instance_of(RAWS::S3)
+        RAWS::S3[bucket_name].bucket_name.should == bucket_name
+        RAWS::S3[bucket_name].name.should == bucket_name
+      end
+
+      it "location('#{bucket_name}') should return location of the bucket" do
+        begin
+          RAWS::S3.location(bucket_name).should == location_label
+        rescue => e
+          d e.response.doc
+        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|
+          object.should be_instance_of(Hash)
+        end
+      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'
+        end
+        response.should be_kind_of(RAWS::HTTP::Response)
+
+        response = RAWS::S3.get(bucket_name, 'a') do |io|
+          io.read
+        end
+        response.should be_kind_of(RAWS::HTTP::Response)
+
+        response = RAWS::S3.delete(bucket_name, 'a')
+        response.should be_kind_of(RAWS::HTTP::Response)
+
+        lambda do
+          RAWS::S3.get(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')
+        response.should be_kind_of(RAWS::HTTP::Response)
+
+        src = nil
+        RAWS::S3.get(bucket_name, 'aaa') do |io|
+          src = io.read
+        end
+
+        dest = nil
+        RAWS::S3.get(bucket_name, 'AAA') do |io|
+          dest = io.read
+        end
+
+        dest.should == src
+
+        response = RAWS::S3.delete(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')
+        response.should be_kind_of(RAWS::HTTP::Response)
       end
     end
 
-    it 'put_bucket' do
-      begin
-#        p RAWS::S3::Adapter.delete_bucket('kikuchitestbucket')
-#p RAWS::S3::Adapter.put_bucket('kikuchitestbucket')
-      rescue RAWS::Error => e
-        p e.response.code
-        p e.data
-      rescue => e
-        p e
+    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
+      end
+
+      after(:all) do
+        response = @bucket.delete_bucket(:force)
+        response.should be_kind_of(RAWS::HTTP::Response)
+
+        sleep 30
+      end
+
+      it "location should return location of the bucket" do
+        @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|
+          object.should be_instance_of(Hash)
+        end
       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.get('a') do |io|
+          io.read
+        end.should be_kind_of(RAWS::HTTP::Response)
+
+        @bucket.delete('a').should be_kind_of(RAWS::HTTP::Response)
+
+        lambda do
+          @bucket.get('a')
+        end.should raise_error(RAWS::HTTP::Error)
+      end
+
+      it "copy method should copy the object" do
+        response = @bucket.copy('aaa', bucket_name, 'AAA')
+        response.should be_kind_of(RAWS::HTTP::Response)
+
+        src = nil
+        @bucket.get('aaa') do |io|
+          src = io.read
+        end
+
+        dest = nil
+        @bucket.get('AAA') do |io|
+          dest = io.read
+        end
+
+        dest.should == src
+
+        @bucket.delete('AAA').should be_kind_of(RAWS::HTTP::Response)
+      end
+
+      it "head method should return header information of the object" do
+        @bucket.head('aaa').should be_kind_of(RAWS::HTTP::Response)
+      end
+    end
+  end
+=begin
+  describe RAWS::S3::S3Object do
+    class S3 < RAWS::S3::S3Object
+      self.bucket_name = bucket_name
+    end
+
+    describe 'class' do
+      before(:all) do
+#        S3.create_bucket
+      end
+
+      after(:all) do
+#        S3.delete_bucket
+#        sleep 60
+      end
+
+      it "location should return location of the bucket"
+      it "filter should return an array of RAWS::S3::Object"
+      it "create method should put the object"
+    end
+
+    describe 'object' do
     end
   end
+=end
 end

data/spec/raws/sdb_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_config'
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe RAWS::SDB do
   before :all do

data/spec/raws/sqs_spec.rb

@@ -1,16 +1,25 @@
 require 'spec/spec_config'
 
 describe RAWS::SQS do
+=begin
   before :all do
-    RAWS::SQS.create_queue(RAWS_SQS_QUEUE)
-    puts '[waiting 60 secs]'
-    sleep 60
+    begin
+      RAWS::SQS.create_queue(RAWS_SQS_QUEUE)
+      puts '[waiting 61 secs]'
+      sleep 61
+    rescue => e
+      d e
+    end
   end
 
   after :all do
-    RAWS::SQS[RAWS_SQS_QUEUE].delete_queue
-    puts '[waiting 60 secs]'
-    sleep 60
+    begin
+      RAWS::SQS[RAWS_SQS_QUEUE].delete_queue
+      puts '[waiting 61 secs]'
+      sleep 61
+    rescue => e
+      d e
+    end
   end
 
   describe 'class' do
@@ -47,7 +56,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]

data/spec/raws_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_config'
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe RAWS do
   describe 'class' do
@@ -7,8 +7,8 @@ describe RAWS do
         aws_access_key_id
         aws_secret_access_key
         escape
-        sign
-        fetch
+        unescape
+        logger
       '.each do |val|
         RAWS.should respond_to val.to_sym
       end
@@ -19,25 +19,17 @@ describe RAWS do
   <?xml version="1.0"?>
   <GetQueueAttributesResponse xmlns="http://queue.amazonaws.com/doc/2009-02-01/"><GetQueueAttributesResult><Attribute><Name>VisibilityTimeout</Name><Value>60</Value></Attribute></GetQueueAttributesResult><ResponseMetadata><RequestId>6f950716-2579-4c55-92e8-ff0cdec28e6d</RequestId></ResponseMetadata></GetQueueAttributesResponse>
       END
-      data = RAWS.parse(
-        Nokogiri::XML.parse(xml)
-      )['GetQueueAttributesResponse']['GetQueueAttributesResult']['Attribute']
+      data = RAWS.xml.parse(xml)['GetQueueAttributesResponse']['GetQueueAttributesResult']['Attribute']
       data.should be_kind_of(Hash)
 
-      data = RAWS.parse(
-        Nokogiri::XML.parse(xml),
-        :multiple => ['Attribute']
-      )['GetQueueAttributesResponse']['GetQueueAttributesResult']['Attribute']
+      data = RAWS.xml.parse(xml, :multiple => ['Attribute'])['GetQueueAttributesResponse']['GetQueueAttributesResult']['Attribute']
       data.should be_kind_of(Array)
 
-      data = RAWS.parse(
-        Nokogiri::XML.parse(xml),
-        :unpack => ['Attribute']
-      )['GetQueueAttributesResponse']['GetQueueAttributesResult']['Attribute']
+      data = RAWS.xml.parse(xml, :unpack => ['Attribute'])['GetQueueAttributesResponse']['GetQueueAttributesResult']['Attribute']
       data.should be_kind_of(Hash)
 
-      data = RAWS.parse(
-        Nokogiri::XML.parse(xml),
+      data = RAWS.xml.parse(
+        xml,
         :multiple => ['Attribute'],
         :unpack => ['Attribute']
       )['GetQueueAttributesResponse']['GetQueueAttributesResult']['Attribute']
@@ -47,25 +39,17 @@ describe RAWS do
   <?xml version="1.0"?>
   <GetQueueAttributesResponse xmlns="http://queue.amazonaws.com/doc/2009-02-01/"><GetQueueAttributesResult><Attribute><Name>VisibilityTimeout</Name><Value>60</Value></Attribute><Attribute><Name>ApproximateNumberOfMessages</Name><Value>7</Value></Attribute><Attribute><Name>CreatedTimestamp</Name><Value>1248498270</Value></Attribute><Attribute><Name>LastModifiedTimestamp</Name><Value>1248501553</Value></Attribute></GetQueueAttributesResult><ResponseMetadata><RequestId>6f950716-2579-4c55-92e8-ff0cdec28e6d</RequestId></ResponseMetadata></GetQueueAttributesResponse>
       END
-      data = RAWS.parse(
-        Nokogiri::XML.parse(xml)
-      )['GetQueueAttributesResponse']['GetQueueAttributesResult']['Attribute']
+      data = RAWS.xml.parse(xml)['GetQueueAttributesResponse']['GetQueueAttributesResult']['Attribute']
       data.should be_kind_of(Array)
 
-      data = RAWS.parse(
-        Nokogiri::XML.parse(xml),
-        :multiple => ['Attribute']
-      )['GetQueueAttributesResponse']['GetQueueAttributesResult']['Attribute']
+      data = RAWS.xml.parse(xml, :multiple => ['Attribute'])['GetQueueAttributesResponse']['GetQueueAttributesResult']['Attribute']
       data.should be_kind_of(Array)
 
-      data = RAWS.parse(
-        Nokogiri::XML.parse(xml),
-        :unpack => ['Attribute']
-      )['GetQueueAttributesResponse']['GetQueueAttributesResult']['Attribute']
+      data = RAWS.xml.parse(xml, :unpack => ['Attribute'])['GetQueueAttributesResponse']['GetQueueAttributesResult']['Attribute']
       data.should be_kind_of(Hash)
 
-      data = RAWS.parse(
-        Nokogiri::XML.parse(xml),
+      data = RAWS.xml.parse(
+        xml,
         :multiple => ['Attribute'],
         :unpack => ['Attribute']
       )['GetQueueAttributesResponse']['GetQueueAttributesResult']['Attribute']

data/spec/spec_helper.rb

@@ -0,0 +1,15 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'raws'
+require 'spec'
+require 'spec/autorun'
+require 'spec/spec_config'
+
+require 'yaml'
+def d(val)
+  puts val.to_yaml
+end
+
+Spec::Runner.configure do |config|
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: raws
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Jun Kikuchi
@@ -9,18 +9,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-11 00:00:00 +09:00
+date: 2009-11-19 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: pauldix-typhoeus
+  name: typhoeus
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.2
+        version: 0.1.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: ht2p
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.5
     version: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -57,14 +67,21 @@ files:
 - 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/model.rb
+- lib/raws/s3/s3object.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
 has_rdoc: true
 homepage: http://github.com/JunKikuchi/raws
 licenses: []
@@ -99,3 +116,4 @@ test_files:
 - spec/raws/sdb_spec.rb
 - spec/raws/sqs_spec.rb
 - spec/raws_spec.rb
+- spec/spec_helper.rb