simple_record 1.4.10 → 1.4.11

data/lib/simple_record/active_sdb.rb

@@ -240,8 +240,10 @@ module SimpleRecord
                 #  end
                 #  Client.create_domain  #=> {:request_id=>"6fc652a0-0000-41d5-91f4-3ed390a3d3b2", :box_usage=>"0.0055590278"}
                 #
-                def create_domain
-                    connection.create_domain(domain)
+                def create_domain(dom=nil)
+                    dom = domain if dom.nil?
+                    puts "Creating new SimpleDB Domain: " + dom
+                    connection.create_domain(dom)
                 end
 
                 # Remove domain from SDB.
@@ -251,8 +253,10 @@ module SimpleRecord
                 #  end
                 #  Client.delete_domain  #=> {:request_id=>"e14d90d3-0000-4898-9995-0de28cdda270", :box_usage=>"0.0055590278"}
                 #
-                def delete_domain
-                    connection.delete_domain(domain)
+                def delete_domain(dom=nil)
+                    dom = domain if dom.nil?
+                    puts "!!! DELETING SimpleDB Domain: " + dom
+                    connection.delete_domain(dom)
                 end
 
                 #
@@ -844,8 +848,9 @@ module SimpleRecord
                     dirty_atts = options[:dirty_atts]
                     atts_to_save.delete_if { |key, value| !dirty_atts.has_key?(key) }
                 end
+                dom = options[:domain] || domain
                 #puts 'atts_to_save2=' + atts_to_save.inspect
-                connection.put_attributes(domain, id, atts_to_save, :replace)
+                connection.put_attributes(dom, id, atts_to_save, :replace)
                 apres_save2
                 @attributes
             end
@@ -948,7 +953,7 @@ module SimpleRecord
 #                @id
 #            end
 
-            # Returns true if this object hasn�t been saved yet.
+            # Returns true if this object hasn�t been saved yet.
             def new_record?
                 @new_record
             end

data/lib/simple_record.rb

@@ -338,10 +338,10 @@ module SimpleRecord
             @@cache_store
         end
 
-        def domain_ok(ex)
+        def domain_ok(ex, options={})
             if (ex.message().index("NoSuchDomain") != nil)
-                #puts "Creating new SimpleDB Domain: " + domain
-                self.class.create_domain
+                dom = options[:domain] || domain
+                self.class.create_domain(dom)
                 return true
             end
             return false
@@ -390,6 +390,7 @@ module SimpleRecord
         # Options:
         #   - :except => Array of attributes to NOT save
         #   - :dirty => true - Will only store attributes that were modified. To make it save regardless and have it update the :updated value, include this and set it to false.
+        #   - :domain => Explicitly define domain to use.
         #
         def save(options={})
 #            puts 'SAVING: ' + self.inspect if SimpleRecord.logging?
@@ -431,9 +432,9 @@ module SimpleRecord
                     else
                         return false
                     end
-                rescue Aws::AwsError
+                rescue Aws::AwsError => ex
                     # puts "RESCUED in save: " + $!
-                    if (domain_ok($!))
+                    if (domain_ok(ex, options))
                         if !@create_domain_called
                             @create_domain_called = true
                             save(options)

data/test/my_base_model.rb

@@ -1,8 +1,8 @@
-require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
-
-class MyBaseModel < SimpleRecord::Base
-
-    has_strings :base_string
-
-    
+require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
+
+class MyBaseModel < SimpleRecord::Base
+
+    has_strings :base_string
+
+    
 end

data/test/my_child_model.rb

@@ -1,35 +1,35 @@
-require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
-require 'my_model'
-
-class MyChildModel < SimpleRecord::Base
-    belongs_to :my_model
-    belongs_to :x, :class_name=>"MyModel"
-    has_attributes :name, :child_attr
-
-end
-
-
-=begin
-
-
-puts 'word'
-
-mm = MyModel.new
-puts 'word2'
-
-mcm = MyChildModel.new
-
-puts 'mcm instance methods=' + MyChildModel.instance_methods(true).inspect
-#puts 'mcm=' + mcm.instance_methods(false)
-puts 'mcm class vars = ' + mcm.class.class_variables.inspect
-puts mcm.class == MyChildModel
-puts 'saved? ' + mm.save.to_s
-puts mm.errors.inspect
-
-puts "mm attributes=" + MyModel.defined_attributes.inspect
-puts "mcm attributes=" + MyChildModel.defined_attributes.inspect
-
-mcm2 = MyChildModel.new
-puts "mcm2 attributes=" + MyChildModel.defined_attributes.inspect
-
-=end
+require File.expand_path(File.dirname(__FILE__) + "/../lib/simple_record")
+require 'my_model'
+
+class MyChildModel < SimpleRecord::Base
+    belongs_to :my_model
+    belongs_to :x, :class_name=>"MyModel"
+    has_attributes :name, :child_attr
+
+end
+
+
+=begin
+
+
+puts 'word'
+
+mm = MyModel.new
+puts 'word2'
+
+mcm = MyChildModel.new
+
+puts 'mcm instance methods=' + MyChildModel.instance_methods(true).inspect
+#puts 'mcm=' + mcm.instance_methods(false)
+puts 'mcm class vars = ' + mcm.class.class_variables.inspect
+puts mcm.class == MyChildModel
+puts 'saved? ' + mm.save.to_s
+puts mm.errors.inspect
+
+puts "mm attributes=" + MyModel.defined_attributes.inspect
+puts "mcm attributes=" + MyChildModel.defined_attributes.inspect
+
+mcm2 = MyChildModel.new
+puts "mcm2 attributes=" + MyChildModel.defined_attributes.inspect
+
+=end

data/test/paging_array_test.rb

@@ -1,15 +1,15 @@
-
-require File.expand_path(File.dirname(__FILE__) + "/../lib/results_array")
-
-array = SimpleRecord::ResultsArray.new()
-#array.extend(ResultsArray)
-
-500.times do |i|
-    array << "_ob_" + i.to_s
-end
-
-array.each do |v|
-    puts v.to_s
-end
-
+
+require File.expand_path(File.dirname(__FILE__) + "/../lib/results_array")
+
+array = SimpleRecord::ResultsArray.new()
+#array.extend(ResultsArray)
+
+500.times do |i|
+    array << "_ob_" + i.to_s
+end
+
+array.each do |v|
+    puts v.to_s
+end
+
 puts array[10]

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: simple_record
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 4
-  - 10
-  version: 1.4.10
+  - 11
+  version: 1.4.11
 platform: ruby
 authors: 
 - Travis Reeder
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-01 00:00:00 -07:00
+date: 2010-09-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,6 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -55,26 +57,26 @@ files:
 - lib/simple_record/stats.rb
 - lib/simple_record/translations.rb
 - README.markdown
-- test/conversions.rb
-- test/model_with_enc.rb
-- test/my_base_model.rb
-- test/my_child_model.rb
-- test/my_model.rb
+- test/test_lobs.rb
 - test/paging_array_test.rb
-- test/temp.rb
-- test/temp_test.rb
-- test/test_base.rb
+- test/test_marshalled.rb
 - test/test_dirty.rb
-- test/test_encodings.rb
-- test/test_global_options.rb
 - test/test_helpers.rb
-- test/test_json.rb
-- test/test_lobs.rb
-- test/test_marshalled.rb
+- test/test_base.rb
 - test/test_pagination.rb
+- test/my_base_model.rb
+- test/my_child_model.rb
+- test/test_global_options.rb
 - test/test_results_array.rb
-- test/test_simple_record.rb
 - test/test_usage.rb
+- test/conversions.rb
+- test/temp_test.rb
+- test/test_encodings.rb
+- test/test_json.rb
+- test/test_simple_record.rb
+- test/temp.rb
+- test/model_with_enc.rb
+- test/my_model.rb
 has_rdoc: true
 homepage: http://github.com/appoxy/simple_record/
 licenses: []
@@ -89,6 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -97,6 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -108,23 +112,23 @@ signing_key:
 specification_version: 3
 summary: Drop in replacement for ActiveRecord to Amazon SimpleDB instead.
 test_files: 
-- test/conversions.rb
-- test/model_with_enc.rb
-- test/my_base_model.rb
-- test/my_child_model.rb
-- test/my_model.rb
+- test/test_lobs.rb
 - test/paging_array_test.rb
-- test/temp.rb
-- test/temp_test.rb
-- test/test_base.rb
+- test/test_marshalled.rb
 - test/test_dirty.rb
-- test/test_encodings.rb
-- test/test_global_options.rb
 - test/test_helpers.rb
-- test/test_json.rb
-- test/test_lobs.rb
-- test/test_marshalled.rb
+- test/test_base.rb
 - test/test_pagination.rb
+- test/my_base_model.rb
+- test/my_child_model.rb
+- test/test_global_options.rb
 - test/test_results_array.rb
-- test/test_simple_record.rb
 - test/test_usage.rb
+- test/conversions.rb
+- test/temp_test.rb
+- test/test_encodings.rb
+- test/test_json.rb
+- test/test_simple_record.rb
+- test/temp.rb
+- test/model_with_enc.rb
+- test/my_model.rb