tb_media 1.2.2 → 1.3.beta1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (51) hide show
  1. checksums.yaml +4 -4
  2. data/Rakefile +2 -2
  3. data/app/controllers/admin/media_controller.rb +57 -61
  4. data/app/controllers/admin/media_picker_controller.rb +9 -9
  5. data/app/controllers/protected_media_controller.rb +7 -7
  6. data/app/helpers/protected_media_helper.rb +1 -1
  7. data/app/models/spud_media.rb +61 -67
  8. data/lib/spud_media/configuration.rb +3 -3
  9. data/lib/spud_media/content_types.rb +2 -2
  10. data/lib/spud_media/engine.rb +17 -17
  11. data/lib/spud_media/version.rb +3 -3
  12. data/lib/tasks/spud_media_tasks.rake +4 -6
  13. data/spec/controllers/admin/media_controller_spec.rb +24 -24
  14. data/spec/dummy/config/application.rb +2 -3
  15. data/spec/dummy/config/boot.rb +1 -1
  16. data/spec/dummy/config/environments/development.rb +0 -7
  17. data/spec/dummy/config/environments/test.rb +3 -5
  18. data/spec/dummy/config/routes.rb +2 -2
  19. data/spec/dummy/config.ru +1 -1
  20. data/spec/dummy/db/migrate/20130904141442_create_spud_users.tb_core.rb +12 -12
  21. data/spec/dummy/db/migrate/20130904141443_add_time_zone_to_spud_user.tb_core.rb +0 -1
  22. data/spec/dummy/db/migrate/20130904141444_add_scope_to_spud_admin_permissions.tb_core.rb +0 -1
  23. data/spec/dummy/db/migrate/20130904141446_create_spud_media.tb_media.rb +1 -1
  24. data/spec/dummy/db/migrate/20130904141447_add_protected_to_spud_media.tb_media.rb +1 -1
  25. data/spec/dummy/db/migrate/20130904141448_add_cropping_to_spud_media.tb_media.rb +3 -3
  26. data/spec/dummy/db/migrate/20151012194531_create_spud_permissions.tb_core.rb +3 -3
  27. data/spec/dummy/db/migrate/20151012194532_create_spud_role_permissions.tb_core.rb +2 -2
  28. data/spec/dummy/db/migrate/20151012194534_add_requires_password_change_to_spud_users.tb_core.rb +1 -1
  29. data/spec/dummy/db/schema.rb +63 -67
  30. data/spec/dummy/public/system/spud_media/1/cropped/test_img1.png +0 -0
  31. data/spec/dummy/public/system/spud_media/1/small/test_img1.png +0 -0
  32. data/spec/dummy/public/system/spud_media/2/cropped/test_img1.png +0 -0
  33. data/spec/dummy/public/system/spud_media/2/small/test_img1.png +0 -0
  34. data/spec/dummy/public/system/spud_media/3/cropped/test_img1.png +0 -0
  35. data/spec/dummy/public/system/spud_media/3/small/test_img1.png +0 -0
  36. data/spec/dummy/public/system/spud_media/4/cropped/test_img1.png +0 -0
  37. data/spec/dummy/public/system/spud_media/4/small/test_img1.png +0 -0
  38. data/spec/dummy/public/system/spud_media/5/cropped/test_img1.png +0 -0
  39. data/spec/dummy/public/system/spud_media/5/small/test_img1.png +0 -0
  40. data/spec/dummy/script/rails +2 -2
  41. data/spec/javascripts/support/jasmine_helper.rb +6 -7
  42. data/spec/models/spud_media_spec.rb +2 -2
  43. data/spec/rails_helper.rb +13 -6
  44. data/spec/spec_helper.rb +42 -44
  45. metadata +51 -49
  46. data/spec/dummy/public/system/spud_media/1/cropped/test_img1.jpg +0 -0
  47. data/spec/dummy/public/system/spud_media/2/cropped/test_img1.jpg +0 -0
  48. data/spec/dummy/public/system/spud_media/3/cropped/test_img1.jpg +0 -0
  49. data/spec/dummy/public/system/spud_media/4/cropped/test_img1.jpg +0 -0
  50. data/spec/dummy/public/system/spud_media/5/cropped/test_img1.jpg +0 -0
  51. data/spec/support/authlogic_helper.rb +0 -2
metadata CHANGED
@@ -1,29 +1,43 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tb_media
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.2
4
+ version: 1.3.beta1
5
5
  platform: ruby
6
6
  authors:
7
- - Westlake Design
7
+ - Moser Consulting
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-03-10 00:00:00.000000000 Z
11
+ date: 2016-10-21 00:00:00.000000000 Z
12
12
  dependencies:
13
+ - !ruby/object:Gem::Dependency
14
+ name: rails
15
+ requirement: !ruby/object:Gem::Requirement
16
+ requirements:
17
+ - - ">="
18
+ - !ruby/object:Gem::Version
19
+ version: 5.0.0.1
20
+ type: :runtime
21
+ prerelease: false
22
+ version_requirements: !ruby/object:Gem::Requirement
23
+ requirements:
24
+ - - ">="
25
+ - !ruby/object:Gem::Version
26
+ version: 5.0.0.1
13
27
  - !ruby/object:Gem::Dependency
14
28
  name: tb_core
15
29
  requirement: !ruby/object:Gem::Requirement
16
30
  requirements:
17
- - - "~>"
31
+ - - ">="
18
32
  - !ruby/object:Gem::Version
19
- version: 1.3.7
33
+ version: 1.4.beta2
20
34
  type: :runtime
21
35
  prerelease: false
22
36
  version_requirements: !ruby/object:Gem::Requirement
23
37
  requirements:
24
- - - "~>"
38
+ - - ">="
25
39
  - !ruby/object:Gem::Version
26
- version: 1.3.7
40
+ version: 1.4.beta2
27
41
  - !ruby/object:Gem::Dependency
28
42
  name: paperclip
29
43
  requirement: !ruby/object:Gem::Requirement
@@ -56,74 +70,74 @@ dependencies:
56
70
  name: rspec-rails
57
71
  requirement: !ruby/object:Gem::Requirement
58
72
  requirements:
59
- - - "~>"
73
+ - - ">="
60
74
  - !ruby/object:Gem::Version
61
- version: 3.1.0
75
+ version: '0'
62
76
  type: :development
63
77
  prerelease: false
64
78
  version_requirements: !ruby/object:Gem::Requirement
65
79
  requirements:
66
- - - "~>"
80
+ - - ">="
67
81
  - !ruby/object:Gem::Version
68
- version: 3.1.0
82
+ version: '0'
69
83
  - !ruby/object:Gem::Dependency
70
- name: factory_girl_rails
84
+ name: rails-controller-testing
71
85
  requirement: !ruby/object:Gem::Requirement
72
86
  requirements:
73
- - - "~>"
87
+ - - ">="
74
88
  - !ruby/object:Gem::Version
75
- version: 4.5.0
89
+ version: '0'
76
90
  type: :development
77
91
  prerelease: false
78
92
  version_requirements: !ruby/object:Gem::Requirement
79
93
  requirements:
80
- - - "~>"
94
+ - - ">="
81
95
  - !ruby/object:Gem::Version
82
- version: 4.5.0
96
+ version: '0'
83
97
  - !ruby/object:Gem::Dependency
84
- name: database_cleaner
98
+ name: factory_girl_rails
85
99
  requirement: !ruby/object:Gem::Requirement
86
100
  requirements:
87
- - - "~>"
101
+ - - ">="
88
102
  - !ruby/object:Gem::Version
89
- version: 1.3.0
103
+ version: '0'
90
104
  type: :development
91
105
  prerelease: false
92
106
  version_requirements: !ruby/object:Gem::Requirement
93
107
  requirements:
94
- - - "~>"
108
+ - - ">="
95
109
  - !ruby/object:Gem::Version
96
- version: 1.3.0
110
+ version: '0'
97
111
  - !ruby/object:Gem::Dependency
98
- name: simplecov
112
+ name: database_cleaner
99
113
  requirement: !ruby/object:Gem::Requirement
100
114
  requirements:
101
- - - "~>"
115
+ - - ">="
102
116
  - !ruby/object:Gem::Version
103
- version: 0.9.1
117
+ version: '0'
104
118
  type: :development
105
119
  prerelease: false
106
120
  version_requirements: !ruby/object:Gem::Requirement
107
121
  requirements:
108
- - - "~>"
122
+ - - ">="
109
123
  - !ruby/object:Gem::Version
110
- version: 0.9.1
124
+ version: '0'
111
125
  - !ruby/object:Gem::Dependency
112
- name: capybara
126
+ name: simplecov
113
127
  requirement: !ruby/object:Gem::Requirement
114
128
  requirements:
115
- - - '='
129
+ - - ">="
116
130
  - !ruby/object:Gem::Version
117
- version: 2.2.0
131
+ version: '0'
118
132
  type: :development
119
133
  prerelease: false
120
134
  version_requirements: !ruby/object:Gem::Requirement
121
135
  requirements:
122
- - - '='
136
+ - - ">="
123
137
  - !ruby/object:Gem::Version
124
- version: 2.2.0
138
+ version: '0'
125
139
  - !ruby/object:Gem::Dependency
126
- name: jasmine
140
+ name: rubocop
127
141
  requirement: !ruby/object:Gem::Requirement
128
142
  requirements:
129
143
  - - ">="
@@ -139,7 +153,7 @@ dependencies:
139
153
  description: Twice Baked Media allows you to upload files to your site and manage
140
154
  them in the spud administrative panel. It also uses paperclip and supports s3 storage
141
155
  email:
142
- - greg@westlakedesign.com
156
+ - greg.woods@moserit.com
143
157
  executables: []
144
158
  extensions: []
145
159
  extra_rdoc_files: []
@@ -244,23 +258,18 @@ files:
244
258
  - spec/dummy/public/422.html
245
259
  - spec/dummy/public/500.html
246
260
  - spec/dummy/public/favicon.ico
247
- - spec/dummy/public/system/spud_media/1/cropped/test_img1.jpg
248
261
  - spec/dummy/public/system/spud_media/1/cropped/test_img1.png
249
262
  - spec/dummy/public/system/spud_media/1/original/test_img1.png
250
263
  - spec/dummy/public/system/spud_media/1/small/test_img1.png
251
- - spec/dummy/public/system/spud_media/2/cropped/test_img1.jpg
252
264
  - spec/dummy/public/system/spud_media/2/cropped/test_img1.png
253
265
  - spec/dummy/public/system/spud_media/2/original/test_img1.png
254
266
  - spec/dummy/public/system/spud_media/2/small/test_img1.png
255
- - spec/dummy/public/system/spud_media/3/cropped/test_img1.jpg
256
267
  - spec/dummy/public/system/spud_media/3/cropped/test_img1.png
257
268
  - spec/dummy/public/system/spud_media/3/original/test_img1.png
258
269
  - spec/dummy/public/system/spud_media/3/small/test_img1.png
259
- - spec/dummy/public/system/spud_media/4/cropped/test_img1.jpg
260
270
  - spec/dummy/public/system/spud_media/4/cropped/test_img1.png
261
271
  - spec/dummy/public/system/spud_media/4/original/test_img1.png
262
272
  - spec/dummy/public/system/spud_media/4/small/test_img1.png
263
- - spec/dummy/public/system/spud_media/5/cropped/test_img1.jpg
264
273
  - spec/dummy/public/system/spud_media/5/cropped/test_img1.png
265
274
  - spec/dummy/public/system/spud_media/5/original/test_img1.png
266
275
  - spec/dummy/public/system/spud_media/5/small/test_img1.png
@@ -273,8 +282,7 @@ files:
273
282
  - spec/models/spud_media_spec.rb
274
283
  - spec/rails_helper.rb
275
284
  - spec/spec_helper.rb
276
- - spec/support/authlogic_helper.rb
277
- homepage: http://bitbucket.org/westlakedesign/tb_media
285
+ homepage: http://bitbucket.org/moser-inc/tb_media
278
286
  licenses: []
279
287
  metadata: {}
280
288
  post_install_message:
@@ -288,12 +296,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
288
296
  version: '0'
289
297
  required_rubygems_version: !ruby/object:Gem::Requirement
290
298
  requirements:
291
- - - ">="
299
+ - - ">"
292
300
  - !ruby/object:Gem::Version
293
- version: '0'
301
+ version: 1.3.1
294
302
  requirements: []
295
303
  rubyforge_project:
296
- rubygems_version: 2.4.6
304
+ rubygems_version: 2.4.8
297
305
  signing_key:
298
306
  specification_version: 4
299
307
  summary: TB File upload/management module
@@ -338,23 +346,18 @@ test_files:
338
346
  - spec/dummy/public/422.html
339
347
  - spec/dummy/public/500.html
340
348
  - spec/dummy/public/favicon.ico
341
- - spec/dummy/public/system/spud_media/1/cropped/test_img1.jpg
342
349
  - spec/dummy/public/system/spud_media/1/cropped/test_img1.png
343
350
  - spec/dummy/public/system/spud_media/1/original/test_img1.png
344
351
  - spec/dummy/public/system/spud_media/1/small/test_img1.png
345
- - spec/dummy/public/system/spud_media/2/cropped/test_img1.jpg
346
352
  - spec/dummy/public/system/spud_media/2/cropped/test_img1.png
347
353
  - spec/dummy/public/system/spud_media/2/original/test_img1.png
348
354
  - spec/dummy/public/system/spud_media/2/small/test_img1.png
349
- - spec/dummy/public/system/spud_media/3/cropped/test_img1.jpg
350
355
  - spec/dummy/public/system/spud_media/3/cropped/test_img1.png
351
356
  - spec/dummy/public/system/spud_media/3/original/test_img1.png
352
357
  - spec/dummy/public/system/spud_media/3/small/test_img1.png
353
- - spec/dummy/public/system/spud_media/4/cropped/test_img1.jpg
354
358
  - spec/dummy/public/system/spud_media/4/cropped/test_img1.png
355
359
  - spec/dummy/public/system/spud_media/4/original/test_img1.png
356
360
  - spec/dummy/public/system/spud_media/4/small/test_img1.png
357
- - spec/dummy/public/system/spud_media/5/cropped/test_img1.jpg
358
361
  - spec/dummy/public/system/spud_media/5/cropped/test_img1.png
359
362
  - spec/dummy/public/system/spud_media/5/original/test_img1.png
360
363
  - spec/dummy/public/system/spud_media/5/small/test_img1.png
@@ -369,4 +372,3 @@ test_files:
369
372
  - spec/models/spud_media_spec.rb
370
373
  - spec/rails_helper.rb
371
374
  - spec/spec_helper.rb
372
- - spec/support/authlogic_helper.rb
data/spec/support/authlogic_helper.rb DELETED
@@ -1,2 +0,0 @@
1
- require 'authlogic/test_case'
2
- include Authlogic::TestCase