evt-entity_cache 0.6.1.1 → 0.11.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aca46d5e864296ec667aad6a7ed0f679aee8463f
-  data.tar.gz: 8e13a338781b0a8e32d27206b455a49a99b43fbf
+  metadata.gz: 85ef1e5e7ba8f3a9032104108c26ff2a4faa4980
+  data.tar.gz: dccc3b8bac1e420ae3d9357a2838aa80acf8b263
 SHA512:
-  metadata.gz: eebfd2ca59a34e6be8df6862fa2a76c8146ed9ce270c644e3a05ad4d7a144712900fede5c9dd7f42dc86978c0b5081c5a44e7cfb7e1bca0f6e61ad29b1298b86
-  data.tar.gz: e2ac284094bfc16c56787fb6958730f23f8e79926b4b644f95fe525069a36ebef71a82a440fd650c0cb287fd4a463aa1aabcc7eda821879c7bf0dff1ca920e3a
+  metadata.gz: 0155c692c01e6996933f05d490c629204a6c557948a6c93f47503711737b94facda5260a46e920ae57c3b533c6b1371d64ab4d8682c119330e1f03fed03dda57
+  data.tar.gz: db9faf371a1398e8cf5ecc3e672fa9a2d405d8c9051cdf30684f99922b6de8528656ad456c0c5f0fc17b48c0f30bb49097ab2a187fffa4928119e6219f9922c5

data/lib/entity_cache.rb

@@ -1,9 +1,11 @@
 require 'configure'; Configure.activate
 require 'settings'; Settings.activate
 require 'telemetry'
-require 'telemetry/logger'
+require 'log'
 require 'virtual'; Virtual.activate
 
+require 'entity_cache/log'
+
 require 'entity_cache/record'
 
 require 'entity_cache/storage/persistent'

data/lib/entity_cache/controls.rb

@@ -1,11 +1,11 @@
 require 'clock/controls'
 require 'identifier/uuid/controls'
 
-require 'entity_cache/controls/entity'
 require 'entity_cache/controls/id'
+require 'entity_cache/controls/entity'
 require 'entity_cache/controls/record'
 require 'entity_cache/controls/storage/persistent'
 require 'entity_cache/controls/storage/temporary'
 require 'entity_cache/controls/time'
 require 'entity_cache/controls/version'
-require 'entity_cache/controls/write_behind_delay'
+require 'entity_cache/controls/persist_interval'

data/lib/entity_cache/controls/{write_behind_delay.rb → persist_interval.rb}

@@ -1,6 +1,6 @@
 class EntityCache
   module Controls
-    module WriteBehindDelay
+    module PersistInterval
       module Exceeds
         def self.example
           Version.example - Version::Persistent.example

data/lib/entity_cache/controls/time.rb

@@ -1,5 +1,13 @@
 class EntityCache
   module Controls
     Time = Clock::Controls::Time
+
+    module Time
+      def self.example(time=nil, precision: nil)
+        time ||= Raw.example
+        precision ||= 5
+        ISO8601.example(time, precision: precision)
+      end
+    end
   end
 end

data/lib/entity_cache/controls/version.rb

@@ -5,7 +5,7 @@ class EntityCache
         11
       end
 
-      module Age
+      module SincePersisted
         def self.example
           Version.example - Persistent.example
         end

data/lib/entity_cache/defaults.rb

@@ -3,9 +3,5 @@ class EntityCache
     def self.persistent_store
       Storage::Persistent::None
     end
-
-    def self.write_behind_delay
-      10
-    end
   end
 end

data/lib/entity_cache/entity_cache.rb

@@ -1,65 +1,67 @@
 class EntityCache
-  configure :entity_cache
+  Error = Class.new(RuntimeError)
 
-  attr_reader :write_behind_delay
+  include Log::Dependency
+
+  configure :cache
+
+  attr_accessor :persist_interval
 
   dependency :clock, Clock::UTC
-  dependency :logger, Telemetry::Logger
   dependency :persistent_store, Storage::Persistent
   dependency :temporary_store, Storage::Temporary
 
-  def initialize(write_behind_delay=nil)
-    @write_behind_delay = write_behind_delay
-  end
+  def self.build(subject, persistent_store: nil, persist_interval: nil, session: nil)
+    unless persistent_store.nil? == persist_interval.nil?
+      raise Error, "Must specify both the persistent store and persist interval, or neither"
+    end
 
-  def self.build(subject, persistent_store: nil, write_behind_delay: nil)
     persistent_store ||= Defaults.persistent_store
-    write_behind_delay ||= Defaults.write_behind_delay
 
-    instance = new write_behind_delay
+    instance = new
+    instance.persist_interval = persist_interval
 
     Clock::UTC.configure instance
-    Telemetry::Logger.configure instance
     Storage::Temporary.configure instance, subject
 
-    persistent_store.configure instance, subject
+    persistent_store.configure(instance, subject, session: session)
 
     instance
   end
 
   def get(id)
-    logger.opt_trace "Reading cache (ID: #{id.inspect})"
+    logger.trace { "Reading cache (ID: #{id.inspect})" }
 
     record = temporary_store.get id
     record ||= restore id
 
     if record.nil?
-      logger.opt_debug "Cache miss (ID: #{id.inspect})"
+      logger.info { "Cache miss (ID: #{id.inspect})" }
       return nil
     end
 
-    logger.opt_debug "Cache hit (ID: #{id.inspect}, Entity Class: #{record.entity.class.name}, Version: #{record.version.inspect}, Time: #{record.time})"
+    logger.info { "Cache hit (ID: #{id.inspect}, Entity Class: #{record.entity.class.name}, Version: #{record.version.inspect}, Time: #{record.time})" }
 
     record
   end
 
   def put(id, entity, version, persisted_version=nil, persisted_time=nil, time: nil)
-    time ||= clock.iso8601
+    time ||= clock.iso8601(precision: 5)
 
-    logger.opt_trace "Writing cache (ID: #{id}, Entity Class: #{entity.class.name}, Version: #{version.inspect}, Time: #{time}, Persistent Version: #{persisted_version.inspect}, Persistent Time: #{persisted_time.inspect})"
+    logger.trace { "Writing cache (ID: #{id}, Entity Class: #{entity.class.name}, Version: #{version.inspect}, Time: #{time}, Persistent Version: #{persisted_version.inspect}, Persistent Time: #{persisted_time.inspect})" }
 
     record = Record.new id, entity, version, time, persisted_version, persisted_time
 
     put_record record
 
-    logger.opt_debug "Cache written (ID: #{id}, Entity Class: #{record.entity.class.name}, Version: #{record.version.inspect}, Time: #{record.time}, Persistent Version: #{persisted_version.inspect}, Persistent Time: #{persisted_time.inspect})"
+    logger.info { "Cache written (ID: #{id}, Entity Class: #{record.entity.class.name}, Version: #{record.version.inspect}, Time: #{record.time}, Persistent Version: #{persisted_version.inspect}, Persistent Time: #{persisted_time.inspect})" }
 
     record
   end
 
   def put_record(record)
-    if write_behind_delay && record.age >= write_behind_delay
-      persisted_time = clock.iso8601
+    if persist_interval && record.versions_since_persisted >= persist_interval
+      persisted_time = clock.iso8601(precision: 5)
 
       persistent_store.put record.id, record.entity, record.version, persisted_time
 

data/lib/entity_cache/log.rb

@@ -0,0 +1,9 @@
+class EntityCache
+  class Log < ::Log
+    def tag!(tags)
+      tags << :entity_cache
+      tags << :library
+      tags << :verbose
+    end
+  end
+end

data/lib/entity_cache/record.rb

@@ -1,6 +1,6 @@
 class EntityCache
   class Record < Struct.new :id, :entity, :version, :time, :persisted_version, :persisted_time
-    def age
+    def versions_since_persisted
       persisted_version = self.persisted_version
       persisted_version ||= -1
 
@@ -25,6 +25,10 @@ class EntityCache
       responses
     end
 
+    def age_milliseconds
+      Clock::UTC.elapsed_milliseconds(time, Clock::UTC.now)
+    end
+
     module NoStream
       def self.destructure(includes=nil)
         record = Record.new

data/lib/entity_cache/storage/persistent.rb

@@ -1,13 +1,16 @@
 class EntityCache
   module Storage
     module Persistent
+      Error = Class.new(RuntimeError)
+
       extend Configure::Macro
 
       def self.included(cls)
         cls.class_exec do
+          include Log::Dependency
+
           configure :persistent_store
 
-          dependency :logger, ::Telemetry::Logger
           dependency :telemetry, ::Telemetry
 
           extend Build
@@ -16,7 +19,7 @@ class EntityCache
           prepend Get
           prepend Put
 
-          virtual :configure_dependencies unless instance_methods.include?(:configure_dependencies)
+          virtual :configure unless instance_methods.include?(:configure)
           abstract :get unless instance_methods.include?(:get)
           abstract :put unless instance_methods.include?(:put)
         end
@@ -30,13 +33,13 @@ class EntityCache
 
       module Get
         def get(id)
-          logger.opt_trace "Getting entity (ID: #{id.inspect})"
+          logger.trace { "Getting entity (ID: #{id.inspect})" }
 
           entity, version, time = super
 
           telemetry.record :get, Telemetry::Data.new(id, entity, version, time)
 
-          logger.opt_debug "Got entity (ID: #{id.inspect}, Entity Class: #{entity.class.name}, Version: #{version.inspect}, Time: #{time.inspect})"
+          logger.debug { "Got entity (ID: #{id.inspect}, Entity Class: #{entity.class.name}, Version: #{version.inspect}, Time: #{time.inspect})" }
 
           return entity, version, time
         end
@@ -44,24 +47,24 @@ class EntityCache
 
       module Put
         def put(id, entity, version, time)
-          logger.opt_trace "Putting entity (ID: #{id.inspect}, Entity Class: #{entity.class.name}, Version: #{version.inspect}, Time: #{time.inspect})"
+          logger.trace { "Putting entity (ID: #{id.inspect}, Entity Class: #{entity.class.name}, Version: #{version.inspect}, Time: #{time.inspect})" }
 
-          super
+          res = super
 
           telemetry.record :put, Telemetry::Data.new(id, entity, version, time)
 
-          logger.opt_debug "Put entity (ID: #{id.inspect}, Entity Class: #{entity.class.name}, Version: #{version.inspect}, Time: #{time.inspect})"
+          logger.debug { "Put entity (ID: #{id.inspect}, Entity Class: #{entity.class.name}, Version: #{version.inspect}, Time: #{time.inspect})" }
 
-          time
+          res
         end
       end
 
       module Build
-        def build(subject)
+        def build(subject, session: nil)
           instance = new subject
-          ::Telemetry::Logger.configure instance
+
           ::Telemetry.configure instance
-          instance.configure_dependencies
+          instance.configure(session: session)
           instance
         end
       end
@@ -73,8 +76,6 @@ class EntityCache
           sink
         end
       end
-
-      Error = Class.new StandardError
     end
   end
 end

data/lib/entity_cache/storage/persistent/substitute.rb

@@ -23,7 +23,7 @@ class EntityCache
           end
 
           def add(id, entity, version, time=nil)
-            time ||= Clock::UTC.iso8601
+            time ||= Clock::UTC.iso8601(precision: 5)
             records[id] ||= [entity, version, time]
           end
 

data/lib/entity_cache/storage/temporary.rb

@@ -1,9 +1,9 @@
 class EntityCache
   module Storage
     class Temporary
-      attr_reader :subject
+      include Log::Dependency
 
-      dependency :logger, Telemetry::Logger
+      attr_reader :subject
 
       def initialize(subject)
         @subject = subject
@@ -11,7 +11,6 @@ class EntityCache
 
       def self.build(subject)
         instance = new subject
-        Telemetry::Logger.configure instance
         instance
       end
 

data/lib/entity_cache/storage/temporary/factory.rb

@@ -34,7 +34,7 @@ class EntityCache
         end
 
         def self.logger
-          @logger ||= Telemetry::Logger.get self
+          @logger ||= Log.get(self)
         end
       end
     end

data/lib/entity_cache/substitute.rb

@@ -5,17 +5,17 @@ class EntityCache
     end
 
     class EntityCache < EntityCache
+      include Log::Dependency
+
       def self.build
-        instance = new
-        Telemetry::Logger.configure instance
-        instance
+        new
       end
 
       def add(id, entity, version=nil, persisted_version: nil)
         version ||= 0
         persisted_version ||= version
 
-        time = clock.iso8601
+        time = clock.iso8601(precision: 5)
 
         record = Record.new id, entity, version, time, persisted_version, time
 

data/lib/loader.rb

@@ -0,0 +1 @@
+entity_cache.rb

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-entity_cache
 version: !ruby/object:Gem::Version
-  version: 0.6.1.1
+  version: 0.11.1.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-22 00:00:00.000000000 Z
+date: 2016-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-configure
@@ -67,7 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: evt-telemetry-logger
+  name: evt-telemetry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: evt-log
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: test_bench
+  name: ntl-test_bench
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -118,14 +132,15 @@ files:
 - lib/entity_cache/controls.rb
 - lib/entity_cache/controls/entity.rb
 - lib/entity_cache/controls/id.rb
+- lib/entity_cache/controls/persist_interval.rb
 - lib/entity_cache/controls/record.rb
 - lib/entity_cache/controls/storage/persistent.rb
 - lib/entity_cache/controls/storage/temporary.rb
 - lib/entity_cache/controls/time.rb
 - lib/entity_cache/controls/version.rb
-- lib/entity_cache/controls/write_behind_delay.rb
 - lib/entity_cache/defaults.rb
 - lib/entity_cache/entity_cache.rb
+- lib/entity_cache/log.rb
 - lib/entity_cache/record.rb
 - lib/entity_cache/storage/persistent.rb
 - lib/entity_cache/storage/persistent/none.rb
@@ -137,6 +152,7 @@ files:
 - lib/entity_cache/storage/temporary/scope/exclusive.rb
 - lib/entity_cache/storage/temporary/scope/shared.rb
 - lib/entity_cache/substitute.rb
+- lib/loader.rb
 homepage: https://github.com/eventide-project/entity-cache
 licenses:
 - MIT
@@ -149,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.3
+      version: 2.3.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -157,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Entity cache