ar-s3-columns 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cbaf52e9ac8fdea731bbf550b27185955806509
-  data.tar.gz: f263b3acc8c0a3a8b6eeef8f6fe653abb8295a83
+  metadata.gz: 282bdd2f9a64ab3ce8b5eb0d1da444561fa5a349
+  data.tar.gz: e3c3819dc1fb3e07e77771b0725e0bdedc213139
 SHA512:
-  metadata.gz: fea92bf6329496d3ed002419fd006702c58287feeb2d4cb0a5a68813034d75b731caa5e6728ec88d568ac2fbdc76c7e91e71bf3ac19594a47871b7c59a103bf0
-  data.tar.gz: 6e4aba64fdfe104f92a9ac9898e988a91b6f67aa1f5b055c278a280addcdaceb4ff03d733509bf71da301a9048a89b9d7618e7297335e8ee4ad98369d774db05
+  metadata.gz: 9f21b8cc024c18f83a05b1b7259d24f235faa018cb012f629dc51149fb4c86e11fc032013d0576ca0c074063d7a5238b94083bbadd0ac18cba0c8c67d01b1072
+  data.tar.gz: 366824645f80a8875cdb560dbfcfa5e5e5546bdfddf9b85cd6013fe473db118c1f5ec4e1aa42467d0ecfa6452afb399566b796cde409e8b2732ea4264ece25aa

data/lib/ar_s3_columns/class_methods.rb

@@ -29,18 +29,12 @@ module S3Columns
         def s3_column_#{column_name}
           if self.persisted? && key_path = read_attribute(:#{column_name})
             key = S3Columns.s3_connection.buckets["#{options[:s3_bucket]}"].objects[key_path]
-
-            if key.exists?
+            # Retry in case it is not persisted in S3 yet
+            Retryable.retryable :on => [AWS::S3::Errors::NoSuchKey], :tries => 10, :sleep => 1 do
               @#{column_name} ||= Marshal.load(key.read)
-            else
-              # Retry in case it is not persisted in S3 yet
-              Retryable.retryable :on => [AWS::S3::Errors::NoSuchKey], :tries => 10, :sleep => 1 do
-                @#{column_name} ||= Marshal.load(key.read)
-              end
             end
-
           else
-            nil
+            @#{column_name}
           end
         end
       }
@@ -54,6 +48,7 @@ module S3Columns
           S3Columns.s3_connection.buckets["#{options[:s3_bucket]}"].objects[key_path].write(marshalled_value, write_options)
           # update column with new key
           write_attribute(:#{column_name}, key_path)
+          @#{column_name} = value
         end
       }
     end

data/lib/ar_s3_columns/version.rb

@@ -1,3 +1,3 @@
 module S3Columns
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/tests/s3_columns_test.rb

@@ -45,6 +45,23 @@ describe "S3Columns" do
     test_object = ClassWithS3Columns.create(name: 'hey')
     assert_equal "hey", test_object.name
   end
+
+  it "memoizes value on write" do
+    SimpleUUID::UUID.any_instance.stubs(:to_guid).returns('unique')
+    test_object = ClassWithS3Columns.new
+    v = {hi: 'hello'}
+
+    @key_stub.expects(:write).with(Marshal.dump(v), {})
+    @objects_stub.expects(:[]).with("extra_data/unique").returns(@key_stub)
+    @buckets_stub.expects(:[]).with("test").returns(stub(objects: @objects_stub))
+    @s3_stub.expects(:buckets).returns(@buckets_stub)
+
+    test_object.s3_column_extra_data = v
+    assert_equal test_object.s3_column_extra_data, v
+
+    test_object = ClassWithS3Columns.new(extra_data: v)
+    assert_equal test_object.extra_data, v
+  end
   
   it "uploads marshalled value of columns to s3 and save s3 key to db" do
     SimpleUUID::UUID.any_instance.stubs(:to_guid).returns('unique')
@@ -60,11 +77,10 @@ describe "S3Columns" do
     assert_equal "extra_data/unique", test_object.read_attribute(:extra_data)
   end
   
-  it "reads from S3 with key in db and if it exists" do
+  it "reads from S3 with key in db" do
     test_object = ClassWithS3Columns.create(name: "unique")
     test_object.send(:write_attribute, :extra_data, 'some/key')
 
-    @key_stub.expects(:exists?).returns(true)
     @key_stub.expects(:read).returns(Marshal.dump("some data"))
     @objects_stub.expects(:[]).with("some/key").returns(@key_stub)
     @buckets_stub.expects(:[]).with("test").returns(stub(objects: @objects_stub))
@@ -72,18 +88,6 @@ describe "S3Columns" do
     assert_equal test_object.s3_column_extra_data, "some data"
   end
 
-  it "retries S3 read, when S3 key in db, but does not exists (usually because S3 has not persisted object yet)" do
-    test_object = ClassWithS3Columns.create(name: "unique")
-    test_object.send(:write_attribute, :extra_data, 'some/key')
-    
-    Retryable.expects(:retryable)
-    @key_stub.expects(:exists?).returns(false)
-    @objects_stub.expects(:[]).with("some/key").returns(@key_stub)
-    @buckets_stub.expects(:[]).with("test").returns(stub(objects: @objects_stub))
-    @s3_stub.expects(:buckets).returns(@buckets_stub)
-    test_object.s3_column_extra_data
-  end
-
   it "returns nil and do not hit S3, if key is not in db" do
       @s3_stub.expects(:buckets).at_most(0)
       test_object = ClassWithS3Columns.create(name: "unique")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ar-s3-columns
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alex Chee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler