embark-journey 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18c9b267ba2cffc78635ed6da60a9fc0cdd541f7
-  data.tar.gz: 2ee2f6281fa95ab36e8cb447b8772cd5ac4fe137
+  metadata.gz: 177f36337f55709ec264098ecc3f810226a77c30
+  data.tar.gz: f33b30380f80fb669218b4bc72be8c1f1562325d
 SHA512:
-  metadata.gz: 45cead5f6647b4a247627480fc3d57f4e2d3b71cb338a2c54ac2312215cb3ba933900f58ad123b9764f45da84e7c38048da416f91ff9d5573a6848773efdc997
-  data.tar.gz: db86af47a90b175ea80e6e36b73c65736bc32498ae3041210a8235eb6aa3cfa8b850329b7ae3874fbf9883923f8caa537e76c6474a44d64ec6a2c81009cda695
+  metadata.gz: 925c574614b4e687671dd66fc8fd752e64a01fd34060ffc236d62d6ba8420bd5ee14e6e27214d0b4ee6cb6aac38a500d3dedfa86aecb5bc9c73e0f6cd1df2846
+  data.tar.gz: 75eec0780c5007d96a2ebb4e13c6d62ca752bd65a05094a71dcb5f49e2ce3e92babb15d32ccc310ef0708be1058a012f09d182cae61532f1bb98ab52f88bfd2e

data/lib/active_resource/associations.rb

@@ -126,8 +126,8 @@ module ActiveResource::Associations
     end
 
     define_method(method_name) do
-      if instance_variable_defined?(ivar_name)
-        instance_variable_get(ivar_name)
+      if ivar = instance_variable_get(ivar_name)
+        ivar
       elsif attributes.include?(method_name)
         attributes[method_name]
       elsif association_id = send(finder_key)

data/lib/journey/resource/attribute_loading.rb

@@ -7,10 +7,19 @@ module Journey::Resource::AttributeLoading
     def load(attributes, remove_root = false, persisted = false)
       # 'data' is a reserved key in ActiveResource,
       # but Journey uses it for the Oplog
-      attributes['content'] = attributes.delete('data')
+      if content = attributes.delete('data')
+        attributes['content'] = content
+      end
 
       super(attributes, remove_root, persisted).tap do
 
+        # set the cached value of any updated associations (e.g. parent_id)
+        # to nil so that they can be re-fetched
+        attributes.keys.map(&:to_s).select{ |key| key =~ /_id$/ }.each do |association_key|
+          association = association_key.gsub /_id$/, ''
+          instance_variable_set("@#{association}", nil)
+        end
+
         # allow enum_sets to be loaded by key (rather than index)
         # by auto-converting them on initialization
         if enum_sets = self.class.instance_variable_get(:@enum_sets)

data/lib/journey/version.rb

@@ -2,7 +2,7 @@ module Journey
   module VERSION
     MAJOR = 0
     MINOR = 1
-    TINY  = 5
+    TINY  = 6
     PRE   = nil
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: embark-journey
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Dan Davey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-11 00:00:00.000000000 Z
+date: 2015-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr