simple_record 1.4.13 → 1.4.15

data/README.markdown

@@ -193,7 +193,8 @@ values should be stored in S3. Fortunately SimpleRecord takes care of this for y
 string value.
 
     has_clobs :my_clob
-    
+
+These clob values will be stored in s3 under a bucket named: "#{aws_access_key}_lobs"
 
 ## Tips and Tricks and Things to Know
 

data/lib/simple_record/results_array.rb

@@ -95,6 +95,7 @@ module SimpleRecord
             params_for_count[0] = :count
             params_for_count[1] = params_for_count[1].dup # for deep clone
             params_for_count[1].delete(:limit)
+             params_for_count[1].delete(:per_token)
 
      #       puts '@params2=' + @params.inspect
            # puts 'params_for_count=' + params_for_count.inspect
@@ -117,7 +118,12 @@ module SimpleRecord
             limit = options[:limit]
     #        puts 'limit=' + limit.inspect
 
-            @items[i..@items.size].each do |v|
+            if i > @items.size
+                i = @items.size
+            end
+            range = i..@items.size
+#            puts 'range=' + range.inspect
+            @items[range].each do |v|
 #                puts "i=" + i.to_s
                 yield v
                 i += 1

data/lib/simple_record.rb

@@ -47,6 +47,8 @@ module SimpleRecord
     @@options = {}
     @@stats = SimpleRecord::Stats.new
     @@logging = false
+    @@s3 = nil
+    @@auto_close_s3 = false
 
     class << self;
         attr_accessor :aws_access_key, :aws_secret_key
@@ -105,16 +107,35 @@ module SimpleRecord
         #                                                  :per_thread (one connection per thread)
         #                                                  :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 establish_connection(aws_access_key=nil, aws_secret_key=nil, params={})
+        def establish_connection(aws_access_key=nil, aws_secret_key=nil, options={})
             @aws_access_key = aws_access_key
             @aws_secret_key = aws_secret_key
-            @@options.merge!(params)
+            @@options.merge!(options)
             #puts 'SimpleRecord.establish_connection with options: ' + @@options.inspect
             SimpleRecord::ActiveSdb.establish_connection(aws_access_key, aws_secret_key, @@options)
+            if options[:connection_mode] == :per_thread
+                @@auto_close_s3 = true
+                @@s3 = Aws::S3.new(SimpleRecord.aws_access_key, SimpleRecord.aws_secret_key, {:connection_mode=>:per_thread})
+            end
         end
 
+        # Call this to close the connection to SimpleDB.
+        # If you're using this in Rails with per_thread connection mode, you should do this in
+        # an after_filter for each request.
         def close_connection()
             SimpleRecord::ActiveSdb.close_connection
+            @@s3.close_connection if @@auto_close_s3
+        end
+
+   # If you'd like to specify the s3 connection to use for LOBs, you can pass it in here.
+        # We recommend that this connection matches the type of connection you're using for SimpleDB,
+        # at least if you're using per_thread connection mode.
+        def s3=(s3)
+            @@s3 = s3
+        end
+
+        def s3
+            @@s3
         end
 
         def options
@@ -488,6 +509,10 @@ module SimpleRecord
         end
 
         def s3
+
+            return SimpleRecord.s3 if SimpleRecord.s3
+            # todo: should optimize this somehow, like use the same connection_mode as used in SR
+            # or keep open while looping in ResultsArray.
             Aws::S3.new(SimpleRecord.aws_access_key, SimpleRecord.aws_secret_key)
         end
 

data/test/{test_simple_record.rb → simple_record_test.rb}

@@ -11,7 +11,7 @@ require_relative 'model_with_enc'
 # Tests for SimpleRecord
 #
 
-class TestSimpleRecord < TestBase
+class SimpleRecordTest < TestBase
 
 
     def test_save_get
@@ -26,8 +26,8 @@ class TestSimpleRecord < TestBase
         assert !mm.updated.nil?
         assert !mm.id.nil?
         assert mm.age == 32
-        assert mm.cool = true
-        assert mm.name = "Travis"
+        assert mm.cool == true
+        assert mm.name == "Travis"
 
         id = mm.id
         puts 'id=' + id.to_s
@@ -39,8 +39,8 @@ class TestSimpleRecord < TestBase
         assert mm2.age == mm.age
         assert mm2.cool == mm.cool
         assert mm2.age == 32
-        assert mm2.cool = true
-        assert mm2.name = "Travis"
+        assert mm2.cool == true
+        assert mm2.name == "Travis"
         assert mm2.created.is_a? DateTime
 
         # test nilification
@@ -177,8 +177,8 @@ class TestSimpleRecord < TestBase
         assert mm.nickname == mm.name
 
         mm2 = MyModel.find(mm.id)
-        assert mm2.nickname = mm.nickname
-        assert mm2.name = mm.name
+        assert_equal mm2.nickname, mm.nickname
+        assert_equal mm2.name, mm.name
 
 
     end
@@ -262,7 +262,7 @@ class TestSimpleRecord < TestBase
         assert mmc3.my_model_id == mm2.id
         assert mmc3.changed?
         assert mmc3.my_model_changed?
-        assert mmc3.my_model.id = mm2.id
+        assert mmc3.my_model.id == mm2.id
 
     end
 
@@ -541,7 +541,7 @@ class TestSimpleRecord < TestBase
     def test_atts_using_strings_and_symbols
         mm = MyModel.new({:name=>"myname"})
         mm2 = MyModel.new({"name"=>"myname"})
-        assert mm.name = mm2.name
+        assert_equal(mm.name, mm2.name)
 
         mm.save
         mm2.save
@@ -549,7 +549,7 @@ class TestSimpleRecord < TestBase
 
         mm = MyModel.find(mm.id)
         mm2 = MyModel.find(mm2.id)
-        assert mm.name = mm2.name
+        assert_equal mm.name, mm2.name
     end
 
     def test_constructor_using_belongs_to_ids
@@ -559,10 +559,17 @@ class TestSimpleRecord < TestBase
 
         mm2 = MyChildModel.new({"name"=>"myname2", :my_model_id=>mm.id})
         puts 'mm2=' + mm2.inspect
-        assert mm.id == mm2.my_model_id, "#{mm.id} != #{mm2.my_model_id}"
+        assert_equal mm.id, mm2.my_model_id, "#{mm.id} != #{mm2.my_model_id}"
         mm3 = mm2.my_model
         puts 'mm3=' + mm3.inspect
-        assert mm.name == mm3.name
+        assert_equal mm.name, mm3.name
+
+        mm3 = MyChildModel.create(:my_model_id=>mm.id, :name=>"myname3")
+
+        sleep 2
+        mm4 = MyChildModel.find(mm3.id)
+        assert_equal mm4.my_model_id, mm.id
+        assert !mm4.my_model.nil?
 
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 4
-  - 13
-  version: 1.4.13
+  - 15
+  version: 1.4.15
 platform: ruby
 authors: 
 - Travis Reeder
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-23 00:00:00 -07:00
+date: 2010-10-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,6 +61,7 @@ files:
 - test/my_child_model.rb
 - test/my_model.rb
 - test/paging_array_test.rb
+- test/simple_record_test.rb
 - test/temp.rb
 - test/temp_test.rb
 - test/test_base.rb
@@ -73,7 +74,6 @@ files:
 - test/test_marshalled.rb
 - test/test_pagination.rb
 - test/test_results_array.rb
-- test/test_simple_record.rb
 - test/test_usage.rb
 has_rdoc: true
 homepage: http://github.com/appoxy/simple_record/
@@ -114,6 +114,7 @@ test_files:
 - test/my_child_model.rb
 - test/my_model.rb
 - test/paging_array_test.rb
+- test/simple_record_test.rb
 - test/temp.rb
 - test/temp_test.rb
 - test/test_base.rb
@@ -126,5 +127,4 @@ test_files:
 - test/test_marshalled.rb
 - test/test_pagination.rb
 - test/test_results_array.rb
-- test/test_simple_record.rb
 - test/test_usage.rb