evt-entity_cache 2.0.0.1 → 2.0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0007333aebd8a09e10abc3015998b795d8f30dedeb7a68bbad6346654eb0a70a
-  data.tar.gz: c7a3b0a1b774b6936b6c37bf28cb9aa80763c3a896963a4ccacd6694aa577b04
+  metadata.gz: 0a65dee7e03fdffdece4718fe1d50e5cdf3f5e59466dfb224068b84c8356b6fc
+  data.tar.gz: b5f966733c02ad8280f954d10226ae99656788514d522e66e3b7750b1670ed62
 SHA512:
-  metadata.gz: 240bda1f074aa169d17ba8aa867598c78e14adbe9c4ce851c4a290a157e8057b6f4bc22bd8bfe95e6779b1d53eda1d23b01f9f14f28c8f61c3c66048282531b8
-  data.tar.gz: 214fb735d89e7fcee4ef7289401db0295fb59c9cb2100631f4de44a2b5d985b23d1903a6dbec1d4911f8407b53e8490be2556cd18ce95a3d6570e0f221f020a5
+  metadata.gz: bad5d326c349c724b90b47fc8e4c5bfbf9c6558be071d9a61b1363266284a084b4a4ff2e5cde5eeb9596570252927e7cbb8038e610f3d9d5d4229e4232384072
+  data.tar.gz: fc18bafad76966151ff5029c4af0996e1b763113efc50a47e7f740f2c94b5030fc58bbe0fac5e8a73617e4014f20ea65bcba755e754d9762e26302541c02b827

data/lib/entity_cache/controls/entity_cache.rb

@@ -0,0 +1,11 @@
+class EntityCache
+  module Controls
+    module EntityCache
+      def self.example(subject=nil, entity_class: nil, specifier: nil, random_specifier: nil)
+        subject ||= Subject.example(entity_class: entity_class, specifier: specifier, random: random_specifier)
+
+        ::EntityCache.new(subject)
+      end
+    end
+  end
+end

data/lib/entity_cache/controls/record.rb

@@ -15,7 +15,7 @@ class EntityCache
           persisted_time ||= self.persisted_time
         end
 
-        EntityCache::Record.new(
+        ::EntityCache::Record.new(
           id,
           entity,
           version,

data/lib/entity_cache/controls/specifier.rb

@@ -0,0 +1,16 @@
+class EntityCache
+  module Controls
+    module Specifier
+      def self.example(specifier: nil, random: nil)
+        specifier ||= 'SomeSpecifier'
+        random ||= false
+
+        if random
+          specifier = "#{specifier}#{SecureRandom.hex(8)}"
+        end
+
+        specifier
+      end
+    end
+  end
+end

data/lib/entity_cache/controls/store/external/example.rb

@@ -18,7 +18,11 @@ class EntityCache
 
             text = File.read(path)
 
-            entity, version, time = YAML.load(text)
+            entity_data, version, time_iso8601 = JSON.parse(text, symbolize_names: true)
+
+            entity = Entity::Example.new(*entity_data)
+
+            time = Clock.parse(time_iso8601)
 
             return entity, version, time
           end
@@ -26,7 +30,17 @@ class EntityCache
           def put(id, entity, version, time)
             path = path(id)
 
-            text = YAML.dump([entity, version, time])
+            entity_data = Transform::Write.raw_data(entity)
+
+            time_iso8601 = Clock.iso8601(time)
+
+            data = [
+              entity_data,
+              version,
+              time_iso8601
+            ]
+
+            text = JSON.generate(data)
 
             File.write(path, text)
           end
@@ -39,7 +53,11 @@ class EntityCache
         def self.path(subject, id=nil)
           id ||= ID.example
 
-          File.join(tmpdir, "#{subject}-#{id}.yaml")
+          filename = "#{subject.to_s.gsub('/', '-')}-#{id}.yaml"
+
+          full_name = File.join(tmpdir, filename)
+
+          full_name
         end
 
         def self.tmpdir

data/lib/entity_cache/controls/store/external/write.rb

@@ -6,11 +6,18 @@ class EntityCache
           def self.call
             subject = Subject.example
 
-            text = YAML.dump([
-              Controls::Entity.example,
+            entity = Controls::Entity.example
+            entity_data = Transform::Write.raw_data(entity)
+
+            persisted_time_iso8601 = Controls::Record.persisted_time.iso8601(5)
+
+            data = [
+              entity_data,
               Controls::Record.persisted_version,
-              Controls::Record.persisted_time
-            ])
+              persisted_time_iso8601
+            ]
+
+            text = JSON.generate(data)
 
             path = External.path(subject)
 

data/lib/entity_cache/controls/store/external.rb

@@ -2,8 +2,10 @@ class EntityCache
   module Controls
     module Store
       module External
-        def self.example(subject=nil)
-          subject ||= Subject.example
+        def self.example(subject=nil, entity_class: nil, specifier: nil, random: nil)
+          random = true if random.nil?
+
+          subject ||= Subject.example(random: random, entity_class: entity_class, specifier: specifier)
 
           Example.build(subject)
         end

data/lib/entity_cache/controls/subject.rb

@@ -1,8 +1,34 @@
 class EntityCache
   module Controls
     module Subject
-      def self.example
-        "some-subject-#{SecureRandom.hex(7)}"
+      def self.example(entity_class: nil, specifier: nil, random: nil)
+        entity_class ||= self.entity_class
+
+        if specifier == :none
+          specifier = nil
+        else
+          specifier = Specifier.example(specifier: specifier, random: random)
+        end
+
+        ::EntityCache::Subject.build({
+          :entity_class => entity_class,
+          :specifier => specifier
+        })
+      end
+
+      def self.entity_class
+        Entity::Example
+      end
+
+      def self.specifier
+        Specifier.example
+      end
+
+      module HashKey
+        def self.example(**args)
+          subject = Subject.example(**args)
+          subject.hash_key
+        end
       end
     end
   end

data/lib/entity_cache/controls.rb

@@ -1,4 +1,4 @@
-require 'yaml'
+require 'json'
 require 'tmpdir'
 
 require 'clock/controls'
@@ -11,6 +11,8 @@ require 'entity_cache/controls/subject'
 require 'entity_cache/controls/time'
 require 'entity_cache/controls/version'
 
+require 'entity_cache/controls/specifier'
+
 require 'entity_cache/controls/persist_interval'
 
 require 'entity_cache/controls/store/external'
@@ -19,3 +21,5 @@ require 'entity_cache/controls/store/external/not_implemented'
 require 'entity_cache/controls/store/external/write'
 
 require 'entity_cache/controls/store/internal'
+
+require 'entity_cache/controls/entity_cache'

data/lib/entity_cache/entity_cache.rb

@@ -1,6 +1,7 @@
 class EntityCache
   include Configure
   include Dependency
+  include Initializer
   include Log::Dependency
 
   configure :entity_cache
@@ -10,12 +11,27 @@ class EntityCache
     @persist_interval ||= Defaults.persist_interval
   end
 
+  def entity_class
+    subject.entity_class
+  end
+
+  def specifier
+    subject.specifier
+  end
+
   dependency :clock, Clock::UTC
   dependency :internal_store, Store::Internal
   dependency :external_store, Store::External
 
-  def self.build(subject, scope: nil, persist_interval: nil, external_store: nil, external_store_session: nil)
-    instance = new
+  initializer :subject
+
+  def self.build(entity_class, specifier=nil, scope: nil, persist_interval: nil, external_store: nil, external_store_session: nil)
+    subject = Subject.build({
+      :entity_class => entity_class,
+      :specifier => specifier
+    })
+
+    instance = new(subject)
 
     instance.configure(
       subject: subject,

data/lib/entity_cache/store/external.rb

@@ -30,6 +30,14 @@ class EntityCache
         end
       end
 
+      def entity_class
+        subject.entity_class
+      end
+
+      def specifier
+        subject.specifier
+      end
+
       module Configure
         def configure(session: nil)
           ::Telemetry.configure(self)

data/lib/entity_cache/subject.rb

@@ -0,0 +1,29 @@
+class EntityCache
+  class Subject
+    include Schema::DataStructure
+
+    attribute :entity_class, Class
+    attribute :specifier, String
+
+    def hash_key
+      self.class.hash_key(entity_class, specifier)
+    end
+    alias_method :to_s, :hash_key
+
+    def hash
+      hash_key.hash
+    end
+
+    def self.hash_key(entity_class, specifier=nil)
+      if specifier.nil?
+        "#{entity_class}"
+      else
+        "#{entity_class}#{hash_key_separator}#{specifier}"
+      end
+    end
+
+    def self.hash_key_separator
+      '/'
+    end
+  end
+end

data/lib/entity_cache/substitute.rb

@@ -5,6 +5,9 @@ class EntityCache
     end
 
     class EntityCache < EntityCache
+      def initialize
+      end
+
       def self.build
         new
       end

data/lib/entity_cache.rb

@@ -7,6 +7,8 @@ require 'entity_cache/log'
 
 require 'entity_cache/defaults'
 
+require 'entity_cache/subject'
+
 require 'entity_cache/record'
 require 'entity_cache/record/destructure'
 require 'entity_cache/record/log_text'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-entity_cache
 version: !ruby/object:Gem::Version
-  version: 2.0.0.1
+  version: 2.0.1.2
 platform: ruby
 authors:
 - The Eventide Project
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-configure
@@ -89,9 +89,11 @@ files:
 - lib/entity_cache.rb
 - lib/entity_cache/controls.rb
 - lib/entity_cache/controls/entity.rb
+- lib/entity_cache/controls/entity_cache.rb
 - lib/entity_cache/controls/id.rb
 - lib/entity_cache/controls/persist_interval.rb
 - lib/entity_cache/controls/record.rb
+- lib/entity_cache/controls/specifier.rb
 - lib/entity_cache/controls/store/external.rb
 - lib/entity_cache/controls/store/external/example.rb
 - lib/entity_cache/controls/store/external/not_implemented.rb
@@ -118,12 +120,13 @@ files:
 - lib/entity_cache/store/internal/scope/global.rb
 - lib/entity_cache/store/internal/scope/thread.rb
 - lib/entity_cache/store/internal/substitute.rb
+- lib/entity_cache/subject.rb
 - lib/entity_cache/substitute.rb
 homepage: https://github.com/eventide-project/entity-cache
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,8 +141,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.3.4
+signing_key:
 specification_version: 4
 summary: Cache of entities retrieved by an entity-store, with in-memory temporary
   and on-disk permanent storage options