ephemeron 0.2.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85b00f989b7f6a03f398cf1bcca07ff5ad6af716d25dfbf4927fcbe6753f51ca
-  data.tar.gz: c73dbe174fc3b31fcd41e0825a081e2168ee7fa7aa4074dd5d227cf24215a92e
+  metadata.gz: ace736b9303d937a44b00aa85605953a10c758a821cdcdd8a9645ac69640379a
+  data.tar.gz: 3bc12d1a15769e6270d2f4aa3fbb049bfe6688bd38adf4228346b452c43807aa
 SHA512:
-  metadata.gz: cfa43027d3191f849a467a54dec03a7228e0c75bec118d737b2b37ea3c2b0e56f8f9b9973cd4f8a6387377305ed1cb7c41352cfd17c5e1430370d3e96b780ab6
-  data.tar.gz: 54d98852dbb6f365396fb2c3db14b7ccfddb4b5d41dc54935d8c37415d6c3ebc416b0f4ceb6f289747b74234db70cc965e0edca41477c0b967472df30a4ab19f
+  metadata.gz: fbf16a76ebb392addee9d80b821942f76a3dfcf2c30cc7e0c427c55f2525ad120b3b890f60b93e50d6f22c65884fc273d1dd87e7d44848fbd241a9771921c185
+  data.tar.gz: 338c9fbb205aea61d902f0be7dbcff341177cf04fc02ae2289121570a4ac92f790472fe3c20b1c6aca7b73b91fb054b1fc9d7e6a66f1c5bf86c710a363ce5238

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(&: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.6.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

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'
@@ -46,8 +48,9 @@ module Ephemeron
 
   def proxy
     Logger.log nil, :proxy_start
-    yield
+    res = yield
     Logger.log nil, :proxy_end
+    res
   end
 
   def get(key)
@@ -64,6 +67,15 @@ module Ephemeron
     model_s
   end
 
+  def allow_fetch!(model_or_key)
+    model = if model_or_key.is_a?(String)
+              Ephemeron.get(model_or_key)
+            else
+              model_or_key
+            end
+    model.tap { |m| Logger.log m, :fetch_allowed }
+  end
+
   def allow_save!(model)
     model.tap { |m| Logger.log m, :save_allowed }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ephemeron
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Zbigniew Humeniuk
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2022-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,35 +29,35 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: jb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.9'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -142,8 +144,9 @@ files:
 homepage: https://artofcode.co
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -151,15 +154,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: The organic DDD
 test_files: []