remote_files 3.3.0 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2bdd40ed1be30e3649f6089e603134e8cbc4bf8445d8b355f769b4ce29c2b25
-  data.tar.gz: 9a4d13593c4022eff78130eaf61d61e83a6bd8cfaae164636dfd81fca95fd7d2
+  metadata.gz: 2c031b3f95c929678e3ab56a3cc98c6aea47db1c294bfbd7b20a4390e90d06b6
+  data.tar.gz: c0665d4387cb9e15fca35e89387e6ac687b8b3c616d4d004892c6787596efe89
 SHA512:
-  metadata.gz: 648b24549307387c950a8ef5f72b0df42f6274eb53889b8c207e0aaba40618bbe1d1bbb43192baf6b037d43c885d492739994ee204a4e65e041321c4640e5d92
-  data.tar.gz: 8ad800c0ddd17a85e4631d6b38e960287c278127b88ec349cb2df890e37442e3fba4239e1219b6b54d66b6cebaf328bb92571607a6e3fd9817e2ef0dbc0ee7c0
+  metadata.gz: 646ff0467bf953702039d0240ca72fe56c0989d5639caa21778079ff4d5ae84014e85e9a191b48095b22dcafe70ba65819e52d771acb5da040fe418b6865b482
+  data.tar.gz: 45cdccb5afa27109216a3c4b56ba220de6410935dddcfde320b61a0642ffea945c3722f179c22b40fd8c8427098534fc93a06f7fc4042a8e2224fcf1d0707ad1

data/lib/remote_files/abstract_store.rb

@@ -22,6 +22,14 @@ module RemoteFiles
       raise "You need to implement #{self.class.name}:#directory_name"
     end
 
+    def files(prefix = '')
+      raise "You need to implement #{self.class.name} #files"
+    end
+
+    def copy_to_store!(file, target_store)
+      raise "You need to implement #{self.class.name} #copy_to_store!"
+    end
+
     def store!(file)
       raise "You need to implement #{self.class.name}#store!"
     end

data/lib/remote_files/file.rb

@@ -1,16 +1,17 @@
 module RemoteFiles
   class File
-    attr_reader :content, :content_type, :identifier, :stored_in, :configuration, :populate_stored_in
+    attr_reader :content, :content_type, :identifier, :stored_in, :configuration, :populate_stored_in, :last_update_ts
 
     def initialize(identifier, options = {})
-      known_keys = [:identifier, :stored_in, :content_type, :configuration, :content, :populate_stored_in]
+      known_keys = [:identifier, :stored_in, :content_type, :configuration, :content, :populate_stored_in, :last_update_ts]
       known_keys.each do |key|
         options[key] ||= options.delete(key.to_s)
       end
 
       @identifier    = identifier
-      @stored_in     = (options[:stored_in] || []).map(&:to_sym)
+      @stored_in     = (options[:stored_in] || []).map(&:to_sym) # TODO: Refactor so that there are two classes: `File` and `FileCopy`
       @content       = options.delete(:content)
+      @last_update_ts = options[:last_update_ts] || Time.now
       @content_type  = options[:content_type]
       @configuration = RemoteFiles::CONFIGURATIONS[(options[:configuration] || :default).to_sym]
       @logger        = options[:logger]

data/lib/remote_files/file_store.rb

@@ -1,7 +1,7 @@
 require 'pathname'
 require 'fileutils'
 
-# This is good for use in deveopment
+# This is good for use in development
 
 module RemoteFiles
   class FileStore < AbstractStore
@@ -13,6 +13,21 @@ module RemoteFiles
       end
     end
 
+    def files(prefix = '')
+      dir = directory + prefix
+
+      return [] unless dir.exist?
+
+      dir.children.reject do |child|
+        child.directory?
+      end.map do |child|
+        File.new(child.basename.to_s,
+                 :stored_in => [self],
+                 :last_update_ts => child.mtime
+        )
+      end
+    end
+
     def store!(file)
       file_name = directory + file.identifier
 
@@ -30,12 +45,19 @@ module RemoteFiles
       end
     end
 
+    def copy_to_store!(file, target_store)
+      FileUtils.cp(directory + file.identifier, target_store.directory + file.identifier)
+    end
+
     def retrieve!(identifier)
-      content = (directory + identifier).read
+      path = directory + identifier
+
+      content = (path).read
 
       RemoteFiles::File.new(identifier,
         :content      => content,
-        :stored_in    => [self]
+        :stored_in    => [self],
+        :last_update_ts => path.mtime
         # what about content-type? maybe use the mime-types gem?
       )
     rescue Errno::ENOENT

data/lib/remote_files/fog_store.rb

@@ -7,6 +7,7 @@ module RemoteFiles
 
     def store!(file)
       success = directory.files.create(store_options(file))
+      # TODO: Probably get the last modified time
 
       raise RemoteFiles::Error unless success
 
@@ -15,6 +16,10 @@ module RemoteFiles
       raise RemoteFiles::Error, $!.message, $!.backtrace
     end
 
+    def copy_to_store!(file, target_store)
+      target_store.connection.copy_object(directory_name, file.identifier, target_store.directory_name, file.identifier)
+    end
+
     def retrieve!(identifier)
       fog_file = directory.files.get(identifier)
 
@@ -23,7 +28,8 @@ module RemoteFiles
       File.new(identifier,
         :content      => fog_file.body,
         :content_type => fog_file.content_type,
-        :stored_in    => [self]
+        :stored_in    => [self],
+        :last_update_ts => fog_file.last_modified
       )
     rescue Fog::Errors::Error, Excon::Errors::Error
       raise RemoteFiles::Error, $!.message, $!.backtrace
@@ -70,6 +76,23 @@ module RemoteFiles
       options[:directory]
     end
 
+    # TODO: Add file bodies if we think it's worth it
+    def files(prefix = '')
+      full_list = []
+
+      directory.files.all(:prefix => prefix).each do |file|
+        full_list.push(
+          File.new(file.identity,
+                 :content_type => file.content_type,
+                 :stored_in => [self],
+                 :last_update_ts => file.last_modified
+          )
+        )
+      end
+
+      full_list
+    end
+
     def directory
       @directory ||= lookup_directory || create_directory
     end

data/lib/remote_files/memory_store.rb

@@ -22,7 +22,11 @@ module RemoteFiles
 
     def store!(file)
       content = file.content.respond_to?(:read) ? file.content.read : file.content
-      data[file.identifier] = { :content => content, :content_type => file.content_type}
+      data[file.identifier] = { :content => content, :content_type => file.content_type, :last_update_ts => file.last_update_ts}
+    end
+
+    def copy_to_store!(file, target_store)
+      target_store.data[file.identifier] = data[file.identifier]
     end
 
     def retrieve!(identifier)
@@ -31,10 +35,23 @@ module RemoteFiles
       File.new(identifier,
         :content      => data[identifier][:content],
         :content_type => data[identifier][:content_type],
+        :last_update_ts => data[identifier][:last_update_ts],
         :stored_in    => [self]
       )
     end
 
+    def files(prefix = '')
+      @data.reject do |identifier|
+        !identifier.start_with? prefix
+      end.map do |identifier, data|
+        File.new(identifier,
+                 :content_type => data[:content_type],
+                 :last_update_ts => data[:last_update_ts],
+                 :stored_in => [self]
+        )
+      end
+    end
+
     def directory_name
       self.identifier.to_s
     end

data/lib/remote_files/version.rb

@@ -1,3 +1,3 @@
 module RemoteFiles
-  VERSION = '3.3.0'
+  VERSION = '3.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remote_files
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Mick Staugaard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-05-03 00:00:00.000000000 Z
+date: 2022-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-aws