simple_record 1.1.68 → 1.1.69

data/lib/simple_record.rb

@@ -39,6 +39,7 @@ require File.expand_path(File.dirname(__FILE__) + "/simple_record/translations")
 
 module SimpleRecord
 
+    @@options = {}
     @@stats = SimpleRecord::Stats.new
 
     def self.stats
@@ -61,8 +62,9 @@ module SimpleRecord
     #                                                  :pool (uses a connection pool with a maximum number of connections - NOT IMPLEMENTED YET)
     #      :logger       => Logger Object        # Logger instance: logs to STDOUT if omitted
     def self.establish_connection(aws_access_key=nil, aws_secret_key=nil, params={})
-        @@options = params
-        Aws::ActiveSdb.establish_connection(aws_access_key, aws_secret_key, params)
+        @@options.merge(params)
+        puts 'SimpleRecord.establish_connection with ' + params.inspect
+        Aws::ActiveSdb.establish_connection(aws_access_key, aws_secret_key, @@options)
     end
 
     def self.close_connection()
@@ -73,6 +75,7 @@ module SimpleRecord
         @@options
     end
 
+
     class Base < Aws::ActiveSdb::Base
 
         include SimpleRecord::Translations
@@ -177,7 +180,7 @@ module SimpleRecord
         def self.domain
             #return self.get_domain_name unless self.get_domain_name.nil?
             d = super
-            puts 'in self.domain, d=' + d.to_s + ' domain_prefix=' + SimpleRecord::Base.domain_prefix.to_s
+#            puts 'in self.domain, d=' + d.to_s + ' domain_prefix=' + SimpleRecord::Base.domain_prefix.to_s
             domain_name_for_class = (SimpleRecord::Base.domain_prefix || "") + d.to_s
             #self.set_domain_name(domain_name_for_class)
             domain_name_for_class

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 68
-  version: 1.1.68
+  - 69
+  version: 1.1.69
 platform: ruby
 authors: 
 - Travis Reeder
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-07 00:00:00 -08:00
+date: 2010-03-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency