simple_record 1.1.68 → 1.1.69

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. data/lib/simple_record.rb +6 -3
  2. metadata +3 -3
data/lib/simple_record.rb CHANGED
@@ -39,6 +39,7 @@ require File.expand_path(File.dirname(__FILE__) + "/simple_record/translations")
39
39
 
40
40
  module SimpleRecord
41
41
 
42
+ @@options = {}
42
43
  @@stats = SimpleRecord::Stats.new
43
44
 
44
45
  def self.stats
@@ -61,8 +62,9 @@ module SimpleRecord
61
62
  # :pool (uses a connection pool with a maximum number of connections - NOT IMPLEMENTED YET)
62
63
  # :logger => Logger Object # Logger instance: logs to STDOUT if omitted
63
64
  def self.establish_connection(aws_access_key=nil, aws_secret_key=nil, params={})
64
- @@options = params
65
- Aws::ActiveSdb.establish_connection(aws_access_key, aws_secret_key, params)
65
+ @@options.merge(params)
66
+ puts 'SimpleRecord.establish_connection with ' + params.inspect
67
+ Aws::ActiveSdb.establish_connection(aws_access_key, aws_secret_key, @@options)
66
68
  end
67
69
 
68
70
  def self.close_connection()
@@ -73,6 +75,7 @@ module SimpleRecord
73
75
  @@options
74
76
  end
75
77
 
78
+
76
79
  class Base < Aws::ActiveSdb::Base
77
80
 
78
81
  include SimpleRecord::Translations
@@ -177,7 +180,7 @@ module SimpleRecord
177
180
  def self.domain
178
181
  #return self.get_domain_name unless self.get_domain_name.nil?
179
182
  d = super
180
- puts 'in self.domain, d=' + d.to_s + ' domain_prefix=' + SimpleRecord::Base.domain_prefix.to_s
183
+ # puts 'in self.domain, d=' + d.to_s + ' domain_prefix=' + SimpleRecord::Base.domain_prefix.to_s
181
184
  domain_name_for_class = (SimpleRecord::Base.domain_prefix || "") + d.to_s
182
185
  #self.set_domain_name(domain_name_for_class)
183
186
  domain_name_for_class
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 1
7
7
  - 1
8
- - 68
9
- version: 1.1.68
8
+ - 69
9
+ version: 1.1.69
10
10
  platform: ruby
11
11
  authors:
12
12
  - Travis Reeder
@@ -16,7 +16,7 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2010-03-07 00:00:00 -08:00
19
+ date: 2010-03-09 00:00:00 -08:00
20
20
  default_executable:
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency