ams_lazy_relationships 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e130952b9f88604a3afccc0cacd41fb9581fc61
-  data.tar.gz: cbf67a43c13d79ab78292b82e8ebefd9b30906b1
+  metadata.gz: 8f2d4206f5ac6fe534e19162405e4d6993e5a8ea
+  data.tar.gz: 78c94b7d3b54794b4ce8dd7f9b5645e694f2eff7
 SHA512:
-  metadata.gz: 940c44cb36ba0c751e1090f6a2a9d7c032752a67ae33fb5967062e78a42d50e3f152dc54a46636f6ce33a2a29d703989c83ba1630a32ea13d1ce73c81648a9c6
-  data.tar.gz: 77a3f4a94552a0229732e13abc9c950e57a67cf17b7c6095429ad16d2a3c6410863f3b0e0a342e5224b30f0793faec3597512e0259d51e76254942d97b4acd5f
+  metadata.gz: 80230d616e3b5007577ca2053080a1f11eda4d7b2978dd30ebb56d79819e5bd6555668add82b446cf381b00fc5684bf63bc13cb70085e2d818ba7d1d072ec228
+  data.tar.gz: c79403dd23812c678235b63a207e218c2c72eda850c7635fe0d962b536305a69c8188d85449e3f07a409702c22db9b573781f9ae6e6a172eaf2bed126fcaf101

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [v0.1.3](https://github.com/Bajena/ams_lazy_relationships/tree/v0.1.3) (2019-05-19)
+[Full Changelog](https://github.com/Bajena/ams_lazy_relationships/compare/0.1.2...v0.1.3)
+
+**Closed issues:**
+
+- Association loader shouldn't yield cached associations data instantly  [\#22](https://github.com/Bajena/ams_lazy_relationships/issues/22)
+- Customize loading behavior [\#14](https://github.com/Bajena/ams_lazy_relationships/issues/14)
+
+**Merged pull requests:**
+
+- Do not yield cached associations data instantly in Association loader [\#23](https://github.com/Bajena/ams_lazy_relationships/pull/23) ([Bajena](https://github.com/Bajena))
+
 ## [0.1.2](https://github.com/Bajena/ams_lazy_relationships/tree/0.1.2) (2019-03-10)
 [Full Changelog](https://github.com/Bajena/ams_lazy_relationships/compare/v0.1.1...0.1.2)
 
@@ -41,4 +53,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ams_lazy_relationships (0.1.2)
+    ams_lazy_relationships (0.1.3)
       active_model_serializers
       batch-loader (~> 1.2)
 

data/ams_lazy_relationships.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   if spec.respond_to?(:metadata)
     spec.metadata["homepage_uri"] = spec.homepage
     spec.metadata["source_code_uri"] = "https://github.com/Bajena/ams_lazy_relationships"
-    spec.metadata["changelog_uri"] = "https://github.com/Bajena/ams_lazy_relationships/CHANGELOG.md"
+    spec.metadata["changelog_uri"] = "https://github.com/Bajena/ams_lazy_relationships/blob/master/CHANGELOG.md"
   else
     raise "RubyGems 2.0 or newer is required to protect against " \
       "public gem pushes."

data/lib/ams_lazy_relationships/loaders/association.rb

@@ -20,20 +20,6 @@ module AmsLazyRelationships
       # @param block [Proc] a block to execute when data is evaluated.
       #  Loaded data is yielded as a block argument.
       def load(record, &block)
-        if record.association(association_name.to_sym).loaded?
-          data = record.public_send(association_name)
-          block&.call(Array.wrap(data).compact.uniq)
-          return data
-        end
-
-        lazy_load(record, block)
-      end
-
-      private
-
-      attr_reader :model_class_name, :association_name
-
-      def lazy_load(record, block)
         BatchLoader.for(record).batch(key: batch_key) do |records, loader|
           data = load_data(records, loader)
 
@@ -41,6 +27,10 @@ module AmsLazyRelationships
         end
       end
 
+      private
+
+      attr_reader :model_class_name, :association_name
+
       def load_data(records, loader)
         # It may happen that same record comes here twice (e.g. wrapped
         # in a decorator and non-wrapped). In this case Associations::Preloader

data/lib/ams_lazy_relationships/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AmsLazyRelationships
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ams_lazy_relationships
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jan Bajena
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-10 00:00:00.000000000 Z
+date: 2019-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -320,7 +320,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/Bajena/ams_lazy_relationships
   source_code_uri: https://github.com/Bajena/ams_lazy_relationships
-  changelog_uri: https://github.com/Bajena/ams_lazy_relationships/CHANGELOG.md
+  changelog_uri: https://github.com/Bajena/ams_lazy_relationships/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: