dm-adapter-simpledb 1.4.0 → 1.5.0

data/Rakefile

@@ -80,7 +80,7 @@ END
     gem.add_dependency('dm-migrations',         '~> 0.10.0')
     gem.add_dependency('dm-types',              '~> 0.10.0')
     gem.add_dependency('uuidtools',             '~> 2.0')
-    gem.add_dependency('sdbtools',              '~> 0.4')
+    gem.add_dependency('sdbtools',              '~> 0.5')
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.5.0

data/lib/dm-adapter-simpledb/adapters/simpledb_adapter.rb

@@ -33,9 +33,12 @@ module DataMapper
         # here is chosen on the basis of it being unlikely to match any strings
         # found in real-world records, as well as being eye-catching in case any
         # nils DO manage to sneak in. It would be preferable if we could disable
-        # RightAWS's nil-token replacement altogether, but that does not appear
+        # AWS's nil-token replacement altogether, but that does not appear
         # to be an option.
         @sdb_options[:nil_representation] = "<[<[<NIL>]>]>"
+        @sdb_options[:connection_mode] = options.fetch(:connection_mode) {
+          :per_thread
+        }
         @null_mode   = options.fetch(:null) { false }
         @batch_limit = options.fetch(:batch_limit) {
           SDBTools::Selection::DEFAULT_RESULT_LIMIT
@@ -163,6 +166,10 @@ module DataMapper
         database.domains
       end
 
+      def sdb_interface
+        database.sdb
+      end
+
     private
       def domain
         @domain ||= database.domain(@sdb_options[:domain])
@@ -194,8 +201,10 @@ module DataMapper
       end
 
       def database
-        options = sdb ? {:sdb_interface => sdb} : {}
-        @database ||= SDBTools::Database.new(
+        return @database if defined?(@database) && !@database.nil?
+        options = @sdb_options.dup
+        if sdb then options.merge(:sdb_interface => sdb) end
+        @database = SDBTools::Database.new(
           @sdb_options[:access_key], 
           @sdb_options[:secret_key],
           options)

data/lib/dm-adapter-simpledb/sdb_array.rb

@@ -29,7 +29,7 @@ module DataMapper
         # we need to return an object which IS considered a primitive - in this
         # case a plain 'ole Ruby Object. In order to convey the actual array
         # value to the backend, we tack on a #to_ary method which returns the
-        # array data. RightAws calls Array() on all values before writing them,
+        # array data. Aws calls Array() on all values before writing them,
         # which in turn calls #to_ary(), and winds up with the correct data. In
         # effect we are sneaking the array data through DataMapper inside a
         # singleton method.

data/spec/integration/spec_helper.rb

@@ -4,7 +4,6 @@ $LOAD_PATH.unshift(File.join(ROOT,'lib'))
 require 'simpledb_adapter'
 require 'logger'
 require 'fileutils'
-require 'right_aws'
 require 'spec'
 require 'spec/autorun'
 
@@ -48,11 +47,8 @@ Spec::Runner.configure do |config|
     log.level = ::Logger::DEBUG
     DataMapper.logger.level = :debug
 
-    $control_sdb ||= RightAws::SdbInterface.new(
-      access_key, secret_key, :domain => test_domain)
-
     DataMapper.logger.set_log(log_file, :debug)
-    DataMapper.setup(:default, {
+    adapter = DataMapper.setup(:default, {
         :adapter => 'simpledb',
         :access_key => access_key,
         :secret_key => secret_key,
@@ -60,6 +56,7 @@ Spec::Runner.configure do |config|
         :logger => log,
         :wait_for_consistency => :manual
       })
+    $control_sdb = adapter.sdb_interface
   end
 
   # Run before each group

data/spec/unit/unit_spec_helper.rb

@@ -1,12 +1,12 @@
 require 'spec'
 ROOT = File.expand_path('../..', File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(ROOT,'lib'))
-require 'right_aws'
+require 'aws'
 require 'simpledb_adapter'
 
 Spec::Runner.configure do |config|
   config.before :each do
-    @sdb = stub("RightAWS::SdbInterface").as_null_object
+    @sdb = stub("AWS::SdbInterface").as_null_object
     @log = stub("Log").as_null_object
 
     # Using Abstract adapter as a null DB

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-adapter-simpledb
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Jeremy Boles
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-24 00:00:00 -05:00
+date: 2010-01-26 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,7 +74,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.4"
+        version: "0.5"
     version: 
 description: |
   A DataMapper adapter for Amazon's SimpleDB service.