sunstone 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59a88634c0c04b6365abb97345ad0dd8ddc27ff7
-  data.tar.gz: 43051a7d769db7de6f01ed1dbbb28f7132531231
+  metadata.gz: 13352c866173a1876379b19e112620e83b732a88
+  data.tar.gz: 3f98a975c2ac40ca32932622890bc2e0d70b0a84
 SHA512:
-  metadata.gz: 8d74d6dff4bbfc34bd49d2619a79a2c27ba257f5672bc8f954b258085afb67422882b1931eccd0dbb23672e4fb2ecd62bce0ecb5301544bb94817a4d1b1fc5d0
-  data.tar.gz: e3576667424fc8b1995ad96e8736455a502d26572209aa7366432dc8943c07b16d4305d8b3841c8276826ddd0d6fcee866df643d51c867430fb0261a42fd24b0
+  metadata.gz: 36ea65d03a36cf83226b7a70adbb2d0fe6d05e28e32c19c018ab2dcb6b456ade16426017e7a073b12c6486aca2ec8e058dcef473c4c82cf1d3abceb464bc62cd
+  data.tar.gz: aa2c0d60f340022ad0a29d4719f29ddf4f9338c2bb052e1ef9dda3ba19a49b363b9f7a7821e7671d8ef6589db0eb191d1e39d6cd6ac36b092e46852c0fc06d1c

data/lib/ext/active_record/finder_methods.rb

@@ -64,11 +64,20 @@ module ActiveRecord
     def construct_association(parent, reflection, attributes, seen, model_cache)
       return if attributes.nil?
       id = attributes[reflection.klass.primary_key]
-    
       model = seen[parent.class.base_class][parent.id][reflection.klass][id]
-    
+      
       if model
         construct(model, attributes.select{|k,v| !reflection.klass.column_names.include?(k.to_s) }, seen, model_cache)
+
+        other = parent.association(reflection.name)
+        
+        if reflection.collection?
+          other.target.push(model)
+        else
+          other.target = model
+        end
+
+        other.set_inverse_instance(model)
       else
         model = construct_model(parent, reflection, id, attributes.select{|k,v| reflection.klass.column_names.include?(k.to_s) }, seen, model_cache)
         seen[parent.class.base_class][parent.id][model.class.base_class][id] = model

data/lib/sunstone/connection.rb

@@ -128,14 +128,14 @@ module Sunstone
             Thread.current[:sunstone_cookie_store].set_cookie(request_uri, value)
           end
         end
-
+        
         if block_given?
           return_value =yield(response)
         else
           return_value =response
         end
       end
-
+      
       return_value
     end
 

data/sunstone.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = "sunstone"
-  s.version     = '1.6.0'
+  s.version     = '1.6.1'
   s.authors     = ["Jon Bracy"]
   s.email       = ["jonbracy@gmail.com"]
   s.homepage    = "http://sunstonerb.com"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunstone
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake