ar-s3-columns 0.0.2 → 0.0.3
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.
- checksums.yaml +4 -4
- data/lib/ar_s3_columns/class_methods.rb +1 -1
- data/lib/ar_s3_columns/version.rb +1 -1
- data/tests/s3_columns_test.rb +5 -5
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c1d9bc6eb52cca221af2d25af6450a405a4b6436
|
|
4
|
+
data.tar.gz: e769b9ecb05b261436c7b5483734377f76a21540
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1c92487a70fb9886ea1ce587d4b577e38fa30594a15945609fcca4b35094b83e9b5a4b56f078eb59123c9f52cac6fb2e9d3316718c33cb83738aace968cdd75d
|
|
7
|
+
data.tar.gz: 83eb710ab57fc237da3e562c10156c76d4c77e7754c8357966ea8fcfce34435dfab74bf1bb2002a3ba76a9eea5116be56f97891910e5cf5e382d7f4b0626d481
|
|
@@ -15,7 +15,7 @@ module S3Columns
|
|
|
15
15
|
# * s3_bucket: S3 bucket to use
|
|
16
16
|
def s3_column_for(column_name, options={})
|
|
17
17
|
raise "Please set a S3Columns.default_aws_bucket" if S3Columns.default_aws_bucket.blank?
|
|
18
|
-
options[:s3_key] ||= Proc.new{|object| "#{column_name}/#{SimpleUUID::UUID.new.to_guid}"}
|
|
18
|
+
options[:s3_key] ||= Proc.new{|object| "#{object.class.name}/#{column_name}/#{SimpleUUID::UUID.new.to_guid}"}
|
|
19
19
|
options[:s3_bucket] ||= S3Columns.default_aws_bucket
|
|
20
20
|
self.s3_columns ||= []
|
|
21
21
|
self.s3_columns_keys ||= {}
|
data/tests/s3_columns_test.rb
CHANGED
|
@@ -52,7 +52,7 @@ describe "S3Columns" do
|
|
|
52
52
|
v = {hi: 'hello'}
|
|
53
53
|
|
|
54
54
|
@key_stub.expects(:write).with(Marshal.dump(v), {})
|
|
55
|
-
@objects_stub.expects(:[]).with("extra_data/unique").returns(@key_stub)
|
|
55
|
+
@objects_stub.expects(:[]).with("ClassWithS3Columns/extra_data/unique").returns(@key_stub)
|
|
56
56
|
@buckets_stub.expects(:[]).with("test").returns(stub(objects: @objects_stub))
|
|
57
57
|
@s3_stub.expects(:buckets).returns(@buckets_stub)
|
|
58
58
|
|
|
@@ -70,11 +70,11 @@ describe "S3Columns" do
|
|
|
70
70
|
value = {something: 'else', goes: 'here'}
|
|
71
71
|
|
|
72
72
|
@key_stub.expects(:write).with(Marshal.dump(value), {})
|
|
73
|
-
@objects_stub.expects(:[]).with("extra_data/unique").returns(@key_stub)
|
|
73
|
+
@objects_stub.expects(:[]).with("ClassWithS3Columns/extra_data/unique").returns(@key_stub)
|
|
74
74
|
@buckets_stub.expects(:[]).with("test").returns(stub(objects: @objects_stub))
|
|
75
75
|
@s3_stub.expects(:buckets).returns(@buckets_stub)
|
|
76
76
|
test_object.s3_column_extra_data = value
|
|
77
|
-
assert_equal "extra_data/unique", test_object.read_attribute(:extra_data)
|
|
77
|
+
assert_equal "ClassWithS3Columns/extra_data/unique", test_object.read_attribute(:extra_data)
|
|
78
78
|
end
|
|
79
79
|
|
|
80
80
|
it "reads from S3 with key in db" do
|
|
@@ -154,7 +154,7 @@ describe "S3Columns" do
|
|
|
154
154
|
key_mock.expects(:write).with(Marshal.dump(metadata_value), {})
|
|
155
155
|
|
|
156
156
|
bucket_objects_mock.expects(:[]).with("thing/options/aww_yeah").at_least(1).returns(key_mock)
|
|
157
|
-
bucket_objects_mock.expects(:[]).with('extra_data/uuid').at_least(1).returns(key_mock)
|
|
157
|
+
bucket_objects_mock.expects(:[]).with('ClassWithS3Columns/extra_data/uuid').at_least(1).returns(key_mock)
|
|
158
158
|
other_bucket_objects_mock.expects(:[]).with("thing/meta/aww_yeah").at_least(1).returns(key_mock)
|
|
159
159
|
|
|
160
160
|
bucket_mock.expects(:objects).at_least(2).returns(bucket_objects_mock)
|
|
@@ -169,7 +169,7 @@ describe "S3Columns" do
|
|
|
169
169
|
S3Columns.stubs(:s3_connection).returns(s3_stub)
|
|
170
170
|
test_object = ClassWithS3Columns.create(name: 'aww_yeah', extra_data: extra_value, options: options_value, metadata: metadata_value)
|
|
171
171
|
# test_object = ClassWithS3Columns.create(name: 'aww_yeah', s3_column_extra_data: extra_value, s3_column_options: options_value, s3_column_metadata: metadata_value)
|
|
172
|
-
assert_equal "extra_data/uuid", test_object.read_attribute(:extra_data)
|
|
172
|
+
assert_equal "ClassWithS3Columns/extra_data/uuid", test_object.read_attribute(:extra_data)
|
|
173
173
|
assert_equal "thing/options/aww_yeah", test_object.read_attribute(:options)
|
|
174
174
|
assert_equal "thing/meta/aww_yeah", test_object.read_attribute(:metadata)
|
|
175
175
|
end
|