attachie 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f21f7eb60467e9fb640626ad3633013e73166d975565afad29a761c8847bb83c
-  data.tar.gz: fb06c69f95ecd1264f13c7d162ab415c94e356deb2b771e7d766852da86de83d
+  metadata.gz: 2eb19de73f237ed0298861ef6b69bd4fdb0ca87b6fb4e30fdd26a3e594f25954
+  data.tar.gz: 3b2f115036c310943864d0732d369f9e796c784aa125a23ec85136c1e0956fdc
 SHA512:
-  metadata.gz: 0f5cd5094aad872ccda17615f1aa2e0c6f582937a0be6f54b45e1ff986f04fad148224d4415ecefcdee4a04a6638ec44031b7dd5167eac6c4f13c21ed7ca317c
-  data.tar.gz: 54ea0ef551453b1335a5267f04c9b43c0fa34d624a1923c10dc946385e6cba09554f4d628cb5b7fe5110c54aad730d4dc9d08c2673caf68d8ffdd0a0c520e7ce
+  metadata.gz: 3094cc9dbf755c8c942ee0e8903a99e364180415f16b7fb69e959d01d8f4c34110722f77acc5f2585e5686b58c0a9553505a7843fd7bbe244ef2cc68cbfc861d
+  data.tar.gz: a976071b69c6a5429d53dc9b3f7427ab1fd3a2f5df665058f2325ae873478b3eb86a86aff71d24bdcd5c4b03cf6439f4954291f0496106f6483200cf3fd948ec

data/.github/workflows/test.yml

@@ -5,7 +5,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: ['2.5', '2.6', '2.7']
+        ruby: ['2.6', '2.7', '3.0']
     services:
       fake-s3:
         image: lphoward/fake-s3

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 1.2.0
+### Added
+* Return proper `last_modified` in `FakeDriver#info`
+
+## 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/attachie.gemspec

@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "fakes3"
+  spec.add_development_dependency "timecop"
 end

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: objects(bucket)[name][:last_modified],
+          content_length: objects(bucket)[name][:data].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: data_or_io.respond_to?(:read) ? data_or_io.read : data_or_io, last_modified: Time.now.utc }
+      end
     end 
 
     def store_multipart(name, bucket, options = {}, &block)
-      objects(bucket)[name] = FakeMultipartUpload.new(name, bucket, options, &block).data
+      synchronize do
+        objects(bucket)[name] = { data: FakeMultipartUpload.new(name, bucket, options, &block).data, last_modified: Time.now.utc }
+      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, "Object #{ name } does not exist in bucket #{ bucket }") unless objects(bucket).key?(name)
 
-      objects(bucket)[name]
+        objects(bucket)[name][:data]
+      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.2.0"
 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
@@ -77,12 +85,16 @@ RSpec.describe Attachie::FakeDriver do
 
   describe "#info" do
     it "returns info about the object" do
-      driver.store("name.txt", "blob", "bucket")
+      timestamp = Time.now.utc
+
+      Timecop.freeze timestamp do
+        driver.store("name.txt", "blob", "bucket")
+      end
 
       expect(driver.info("name.txt", "bucket")).to eq(
         content_length: 4,
         content_type: "text/plain",
-        last_modified: nil
+        last_modified: timestamp
       )
     end
   end

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require File.expand_path("../../lib/attachie", __FILE__)
 require "attachie/file_driver"
 require "attachie/fake_driver"
 require "attachie/s3_driver"
+require "timecop"
 
 class Product
   include Attachie

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attachie
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Benjamin Vetter
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-01 00:00:00.000000000 Z
+date: 2022-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -122,6 +122,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Declarative and flexible attachments
 email:
 - vetter@plainpicture.de
@@ -154,7 +168,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -169,8 +183,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Declarative and flexible attachments
 test_files: