api_resource 0.3.3 → 0.3.4

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.
data/.rspec CHANGED
@@ -1,3 +1,4 @@
1
1
  --color
2
2
  --format nested
3
3
  --backtrace
4
+ --fail-fast
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.3.3
1
+ 0.3.4
data/api_resource.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "api_resource"
8
- s.version = "0.3.3"
8
+ s.version = "0.3.4"
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,7 +12,7 @@ module ApiResource
12
12
 
13
13
  class_attribute :attribute_names, :public_attribute_names, :protected_attribute_names, :attribute_types
14
14
 
15
- cattr_accessor :valid_typecasts; self.valid_typecasts = [:date, :time, :float, :integer, :int, :fixnum, :string]
15
+ cattr_accessor :valid_typecasts; self.valid_typecasts = [:date, :time, :float, :integer, :int, :fixnum, :string, :array]
16
16
 
17
17
  attr_reader :attributes
18
18
 
@@ -47,7 +47,7 @@ module ApiResource
47
47
  # Override the setter for dirty tracking
48
48
  self.class_eval <<-EOE, __FILE__, __LINE__ + 1
49
49
  def #{arg}
50
- attributes[:#{arg}]
50
+ attribute_with_default(:#{arg})
51
51
  end
52
52
 
53
53
  def #{arg}=(val)
@@ -80,7 +80,7 @@ module ApiResource
80
80
  self.class_eval <<-EOE, __FILE__, __LINE__ + 1
81
81
 
82
82
  def #{arg}
83
- self.attributes[:#{arg}]
83
+ self.attribute_with_default(:#{arg})
84
84
  end
85
85
 
86
86
  def #{arg}=(val)
@@ -171,6 +171,20 @@ module ApiResource
171
171
  end
172
172
 
173
173
  protected
174
+
175
+ def attribute_with_default(field)
176
+ self.attributes[field].nil? ? self.default_value_for_field(field) : self.attributes[field]
177
+ end
178
+
179
+ def default_value_for_field(field)
180
+ case self.class.attribute_types[field.to_sym]
181
+ when :array
182
+ return []
183
+ else
184
+ return nil
185
+ end
186
+ end
187
+
174
188
  def typecast_attribute(field, val)
175
189
  return val unless self.class.attribute_types.include?(field)
176
190
  case self.class.attribute_types[field.to_sym]
@@ -184,6 +198,8 @@ module ApiResource
184
198
  return val.class == Float ? val.dup : val.to_f rescue val
185
199
  when :string
186
200
  return val.class == String ? val.dup : val.to_s rescue val
201
+ when :array
202
+ return val.class == Array ? val.dup : Array.wrap(val)
187
203
  else
188
204
  # catches the nil case and just leaves it alone
189
205
  return val.dup rescue val
@@ -15,6 +15,68 @@ describe "Attributes" do
15
15
  TestResource.attribute?(:attr2).should be_true
16
16
  end
17
17
 
18
+
19
+ describe "Determining Attributes, Scopes, and Associations from the server" do
20
+
21
+ it "should determine it's attributes when the class loads" do
22
+ tst = TestResource.new
23
+ tst.attribute?(:name).should be_true
24
+ tst.attribute?(:age).should be_true
25
+ end
26
+
27
+ it "should typecast data if a format is specified" do
28
+ tst = TestResource.new(:bday => Date.today.to_s)
29
+ tst.bday.should be_a Date
30
+ end
31
+
32
+ it "should typecast data if a format is specified" do
33
+ tst = TestResource.new(:roles => [:role1, :role2])
34
+ tst.roles.should be_a Array
35
+ end
36
+
37
+ it "should default array fields to a blank array" do
38
+ tst = TestResource.new
39
+ tst.roles.should be_a Array
40
+ end
41
+
42
+ it "should determine it's associations when the class loads" do
43
+ tst = TestResource.new
44
+ tst.association?(:has_many_objects).should be_true
45
+ tst.association?(:belongs_to_object).should be_true
46
+ end
47
+
48
+ it "should be able to determine scopes when the class loads" do
49
+ tst = TestResource.new
50
+ tst.scope?(:paginate).should be_true
51
+ tst.scope?(:active).should be_true
52
+ end
53
+
54
+ end
55
+
56
+ context "Attributes" do
57
+ before(:all) do
58
+ TestResource.define_attributes :attr1, :attr2
59
+ TestResource.define_protected_attributes :attr3
60
+ end
61
+
62
+ it "should set attributes for the data loaded from a hash" do
63
+ tst = TestResource.new({:attr1 => "attr1", :attr2 => "attr2"})
64
+ tst.attr1?.should be_true
65
+ tst.attr1.should eql("attr1")
66
+ tst.attr1 = "test"
67
+ tst.attr1.should eql("test")
68
+ end
69
+
70
+ it "should create protected attributes for unknown attributes trying to be loaded" do
71
+ tst = TestResource.new({:attr1 => "attr1", :attr3 => "attr3"})
72
+ tst.attr3?.should be_true
73
+ tst.attr3.should eql("attr3")
74
+ lambda {
75
+ tst.attr3 = "test"
76
+ }.should raise_error
77
+ end
78
+ end
79
+
18
80
  it "should define methods for testing for reading and writing known attributes" do
19
81
  TestResource.define_attributes :attr1, :attr2
20
82
  tst = TestResource.new
@@ -11,56 +11,6 @@ describe "Base" do
11
11
 
12
12
  describe "Loading data from a hash" do
13
13
 
14
- describe "Determining Attributes, Scopes, and Associations from the server" do
15
-
16
- it "should determine it's attributes when the class loads" do
17
- tst = TestResource.new
18
- tst.attribute?(:name).should be_true
19
- tst.attribute?(:age).should be_true
20
- end
21
-
22
- it "should typecast data if a format is specified" do
23
- tst = TestResource.new(:bday => Date.today.to_s)
24
- tst.bday.should be_a Date
25
- end
26
-
27
- it "should determine it's associations when the class loads" do
28
- tst = TestResource.new
29
- tst.association?(:has_many_objects).should be_true
30
- tst.association?(:belongs_to_object).should be_true
31
- end
32
-
33
- it "should be able to determine scopes when the class loads" do
34
- tst = TestResource.new
35
- tst.scope?(:paginate).should be_true
36
- tst.scope?(:active).should be_true
37
- end
38
-
39
- end
40
- context "Attributes" do
41
- before(:all) do
42
- TestResource.define_attributes :attr1, :attr2
43
- TestResource.define_protected_attributes :attr3
44
- end
45
-
46
- it "should set attributes for the data loaded from a hash" do
47
- tst = TestResource.new({:attr1 => "attr1", :attr2 => "attr2"})
48
- tst.attr1?.should be_true
49
- tst.attr1.should eql("attr1")
50
- tst.attr1 = "test"
51
- tst.attr1.should eql("test")
52
- end
53
-
54
- it "should create protected attributes for unknown attributes trying to be loaded" do
55
- tst = TestResource.new({:attr1 => "attr1", :attr3 => "attr3"})
56
- tst.attr3?.should be_true
57
- tst.attr3.should eql("attr3")
58
- lambda {
59
- tst.attr3 = "test"
60
- }.should raise_error
61
- end
62
- end
63
-
64
14
  context "Associations" do
65
15
  before(:all) do
66
16
  TestResource.has_many :has_many_objects
@@ -390,7 +340,7 @@ describe "Base" do
390
340
  it "should include nil attributes when creating if include_nil_attributes_on_create is true" do
391
341
  ApiResource::Connection.any_instance.expects(:post).with(
392
342
  "/test_resources.json",
393
- "{\"test_resource\":{\"name\":\"Ethan\",\"age\":null,\"bday\":null}}",
343
+ "{\"test_resource\":{\"name\":\"Ethan\",\"age\":null,\"bday\":null,\"roles\":[]}}",
394
344
  TestResource.headers
395
345
  )
396
346
 
@@ -514,7 +464,7 @@ describe "Base" do
514
464
  it "should include all attributes if include_all_attributes_on_update is true" do
515
465
  ApiResource::Connection.any_instance.expects(:put).with(
516
466
  "/test_resources/1.json",
517
- "{\"test_resource\":{\"name\":\"Ethan\",\"age\":null,\"bday\":null}}",
467
+ "{\"test_resource\":{\"name\":\"Ethan\",\"age\":null,\"bday\":null,\"roles\":[]}}",
518
468
  TestResource.headers
519
469
  )
520
470
 
@@ -8,6 +8,7 @@ Mocks.define do
8
8
 
9
9
  endpoint("/test_resources") do
10
10
  post(HashDealer.roll(:test_resource).merge(:id => 1), :params => {:test_resource => HashDealer.roll(:test_resource).matcher})
11
+ post(HashDealer.roll(:test_resource).merge(:id => 1), :params => {:test_resource => HashDealer.roll(:test_resource_with_roles).matcher})
11
12
  get((0..4).to_a.collect{HashDealer.roll(:test_resource)})
12
13
  get((0..4).to_a.collect{HashDealer.roll(:test_resource)}, :params => {:active => true})
13
14
  end
@@ -1,7 +1,7 @@
1
1
  HashDealer.define(:new_test_object) do
2
2
  attributes({
3
3
  :protected => [:id],
4
- :public => [:name, :age, [:bday, :date]],
4
+ :public => [:name, :age, [:bday, :date], [:roles, :array]]
5
5
  })
6
6
  scopes({
7
7
  :active => {:active => true},
@@ -19,6 +19,12 @@ HashDealer.define(:test_resource) do
19
19
  age("age")
20
20
  end
21
21
 
22
+ HashDealer.define(:test_resource_with_roles) do
23
+ name("name")
24
+ age("age")
25
+ roles([])
26
+ end
27
+
22
28
  HashDealer.define(:test_resource_errors) do
23
29
  errors({
24
30
  :name => ["can't be blank"],
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.3
4
+ version: 0.3.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-07-02 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70243820953360 !ruby/object:Gem::Requirement
16
+ requirement: &70173231121040 !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: *70243820953360
24
+ version_requirements: *70173231121040
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: hash_dealer
27
- requirement: &70243820952500 !ruby/object:Gem::Requirement
27
+ requirement: &70173231120060 !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: *70243820952500
35
+ version_requirements: *70173231120060
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rest-client
38
- requirement: &70243820951640 !ruby/object:Gem::Requirement
38
+ requirement: &70173231118740 !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: *70243820951640
46
+ version_requirements: *70173231118740
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: log4r
49
- requirement: &70243820950760 !ruby/object:Gem::Requirement
49
+ requirement: &70173231117920 !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: *70243820950760
57
+ version_requirements: *70173231117920
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: differ
60
- requirement: &70243820949980 !ruby/object:Gem::Requirement
60
+ requirement: &70173231116760 !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: *70243820949980
68
+ version_requirements: *70173231116760
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: colorize
71
- requirement: &70243820949180 !ruby/object:Gem::Requirement
71
+ requirement: &70173231115920 !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: *70243820949180
79
+ version_requirements: *70173231115920
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: json
82
- requirement: &70243820948300 !ruby/object:Gem::Requirement
82
+ requirement: &70173231114900 !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: *70243820948300
90
+ version_requirements: *70173231114900
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: pry
93
- requirement: &70243820947520 !ruby/object:Gem::Requirement
93
+ requirement: &70173231113720 !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: *70243820947520
101
+ version_requirements: *70173231113720
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: pry-doc
104
- requirement: &70243820946820 !ruby/object:Gem::Requirement
104
+ requirement: &70173231112620 !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: *70243820946820
112
+ version_requirements: *70173231112620
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: pry-nav
115
- requirement: &70243820946200 !ruby/object:Gem::Requirement
115
+ requirement: &70173231111600 !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: *70243820946200
123
+ version_requirements: *70173231111600
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: rspec
126
- requirement: &70243820945540 !ruby/object:Gem::Requirement
126
+ requirement: &70173231110520 !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: *70243820945540
134
+ version_requirements: *70173231110520
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: ruby-debug19
137
- requirement: &70243820944720 !ruby/object:Gem::Requirement
137
+ requirement: &70173231109640 !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: *70243820944720
145
+ version_requirements: *70173231109640
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: growl
148
- requirement: &70243820943760 !ruby/object:Gem::Requirement
148
+ requirement: &70173231108700 !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: *70243820943760
156
+ version_requirements: *70173231108700
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: rspec-rails
159
- requirement: &70243820943100 !ruby/object:Gem::Requirement
159
+ requirement: &70173231107700 !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: *70243820943100
167
+ version_requirements: *70173231107700
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: factory_girl
170
- requirement: &70243820942420 !ruby/object:Gem::Requirement
170
+ requirement: &70173231106960 !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: *70243820942420
178
+ version_requirements: *70173231106960
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: simplecov
181
- requirement: &70243820941720 !ruby/object:Gem::Requirement
181
+ requirement: &70173231105660 !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: *70243820941720
189
+ version_requirements: *70173231105660
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: faker
192
- requirement: &70243820941160 !ruby/object:Gem::Requirement
192
+ requirement: &70173231104920 !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: *70243820941160
200
+ version_requirements: *70173231104920
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: guard
203
- requirement: &70243820940600 !ruby/object:Gem::Requirement
203
+ requirement: &70173231104280 !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: *70243820940600
211
+ version_requirements: *70173231104280
212
212
  - !ruby/object:Gem::Dependency
213
213
  name: guard-rspec
214
- requirement: &70243820939980 !ruby/object:Gem::Requirement
214
+ requirement: &70173231103600 !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: *70243820939980
222
+ version_requirements: *70173231103600
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: mocha
225
- requirement: &70243820939320 !ruby/object:Gem::Requirement
225
+ requirement: &70173231102860 !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: *70243820939320
233
+ version_requirements: *70173231102860
234
234
  - !ruby/object:Gem::Dependency
235
235
  name: bundler
236
- requirement: &70243820938580 !ruby/object:Gem::Requirement
236
+ requirement: &70173231100620 !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: *70243820938580
244
+ version_requirements: *70173231100620
245
245
  - !ruby/object:Gem::Dependency
246
246
  name: jeweler
247
- requirement: &70243820937700 !ruby/object:Gem::Requirement
247
+ requirement: &70173231099920 !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: *70243820937700
255
+ version_requirements: *70173231099920
256
256
  - !ruby/object:Gem::Dependency
257
257
  name: activerecord
258
- requirement: &70243820936520 !ruby/object:Gem::Requirement
258
+ requirement: &70173231099300 !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: *70243820936520
266
+ version_requirements: *70173231099300
267
267
  - !ruby/object:Gem::Dependency
268
268
  name: sqlite3
269
- requirement: &70243820935580 !ruby/object:Gem::Requirement
269
+ requirement: &70173231098500 !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: *70243820935580
277
+ version_requirements: *70173231098500
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: 711129040468791614
364
+ hash: -1534545171276670473
365
365
  required_rubygems_version: !ruby/object:Gem::Requirement
366
366
  none: false
367
367
  requirements: