attachie 1.2.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 426ea398ce4c4a06805ccc1d3640e1fa67288e1c468cd06c7373335f4c9367b9
-  data.tar.gz: 4b4727398f90606dd4ef40beb4bb09e76c907551a94838f029e5801e374438c6
+  metadata.gz: c4dc1a3393421a2accb0c07990ac3375b430fc2476426a0621526455351c7ee4
+  data.tar.gz: 951319408c1cc9d4780d3cdf0431e1867b564e8ae27a948100fa6c2393c07cdb
 SHA512:
-  metadata.gz: 5720192d8aa3f016822f72e0a496f92da3540e37af468e5051d9b27b0ab6425fff71568896d0dcd8c5c71fa8610dbf5c09b80ed01da243bea447cb16020a0a59
-  data.tar.gz: ed58ffa041525bb43d676cf505267de7c3814eec9e497ca07ca06d91c05a168983c31e65ba36713a4db74c1e0c727bdca63f0cd4707820205bc936bdf8d7e0a2
+  metadata.gz: dcca0e92e21b2acf9ca876a6f38edb4fffc142d117ac365e2bf0f186fb2513beba3fba6dfc4c4fd29f519ff81819a6cb3b9f8eabc9a14bca6ddf466d549de1f4
+  data.tar.gz: a11a61a127abef07278e36f6db19e13e0ce3c12d6412cd91fa85e8aed5569e0cd15df01b543dabe1e5160a954216921ed36d0725d68d4f24960964beeaa1f9a0

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## 2.0.0
+### BREAKING
+* Wrap `Aws::S3::Errors::NotFound` from `Attachie::S3Driver` and
+ `Errno::ENOENT` from `Attachie::FileDriver` in `Attachie::ItemNotFound`
+* Change `Attachie::FakeDriver::ItemNotFound` to `Attachie::ItemNotFound`
+* Make `#delete` always return `true` for all drivers
+### Added
+* Added `Attachie::BaseError` as a base for all attachie exceptions
+
 ## 1.2.1
 ### Fixed
 * Fix regarding `File.exists?` being no longer available in ruby 3.2

data/lib/attachie/fake_driver.rb

@@ -34,8 +34,6 @@ module Attachie
   class FakeDriver
     include MonitorMixin
 
-    class ItemNotFound < StandardError; end
-
     def list(bucket, prefix: nil)
       return enum_for(:list, bucket, prefix: prefix) unless block_given?
 
@@ -48,6 +46,8 @@ module Attachie
 
     def info(name, bucket)
       synchronize do
+        raise(ItemNotFound, "Object #{ name } does not exist in bucket #{ bucket }") unless objects(bucket).key?(name)
+
         {
           last_modified: objects(bucket)[name][:last_modified],
           content_length: objects(bucket)[name][:data].size,
@@ -82,6 +82,8 @@ module Attachie
       synchronize do
         objects(bucket).delete(name)
       end
+
+      true
     end 
 
     def value(name, bucket)

data/lib/attachie/file_driver.rb

@@ -75,6 +75,8 @@ module Attachie
         content_type: MIME::Types.of(name).first&.to_s,
         content_length: File.size(path_for(name, bucket))
       }
+    rescue Errno::ENOENT => e
+      raise ItemNotFound, e.message
     end
 
     def store_multipart(name, bucket, options = {}, &block)
@@ -87,6 +89,8 @@ module Attachie
 
     def value(name, bucket)
       File.binread path_for(name, bucket)
+    rescue Errno::ENOENT => e
+      raise ItemNotFound, e.message
     end
 
     def download(name, bucket, dest_path)
@@ -95,6 +99,8 @@ module Attachie
       FileUtils.mkdir_p File.dirname(path)
 
       FileUtils.cp(path, dest_path)
+    rescue Errno::ENOENT => e
+      raise ItemNotFound, e.message
     end
 
     def delete(name, bucket)

data/lib/attachie/s3_driver.rb

@@ -84,6 +84,8 @@ module Attachie
         last_modified: object.last_modified,
         content_type: object.content_type
       }
+    rescue Aws::S3::Errors::NotFound => e
+      raise ItemNotFound, e.message
     end
 
     def store(name, data_or_io, bucket, options = {})
@@ -112,14 +114,20 @@ module Attachie
 
     def value(name, bucket)
       s3_resource.bucket(bucket).object(name).get.body.read.force_encoding(Encoding::BINARY)
+    rescue Aws::S3::Errors::NotFound => e
+      raise ItemNotFound, e.message
     end
 
     def download(name, bucket, path)
       s3_resource.bucket(bucket).object(name).download_file(path)
+    rescue Aws::S3::Errors::NotFound => e
+      raise ItemNotFound, e.message
     end
 
     def delete(name, bucket)
       s3_resource.bucket(bucket).object(name).delete
+
+      true
     end
 
     def exists?(name, bucket)

data/lib/attachie/version.rb

@@ -1,3 +1,3 @@
 module Attachie
-  VERSION = "1.2.1"
+  VERSION = "2.0.0"
 end

data/lib/attachie.rb

@@ -4,10 +4,12 @@ require "attachie/interpolation"
 require "active_support/all"
 
 module Attachie
-  class UnknownAttachment < StandardError; end
-  class NoSuchVersion < StandardError; end
-  class InterpolationError < StandardError; end
-  class NotSupported < StandardError; end
+  class BaseError < StandardError; end
+  class UnknownAttachment < BaseError; end
+  class NoSuchVersion < BaseError; end
+  class InterpolationError < BaseError; end
+  class NotSupported < BaseError; end
+  class ItemNotFound < BaseError; end
 
   def self.default_options
     @default_options ||= { :protocol => "http" }

data/spec/attachie/fake_driver_spec.rb

@@ -53,6 +53,16 @@ RSpec.describe Attachie::FakeDriver do
         tempfile.close(true)
       end
     end
+
+    it "raises an Attachie::ItemNotFound when the object does not exist" do
+      tempfile = Tempfile.new
+
+      begin
+        expect { driver.download("unknown", "bucket", tempfile.path) }.to raise_error(Attachie::ItemNotFound)
+      ensure
+        tempfile.close(true)
+      end
+    end
   end
 
   describe "#store_multipart" do
@@ -75,6 +85,10 @@ RSpec.describe Attachie::FakeDriver do
       driver.delete("name", "bucket")
       expect(driver.exists?("name", "bucket")).to be(false)
     end
+
+    it "returns true even when the object does not exist" do
+      expect(driver.delete("unknown", "bucket")).to eq(true)
+    end
   end
 
   describe "#temp_url" do
@@ -97,6 +111,10 @@ RSpec.describe Attachie::FakeDriver do
         last_modified: timestamp
       )
     end
+
+    it "raises an Attachie::ItemNotFound when the object does not exist" do
+      expect { driver.info("unknown", "bucket") }.to raise_error(Attachie::ItemNotFound)
+    end
   end
 end
 

data/spec/attachie/file_driver_spec.rb

@@ -37,6 +37,16 @@ RSpec.describe Attachie::FileDriver do
         tempfile.close(true)
       end
     end
+
+    it "raises an Attachie::ItemNotFound when the object does not exist" do
+      tempfile = Tempfile.new
+
+      begin
+        expect { driver.download("unknown", "bucket", tempfile.path) }.to raise_error(Attachie::ItemNotFound)
+      ensure
+        tempfile.close(true)
+      end
+    end
   end
 
   describe" #store_multipart" do
@@ -67,6 +77,10 @@ RSpec.describe Attachie::FileDriver do
         driver.delete("name", "bucket")
       end
     end
+
+    it "returns true even when the object does not exist" do
+      expect(driver.delete("unknown", "bucket")).to eq(true)
+    end
   end
 
   describe "#info" do
@@ -83,6 +97,10 @@ RSpec.describe Attachie::FileDriver do
         driver.delete("name.txt", "bucket")
       end
     end
+
+    it "raises an Attachie::ItemNotFound when the object does not exist" do
+      expect { driver.info("unknown", "bucket") }.to raise_error(Attachie::ItemNotFound)
+    end
   end
 end
 

data/spec/attachie/s3_driver_spec.rb

@@ -55,6 +55,16 @@ RSpec.describe Attachie::S3Driver do
         tempfile.close(true)
       end
     end
+
+    it "raises an Attachie::ItemNotFound when the object does not exist" do
+      tempfile = Tempfile.new
+
+      begin
+        expect { driver.download("unknown", "bucket", tempfile.path) }.to raise_error(Attachie::ItemNotFound)
+      ensure
+        tempfile.close(true)
+      end
+    end
   end
 
   describe "#store_multipart" do
@@ -85,6 +95,10 @@ RSpec.describe Attachie::S3Driver do
         driver.delete("name", "bucket")
       end
     end
+
+    it "returns true even when the object does not exist" do
+      expect(driver.delete("unknown", "bucket")).to eq(true)
+    end
   end
 
   describe "#temp_url" do
@@ -131,6 +145,10 @@ RSpec.describe Attachie::S3Driver do
         driver.delete("name.txt", "bucket")
       end
     end
+
+    it "raises an Attachie::ItemNotFound when the object does not exist" do
+      expect { driver.info("unknown", "bucket") }.to raise_error(Attachie::ItemNotFound)
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attachie
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-28 00:00:00.000000000 Z
+date: 2023-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3