simple_record 2.0.1 → 2.0.2

data/lib/simple_record.rb

@@ -128,8 +128,9 @@ module SimpleRecord
             if options[:connection_mode] == :per_thread
                 @@auto_close_s3 = true
                 # todo: should we init this only when needed?
-                @@s3            = Aws::S3.new(SimpleRecord.aws_access_key, SimpleRecord.aws_secret_key, {:connection_mode=>:per_thread})
             end
+            s3_ops = {:connection_mode=>options[:connection_mode] || :default}
+            @@s3 = Aws::S3.new(SimpleRecord.aws_access_key, SimpleRecord.aws_secret_key, s3_ops)
         end
 
         # Call this to close the connection to SimpleDB.
@@ -434,7 +435,6 @@ module SimpleRecord
                         options[:domain] = sharded_domain
                     end
 
-                    # todo: Instead of doing the domain_ok, below, pass in the new option to aws lib :create_domain=>true, does the same thing now
                     if super(options)
                         self.class.cache_results(self)
                         delete_niled(to_delete)
@@ -451,16 +451,18 @@ module SimpleRecord
                     end
                 rescue Aws::AwsError => ex
                     # puts "RESCUED in save: " + $!
-                    if (domain_ok(ex, options))
-                        if !@create_domain_called
-                            @create_domain_called = true
-                            save(options)
-                        else
-                            raise $!
-                        end
-                    else
-                        raise $!
-                    end
+                    # Domain is created in aws lib now using :create_domain=>true
+#                    if (domain_ok(ex, options))
+#                        if !@create_domain_called
+#                            @create_domain_called = true
+#                            save(options)
+#                        else
+#                            raise $!
+#                        end
+#                    else
+#                        raise $!
+#                    end
+                    raise ex
                 end
             else
                 #@debug = "not saved"
@@ -499,9 +501,24 @@ module SimpleRecord
                     end
                 end
             end
+        end
 
+        def delete_lobs
+            defined_attributes_local.each_pair do |k, v|
+                if v.type == :clob
+                    if self.class.get_sr_config[:single_clob]
+                        s3_bucket(false, :new_bucket=>true).delete_key(single_clob_id)
+                        SimpleRecord.stats.s3_deletes += 1
+                        return
+                    else
+                        s3_bucket.delete_key(s3_lob_id(k))
+                        SimpleRecord.stats.s3_deletes += 1
+                    end
+                end
+            end
         end
 
+
         def put_lob(k, val, options={})
             begin
                 s3_bucket(false, options).put(k, val)
@@ -547,10 +564,14 @@ module SimpleRecord
         end
 
         def s3_lob_id(name)
-            self.id + "_" + name.to_s
+            if SimpleRecord.options[:new_bucket]
+                "lobs/#{self.id}_#{name}"
+            else
+                self.id + "_" + name.to_s
+            end
         end
 
-        def single_clob_id 
+        def single_clob_id
             "lobs/#{self.id}_single_clob"
         end
 
@@ -649,6 +670,7 @@ module SimpleRecord
         # Run pre_save on each object, then runs batch_put_attributes
         # Returns
         def self.batch_save(objects, options={})
+            options[:create_domain] = true if options[:create_domain].nil?
             results = []
             to_save = []
             if objects && objects.size > 0
@@ -660,12 +682,12 @@ module SimpleRecord
                     o.pre_save2
                     to_save << Aws::SdbInterface::Item.new(o.id, o.attributes, true)
                     if to_save.size == 25 # Max amount SDB will accept
-                        connection.batch_put_attributes(domain, to_save)
+                        connection.batch_put_attributes(domain, to_save, options)
                         to_save.clear
                     end
                 end
             end
-            connection.batch_put_attributes(domain, to_save) if to_save.size > 0
+            connection.batch_put_attributes(domain, to_save, options) if to_save.size > 0
             objects.each do |o|
                 o.save_lobs(nil)
             end
@@ -710,13 +732,14 @@ module SimpleRecord
             return i
         end
 
-        def delete()
-            # TODO: DELETE CLOBS, etc from s3
-            options = {}
+        def delete(options={})
             if self.class.is_sharded?
                 options[:domain] = sharded_domain
             end
             super(options)
+
+            # delete lobs now too
+            delete_lobs
         end
 
         def destroy

data/lib/simple_record/active_sdb.rb

@@ -857,6 +857,7 @@ module SimpleRecord
             #
             # compare to +put+ method
             def save(options={})
+                options[:create_domain] = true if options[:create_domain].nil?
                 pre_save2
                 atts_to_save = @attributes.dup
                 #puts 'atts_to_save=' + atts_to_save.inspect
@@ -873,7 +874,7 @@ module SimpleRecord
                 end
                 dom          = options[:domain] || domain
                 #puts 'atts_to_save2=' + atts_to_save.inspect
-                connection.put_attributes(dom, id, atts_to_save, :replace)
+                connection.put_attributes(dom, id, atts_to_save, :replace, options)
                 apres_save2
                 @attributes
             end
@@ -971,11 +972,6 @@ module SimpleRecord
                 connection.delete_attributes(options[:domain] || domain, id)
             end
 
-            # Item ID
-#            def to_s
-#                @id
-#            end
-
             # Returns true if this object hasn�t been saved yet.
             def new_record?
                 @new_record

data/lib/simple_record/stats.rb

@@ -1,6 +1,6 @@
 module SimpleRecord
     class Stats
-        attr_accessor :selects, :saves, :deletes, :s3_puts, :s3_gets
+        attr_accessor :selects, :saves, :deletes, :s3_puts, :s3_gets, :s3_deletes
 
         def initialize
             @selects = 0
@@ -8,6 +8,7 @@ module SimpleRecord
             @deletes = 0
             @s3_puts = 0
             @s3_gets = 0
+            @s3_deletes = 0
         end
 
         def clear
@@ -16,6 +17,7 @@ module SimpleRecord
             self.deletes = 0
             self.s3_puts = 0
             self.s3_gets = 0
+            self.s3_deletes = 0
         end
     end
 end

data/test/test_lobs.rb

@@ -53,6 +53,20 @@ class TestLobs < TestBase
         # shouldn't save twice if not dirty
         assert SimpleRecord.stats.s3_puts == 3
 
+        mm2.delete
+
+        assert_equal 2, SimpleRecord.stats.s3_deletes
+
+        e = assert_raise(Aws::AwsError) do
+            sclob = SimpleRecord.s3.bucket(mm2.s3_bucket_name2).get(mm2.s3_lob_id("clob1"))
+        end
+        assert_match(/NoSuchKey/, e.message)
+        e = assert_raise(Aws::AwsError) do
+            sclob = SimpleRecord.s3.bucket(mm2.s3_bucket_name2).get(mm2.s3_lob_id("clob2"))
+        end
+        assert_match(/NoSuchKey/, e.message)
+
+
     end
 
     def test_single_clob
@@ -89,6 +103,16 @@ class TestLobs < TestBase
 
         # shouldn't save twice if not dirty
         assert SimpleRecord.stats.s3_puts == 1
+
+        mm2.delete
+
+        assert SimpleRecord.stats.s3_deletes == 1
+
+        e = assert_raise(Aws::AwsError) do
+            sclob = SimpleRecord.s3.bucket(mm2.s3_bucket_name2).get(mm2.single_clob_id)
+        end
+        assert_match(/NoSuchKey/, e.message)
+
     end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - Travis Reeder