sdb_dal 0.0.4 → 0.0.5

data/lib/sdb_dal/repository_factory.rb

@@ -21,14 +21,15 @@ module SdbDal
         else
           repo_class=SdbDal::Repository
         end
-        domain_prefix= sdb_dal_config["sdb_domain_prefix"]
+        domain_prefix= sdb_dal_config["sdb_domain_prefix"] || ""
         clob_bucket= sdb_dal_config["s3_clob_bucket"]
         aws_key_id = sdb_dal_config["aws_key_id"]
         aws_secret_key = sdb_dal_config["aws_secret_key"]
         memcache_servers= sdb_dal_config['memcache_servers']
         memcache_servers = memcache_servers.split(",") if memcache_servers
- 
-        @repository= repo_class.new(domain_prefix,clob_bucket,aws_key_id,aws_secret_key,memcache_servers)
+
+        append_table_to_domain=sdb_dal_config['append_table_to_domain']
+        @repository= repo_class.new(domain_prefix,clob_bucket,aws_key_id,aws_secret_key,memcache_servers,nil,append_table_to_domain)
       end
     end
 

data/lib/sdb_dal/s3.rb

@@ -29,7 +29,6 @@ if (RUBY_VERSION < '1.8.3')
   end
 end
 module SdbDal
-
 # this module has two big classes: AWSAuthConnection and
 # QueryStringAuthGenerator.  both use identical apis, but the first actually
 # performs the operation, while the second simply outputs urls with the
@@ -41,7 +40,7 @@ module S3
   METADATA_PREFIX = 'x-amz-meta-'
   AMAZON_HEADER_PREFIX = 'x-amz-'
   AMAZON_TOKEN_HEADER_PREFIX = "x-amz-security-token"
-
+  CANONICAL_STRING_WORTHY_PATH_ARGS=['acl','torrent','logging','requestPayment']
   # builds the canonical string for signing.
   def S3.canonical_string(method, bucket="", path="", path_args={}, headers={}, expires=nil)
     interesting_headers = {}
@@ -78,25 +77,24 @@ module S3
         buf << "#{value}\n"
       end
     end
-    
+
     # build the path using the bucket and key
     if not bucket.empty?
       buf << "/#{bucket}"
     end
-    # append the key (it might be empty string) 
+    # append the key (it might be empty string)
     # append a slash regardless
     buf << "/#{path}"
 
-    # if there is an acl, logging, or torrent parameter
+    # if there is an acl, logging, torrent, or requestPayment parameter
     # add them to the string
-    if path_args.has_key?('acl')
-      buf << '?acl'
-    elsif path_args.has_key?('torrent')
-      buf << '?torrent'
-    elsif path_args.has_key?('logging')
-      buf << '?logging'
-    end
-    
+    CANONICAL_STRING_WORTHY_PATH_ARGS.each do |arg_name|
+      if path_args.has_key?(arg_name)
+        buf << "?#{arg_name}"
+        break
+      end
+    end
+
     return buf
   end
 
@@ -121,7 +119,7 @@ module S3
   def S3.path_args_hash_to_string(path_args={})
     arg_string = ''
     path_args.each { |k, v|
-      arg_string << k.to_s
+      arg_string << k
       if not v.nil?
         arg_string << "=#{CGI::escape(v)}"
       end
@@ -138,14 +136,14 @@ module S3
   # some connection pooling.
   class AWSAuthConnection
     attr_accessor :calling_format
-    
-    def initialize(aws_access_key_id, 
-                    aws_secret_access_key, 
+
+    def initialize(aws_access_key_id,
+                    aws_secret_access_key,
                     tokens=Array.new,
-                   is_secure=true, 
-                   server=DEFAULT_HOST, 
+                   is_secure=true,
+                   server=DEFAULT_HOST,
                    port=PORTS_BY_SECURITY[is_secure],
-                   calling_format=CallingFormat::SUBDOMAIN)
+                   calling_format=CallingFormat::REGULAR)
       @aws_access_key_id = aws_access_key_id
       @aws_secret_access_key = aws_secret_access_key
       @server = server
@@ -183,26 +181,6 @@ module S3
         make_request('PUT', bucket, CGI::escape(key), {}, headers, object.data, object.metadata)
       )
     end
-    def copy(source_bucket, source_key, destination_bucket,destination_key, headers={})
-      headers['x-amz-copy-source']="#{source_bucket}/#{source_key}"
-      headers['x-amz-metadata-directive']="REPLACE "
-      return GetResponse.new(make_request('PUT', destination_bucket, CGI::escape(destination_key),{}, headers))
-     end
-
-    def get_head(bucket, key, headers={})
-      return GetResponse.new(make_request('HEAD',bucket, CGI::escape(key),{}, headers))
-    end
-    def get_content_type(bucket, key, headers={})
-       response= get_head(bucket, key, headers)
-      if response.http_response.code=='404'
-                    return nil
-      
-      elsif response.http_response.code=='200'
-        return response.http_response.header.content_type
-      end
-      raise response.http_response.code
-    end
-    
 
     def get(bucket, key, headers={})
       return GetResponse.new(make_request('GET', bucket, CGI::escape(key), {}, headers))
@@ -223,7 +201,7 @@ module S3
     def get_bucket_acl(bucket, headers={})
       return get_acl(bucket, '', headers)
     end
- 
+
     # returns an xml document representing the access control list.
     # this could be parsed into an object.
     def get_acl(bucket, key, headers={})
@@ -242,13 +220,46 @@ module S3
       )
     end
 
+
+    #payer may be RequestPayer::REQUESTER or RequestPayer::BUCKET_OWNER
+    def  put_bucket_request_payment( bucket,  payer=RequestPayer::REQUESTER,  headers={})
+
+      body = "<RequestPaymentConfiguration xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\"><Payer>#{payer}</Payer></RequestPaymentConfiguration>"
+
+      result= make_request(
+                           'PUT',
+                           bucket,
+                           '',
+                           {'requestPayment' => nil },
+                           headers,
+                           body,
+                           {} )
+      return GetResponse.new(result)
+
+    end
+
+    def  get_bucket_request_payment( bucket,    headers={})
+
+      result= make_request(
+                           'GET',
+                           bucket,
+                           '',
+                           {'requestPayment' => nil },
+                           headers,
+                           '',
+                           {} )
+      return GetResponse.new(result)
+
+    end
+
+
     def list_all_my_buckets(headers={})
       return ListAllMyBucketsResponse.new(make_request('GET', '', '', {}, headers))
     end
 
     private
     def make_request(method, bucket='', key='', path_args={}, headers={}, data='', metadata={})
-      
+
       # build the domain based on the calling format
       server = ''
       if bucket.empty?
@@ -257,9 +268,9 @@ module S3
         # does not make sense for vanity domains
         server = @server
       elsif @calling_format == CallingFormat::SUBDOMAIN
-        server = "#{bucket}.#{@server}" 
+        server = "#{bucket}.#{@server}"
       elsif @calling_format == CallingFormat::VANITY
-        server = bucket 
+        server = bucket
       else
         server = @server
       end
@@ -274,11 +285,11 @@ module S3
       path << "/#{key}"
 
       # build the path_argument string
-      # add the ? in all cases since 
+      # add the ? in all cases since
       # signature and credentials follow path args
       path << '?'
-      path << S3.path_args_hash_to_string(path_args) 
-      
+      path << S3.path_args_hash_to_string(path_args)
+
       http = Net::HTTP.new(server, @port)
       http.use_ssl = @is_secure
       http.start do
@@ -295,7 +306,6 @@ module S3
           return http.request(req)
         end
       end
-      
     end
 
     def method_to_request_class(method)
@@ -306,8 +316,6 @@ module S3
         return Net::HTTP::Put
       when 'DELETE'
         return Net::HTTP::Delete
-      when 'HEAD'
-        return Net::HTTP::Head
       else
         raise "Unsupported method #{method}"
       end
@@ -348,8 +356,12 @@ module S3
     end
   end
 
+  module RequestPayer
+    REQUESTER="Requester"
+    BUCKET_OWNER="BucketOwner"
+  end
   # class for storing calling format constants
-  module CallingFormat 
+  module CallingFormat
     REGULAR   = 0 # http://s3.amazonaws.com/bucket/key
     SUBDOMAIN = 1 # http://bucket.s3.amazonaws.com/key
     VANITY    = 2  # http://<vanity_domain>/key  -- vanity_domain resolves to s3.amazonaws.com
@@ -366,7 +378,7 @@ module S3
       else
         build_url_base << "#{server}:#{port}/#{bucket}"
       end
-      return build_url_base 
+      return build_url_base
     end
   end
 
@@ -418,7 +430,7 @@ module S3
         @curr_entry.owner = Owner.new
       elsif name == 'CommonPrefixes'
         @common_prefix_entry = CommonPrefixEntry.new
-      end      
+      end
     end
 
     # we have one, add him to the entries list
@@ -427,7 +439,7 @@ module S3
       if name == 'Name'
         @properties.name = @curr_text
       elsif name == 'Prefix' and @is_echoed_prefix
-        @properties.prefix = @curr_text       
+        @properties.prefix = @curr_text
         @is_echoed_prefix = nil
       elsif name == 'Marker'
         @properties.marker = @curr_text
@@ -437,7 +449,7 @@ module S3
         @properties.delimiter = @curr_text
       elsif name == 'IsTruncated'
         @properties.is_truncated = @curr_text == 'true'
-      elsif name == 'NextMarker'        
+      elsif name == 'NextMarker'
         @properties.next_marker = @curr_text
       elsif name == 'Contents'
         @entries << @curr_entry
@@ -456,7 +468,7 @@ module S3
       elsif name == 'DisplayName'
         @curr_entry.owner.display_name = @curr_text
       elsif name == 'CommonPrefixes'
-        @common_prefixes << @common_prefix_entry         
+        @common_prefixes << @common_prefix_entry
       elsif name == 'Prefix'
         # this is the common prefix for keys that match up to the delimiter
         @common_prefix_entry.prefix = @curr_text
@@ -591,4 +603,4 @@ module S3
     end
   end
 end
-end
+end

data/lib/sdb_dal/sdb_monkey_patch.rb

@@ -0,0 +1,47 @@
+require 'logger'
+require 'time'
+require 'cgi'
+require 'uri'
+require 'net/http'
+require 'base64'
+require 'openssl'
+require 'rexml/document'
+require 'rexml/xpath'
+
+module AwsSdb
+  class Service
+     def query_with_attributes(domain, query, max = nil, token = nil)
+      params = {
+        'Action' => 'QueryWithAttributes',
+        'QueryExpression' => query,
+        'DomainName' => domain.to_s
+      }
+      params['NextToken'] =
+        token unless token.nil? || token.empty?
+      params['MaxNumberOfItems'] =
+        max.to_s unless max.nil? || max.to_i == 0
+      doc = call(:get, params)
+      results = {}
+      REXML::XPath.each(doc, '//Item') do |item|
+        item_attributes={}
+         item_name = REXML::XPath.first(item, './Name/text()').to_s
+       
+        
+         REXML::XPath.each(item, "./Attribute") do |attr|
+           
+            key = REXML::XPath.first(attr, './Name/text()').to_s
+            value = REXML::XPath.first(attr, './Value/text()').to_s
+            item_attributes[key]= value
+        end
+         results[item_name]=item_attributes
+       
+      end
+      return results, REXML::XPath.first(doc, '//NextToken/text()').to_s
+    end
+    
+    
+
+
+   
+  end
+end

data/lib/sdb_dal/storage.rb

@@ -80,13 +80,13 @@ class Storage
     real_s3.create_bucket(bucket,headers)
   end
   def real_s3_put(bucket,key,object,attributes)
-
+x=nil
     20.times do |i|
       begin
-       real_s3.put(bucket,key,S3::S3Object.new(object),attributes)
-                  
-        return 
+      x= real_s3.put(bucket,key,S3::S3Object.new(object),attributes)
+      
 
+     break
       rescue =>e
                  s= "#{e.message}\n#{e.backtrace}"
         puts(s)
@@ -95,6 +95,10 @@ class Storage
         #try again
       end
     end
+    if x.http_response.code!="200"
+
+         raise "bucket #{bucket} key #{key} response #{x.http_response.code}"
+      end
   end
   def delete(bucket,key)
     if @cache

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sdb_dal
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - David Knight
@@ -9,7 +9,7 @@ autorequire: sdb_dal
 bindir: bin
 cert_chain: []
 
-date: 2008-12-22 00:00:00 -08:00
+date: 2009-01-03 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -43,6 +43,7 @@ files:
 - ./lib/sdb_dal/repository_factory.rb
 - ./lib/sdb_dal/s3.rb
 - ./lib/sdb_dal/sdb_formatter.rb
+- ./lib/sdb_dal/sdb_monkey_patch.rb
 - ./lib/sdb_dal/starts_with_condition.rb
 - ./lib/sdb_dal/storage.rb
 - ./lib/sdb_dal/tag_cloud.rb
@@ -68,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: sdb-dal
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2