api_resource 0.3.1 → 0.3.2
Sign up to get free protection for your applications and to get access to all the features.
- data/VERSION +1 -1
- data/api_resource.gemspec +2 -2
- data/lib/api_resource/association_activation.rb +1 -1
- data/lib/api_resource/associations.rb +50 -16
- data/lib/api_resource/base.rb +1 -1
- data/spec/lib/associations_spec.rb +18 -5
- metadata +51 -51
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.3.
|
1
|
+
0.3.2
|
data/api_resource.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = "api_resource"
|
8
|
-
s.version = "0.3.
|
8
|
+
s.version = "0.3.2"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Ethan Langevin"]
|
12
|
-
s.date = "2012-06-
|
12
|
+
s.date = "2012-06-25"
|
13
13
|
s.description = "A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources"
|
14
14
|
s.email = "ejl6266@gmail.com"
|
15
15
|
s.extra_rdoc_files = [
|
@@ -3,7 +3,7 @@ module ApiResource
|
|
3
3
|
extend ActiveSupport::Concern
|
4
4
|
|
5
5
|
included do
|
6
|
-
|
6
|
+
class_attribute :association_types
|
7
7
|
# our default association types
|
8
8
|
self.association_types = {:belongs_to => :single, :has_one => :single, :has_many => :multi}
|
9
9
|
end
|
@@ -19,16 +19,20 @@ module ApiResource
|
|
19
19
|
|
20
20
|
included do
|
21
21
|
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
self.related_objects = RelatedObjectHash.new
|
27
|
-
self.association_types.keys.each do |type|
|
28
|
-
self.related_objects[type] = RelatedObjectHash.new({})
|
22
|
+
unless self.ancestors.include?(ApiResource::AssociationActivation)
|
23
|
+
raise Exception.new(
|
24
|
+
"Can't include Associations without AssociationActivation"
|
25
|
+
)
|
29
26
|
end
|
30
|
-
|
31
|
-
|
27
|
+
|
28
|
+
class_attribute :related_objects
|
29
|
+
self.clear_related_objects
|
30
|
+
|
31
|
+
# we need to add an inherited method here, but it can't happen
|
32
|
+
# until after this module in included/extended, so it's in its own
|
33
|
+
# little mini module
|
34
|
+
extend InheritedMethod
|
35
|
+
|
32
36
|
self.define_association_methods
|
33
37
|
|
34
38
|
end
|
@@ -37,7 +41,24 @@ module ApiResource
|
|
37
41
|
def self.activate_active_record
|
38
42
|
ActiveRecord::Base.class_eval do
|
39
43
|
include ApiResource::AssociationActivation
|
40
|
-
self.activate_associations(
|
44
|
+
self.activate_associations(
|
45
|
+
:has_many_remote => :has_many_remote,
|
46
|
+
:belongs_to_remote => :belongs_to_remote,
|
47
|
+
:has_one_remote => :has_one_remote
|
48
|
+
)
|
49
|
+
end
|
50
|
+
end
|
51
|
+
|
52
|
+
module InheritedMethod
|
53
|
+
# define a method to reset our related objects
|
54
|
+
def inherited(descendant)
|
55
|
+
# we only want to do this in direct descendants of ApiResoruce::Base
|
56
|
+
if self == ApiResource::Base
|
57
|
+
descendant.clear_related_objects
|
58
|
+
else
|
59
|
+
descendant.clone_related_objects
|
60
|
+
end
|
61
|
+
super(descendant)
|
41
62
|
end
|
42
63
|
end
|
43
64
|
|
@@ -109,13 +130,26 @@ module ApiResource
|
|
109
130
|
end
|
110
131
|
end
|
111
132
|
|
112
|
-
def clear_associations
|
113
|
-
self.related_objects.each do |_, val|
|
114
|
-
val.clear
|
115
|
-
end
|
116
|
-
end
|
117
|
-
|
118
133
|
protected
|
134
|
+
|
135
|
+
def clear_related_objects
|
136
|
+
# Hash to hold onto the definitions of the related objects
|
137
|
+
self.related_objects = RelatedObjectHash.new
|
138
|
+
self.association_types.keys.each do |type|
|
139
|
+
self.related_objects[type] = RelatedObjectHash.new({})
|
140
|
+
end
|
141
|
+
self.related_objects[:scope] = RelatedObjectHash.new({})
|
142
|
+
end
|
143
|
+
|
144
|
+
def clone_related_objects
|
145
|
+
# Hash to hold onto the definitions of the related objects
|
146
|
+
self.related_objects = self.related_objects.clone
|
147
|
+
self.association_types.keys.each do |type|
|
148
|
+
self.related_objects[type] = self.related_objects[type].clone
|
149
|
+
end
|
150
|
+
self.related_objects[:scope] = self.related_objects[:scope].clone
|
151
|
+
end
|
152
|
+
|
119
153
|
def define_association_as_attribute(assoc_type, assoc_name)
|
120
154
|
# set up dirty tracking for associations
|
121
155
|
|
data/lib/api_resource/base.rb
CHANGED
@@ -117,7 +117,7 @@ module ApiResource
|
|
117
117
|
# clear the public_attribute_names, protected_attribute_names
|
118
118
|
remove_instance_variable(:@class_data) if instance_variable_defined?(:@class_data)
|
119
119
|
self.clear_attributes
|
120
|
-
self.
|
120
|
+
self.clear_related_objects
|
121
121
|
self.set_class_attributes_upon_load
|
122
122
|
end
|
123
123
|
|
@@ -55,11 +55,6 @@ describe "Associations" do
|
|
55
55
|
AnotherTestResource.association?(:belongs_to_object).should_not be_true
|
56
56
|
end
|
57
57
|
|
58
|
-
it "should have its relationship cascade when sub-classed" do
|
59
|
-
TestResource.belongs_to :belongs_to_object
|
60
|
-
ChildTestResource.association?(:belongs_to_object).should be true
|
61
|
-
end
|
62
|
-
|
63
58
|
it "should have its relationship cascade when sub-classed after the relationship is defined" do
|
64
59
|
TestResource.belongs_to :belongs_to_object
|
65
60
|
class ChildTestResource2 < TestResource; end
|
@@ -136,6 +131,24 @@ describe "Associations" do
|
|
136
131
|
TestResource.scope?(:test_scope).should be_true
|
137
132
|
TestResource.scope_attributes(:test_scope).should eql({"item" => "test"})
|
138
133
|
end
|
134
|
+
|
135
|
+
it "should not propagate scopes from one class to another" do
|
136
|
+
|
137
|
+
Scope1Class = Class.new(ApiResource::Base) do
|
138
|
+
scope :one, {:item => "test"}
|
139
|
+
end
|
140
|
+
|
141
|
+
Scope2Class = Class.new(ApiResource::Base) do
|
142
|
+
scope :two, {:abc => "def"}
|
143
|
+
end
|
144
|
+
|
145
|
+
Scope1Class.scope?(:one).should be true
|
146
|
+
Scope1Class.scope?(:two).should be false
|
147
|
+
|
148
|
+
Scope2Class.scope?(:one).should be false
|
149
|
+
Scope2Class.scope?(:two).should be true
|
150
|
+
|
151
|
+
end
|
139
152
|
|
140
153
|
end
|
141
154
|
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: api_resource
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.3.
|
4
|
+
version: 0.3.2
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,11 +9,11 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-06-
|
12
|
+
date: 2012-06-25 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rails
|
16
|
-
requirement: &
|
16
|
+
requirement: &2151864820 !ruby/object:Gem::Requirement
|
17
17
|
none: false
|
18
18
|
requirements:
|
19
19
|
- - ~>
|
@@ -21,10 +21,10 @@ dependencies:
|
|
21
21
|
version: '3'
|
22
22
|
type: :runtime
|
23
23
|
prerelease: false
|
24
|
-
version_requirements: *
|
24
|
+
version_requirements: *2151864820
|
25
25
|
- !ruby/object:Gem::Dependency
|
26
26
|
name: hash_dealer
|
27
|
-
requirement: &
|
27
|
+
requirement: &2151862940 !ruby/object:Gem::Requirement
|
28
28
|
none: false
|
29
29
|
requirements:
|
30
30
|
- - ! '>='
|
@@ -32,10 +32,10 @@ dependencies:
|
|
32
32
|
version: '0'
|
33
33
|
type: :runtime
|
34
34
|
prerelease: false
|
35
|
-
version_requirements: *
|
35
|
+
version_requirements: *2151862940
|
36
36
|
- !ruby/object:Gem::Dependency
|
37
37
|
name: rest-client
|
38
|
-
requirement: &
|
38
|
+
requirement: &2151860900 !ruby/object:Gem::Requirement
|
39
39
|
none: false
|
40
40
|
requirements:
|
41
41
|
- - ! '>='
|
@@ -43,10 +43,10 @@ dependencies:
|
|
43
43
|
version: '0'
|
44
44
|
type: :runtime
|
45
45
|
prerelease: false
|
46
|
-
version_requirements: *
|
46
|
+
version_requirements: *2151860900
|
47
47
|
- !ruby/object:Gem::Dependency
|
48
48
|
name: log4r
|
49
|
-
requirement: &
|
49
|
+
requirement: &2151860220 !ruby/object:Gem::Requirement
|
50
50
|
none: false
|
51
51
|
requirements:
|
52
52
|
- - ! '>='
|
@@ -54,10 +54,10 @@ dependencies:
|
|
54
54
|
version: '0'
|
55
55
|
type: :runtime
|
56
56
|
prerelease: false
|
57
|
-
version_requirements: *
|
57
|
+
version_requirements: *2151860220
|
58
58
|
- !ruby/object:Gem::Dependency
|
59
59
|
name: differ
|
60
|
-
requirement: &
|
60
|
+
requirement: &2151859200 !ruby/object:Gem::Requirement
|
61
61
|
none: false
|
62
62
|
requirements:
|
63
63
|
- - ! '>='
|
@@ -65,10 +65,10 @@ dependencies:
|
|
65
65
|
version: '0'
|
66
66
|
type: :runtime
|
67
67
|
prerelease: false
|
68
|
-
version_requirements: *
|
68
|
+
version_requirements: *2151859200
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
70
|
name: colorize
|
71
|
-
requirement: &
|
71
|
+
requirement: &2151858280 !ruby/object:Gem::Requirement
|
72
72
|
none: false
|
73
73
|
requirements:
|
74
74
|
- - ! '>='
|
@@ -76,10 +76,10 @@ dependencies:
|
|
76
76
|
version: '0'
|
77
77
|
type: :runtime
|
78
78
|
prerelease: false
|
79
|
-
version_requirements: *
|
79
|
+
version_requirements: *2151858280
|
80
80
|
- !ruby/object:Gem::Dependency
|
81
81
|
name: json
|
82
|
-
requirement: &
|
82
|
+
requirement: &2151857520 !ruby/object:Gem::Requirement
|
83
83
|
none: false
|
84
84
|
requirements:
|
85
85
|
- - ! '>='
|
@@ -87,10 +87,10 @@ dependencies:
|
|
87
87
|
version: '0'
|
88
88
|
type: :runtime
|
89
89
|
prerelease: false
|
90
|
-
version_requirements: *
|
90
|
+
version_requirements: *2151857520
|
91
91
|
- !ruby/object:Gem::Dependency
|
92
92
|
name: pry
|
93
|
-
requirement: &
|
93
|
+
requirement: &2151856680 !ruby/object:Gem::Requirement
|
94
94
|
none: false
|
95
95
|
requirements:
|
96
96
|
- - ! '>='
|
@@ -98,10 +98,10 @@ dependencies:
|
|
98
98
|
version: '0'
|
99
99
|
type: :development
|
100
100
|
prerelease: false
|
101
|
-
version_requirements: *
|
101
|
+
version_requirements: *2151856680
|
102
102
|
- !ruby/object:Gem::Dependency
|
103
103
|
name: pry-doc
|
104
|
-
requirement: &
|
104
|
+
requirement: &2151855900 !ruby/object:Gem::Requirement
|
105
105
|
none: false
|
106
106
|
requirements:
|
107
107
|
- - ! '>='
|
@@ -109,10 +109,10 @@ dependencies:
|
|
109
109
|
version: '0'
|
110
110
|
type: :development
|
111
111
|
prerelease: false
|
112
|
-
version_requirements: *
|
112
|
+
version_requirements: *2151855900
|
113
113
|
- !ruby/object:Gem::Dependency
|
114
114
|
name: pry-nav
|
115
|
-
requirement: &
|
115
|
+
requirement: &2151854960 !ruby/object:Gem::Requirement
|
116
116
|
none: false
|
117
117
|
requirements:
|
118
118
|
- - ! '>='
|
@@ -120,10 +120,10 @@ dependencies:
|
|
120
120
|
version: '0'
|
121
121
|
type: :development
|
122
122
|
prerelease: false
|
123
|
-
version_requirements: *
|
123
|
+
version_requirements: *2151854960
|
124
124
|
- !ruby/object:Gem::Dependency
|
125
125
|
name: rspec
|
126
|
-
requirement: &
|
126
|
+
requirement: &2151854060 !ruby/object:Gem::Requirement
|
127
127
|
none: false
|
128
128
|
requirements:
|
129
129
|
- - ! '>='
|
@@ -131,10 +131,10 @@ dependencies:
|
|
131
131
|
version: '0'
|
132
132
|
type: :development
|
133
133
|
prerelease: false
|
134
|
-
version_requirements: *
|
134
|
+
version_requirements: *2151854060
|
135
135
|
- !ruby/object:Gem::Dependency
|
136
136
|
name: ruby-debug19
|
137
|
-
requirement: &
|
137
|
+
requirement: &2151852920 !ruby/object:Gem::Requirement
|
138
138
|
none: false
|
139
139
|
requirements:
|
140
140
|
- - ! '>='
|
@@ -142,10 +142,10 @@ dependencies:
|
|
142
142
|
version: '0'
|
143
143
|
type: :development
|
144
144
|
prerelease: false
|
145
|
-
version_requirements: *
|
145
|
+
version_requirements: *2151852920
|
146
146
|
- !ruby/object:Gem::Dependency
|
147
147
|
name: growl
|
148
|
-
requirement: &
|
148
|
+
requirement: &2151851420 !ruby/object:Gem::Requirement
|
149
149
|
none: false
|
150
150
|
requirements:
|
151
151
|
- - ! '>='
|
@@ -153,10 +153,10 @@ dependencies:
|
|
153
153
|
version: '0'
|
154
154
|
type: :development
|
155
155
|
prerelease: false
|
156
|
-
version_requirements: *
|
156
|
+
version_requirements: *2151851420
|
157
157
|
- !ruby/object:Gem::Dependency
|
158
158
|
name: rspec-rails
|
159
|
-
requirement: &
|
159
|
+
requirement: &2151850660 !ruby/object:Gem::Requirement
|
160
160
|
none: false
|
161
161
|
requirements:
|
162
162
|
- - ! '>='
|
@@ -164,10 +164,10 @@ dependencies:
|
|
164
164
|
version: '0'
|
165
165
|
type: :development
|
166
166
|
prerelease: false
|
167
|
-
version_requirements: *
|
167
|
+
version_requirements: *2151850660
|
168
168
|
- !ruby/object:Gem::Dependency
|
169
169
|
name: factory_girl
|
170
|
-
requirement: &
|
170
|
+
requirement: &2151849600 !ruby/object:Gem::Requirement
|
171
171
|
none: false
|
172
172
|
requirements:
|
173
173
|
- - ! '>='
|
@@ -175,10 +175,10 @@ dependencies:
|
|
175
175
|
version: '0'
|
176
176
|
type: :development
|
177
177
|
prerelease: false
|
178
|
-
version_requirements: *
|
178
|
+
version_requirements: *2151849600
|
179
179
|
- !ruby/object:Gem::Dependency
|
180
180
|
name: simplecov
|
181
|
-
requirement: &
|
181
|
+
requirement: &2151848060 !ruby/object:Gem::Requirement
|
182
182
|
none: false
|
183
183
|
requirements:
|
184
184
|
- - ! '>='
|
@@ -186,10 +186,10 @@ dependencies:
|
|
186
186
|
version: '0'
|
187
187
|
type: :development
|
188
188
|
prerelease: false
|
189
|
-
version_requirements: *
|
189
|
+
version_requirements: *2151848060
|
190
190
|
- !ruby/object:Gem::Dependency
|
191
191
|
name: faker
|
192
|
-
requirement: &
|
192
|
+
requirement: &2151846900 !ruby/object:Gem::Requirement
|
193
193
|
none: false
|
194
194
|
requirements:
|
195
195
|
- - ! '>='
|
@@ -197,10 +197,10 @@ dependencies:
|
|
197
197
|
version: '0'
|
198
198
|
type: :development
|
199
199
|
prerelease: false
|
200
|
-
version_requirements: *
|
200
|
+
version_requirements: *2151846900
|
201
201
|
- !ruby/object:Gem::Dependency
|
202
202
|
name: guard
|
203
|
-
requirement: &
|
203
|
+
requirement: &2151844640 !ruby/object:Gem::Requirement
|
204
204
|
none: false
|
205
205
|
requirements:
|
206
206
|
- - ! '>='
|
@@ -208,10 +208,10 @@ dependencies:
|
|
208
208
|
version: '0'
|
209
209
|
type: :development
|
210
210
|
prerelease: false
|
211
|
-
version_requirements: *
|
211
|
+
version_requirements: *2151844640
|
212
212
|
- !ruby/object:Gem::Dependency
|
213
213
|
name: guard-rspec
|
214
|
-
requirement: &
|
214
|
+
requirement: &2151843220 !ruby/object:Gem::Requirement
|
215
215
|
none: false
|
216
216
|
requirements:
|
217
217
|
- - ! '>='
|
@@ -219,10 +219,10 @@ dependencies:
|
|
219
219
|
version: '0'
|
220
220
|
type: :development
|
221
221
|
prerelease: false
|
222
|
-
version_requirements: *
|
222
|
+
version_requirements: *2151843220
|
223
223
|
- !ruby/object:Gem::Dependency
|
224
224
|
name: mocha
|
225
|
-
requirement: &
|
225
|
+
requirement: &2151841600 !ruby/object:Gem::Requirement
|
226
226
|
none: false
|
227
227
|
requirements:
|
228
228
|
- - ! '>='
|
@@ -230,10 +230,10 @@ dependencies:
|
|
230
230
|
version: '0'
|
231
231
|
type: :development
|
232
232
|
prerelease: false
|
233
|
-
version_requirements: *
|
233
|
+
version_requirements: *2151841600
|
234
234
|
- !ruby/object:Gem::Dependency
|
235
235
|
name: bundler
|
236
|
-
requirement: &
|
236
|
+
requirement: &2151839980 !ruby/object:Gem::Requirement
|
237
237
|
none: false
|
238
238
|
requirements:
|
239
239
|
- - ! '>='
|
@@ -241,10 +241,10 @@ dependencies:
|
|
241
241
|
version: '0'
|
242
242
|
type: :development
|
243
243
|
prerelease: false
|
244
|
-
version_requirements: *
|
244
|
+
version_requirements: *2151839980
|
245
245
|
- !ruby/object:Gem::Dependency
|
246
246
|
name: jeweler
|
247
|
-
requirement: &
|
247
|
+
requirement: &2151838700 !ruby/object:Gem::Requirement
|
248
248
|
none: false
|
249
249
|
requirements:
|
250
250
|
- - ~>
|
@@ -252,10 +252,10 @@ dependencies:
|
|
252
252
|
version: 1.6.4
|
253
253
|
type: :development
|
254
254
|
prerelease: false
|
255
|
-
version_requirements: *
|
255
|
+
version_requirements: *2151838700
|
256
256
|
- !ruby/object:Gem::Dependency
|
257
257
|
name: activerecord
|
258
|
-
requirement: &
|
258
|
+
requirement: &2151837180 !ruby/object:Gem::Requirement
|
259
259
|
none: false
|
260
260
|
requirements:
|
261
261
|
- - ~>
|
@@ -263,10 +263,10 @@ dependencies:
|
|
263
263
|
version: '3'
|
264
264
|
type: :development
|
265
265
|
prerelease: false
|
266
|
-
version_requirements: *
|
266
|
+
version_requirements: *2151837180
|
267
267
|
- !ruby/object:Gem::Dependency
|
268
268
|
name: sqlite3
|
269
|
-
requirement: &
|
269
|
+
requirement: &2151835440 !ruby/object:Gem::Requirement
|
270
270
|
none: false
|
271
271
|
requirements:
|
272
272
|
- - ! '>='
|
@@ -274,7 +274,7 @@ dependencies:
|
|
274
274
|
version: '0'
|
275
275
|
type: :development
|
276
276
|
prerelease: false
|
277
|
-
version_requirements: *
|
277
|
+
version_requirements: *2151835440
|
278
278
|
description: A replacement for ActiveResource for RESTful APIs that handles associated
|
279
279
|
object and multiple data sources
|
280
280
|
email: ejl6266@gmail.com
|
@@ -361,7 +361,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
361
361
|
version: '0'
|
362
362
|
segments:
|
363
363
|
- 0
|
364
|
-
hash:
|
364
|
+
hash: 4068508212743998098
|
365
365
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
366
366
|
none: false
|
367
367
|
requirements:
|