eac_fs 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8adcfc3c8dd15da3828dbb522be9117d6c07c763006301dc248107fbe079356c
-  data.tar.gz: 358cecbb08b7c445f84147a3cbd1961fb5248ddf3b1dc3d771153440df5b1ad3
+  metadata.gz: e852c4bca2367df238571d8d843e2440fe0c7e91f564dab685f4ea1e5188d7a2
+  data.tar.gz: aa31fa42eedb2bb8ed49642dadd57d2c548fca7c484e9d0e766bf3c8712f1f44
 SHA512:
-  metadata.gz: f532f36fc63a421c9c0bc9472014b13c545b55e8c27ca30db85935c9e90a1360bf4193edbfbe87b301c02c9713cea7ab55e1909923741bd7c3431c7f69a883ad
-  data.tar.gz: 1b32848d04f515f8bead2fd493f411fbfc99181b1927475cf9ace1a4aec2b6c2413e470217c3c1fb8e1504912559328eaec5586549c4d2fe93cbdc22241cde6f
+  metadata.gz: f2f4aabd8d31321f475f67545db56fa49fdc54bf46fcb007478589e1d365fb45050dc0f988536c7e3232b8839d9b3a72a1c2ce612bfcc1ddd4a0481cc000610a
+  data.tar.gz: c89c848cb937e1bb100584d7974180a7dd8725d8b233837ee04ae12f649fd424966a7b82e29dd2fdb1f64886e3a9f18b844a46e42cfbdd191a9197336f180860

data/lib/eac_fs/cached_download.rb

@@ -13,7 +13,7 @@ module Avm
     end
 
     def assert
-      download unless fs_cache.cached?
+      download unless fs_cache.stored?
     end
 
     def download

data/lib/eac_fs/contexts.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'eac_ruby_utils/core_ext'
+require 'eac_ruby_utils/context'
+
+module EacFs
+  class Contexts
+    TYPES = %i[cache config data].freeze
+
+    class << self
+      TYPES.each do |type|
+        class_eval <<~CODE, __FILE__, __LINE__ + 1
+          # @return [EacRubyUtils::Context<EacFs::StorageTree>]
+          def #{type}
+            @#{type} ||= ::EacRubyUtils::Context.new
+          end
+        CODE
+      end
+    end
+  end
+end

data/lib/eac_fs/patches/module/fs_cache.rb

@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
-require 'eac_fs/cache'
+require 'eac_fs/contexts'
 
 class Module
-  # @return [EacFs::Cache]
-  def fs_cache
-    ::EacFs::Cache.context.current.child('fs_cache', *name.split('::'))
+  ::EacFs::Contexts::TYPES.each do |type|
+    method_name = "fs_#{type}"
+    class_eval <<~CODE, __FILE__, __LINE__ + 1
+      # @return [EacFs::StorageTree]
+      def #{method_name}
+        ::EacFs::Contexts.#{type}.current.child('#{method_name}', *name.split('::'))
+      end
+    CODE
   end
 end

data/lib/eac_fs/patches/object/fs_cache.rb

@@ -1,17 +1,27 @@
 # frozen_string_literal: true
 
+require 'eac_fs/contexts'
 require 'eac_fs/patches/module/fs_cache'
 
 class Object
-  # @return [EacFs::Cache]
-  def fs_cache
-    oid = fs_cache_object_id
-    oid = [oid.to_s] unless oid.is_a?(::Enumerable)
-    oid.inject(self.class.fs_cache) { |a, e| a.child(e.to_s) }
+  ::EacFs::Contexts::TYPES.each do |type|
+    class_eval <<~CODE, __FILE__, __LINE__ + 1
+      # @return [EacFs::StorageTree]
+      def fs_#{type}
+        oid = fs_object_id_by_type(:'#{type}')
+        oid = [oid.to_s] unless oid.is_a?(::Enumerable)
+        oid.inject(self.class.fs_#{type}) { |a, e| a.child(e.to_s) }
+      end
+    CODE
   end
 
   # @return [String, Array<String>]
-  def fs_cache_object_id
+  def fs_object_id
     raise 'Abstract method hit'
   end
+
+  def fs_object_id_by_type(type)
+    method = "fs_#{type}_object_id"
+    respond_to?(method) ? send(method) : fs_object_id
+  end
 end

data/lib/eac_fs/{cache.rb → storage_tree.rb}

@@ -4,9 +4,7 @@ require 'eac_ruby_utils/core_ext'
 require 'fileutils'
 
 module EacFs
-  class Cache
-    enable_context
-
+  class StorageTree
     CONTENT_FILE_NAME = '__content__'
 
     attr_reader :path
@@ -18,19 +16,19 @@ module EacFs
     end
 
     def clear
-      return unless cached?
+      return unless stored?
 
       ::File.unlink(content_path)
     end
 
     def read
-      return nil unless cached?
+      return nil unless stored?
 
       ::File.read(content_path)
     end
 
     def read_or_cache
-      write(yield) unless cached?
+      write(yield) unless stored?
 
       read
     end
@@ -45,7 +43,7 @@ module EacFs
       self.class.new(path, *child_path_parts)
     end
 
-    def cached?
+    def stored?
       ::File.exist?(content_path)
     end
 

data/lib/eac_fs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EacFs
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eac_fs
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Put here the authors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-11 00:00:00.000000000 Z
+date: 2022-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: content-type
@@ -73,8 +73,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/eac_fs.rb
-- lib/eac_fs/cache.rb
 - lib/eac_fs/cached_download.rb
+- lib/eac_fs/contexts.rb
 - lib/eac_fs/file_info.rb
 - lib/eac_fs/logs.rb
 - lib/eac_fs/logs/file.rb
@@ -85,6 +85,7 @@ files:
 - lib/eac_fs/patches/object/fs_cache.rb
 - lib/eac_fs/patches/pathname.rb
 - lib/eac_fs/patches/pathname/info.rb
+- lib/eac_fs/storage_tree.rb
 - lib/eac_fs/traversable.rb
 - lib/eac_fs/traverser.rb
 - lib/eac_fs/version.rb