sinatra_resource 0.2.4 → 0.2.5

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/VERSION CHANGED
@@ -1 +1 @@
1
- 0.2.4
1
+ 0.2.5
@@ -45,7 +45,7 @@ class CategoriesPostResourceTest < ResourceTestCase
45
45
  end
46
46
  end
47
47
 
48
- [:id, :created_at, :updated_at, :sources].each do |invalid|
48
+ [:id, :created_at, :updated_at, :sources, :junk].each do |invalid|
49
49
  context "#{role} : post / but with #{invalid}" do
50
50
  before do
51
51
  post "/", valid_params_for(role).merge(invalid => 9)
@@ -79,7 +79,7 @@ class CategoriesPostResourceTest < ResourceTestCase
79
79
  end
80
80
  end
81
81
 
82
- [:id, :created_at, :updated_at, :sources].each do |invalid|
82
+ [:id, :created_at, :updated_at, :sources, :junk].each do |invalid|
83
83
  context "#{role} : post / but with #{invalid}" do
84
84
  before do
85
85
  post "/", valid_params_for(role).merge(invalid => 9)
@@ -39,7 +39,7 @@ class CategoriesPutResourceTest < ResourceTestCase
39
39
  end
40
40
 
41
41
  %w(basic).each do |role|
42
- [:created_at, :updated_at, :sources].each do |invalid|
42
+ [:created_at, :updated_at, :sources, :junk].each do |invalid|
43
43
  context "#{role} : put /:id but with #{invalid}" do
44
44
  before do
45
45
  put "/#{@category.id}", valid_params_for(role).merge(invalid => 9)
@@ -81,7 +81,7 @@ class CategoriesPutResourceTest < ResourceTestCase
81
81
  end
82
82
 
83
83
  %w(curator admin).each do |role|
84
- [:created_at, :updated_at, :sources].each do |invalid|
84
+ [:created_at, :updated_at, :sources, :junk].each do |invalid|
85
85
  context "#{role} : put /:id but with #{invalid}" do
86
86
  before do
87
87
  put "/#{@category.id}", valid_params_for(role).merge(invalid => 9)
@@ -90,7 +90,7 @@ class CategoriesSourcesPostResourceTest < ResourceTestCase
90
90
  end
91
91
  end
92
92
 
93
- [:raw, :id, :created_at, :updated_at].each do |invalid|
93
+ [:raw, :id, :created_at, :updated_at, :junk].each do |invalid|
94
94
  context "#{role} : post /:id/sources/ but with #{invalid}" do
95
95
  before do
96
96
  post "/#{@category.id}/sources/", valid_params_for(role).
@@ -149,7 +149,7 @@ class CategoriesSourcesPostResourceTest < ResourceTestCase
149
149
  end
150
150
  end
151
151
 
152
- [:id, :created_at, :updated_at].each do |invalid|
152
+ [:id, :created_at, :updated_at, :junk].each do |invalid|
153
153
  context "#{role} : post /:id/sources/ but with #{invalid}" do
154
154
  before do
155
155
  post "/#{@category.id}/sources/", valid_params_for(role).
@@ -142,7 +142,7 @@ class CategoriesSourcesPutResourceTest < ResourceTestCase
142
142
  use "source unchanged"
143
143
  end
144
144
 
145
- [:raw, :created_at, :updated_at].each do |invalid|
145
+ [:raw, :created_at, :updated_at, :junk].each do |invalid|
146
146
  context "#{role} : put /:id/sources/:id with #{invalid}" do
147
147
  before do
148
148
  put "/#{@category.id}/sources/#{@source.id}",
@@ -246,7 +246,7 @@ class CategoriesSourcesPutResourceTest < ResourceTestCase
246
246
  use "source unchanged"
247
247
  end
248
248
 
249
- [:created_at, :updated_at].each do |invalid|
249
+ [:created_at, :updated_at, :junk].each do |invalid|
250
250
  context "#{role} : put /:id/sources/:id but with #{invalid}" do
251
251
  before do
252
252
  put "/#{@category.id}/sources/#{@source.id}",
@@ -47,7 +47,7 @@ class SourcesPostResourceTest < ResourceTestCase
47
47
  end
48
48
  end
49
49
 
50
- [:id, :created_at, :updated_at, :categories].each do |invalid|
50
+ [:id, :created_at, :updated_at, :categories, :junk].each do |invalid|
51
51
  context "#{role} : post / but with #{invalid}" do
52
52
  before do
53
53
  post "/", valid_params_for(role).merge(invalid => 9)
@@ -57,7 +57,7 @@ class SourcesPostResourceTest < ResourceTestCase
57
57
  use "no change in source count"
58
58
  end
59
59
  end
60
-
60
+
61
61
  context "#{role} : post / with valid params" do
62
62
  before do
63
63
  post "/", valid_params_for(role)
@@ -81,7 +81,7 @@ class SourcesPostResourceTest < ResourceTestCase
81
81
  end
82
82
  end
83
83
 
84
- [:raw, :id, :created_at, :updated_at, :categories].each do |invalid|
84
+ [:raw, :id, :created_at, :updated_at, :categories, :junk].each do |invalid|
85
85
  context "#{role} : post / but with #{invalid}" do
86
86
  before do
87
87
  post "/", valid_params_for(role).merge(invalid => 9)
@@ -131,7 +131,7 @@ class SourcesPostResourceTest < ResourceTestCase
131
131
  end
132
132
  end
133
133
 
134
- [:id, :created_at, :updated_at, :categories].each do |invalid|
134
+ [:id, :created_at, :updated_at, :categories, :junk].each do |invalid|
135
135
  context "#{role} : post / but with #{invalid}" do
136
136
  before do
137
137
  post "/", valid_params_for(role).
@@ -41,7 +41,7 @@ class SourcesPutResourceTest < ResourceTestCase
41
41
  end
42
42
 
43
43
  %w(basic).each do |role|
44
- [:id, :created_at, :updated_at, :categories].each do |invalid|
44
+ [:id, :created_at, :updated_at, :categories, :junk].each do |invalid|
45
45
  context "#{role} : put /:id but with #{invalid}" do
46
46
  before do
47
47
  put "/#{@source.id}", valid_params_for(role).merge(invalid => 9)
@@ -85,7 +85,7 @@ class SourcesPutResourceTest < ResourceTestCase
85
85
  end
86
86
 
87
87
  %w(curator).each do |role|
88
- [:raw, :created_at, :updated_at, :categories].each do |invalid|
88
+ [:raw, :created_at, :updated_at, :categories, :junk].each do |invalid|
89
89
  context "#{role} : put /:id but with #{invalid}" do
90
90
  before do
91
91
  put "/#{@source.id}", valid_params_for(role).merge(invalid => 9)
@@ -146,7 +146,7 @@ class SourcesPutResourceTest < ResourceTestCase
146
146
  end
147
147
 
148
148
  %w(admin).each do |role|
149
- [:created_at, :updated_at, :categories].each do |invalid|
149
+ [:created_at, :updated_at, :categories, :junk].each do |invalid|
150
150
  context "#{role} : put /:id but with #{invalid}" do
151
151
  before do
152
152
  put "/#{@source.id}", valid_params_for(role).
@@ -50,7 +50,7 @@ class UsersPostResourceTest < ResourceTestCase
50
50
  end
51
51
  end
52
52
 
53
- [:role, :_api_key, :id, :created_at, :updated_at].each do |invalid|
53
+ [:role, :_api_key, :id, :created_at, :updated_at, :junk].each do |invalid|
54
54
  context "#{role} : post / but with #{invalid}" do
55
55
  before do
56
56
  post "/", valid_params_for(role).merge(invalid => 9)
@@ -85,7 +85,7 @@ class UsersPostResourceTest < ResourceTestCase
85
85
  end
86
86
  end
87
87
 
88
- [:id, :created_at, :updated_at].each do |invalid|
88
+ [:id, :created_at, :updated_at, :junk].each do |invalid|
89
89
  context "#{role} : post / but with #{invalid}" do
90
90
  before do
91
91
  post "/", valid_params_for(role).
@@ -43,7 +43,7 @@ class UsersPutResourceTest < ResourceTestCase
43
43
  end
44
44
 
45
45
  %w(basic curator).each do |role|
46
- [:created_at, :updated_at].each do |invalid|
46
+ [:created_at, :updated_at, :junk].each do |invalid|
47
47
  context "#{role} : put /:id but with #{invalid}" do
48
48
  before do
49
49
  put "/#{@user.id}", valid_params_for(role).merge(invalid => 9)
@@ -88,7 +88,7 @@ class UsersPutResourceTest < ResourceTestCase
88
88
  end
89
89
 
90
90
  %w(admin).each do |role|
91
- [:created_at, :updated_at].each do |invalid|
91
+ [:created_at, :updated_at, :junk].each do |invalid|
92
92
  context "#{role} : put /:id but with #{invalid}" do
93
93
  before do
94
94
  put "/#{@user.id}", valid_params_for(role).
@@ -161,13 +161,10 @@ module SinatraResource
161
161
  # a role (such as :anonymous, :basic, or :admin)
162
162
  def minimum_role(action, resource_config, property=nil)
163
163
  if property.nil?
164
- hash = resource_config[:permission][to_read_or_modify(action)]
164
+ resource_config[:permission][to_read_or_modify(action)]
165
165
  else
166
166
  hash = resource_config[:properties][property]
167
- unless hash
168
- raise Error, "bad configuration for #{property.inspect}"
169
- end
170
- hash[to_r_or_w(action)]
167
+ hash ? hash[to_r_or_w(action)] : :nobody
171
168
  end || :anonymous
172
169
  end
173
170
 
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{sinatra_resource}
8
- s.version = "0.2.4"
8
+ s.version = "0.2.5"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["David James"]
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sinatra_resource
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.4
4
+ version: 0.2.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - David James