attachie 1.0.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a6322baba1a72a9869ed2cb50a2f58a890fed49a5b1fbfb57c6e358dfcce4b2
-  data.tar.gz: 7e95e247cf920af92fd51d32b21bf2d0a82a59af022cacc1343a2bb71612d5b7
+  metadata.gz: 1e46dfdb8f2b5d9b94594ca38b5d72b3164a7659ce165f6e5f328ee72275ee5a
+  data.tar.gz: d88df51754ce79dc3f716b0e5ccbd7fc4853bde2b92dbf75a85bc65dbb5b83ae
 SHA512:
-  metadata.gz: ef797be58fb2573636f3cfc9de41fc1484cc8f6357488e7d1699ed5288a79b3c2ca0a51795ab825ce8941f05c69986dd84dd05b1861493ef74c8cc1afb5a1cd6
-  data.tar.gz: e986a15bc1a7781d4d60f620949582ae455c0dc6374c818930c7990a430bc9cbc4740d14cb2b0a60865769c084b7bc5bbce9c55f5aa1cabb0a10790704767745
+  metadata.gz: 8f92ec31c86801736cdc8cd6c2cd7265ed6054d48e796d3961c00490b1e8a79cdfaeefddc4746c2d3d714e0659f95ab0e1873331b3d6835acf0eaf47ed9dca4f
+  data.tar.gz: 2495f460854161a8e241c67babb8bd7eb72bf63bbaabd04b867a195e106207e6fbd5701c687acf8909bac241adecc25e32e571660d904ccebc32b3edd287d327

data/.github/workflows/test.yml

@@ -0,0 +1,27 @@
+name: test
+on: [push, pull_request]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ['2.5', '2.6', '2.7']
+    services:
+      fake-s3:
+        image: lphoward/fake-s3
+        ports:
+          - 4569:4569
+    steps:
+    - uses: actions/checkout@v1
+    - uses: actions/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+    - uses: actions/cache@v1
+      id: cache
+      with:
+        path: vendor/bundler
+        key: ${{ hashFiles('Gemfile.lock') }}-${{ matrix.ruby }}
+    - run: |
+        gem install bundler
+        bundle install --path=vendor/bundler
+        bundle exec rspec

data/CHANGELOG.md

@@ -0,0 +1,18 @@
+# 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`
+
+## 1.1.0
+### Added
+* Added a download method to download files to a specific path
+
+## 1.0.1
+### Fixed
+* dup list result in FakeDriver before iterating

data/README.md

@@ -70,6 +70,7 @@ user.avatar(:icon).delete
 user.avatar(:icon).exists?
 user.avatar(:icon).value
 user.avatar(:icon).temp_url(expires_in: 2.days) # Must be supported by the driver
+user.avator(:icon).download("/path/to/destination")
 ```
 
 ## Drivers

data/lib/attachie.rb

@@ -59,6 +59,10 @@ module Attachie
         option(:driver).store(path, data_or_io, container, opts)
       end
 
+      def download(dest_path)
+        option(:driver).download(path, container, dest_path)
+      end
+
       def info
         option(:driver).info(path, container)
       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).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,40 +61,60 @@ 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)
+      content = value(name, bucket)
+
+      open(path, "wb") { |stream| stream.write(content) }
+    end
+
     def temp_url(name, bucket, options = {})
       "https://example.com/#{bucket}/#{name}?signature=signature&expires=expires"
     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/file_driver.rb

@@ -89,6 +89,14 @@ module Attachie
       File.binread path_for(name, bucket)
     end
 
+    def download(name, bucket, dest_path)
+      path = path_for(name, bucket)
+
+      FileUtils.mkdir_p File.dirname(path)
+
+      FileUtils.cp(path, dest_path)
+    end
+
     def delete(name, bucket)
       path = path_for(name, bucket)
 

data/lib/attachie/s3_driver.rb

@@ -114,6 +114,10 @@ module Attachie
       s3_resource.bucket(bucket).object(name).get.body.read.force_encoding(Encoding::BINARY)
     end
 
+    def download(name, bucket, path)
+      s3_resource.bucket(bucket).object(name).download_file(path)
+    end
+
     def delete(name, bucket)
       s3_resource.bucket(bucket).object(name).delete
     end

data/lib/attachie/version.rb

@@ -1,3 +1,3 @@
 module Attachie
-  VERSION = "1.0.0"
+  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
@@ -32,6 +40,21 @@ RSpec.describe Attachie::FakeDriver do
     end
   end
 
+  describe "#download" do
+    it "downloads the blob to the specified path" do
+      tempfile = Tempfile.new
+
+      begin
+        driver.store("name", "blob", "bucket")
+        driver.download("name", "bucket", tempfile.path)
+
+        expect(tempfile.read).to eq("blob")
+      ensure
+        tempfile.close(true)
+      end
+    end
+  end
+
   describe "#store_multipart" do
     it "stores a blob via multipart upload" do
       driver.store_multipart("name", "bucket") do |upload|

data/spec/attachie/file_driver_spec.rb

@@ -23,6 +23,22 @@ RSpec.describe Attachie::FileDriver do
     end
   end
 
+  describe "#download" do
+    it "downloads the blob to the specified path" do
+      tempfile = Tempfile.new
+
+      begin
+        driver.store("name", "blob", "bucket")
+        driver.download("name", "bucket", tempfile.path)
+
+        expect(tempfile.read).to eq("blob")
+      ensure
+        driver.delete("name", "bucket")
+        tempfile.close(true)
+      end
+    end
+  end
+
   describe" #store_multipart" do
     it "stores a blob via multipart upload" do
       begin

data/spec/attachie/s3_driver_spec.rb

@@ -7,6 +7,7 @@ RSpec.describe Attachie::S3Driver do
       access_key_id: "access_key_id",
       secret_access_key: "secret_access_key",
       endpoint: "http://localhost:4569",
+      force_path_style: true,
       region: "us-east-1"
     ))
   end
@@ -40,6 +41,22 @@ RSpec.describe Attachie::S3Driver do
     end
   end
 
+  describe "#download" do
+    it "downloads the blob to the specified path" do
+      tempfile = Tempfile.new
+
+      begin
+        driver.store("name", "blob", "bucket")
+        driver.download("name", "bucket", tempfile.path)
+
+        expect(tempfile.read).to eq("blob")
+      ensure
+        driver.delete("name", "bucket")
+        tempfile.close(true)
+      end
+    end
+  end
+
   describe "#store_multipart" do
     it "stores a blob via multipart upload" do
       begin
@@ -82,7 +99,7 @@ RSpec.describe Attachie::S3Driver do
         fields: hash_including("key" => "path/to/object"),
         headers: {},
         method: "post",
-        url: "http://bucket.localhost:4569"
+        url: "http://localhost:4569/bucket"
       )
     end
 

data/spec/attachie_spec.rb

@@ -37,7 +37,7 @@ RSpec.describe TestModel do
 
   it "correctly uses the driver" do
     test_model = TestModel.new(filename: "blob.txt")
-    test_model.file(:large).store "blob"
+    test_model.file(:large).store("blob")
 
     expect(test_model.file(:large).value).to eq("blob")
   end
@@ -54,6 +54,22 @@ RSpec.describe TestModel do
     expect(test_model.updated_at).to be_nil
   end
 
+  describe "#download" do
+    it "downloads the file to the specified path" do
+      tempfile = Tempfile.new
+
+      begin
+        test_model = TestModel.new(filename: "blob.txt")
+        test_model.file(:large).store("blob")
+        test_model.file(:large).download(tempfile.path)
+
+        expect(tempfile.read).to eq("blob")
+      ensure
+        tempfile.close(true)
+      end
+    end
+  end
+
   describe "#info" do
     it "returns info about the attachment" do
       test_model = TestModel.new(filename: "blob.txt")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attachie
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Benjamin Vetter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2021-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
@@ -129,8 +129,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
-- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -168,8 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Declarative and flexible attachments

data/.travis.yml

@@ -1,13 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.3.3
-addons:
-  hosts:
-    - bucket.localhost
-before_install:
-  - docker-compose up -d
-  - sleep 10
-install:
-  - travis_retry bundle install
-script: rspec