lazy_lazer 0.5.4 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22872353f1cee531497c41b3d54db9f03b9ab9ee
-  data.tar.gz: 4fc8d26919472b31c3257798af077d5d2b5fc02b
+  metadata.gz: 1ad5be6027b7147b22c96236407c5700e29cc7fe
+  data.tar.gz: 742cdb3547d6ede2afe121fd14f9e113af4d8de1
 SHA512:
-  metadata.gz: 30fc0cb9bb106a2c6cc6f5dc959d920584bfbbf2dff95e5f5a5358fbe4542b91a5e4012b2b3446531f5662e2aa180b5722971e15030ff3e756d50914df2403f1
-  data.tar.gz: f39411ddcc2fb04c16149607586736b236f135e78521e8077f9b544d1b9a049fcc4c61cf1a69031e0431db4c9d3f69176e4ac2ed34d7adaf0953f7a8e4063fbd
+  metadata.gz: d4ca6f7e61971cc4f12bdd5d7d9b9b30555d0f1b84777261b1bdafa65bcfed0c18b8b26cbdf6d29b78b2edc7c6272d38dff28fd52aba5405cae0c1b482232088
+  data.tar.gz: 2a89cd5569b7f43292810b9fbbdbf75bf5d1b33ee339a578c56d89058a5aa7b1cddb8575324602214525c37a0eb7641ad09707b4e98e96440d916e7275ed1a38

data/lib/lazy_lazer/internal_model.rb

@@ -3,14 +3,19 @@
 module LazyLazer
   # A delegator for internal operations.
   class InternalModel
+    # @return [Boolean] whether the model is fully loaded
+    attr_accessor :fully_loaded
+
     # Create an internal model with a reference to a public model.
     # @param key_metadata [KeyMetadataStore] a reference to a metadata store
     # @param parent [LazyLazer] a reference to a LazyLazer model
     def initialize(key_metadata, parent)
       @key_metadata = key_metadata
       @parent = parent
+      @invalidated = Set.new
       @source_hash = {}
       @cache_hash = {}
+      @fully_loaded = false
     end
 
     # Verify that all the keys marked as required are present.
@@ -35,26 +40,47 @@ module LazyLazer
       todo.each_with_object(@cache_hash) { |key, cache| cache[key] = load_key_from_source(key) }.dup
     end
 
-    # @return [Array<Symbol>] the locally processed and cached keys
-    def cached_keys
-      @cache_hash.keys
+    # @return [String] the string representation of the parent
+    def parent_inspect
+      "#<#{@parent.class.name} (#{@fully_loaded ? 'loaded' : 'unloaded'}): [" + \
+        @cache_hash.keys.join(', ') + ']>'
+    end
+
+    # Mark a key as tainted, forcing a reload on the next lookup.
+    # @param key_name [Symbol] the key to invalidate
+    # @return [void]
+    def invalidate(key_name)
+      @invalidated.add(key_name)
     end
 
     # Get the value of a key (fetching it from the cache if possible)
     # @param key_name [Symbol] the name of the key
     # @return [Object] the returned value
     # @raise MissingAttribute if the attribute wasn't found and there isn't a default
-    def fetch(key_name)
+    def read_attribute(key_name)
+      if @invalidated.include?(key_name)
+        @parent.reload
+        @invalidated.delete(key_name)
+      end
       @cache_hash[key_name] ||= load_key_from_source(key_name)
     end
 
+    # Update an attribute.
+    # @param key_name [Symbol] the attribute to update
+    # @param new_value [Object] the new value
+    # @return [Object] the written value
+    def write_attribute(key_name, new_value)
+      unless @key_metadata.contains?(key_name)
+        raise ArgumentError, "#{key_name} is not a valid attribute for #{parent}"
+      end
+      @cache_hash[key_name] = new_value
+    end
+
     # Merge a hash into the model.
     # @param attributes [Hash<Symbol, Object>] the attributes to merge
-    # @return [nil]
     def merge!(attributes)
       @cache_hash.clear
       @source_hash.merge!(attributes)
-      nil
     end
 
     private
@@ -85,7 +111,7 @@ module LazyLazer
     # @return [void]
     # @raise MissingAttribute if runtime_required is true and the key can't be loaded.
     def ensure_key_is_loaded(source_key, runtime_required)
-      @parent.reload if !@source_hash.key?(source_key) && !@parent.fully_loaded?
+      @parent.reload if !@source_hash.key?(source_key) && !@fully_loaded
       return if @source_hash.key?(source_key) || !runtime_required
       raise MissingAttribute, "`#{source_key} is missing for #{@parent}`"
     end

data/lib/lazy_lazer/version.rb

@@ -2,5 +2,5 @@
 
 module LazyLazer
   # The gem's semantic version number.
-  VERSION = '0.5.4'
+  VERSION = '0.6.0'
 end

data/lib/lazy_lazer.rb

@@ -68,8 +68,6 @@ module LazyLazer
       @_lazer_model = InternalModel.new(self.class.instance_variable_get(:@_lazer_metadata), self)
       @_lazer_model.merge!(attributes)
       @_lazer_model.verify_required!
-      @_lazer_writethrough = {}
-      @_lazer_loaded = false
     end
 
     # Equality check, performed using required keys.
@@ -92,8 +90,7 @@ module LazyLazer
 
     # @return [String] a human-friendly view of the model
     def inspect
-      "#<#{self.class.name} (#{fully_loaded? ? 'loaded' : 'unloaded'}): [" + \
-        (@_lazer_model.cached_keys + @_lazer_writethrough.keys).join(', ') + ']>'
+      @_lazer_model.parent_inspect
     end
 
     # Reload the object. Calls {#lazer_reload}, then merges the results into the internal store.
@@ -110,9 +107,7 @@ module LazyLazer
     # @return [Object] the returned value
     # @raise MissingAttribute if the key was not found
     def read_attribute(key_name)
-      symbol_key = key_name.to_sym
-      return @_lazer_writethrough[symbol_key] if @_lazer_writethrough.key?(symbol_key)
-      @_lazer_model.fetch(symbol_key)
+      @_lazer_model.read_attribute(key_name.to_sym)
     end
 
     # Return the value of the attribute, returning nil if not found.
@@ -126,10 +121,10 @@ module LazyLazer
 
     # Update an attribute.
     # @param key_name [Symbol] the attribute to update
-    # @param value [Object] the new value
+    # @param new_value [Object] the new value
     # @return [Object] the written value
-    def write_attribute(key_name, value)
-      @_lazer_writethrough[key_name] = value
+    def write_attribute(key_name, new_value)
+      @_lazer_model.write_attribute(key_name, new_value)
     end
 
     # Update multiple attributes at once.
@@ -143,7 +138,7 @@ module LazyLazer
 
     # @return [Boolean] whether the object is done with lazy loading
     def fully_loaded?
-      @_lazer_loaded
+      @_lazer_model.fully_loaded
     end
 
     private
@@ -155,16 +150,23 @@ module LazyLazer
       {}
     end
 
+    # Mark a key as tainted, forcing a reload on the next lookup.
+    # @param key_name [Symbol] the key to invalidate
+    # @return [void]
+    def invalidate(key_name)
+      @_lazer_model.invalidate(key_name)
+    end
+
     # Mark the model as fully loaded.
     # @return [void]
     def fully_loaded!
-      @_lazer_loaded = true
+      @_lazer_model.fully_loaded = true
     end
 
     # Mark the model as not fully loaded.
     # @return [void]
     def not_fully_loaded!
-      @_lazer_loaded = false
+      @_lazer_model.fully_loaded = false
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lazy_lazer
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.6.0
 platform: ruby
 authors:
 - Avinash Dwarapu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-30 00:00:00.000000000 Z
+date: 2017-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler