attachie 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f21f7eb60467e9fb640626ad3633013e73166d975565afad29a761c8847bb83c
-  data.tar.gz: fb06c69f95ecd1264f13c7d162ab415c94e356deb2b771e7d766852da86de83d
+  metadata.gz: 1e46dfdb8f2b5d9b94594ca38b5d72b3164a7659ce165f6e5f328ee72275ee5a
+  data.tar.gz: d88df51754ce79dc3f716b0e5ccbd7fc4853bde2b92dbf75a85bc65dbb5b83ae
 SHA512:
-  metadata.gz: 0f5cd5094aad872ccda17615f1aa2e0c6f582937a0be6f54b45e1ff986f04fad148224d4415ecefcdee4a04a6638ec44031b7dd5167eac6c4f13c21ed7ca317c
-  data.tar.gz: 54ea0ef551453b1335a5267f04c9b43c0fa34d624a1923c10dc946385e6cba09554f4d628cb5b7fe5110c54aad730d4dc9d08c2673caf68d8ffdd0a0c520e7ce
+  metadata.gz: 8f92ec31c86801736cdc8cd6c2cd7265ed6054d48e796d3961c00490b1e8a79cdfaeefddc4746c2d3d714e0659f95ab0e1873331b3d6835acf0eaf47ed9dca4f
+  data.tar.gz: 2495f460854161a8e241c67babb8bd7eb72bf63bbaabd04b867a195e106207e6fbd5701c687acf8909bac241adecc25e32e571660d904ccebc32b3edd287d327

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.1.2
+### Fixed
+* Make `FakeDriver` thread-safe
+* Sort objects in `FakeDriver#list` by key
+
 ## 1.1.1
 ### Fixed
 * Use `mkdir_p` in `FileDriver#download`

data/lib/attachie/fake_driver.rb

@@ -32,22 +32,28 @@ module Attachie
   end
 
   class FakeDriver
+    include MonitorMixin
+
     class ItemNotFound < StandardError; end
 
     def list(bucket, prefix: nil)
       return enum_for(:list, bucket, prefix: prefix) unless block_given?
 
-      objects(bucket).dup.each do |key, _|
-        yield key if prefix.nil? || key.start_with?(prefix)
+      synchronize do
+        objects(bucket).sort { |a, b| a[0] <=> b[0] }.each do |key, _|
+          yield key if prefix.nil? || key.start_with?(prefix)
+        end
       end
     end
 
     def info(name, bucket)
-      {
-        last_modified: nil,
-        content_length: objects(bucket)[name].size,
-        content_type: MIME::Types.of(name).first&.to_s
-      }
+      synchronize do
+        {
+          last_modified: nil,
+          content_length: objects(bucket)[name].size,
+          content_type: MIME::Types.of(name).first&.to_s
+        }
+      end
     end
 
     def presigned_post(name, bucket, options = {})
@@ -55,25 +61,35 @@ module Attachie
     end
 
     def store(name, data_or_io, bucket, options = {})
-      objects(bucket)[name] = data_or_io.respond_to?(:read) ? data_or_io.read : data_or_io
+      synchronize do
+        objects(bucket)[name] = data_or_io.respond_to?(:read) ? data_or_io.read : data_or_io
+      end
     end 
 
     def store_multipart(name, bucket, options = {}, &block)
-      objects(bucket)[name] = FakeMultipartUpload.new(name, bucket, options, &block).data
+      synchronize do
+        objects(bucket)[name] = FakeMultipartUpload.new(name, bucket, options, &block).data
+      end
     end
 
     def exists?(name, bucket)
-      objects(bucket).key?(name)
+      synchronize do
+        objects(bucket).key?(name)
+      end
     end 
 
     def delete(name, bucket)
-      objects(bucket).delete(name)
+      synchronize do
+        objects(bucket).delete(name)
+      end
     end 
 
     def value(name, bucket)
-      raise(ItemNotFound) unless objects(bucket).key?(name)
+      synchronize do
+        raise(ItemNotFound) unless objects(bucket).key?(name)
 
-      objects(bucket)[name]
+        objects(bucket)[name]
+      end
     end 
 
     def download(name, bucket, path)
@@ -87,14 +103,18 @@ module Attachie
     end
 
     def flush
-      @objects = {}
+      synchronize do
+        @objects = {}
+      end
     end 
 
     private
 
     def objects(bucket)
-      @objects ||= {}
-      @objects[bucket] ||= {}
+      synchronize do
+        @objects ||= {}
+        @objects[bucket] ||= {}
+      end
     end 
   end 
 end

data/lib/attachie/version.rb

@@ -1,3 +1,3 @@
 module Attachie
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/spec/attachie/fake_driver_spec.rb

@@ -21,6 +21,14 @@ RSpec.describe Attachie::FakeDriver do
 
       expect(driver.list("bucket1", prefix: "object").to_a).to eq(["object1", "object2"])
     end
+
+    it "sorts the objects by key" do
+      driver.store("object2", "blob", "bucket")
+      driver.store("object1", "blob", "bucket")
+      driver.store("object3", "blob", "bucket")
+
+      expect(driver.list("bucket").to_a).to eq(["object1", "object2", "object3"])
+    end
   end
 
   describe "#store" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attachie
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-01 00:00:00.000000000 Z
+date: 2021-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3