aws-sdb 0.1.4 → 0.3.0

data/Rakefile

@@ -7,7 +7,7 @@ Spec::Rake::SpecTask.new
 gem_spec = Gem::Specification.new do |s|
   s.name = "aws-sdb"
   s.rubyforge_project = s.name
-  s.version = "0.1.4"
+  s.version = "0.3.0"
   s.platform = Gem::Platform::RUBY
   s.has_rdoc = true
   s.extra_rdoc_files = ["README", "LICENSE"]
@@ -16,11 +16,16 @@ gem_spec = Gem::Specification.new do |s|
   s.author = "Tim Dysinger"
   s.email = "tim@dysinger.net"
   s.homepage = "http://aws-sdb.rubyforge.org"
-  s.add_dependency "needle"
+  s.add_dependency "uuidtools"
   s.require_path = 'lib'
   s.files = %w(LICENSE README Rakefile) + Dir.glob("{lib,spec}/**/*")
 end
 
+desc "Open an irb session preloaded with this library"
+task :console do
+  sh "irb -rubygems -I lib -r aws_sdb.rb"
+end
+
 Rake::GemPackageTask.new(gem_spec) do |pkg|
   pkg.gem_spec = gem_spec
 end

data/lib/aws_sdb/error.rb

@@ -1,16 +1,16 @@
 module AwsSdb
 
   class Error < RuntimeError ; end
-  
+
   class RequestError < Error
     attr_reader :request_id
-    
+
     def initialize(message, request_id=nil)
       super(message)
       @request_id = request_id
     end
   end
-    
+
   class InvalidDomainNameError < RequestError ; end
   class InvalidParameterValueError < RequestError ; end
   class InvalidNextTokenError < RequestError ; end
@@ -24,12 +24,12 @@ module AwsSdb
   class NumberDomainBytesExceededError < RequestError ; end
   class NumberItemAttributesExceededError < RequestError ; end
   class RequestTimeoutError < RequestError ; end
-  
+
   class FeatureDeprecatedError < RequestError ; end
-  
+
   class ConnectionError < Error
     attr_reader :response
-      
+
     def initialize(response)
       super(
         "#{response.code} \
@@ -38,5 +38,5 @@ module AwsSdb
       @response = response
     end
   end
-  
+
 end

data/lib/aws_sdb/service.rb

@@ -1,82 +1,76 @@
+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 initialize(
-        logger, 
-        access_key_id, 
-        secret_access_key, 
-        url = "http://sds.amazonaws.com"
-      )
-      @logger = logger
-      @access_key_id = access_key_id 
-      @secret_access_key = secret_access_key
-      @base_url = url
+    def initialize(options={})
+      @access_key_id = options[:access_key_id] || ENV['AMAZON_ACCESS_KEY_ID']
+      @secret_access_key = options[:secret_access_key] || ENV['AMAZON_SECRET_ACCESS_KEY']
+      @base_url = options[:url] || 'http://sdb.amazonaws.com'
+      @logger = options[:logger] || Logger.new("aws_sdb.log")
     end
-    
+
     def list_domains(max = nil, token = nil)
       params = { 'Action' => 'ListDomains' }
-      params['NextToken'] = 
+      params['NextToken'] =
         token unless token.nil? || token.empty?
-      params['MaxNumberOfDomains'] = 
+      params['MaxNumberOfDomains'] =
         max.to_s unless max.nil? || max.to_i == 0
       doc = call(:get, params)
       results = []
-      REXML::XPath.each(doc, '//DomainName/text()') do |domain| 
+      REXML::XPath.each(doc, '//DomainName/text()') do |domain|
         results << domain.to_s
       end
-      return results, REXML::XPath.first(doc, '//NextToken/text()').to_s 
+      return results, REXML::XPath.first(doc, '//NextToken/text()').to_s
     end
-        
+
     def create_domain(domain)
       call(:post, { 'Action' => 'CreateDomain', 'DomainName'=> domain.to_s })
       nil
     end
-  
+
     def delete_domain(domain)
       call(
-        :delete, 
+        :delete,
         { 'Action' => 'DeleteDomain', 'DomainName' => domain.to_s }
       )
       nil
-    end  
-    
+    end
+
     def query(domain, query, max = nil, token = nil)
-      params = { 
-        'Action' => 'Query', 
+      params = {
+        'Action' => 'Query',
         'QueryExpression' => query,
-        'DomainName' => domain.to_s 
+        'DomainName' => domain.to_s
       }
-      params['NextToken'] = 
+      params['NextToken'] =
         token unless token.nil? || token.empty?
-      params['MaxNumberOfItems'] = 
+      params['MaxNumberOfItems'] =
         max.to_s unless max.nil? || max.to_i == 0
       doc = call(:get, params)
       results = []
-      REXML::XPath.each(doc, '//ItemName/text()') do |item| 
+      REXML::XPath.each(doc, '//ItemName/text()') do |item|
         results << item.to_s
       end
-      return results, REXML::XPath.first(doc, '//NextToken/text()').to_s 
+      return results, REXML::XPath.first(doc, '//NextToken/text()').to_s
     end
-    
+
     def put_attributes(domain, item, attributes, replace = true)
-      params = { 
-        'Action' => 'PutAttributes', 
+      params = {
+        'Action' => 'PutAttributes',
         'DomainName' => domain.to_s,
         'ItemName' => item.to_s
       }
       count = 0
-      attributes.each do | key, values | 
+      attributes.each do | key, values |
         ([]<<values).flatten.each do |value|
           params["Attribute.#{count}.Name"] = key.to_s
           params["Attribute.#{count}.Value"] = value.to_s
@@ -87,15 +81,15 @@ module AwsSdb
       call(:put, params)
       nil
     end
-        
+
     def get_attributes(domain, item)
-      doc = call( 
-        :get, 
-        { 
-          'Action' => 'GetAttributes', 
+      doc = call(
+        :get,
+        {
+          'Action' => 'GetAttributes',
           'DomainName' => domain.to_s,
-          'ItemName' => item.to_s 
-        } 
+          'ItemName' => item.to_s
+        }
       )
       attributes = {}
       REXML::XPath.each(doc, "//Attribute") do |attr|
@@ -107,26 +101,26 @@ module AwsSdb
     end
 
     def delete_attributes(domain, item)
-      call( 
-        :delete, 
-        { 
-          'Action' => 'DeleteAttributes', 
+      call(
+        :delete,
+        {
+          'Action' => 'DeleteAttributes',
           'DomainName' => domain.to_s,
-          'ItemName' => item.to_s 
-        } 
+          'ItemName' => item.to_s
+        }
       )
       nil
     end
 
     protected
-    
-    def call(method, params)   
-      params.merge!( { 
+
+    def call(method, params)
+      params.merge!( {
           'Version' => '2007-11-07',
           'SignatureVersion' => '1',
           'AWSAccessKeyId' => @access_key_id,
           'Timestamp' => Time.now.gmtime.iso8601
-        } 
+        }
       )
       data = ''
       query = []
@@ -142,7 +136,7 @@ module AwsSdb
       url = "#{@base_url}?#{query}"
       uri = URI.parse(url)
       @logger.debug("#{url}") if @logger
-      response = 
+      response =
         Net::HTTP.new(uri.host, uri.port).send_request(method, url)
       @logger.debug("#{response.code}\n#{response.body}") if @logger
       raise(ConnectionError.new(response)) unless (200..400).include?(
@@ -156,7 +150,7 @@ module AwsSdb
         ).new(
           error.get_elements('Message')[0].text,
           doc.get_elements('*/RequestID')[0].text
-        ) 
+        )
       ) unless error.nil?
       doc
     end

data/lib/aws_sdb.rb

@@ -1,23 +1,3 @@
-# require needle
-require 'rubygems'
-require 'needle'
-
-# require modules
 require 'aws_sdb/error'
 require 'aws_sdb/service'
 
-module AwsSdb
-
-  def self.container
-    @@container ||= Needle::Registry.new(
-      :logs => { :filename => "aws_sdb.log" }
-    ).namespace!(:aws_sdb) do
-      
-      service(:model => :multiton) do | c, p, access, secret |
-        Service.new(c.log_for(p), access, secret)
-      end
-      
-    end
-  end
-  
-end

data/spec/aws_sdb/service_spec.rb

@@ -11,11 +11,7 @@ include AwsSdb
 
 describe Service, "when creating a new domain" do
   before(:all) do
-    @logger = AwsSdb.container.logs.get(:rspec)
-    @service = AwsSdb.container.service(
-      ENV['AMAZON_ACCESS_KEY_ID'],
-      ENV['AMAZON_SECRET_ACCESS_KEY']
-    )
+    @service = AwsSdb::Service.new
     @domain = "test-#{UUID.random_create.to_s}"
     #    domains = @service.list_domains[0]
     #    domains.each do |d|
@@ -66,14 +62,14 @@ describe Service, "when creating a new domain" do
     http.stub!(:send_request).and_return(resp)
     Net::HTTP.stub!(:new).and_return(http)
   end
-  
+
   it "should not raise an error if a valid new domain name is given" do
     stub_success
     lambda {
       @service.create_domain("test-#{UUID.random_create.to_s}")
     }.should_not raise_error
   end
-  
+
   it "should not raise an error if the domain name already exists" do
     stub_success
     domain = "test-#{UUID.random_create.to_s}"
@@ -82,55 +78,55 @@ describe Service, "when creating a new domain" do
       @service.create_domain(domain)
     }.should_not raise_error
   end
-  
+
   it "should raise an error if an a nil or '' domain name is given" do
     stub_error(
-      400, 
-      :InvalidParameterValue, 
+      400,
+      :InvalidParameterValue,
       "Value () for parameter DomainName is invalid."
     )
-    lambda { 
-      @service.create_domain('') 
+    lambda {
+      @service.create_domain('')
     }.should raise_error(InvalidParameterValueError)
-    lambda { 
+    lambda {
       @service.create_domain(nil)
     }.should raise_error(InvalidParameterValueError)
     stub_error(
-      400, 
-      :InvalidParameterValue, 
+      400,
+      :InvalidParameterValue,
       "Value (     ) for parameter DomainName is invalid."
     )
-    lambda { 
+    lambda {
       @service.create_domain('     ')
     }.should raise_error(InvalidParameterValueError)
   end
 
   it "should raise an error if the domain name length is < 3 or > 255" do
     stub_error(
-      400, 
-      :InvalidParameterValue, 
+      400,
+      :InvalidParameterValue,
       "Value (xx) for parameter DomainName is invalid."
     )
-    lambda { 
+    lambda {
       @service.create_domain('xx')
     }.should raise_error(InvalidParameterValueError)
     stub_error(
-      400, 
-      :InvalidParameterValue, 
+      400,
+      :InvalidParameterValue,
       "Value (#{:x.to_s*256}) for parameter DomainName is invalid."
     )
-    lambda { 
+    lambda {
       @service.create_domain('x'*256)
     }.should raise_error(InvalidParameterValueError)
   end
 
   it "should only accept domain names with a-z, A-Z, 0-9, '_', '-', and '.' " do
     stub_error(
-      400, 
-      :InvalidParameterValue, 
+      400,
+      :InvalidParameterValue,
       "Value (@$^*()) for parameter DomainName is invalid."
     )
-    lambda { 
+    lambda {
       @service.create_domain('@$^*()')
     }.should raise_error(InvalidParameterValueError)
   end
@@ -146,10 +142,7 @@ end
 
 describe Service, "when listing domains" do
   before(:all) do
-    @service = AwsSdb.container.service(
-      ENV['AMAZON_ACCESS_KEY_ID'],
-      ENV['AMAZON_SECRET_ACCESS_KEY']
-    )
+    @service = AwsSdb::Service.new
     @domain = "test-#{UUID.random_create.to_s}"
     #    @service.list_domains[0].each do |d|
     #      @service.delete_domain(d) if d =~ /^test/
@@ -179,10 +172,10 @@ describe Service, "when listing domains" do
     http = mock(Net::HTTP)
     http.stub!(:send_request).and_return(resp)
     Net::HTTP.stub!(:new).and_return(http)
-    
+
     result = nil
-    lambda { result = @service.list_domains[0] }.should_not raise_error    
-    result.should_not be_nil 
+    lambda { result = @service.list_domains[0] }.should_not raise_error
+    result.should_not be_nil
     result.should_not be_empty
     result.size.should == 1
     result.should_not be_nil
@@ -192,21 +185,18 @@ end
 
 describe Service, "when deleting domains" do
   before(:all) do
-    @service = AwsSdb.container.service(
-      ENV['AMAZON_ACCESS_KEY_ID'],
-      ENV['AMAZON_SECRET_ACCESS_KEY']
-    )
+    @service = AwsSdb::Service.new
     @domain = "test-#{UUID.random_create.to_s}"
     #    @service.list_domains[0].each do |d|
     #      @service.delete_domain(d) if d =~ /^test/
     #    end
     #    @service.create_domain(@domain)
   end
-  
+
   after do
     #    @service.delete_domain(@domain)
   end
-  
+
   def stub_success
     resp = mock(Net::HTTPResponse)
     resp.stub!(:code).and_return("200")
@@ -230,21 +220,18 @@ describe Service, "when deleting domains" do
     stub_success
     lambda { @service.delete_domain(@domain) }.should_not raise_error
   end
-   
+
   it "should not raise an error trying to delete a non-existing domain" do
     stub_success
-    lambda { 
-      @service.delete_domain(UUID.random_create.to_s) 
+    lambda {
+      @service.delete_domain(UUID.random_create.to_s)
     }.should_not raise_error
   end
 end
 
 describe Service, "when managing items" do
   before(:all) do
-    @service = AwsSdb.container.service(
-      ENV['AMAZON_ACCESS_KEY_ID'],
-      ENV['AMAZON_SECRET_ACCESS_KEY']
-    )
+    @service = AwsSdb::Service.new
     @domain = "test-#{UUID.random_create.to_s}"
     #    @service.list_domains[0].each do |d|
     #      @service.delete_domain(d) if d =~ /^test/
@@ -256,11 +243,11 @@ describe Service, "when managing items" do
       :answer => [ true, 'testing123', 4.2, 42, 420 ]
     }
   end
-  
+
   after(:all) do
     #    @service.delete_domain(@domain)
   end
-  
+
   def stub_put
     resp = mock(Net::HTTPResponse)
     resp.stub!(:code).and_return("200")
@@ -276,9 +263,9 @@ describe Service, "when managing items" do
     )
     http = mock(Net::HTTP)
     http.stub!(:send_request).and_return(resp)
-    Net::HTTP.stub!(:new).and_return(http)    
+    Net::HTTP.stub!(:new).and_return(http)
   end
-  
+
   def stub_get
     resp = mock(Net::HTTPResponse)
     resp.stub!(:code).and_return("200")
@@ -319,9 +306,9 @@ describe Service, "when managing items" do
     )
     http = mock(Net::HTTP)
     http.stub!(:send_request).and_return(resp)
-    Net::HTTP.stub!(:new).and_return(http)    
+    Net::HTTP.stub!(:new).and_return(http)
   end
-  
+
   def stub_query
     resp = mock(Net::HTTPResponse)
     resp.stub!(:code).and_return("200")
@@ -341,7 +328,7 @@ describe Service, "when managing items" do
     http.stub!(:send_request).and_return(resp)
     Net::HTTP.stub!(:new).and_return(http)
   end
-  
+
   def stub_delete
     resp = mock(Net::HTTPResponse)
     resp.stub!(:code).and_return("200")
@@ -360,7 +347,7 @@ describe Service, "when managing items" do
     http.stub!(:send_request).and_return(resp)
     Net::HTTP.stub!(:new).and_return(http)
   end
-  
+
   it "should be able to put attributes" do
     stub_put
     lambda {
@@ -368,7 +355,7 @@ describe Service, "when managing items" do
     }.should_not raise_error
   end
 
-  it "should be able to get attributes" do 
+  it "should be able to get attributes" do
     stub_get
     result = nil
     lambda {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aws-sdb
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.3.0
 platform: ruby
 authors: 
 - Tim Dysinger
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-19 00:00:00 -10:00
+date: 2008-08-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: needle
+  name: uuidtools
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -63,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: aws-sdb
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: Amazon SDB API