sunstone 1.6.0 → 1.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/ext/active_record/finder_methods.rb +11 -2
- data/lib/sunstone/connection.rb +2 -2
- data/sunstone.gemspec +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 13352c866173a1876379b19e112620e83b732a88
|
|
4
|
+
data.tar.gz: 3f98a975c2ac40ca32932622890bc2e0d70b0a84
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 36ea65d03a36cf83226b7a70adbb2d0fe6d05e28e32c19c018ab2dcb6b456ade16426017e7a073b12c6486aca2ec8e058dcef473c4c82cf1d3abceb464bc62cd
|
|
7
|
+
data.tar.gz: aa2c0d60f340022ad0a29d4719f29ddf4f9338c2bb052e1ef9dda3ba19a49b363b9f7a7821e7671d8ef6589db0eb191d1e39d6cd6ac36b092e46852c0fc06d1c
|
|
@@ -64,11 +64,20 @@ module ActiveRecord
|
|
|
64
64
|
def construct_association(parent, reflection, attributes, seen, model_cache)
|
|
65
65
|
return if attributes.nil?
|
|
66
66
|
id = attributes[reflection.klass.primary_key]
|
|
67
|
-
|
|
68
67
|
model = seen[parent.class.base_class][parent.id][reflection.klass][id]
|
|
69
|
-
|
|
68
|
+
|
|
70
69
|
if model
|
|
71
70
|
construct(model, attributes.select{|k,v| !reflection.klass.column_names.include?(k.to_s) }, seen, model_cache)
|
|
71
|
+
|
|
72
|
+
other = parent.association(reflection.name)
|
|
73
|
+
|
|
74
|
+
if reflection.collection?
|
|
75
|
+
other.target.push(model)
|
|
76
|
+
else
|
|
77
|
+
other.target = model
|
|
78
|
+
end
|
|
79
|
+
|
|
80
|
+
other.set_inverse_instance(model)
|
|
72
81
|
else
|
|
73
82
|
model = construct_model(parent, reflection, id, attributes.select{|k,v| reflection.klass.column_names.include?(k.to_s) }, seen, model_cache)
|
|
74
83
|
seen[parent.class.base_class][parent.id][model.class.base_class][id] = model
|
data/lib/sunstone/connection.rb
CHANGED
|
@@ -128,14 +128,14 @@ module Sunstone
|
|
|
128
128
|
Thread.current[:sunstone_cookie_store].set_cookie(request_uri, value)
|
|
129
129
|
end
|
|
130
130
|
end
|
|
131
|
-
|
|
131
|
+
|
|
132
132
|
if block_given?
|
|
133
133
|
return_value =yield(response)
|
|
134
134
|
else
|
|
135
135
|
return_value =response
|
|
136
136
|
end
|
|
137
137
|
end
|
|
138
|
-
|
|
138
|
+
|
|
139
139
|
return_value
|
|
140
140
|
end
|
|
141
141
|
|
data/sunstone.gemspec
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: sunstone
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.6.
|
|
4
|
+
version: 1.6.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Jon Bracy
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-
|
|
11
|
+
date: 2014-12-01 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rake
|