ephemeron 0.1.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 032a79004b77bffee915f105cd807beb01fcc60c52e829c478fcf615a8fa8184
-  data.tar.gz: 65168d9788376856e6745c083f2a0d467b18deace844719e59024e9027a47db4
+  metadata.gz: 3bb6daaac01582150f1f3c3cd12865e5766966ca1671afb2f29f2b5ff536b30a
+  data.tar.gz: 1fb117784cfc5135b48d8a4dc4cee7fc43c29cdc1e256a760b15318b08b86a3e
 SHA512:
-  metadata.gz: 88ddba6984c039180c74433d9dc9447eae247b040700f3de02c0338e6a9ffe95dc3472c7eb982b81a867044d1c214c15cafe0ede0bf9286308d15f59664e403b
-  data.tar.gz: 6488f41b9df17130dbedb9f1db5bfa72e1aeded337863e46fe03e898728ed6aa5dfac2666f8cdaaf7004bf0623900f1073195327e06653994d4b974a17f67f1a
+  metadata.gz: 0e0d60880cbbf2005071bfe83a1ed0ef8abb634160130dea0488c8a3dc30b534a89649f29628d999db156e6d94dd830a4fd9339cafb0727664df8d19f113d9c3
+  data.tar.gz: 88dc0d8d8280b61f8fb705d02e7493e9a87f560e28a7afe9435f01b8aaab89003eb0c872d46d29eecf18f68fb315f3d57d2f265dce746d38822f35644a607232

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

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/convert.rb

@@ -5,14 +5,16 @@ module Ephemeron
     class Convert
       class << self
         def call(model_s, as_new_record: false)
-          return class_name_and_id(model_s, as_new_record) if model_s.is_a?(ActiveRecord::Base)
+          if model_s.is_a?(ActiveRecord::Base)
+            return class_name_and_id(model_s, as_new_record: as_new_record)
+          end
 
           model_s.map { |model| class_name_and_id(model) }.join ', '
         end
 
         private
 
-        def class_name_and_id(model, as_new_record = false)
+        def class_name_and_id(model, as_new_record: false)
           new_record = as_new_record || model.new_record?
           name = model.class.name.downcase
           id = new_record ? "new_record##{model.object_id}" : model.id

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/store/update.rb

@@ -12,8 +12,8 @@ module Ephemeron
         Store.store.delete Convert.call(model, as_new_record: true)
 
         Store.aliases.find_all { |_, v| v == Convert.call(model, as_new_record: true) }
-             .to_h.keys
-             .each { |key| Store.aliases[key] = Convert.call(model) }
+             .to_h
+             .each_key { |key| Store.aliases[key] = Convert.call(model) }
       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.1.0'
+  VERSION = '0.5.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 ||= []
@@ -16,11 +16,11 @@ module Ephemeron
       logs.include? Convert.call(model, event)
     end
 
-    def log(model, event, soft: false)
+    def log(model, event, opts = {})
       validate model, event
       logs << Convert.call(model, event)
     rescue LoggerError, StoreError => e
-      raise e unless soft
+      raise e unless opts[:soft]
     end
 
     def reset

data/lib/ephemeron/writers/store.rb

@@ -16,24 +16,21 @@ module Ephemeron
       !store[Convert.call(model, as_new_record: as_new_record)].nil?
     end
 
-    def add(model, as: nil)
+    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 !as.nil?
-        aliases[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
 
     def get(key)
-      store[aliases[key]].tap do |model|
-        Logger.log(model, :used) if model
-      end
+      model = store[key]
+      model ||= store[aliases[key]]
+      Logger.log(model, :used) if model
+      model
     end
 
     def validate
@@ -62,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.1.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Zbigniew Humeniuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-14 00:00:00.000000000 Z
+date: 2020-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -58,6 +58,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.9'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -98,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
@@ -123,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="