ephemeron 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85b00f989b7f6a03f398cf1bcca07ff5ad6af716d25dfbf4927fcbe6753f51ca
-  data.tar.gz: c73dbe174fc3b31fcd41e0825a081e2168ee7fa7aa4074dd5d227cf24215a92e
+  metadata.gz: c50cea9d34520d0a578c05f81d621b357fc07f233fee202b0031636692e3ce1b
+  data.tar.gz: a81052e6ced9fbeb86711a29a7dee2a7cd7a76b4a886ad348dea64ce14dfd672
 SHA512:
-  metadata.gz: cfa43027d3191f849a467a54dec03a7228e0c75bec118d737b2b37ea3c2b0e56f8f9b9973cd4f8a6387377305ed1cb7c41352cfd17c5e1430370d3e96b780ab6
-  data.tar.gz: 54d98852dbb6f365396fb2c3db14b7ccfddb4b5d41dc54935d8c37415d6c3ebc416b0f4ceb6f289747b74234db70cc965e0edca41477c0b967472df30a4ab19f
+  metadata.gz: 17aabd88b2067ea3102789827a1215244f8ce3cdc9508f349394b5ec0b707683b02e96aa2dcc1d15214f07fff34704875662f60c3476eee7134c5cb6f1f3c47a
+  data.tar.gz: f1d086cddff04cb218da90a094a0c689583dc01077e96c5b7dce35a1b8cd3a61299ecdb29994f374b22e8de594f4a6ce4e114d572a2b648ca31829e414562531

data/lib/ephemeron.rb

@@ -14,7 +14,9 @@ require 'ephemeron/errors'
 require 'ephemeron/logger/convert'
 require 'ephemeron/logger/finders'
 require 'ephemeron/settings'
+require 'ephemeron/store/allow_fetch'
 require 'ephemeron/store/convert'
+require 'ephemeron/store/finders'
 require 'ephemeron/store/update'
 require 'ephemeron/validators/before_save'
 require 'ephemeron/validators/store'
@@ -64,6 +66,10 @@ module Ephemeron
     model_s
   end
 
+  def allow_fetch!(model)
+    model.tap { |m| Logger.log m, :fetch_allowed }
+  end
+
   def allow_save!(model)
     model.tap { |m| Logger.log m, :save_allowed }
   end

data/lib/ephemeron/addons/model_addons.rb

@@ -6,7 +6,7 @@ module Ephemeron
 
     included do
       after_find lambda { |model|
-        Ephemeron.add model
+        Store.add model, log: true
       }
 
       after_validation lambda { |model|

data/lib/ephemeron/logger/finders.rb

@@ -9,16 +9,6 @@ module Ephemeron
         Logger.logs
               .filter { |l| events.any? { |e| l == Logger::Convert.call(model, e) } }
       end
-
-      def find_first_allowed_but_unsaved
-        ary = Logger.logs
-                    .reverse
-                    .map { |line| line.split ' ' }
-                    .find { |arr| %w[save_allowed saved].include?(arr[1]) }
-        return nil if ary.nil? || ary[1] == 'saved'
-
-        Store.store[ary[0]]
-      end
     end
   end
 end

data/lib/ephemeron/store/allow_fetch.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Ephemeron
+  class Store
+    module AllowFetch
+      module_function
+
+      def call(model)
+        last_events = Ephemeron::Logger::Finders
+                      .find_all_events_for(model, :fetch_allowed, :fetched)
+                      .last(2)
+        cond1 = last_events[0] == Logger::Convert.call(model, :fetch_allowed)
+        cond2 = last_events[1] == Logger::Convert.call(model, :fetched)
+        cond1 && cond2
+      end
+    end
+  end
+end

data/lib/ephemeron/store/finders.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Ephemeron
+  class Store
+    module Finders
+      module_function
+
+      def find_first_allowed_but_unsaved
+        ary = Logger.logs
+                    .reverse
+                    .map { |line| line.split ' ' }
+                    .find { |arr| %w[save_allowed saved].include?(arr[1]) }
+        return nil if ary.nil? || ary[1] == 'saved'
+
+        Store.store[ary[0]]
+      end
+    end
+  end
+end

data/lib/ephemeron/validators/store/allowed_but_unsaved.rb

@@ -7,7 +7,7 @@ module Ephemeron
         module_function
 
         def call
-          model = Ephemeron::Logger::Finders.find_first_allowed_but_unsaved
+          model = Ephemeron::Store::Finders.find_first_allowed_but_unsaved
           return if model.nil?
 
           raise(

data/lib/ephemeron/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ephemeron
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 end

data/lib/ephemeron/writers/logger.rb

@@ -5,7 +5,7 @@ module Ephemeron
     attribute :ts_logs
 
     PROXY_EVENTS = %i[proxy_start proxy_end].freeze
-    VALID_EVENTS = %i[saved save_allowed skip_save used] + PROXY_EVENTS
+    VALID_EVENTS = %i[fetched fetch_allowed saved save_allowed skip_save used] + PROXY_EVENTS
 
     def logs
       self.ts_logs ||= []

data/lib/ephemeron/writers/store.rb

@@ -19,14 +19,10 @@ module Ephemeron
     def add(model, opts = {})
       return unless Validators::StoreElement.call(model)
 
-      key = Convert.call model
-      in_store = !store[key].nil?
-      store[key] = model unless in_store
-      if !opts[:as].nil?
-        aliases[opts[:as]] = key
-      elsif in_store
-        raise StoreError, "#{key} is already in the store"
-      end
+      in_store_before = stored?(model)
+      store[to_store_key(model)] = model unless stored?(model)
+      Logger.log(model, :fetched) if opts[:log]
+      add_alias(model, opts[:as], in_store_before)
       model
     end
 
@@ -63,5 +59,23 @@ module Ephemeron
       self.ts_store = {}
       self.ts_aliases = {}
     end
+
+    private
+
+    def to_store_key(model)
+      Convert.call(model)
+    end
+
+    def stored?(model)
+      !store[to_store_key(model)].nil?
+    end
+
+    def add_alias(model, as, in_store_before)
+      if !as.nil?
+        aliases[as] = to_store_key(model)
+      elsif in_store_before && !Store::AllowFetch.call(model)
+        raise StoreError, "#{to_store_key(model)} is already in the store"
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ephemeron
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Zbigniew Humeniuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -126,7 +126,9 @@ files:
 - lib/ephemeron/logger/finders.rb
 - lib/ephemeron/railtie.rb
 - lib/ephemeron/settings.rb
+- lib/ephemeron/store/allow_fetch.rb
 - lib/ephemeron/store/convert.rb
+- lib/ephemeron/store/finders.rb
 - lib/ephemeron/store/update.rb
 - lib/ephemeron/validators/before_save.rb
 - lib/ephemeron/validators/store.rb