tb_banners 1.2.1 → 1.3.beta1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.markdown +2 -12
- data/Rakefile +2 -5
- data/app/assets/javascripts/admin/banners/banners.js +34 -41
- data/app/controllers/admin/banner_sets_controller.rb +15 -19
- data/app/controllers/admin/banners_controller.rb +30 -52
- data/app/helpers/spud_banners_helper.rb +12 -12
- data/app/models/spud_banner.rb +18 -18
- data/app/models/spud_banner_set.rb +15 -17
- data/app/views/admin/banners/_form.html.erb +1 -3
- data/lib/spud_banners/configuration.rb +2 -2
- data/lib/spud_banners/engine.rb +6 -6
- data/lib/spud_banners/liquid_tags.rb +6 -3
- data/lib/spud_banners/version.rb +1 -1
- data/lib/tb_banners.rb +1 -1
- data/spec/authlogic_helper.rb +1 -1
- data/spec/controllers/admin/banner_sets_controller_spec.rb +33 -33
- data/spec/dummy/config/application.rb +2 -3
- data/spec/dummy/config/boot.rb +1 -1
- data/spec/dummy/config/environments/production.rb +1 -1
- data/spec/dummy/config/environments/test.rb +3 -6
- data/spec/dummy/config.ru +1 -1
- data/spec/dummy/db/migrate/20121127192247_create_spud_users.spud_core.rb +12 -12
- data/spec/dummy/db/migrate/20121127192248_add_time_zone_to_spud_user.spud_core.rb +0 -1
- data/spec/dummy/db/migrate/20121127192249_add_scope_to_spud_admin_permissions.spud_core.rb +0 -1
- data/spec/dummy/db/migrate/20130920154443_create_spud_permissions.tb_core.rb +3 -3
- data/spec/dummy/db/migrate/20130920154444_create_spud_role_permissions.tb_core.rb +2 -2
- data/spec/dummy/db/migrate/20130920154446_create_spud_banners.tb_banners.rb +4 -4
- data/spec/dummy/db/migrate/20130920154447_create_spud_banner_sets.tb_banners.rb +5 -5
- data/spec/dummy/db/migrate/20130920154448_add_rich_text_to_spud_banners.tb_banners.rb +1 -1
- data/spec/dummy/db/migrate/20160310164644_add_requires_password_change_to_spud_users.tb_core.rb +1 -1
- data/spec/dummy/db/schema.rb +85 -92
- data/spec/dummy/script/rails +2 -2
- data/spec/rails_helper.rb +12 -5
- data/spec/spec_helper.rb +42 -44
- metadata +72 -31
- data/app/views/admin/banners/legacy.js.erb +0 -5
data/spec/spec_helper.rb
CHANGED
|
@@ -38,48 +38,46 @@ RSpec.configure do |config|
|
|
|
38
38
|
mocks.verify_partial_doubles = true
|
|
39
39
|
end
|
|
40
40
|
|
|
41
|
-
# The settings below are suggested to provide a good initial experience
|
|
42
|
-
# with RSpec, but feel free to customize to your heart's content.
|
|
43
|
-
|
|
44
|
-
#
|
|
45
|
-
#
|
|
46
|
-
#
|
|
47
|
-
#
|
|
48
|
-
config.
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
#
|
|
52
|
-
#
|
|
53
|
-
# - http://
|
|
54
|
-
# - http://
|
|
55
|
-
#
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
#
|
|
59
|
-
#
|
|
60
|
-
#
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
#
|
|
69
|
-
#
|
|
70
|
-
#
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
#
|
|
74
|
-
#
|
|
75
|
-
#
|
|
76
|
-
#
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
#
|
|
80
|
-
#
|
|
81
|
-
#
|
|
82
|
-
#
|
|
83
|
-
Kernel.srand config.seed
|
|
84
|
-
=end
|
|
41
|
+
# The settings below are suggested to provide a good initial experience
|
|
42
|
+
# with RSpec, but feel free to customize to your heart's content.
|
|
43
|
+
# # These two settings work together to allow you to limit a spec run
|
|
44
|
+
# # to individual examples or groups you care about by tagging them with
|
|
45
|
+
# # `:focus` metadata. When nothing is tagged with `:focus`, all examples
|
|
46
|
+
# # get run.
|
|
47
|
+
# config.filter_run :focus
|
|
48
|
+
# config.run_all_when_everything_filtered = true
|
|
49
|
+
#
|
|
50
|
+
# # Limits the available syntax to the non-monkey patched syntax that is recommended.
|
|
51
|
+
# # For more details, see:
|
|
52
|
+
# # - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
|
|
53
|
+
# # - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
|
|
54
|
+
# # - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
|
|
55
|
+
# config.disable_monkey_patching!
|
|
56
|
+
#
|
|
57
|
+
# # Many RSpec users commonly either run the entire suite or an individual
|
|
58
|
+
# # file, and it's useful to allow more verbose output when running an
|
|
59
|
+
# # individual spec file.
|
|
60
|
+
# if config.files_to_run.one?
|
|
61
|
+
# # Use the documentation formatter for detailed output,
|
|
62
|
+
# # unless a formatter has already been configured
|
|
63
|
+
# # (e.g. via a command-line flag).
|
|
64
|
+
# config.default_formatter = 'doc'
|
|
65
|
+
# end
|
|
66
|
+
#
|
|
67
|
+
# # Print the 10 slowest examples and example groups at the
|
|
68
|
+
# # end of the spec run, to help surface which specs are running
|
|
69
|
+
# # particularly slow.
|
|
70
|
+
# config.profile_examples = 10
|
|
71
|
+
#
|
|
72
|
+
# # Run specs in random order to surface order dependencies. If you find an
|
|
73
|
+
# # order dependency and want to debug it, you can fix the order by providing
|
|
74
|
+
# # the seed, which is printed after each run.
|
|
75
|
+
# # --seed 1234
|
|
76
|
+
# config.order = :random
|
|
77
|
+
#
|
|
78
|
+
# # Seed global randomization in this process using the `--seed` CLI option.
|
|
79
|
+
# # Setting this allows you to use `--seed` to deterministically reproduce
|
|
80
|
+
# # test failures related to randomization by passing the same `--seed` value
|
|
81
|
+
# # as the one that triggered the failure.
|
|
82
|
+
# Kernel.srand config.seed
|
|
85
83
|
end
|
metadata
CHANGED
|
@@ -1,29 +1,43 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: tb_banners
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.
|
|
4
|
+
version: 1.3.beta1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
|
-
-
|
|
7
|
+
- Moser Consulting
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2016-
|
|
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.
|
|
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.
|
|
40
|
+
version: 1.4.beta2
|
|
27
41
|
- !ruby/object:Gem::Dependency
|
|
28
42
|
name: paperclip
|
|
29
43
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -44,14 +58,14 @@ dependencies:
|
|
|
44
58
|
requirements:
|
|
45
59
|
- - ">="
|
|
46
60
|
- !ruby/object:Gem::Version
|
|
47
|
-
version:
|
|
61
|
+
version: 1.1.beta1
|
|
48
62
|
type: :runtime
|
|
49
63
|
prerelease: false
|
|
50
64
|
version_requirements: !ruby/object:Gem::Requirement
|
|
51
65
|
requirements:
|
|
52
66
|
- - ">="
|
|
53
67
|
- !ruby/object:Gem::Version
|
|
54
|
-
version:
|
|
68
|
+
version: 1.1.beta1
|
|
55
69
|
- !ruby/object:Gem::Dependency
|
|
56
70
|
name: mysql2
|
|
57
71
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -70,61 +84,89 @@ dependencies:
|
|
|
70
84
|
name: rspec-rails
|
|
71
85
|
requirement: !ruby/object:Gem::Requirement
|
|
72
86
|
requirements:
|
|
73
|
-
- - "
|
|
87
|
+
- - ">="
|
|
74
88
|
- !ruby/object:Gem::Version
|
|
75
|
-
version:
|
|
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:
|
|
96
|
+
version: '0'
|
|
97
|
+
- !ruby/object:Gem::Dependency
|
|
98
|
+
name: rails-controller-testing
|
|
99
|
+
requirement: !ruby/object:Gem::Requirement
|
|
100
|
+
requirements:
|
|
101
|
+
- - ">="
|
|
102
|
+
- !ruby/object:Gem::Version
|
|
103
|
+
version: '0'
|
|
104
|
+
type: :development
|
|
105
|
+
prerelease: false
|
|
106
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
107
|
+
requirements:
|
|
108
|
+
- - ">="
|
|
109
|
+
- !ruby/object:Gem::Version
|
|
110
|
+
version: '0'
|
|
83
111
|
- !ruby/object:Gem::Dependency
|
|
84
112
|
name: factory_girl_rails
|
|
85
113
|
requirement: !ruby/object:Gem::Requirement
|
|
86
114
|
requirements:
|
|
87
|
-
- - "
|
|
115
|
+
- - ">="
|
|
88
116
|
- !ruby/object:Gem::Version
|
|
89
|
-
version:
|
|
117
|
+
version: '0'
|
|
90
118
|
type: :development
|
|
91
119
|
prerelease: false
|
|
92
120
|
version_requirements: !ruby/object:Gem::Requirement
|
|
93
121
|
requirements:
|
|
94
|
-
- - "
|
|
122
|
+
- - ">="
|
|
95
123
|
- !ruby/object:Gem::Version
|
|
96
|
-
version:
|
|
124
|
+
version: '0'
|
|
97
125
|
- !ruby/object:Gem::Dependency
|
|
98
126
|
name: database_cleaner
|
|
99
127
|
requirement: !ruby/object:Gem::Requirement
|
|
100
128
|
requirements:
|
|
101
|
-
- - "
|
|
129
|
+
- - ">="
|
|
102
130
|
- !ruby/object:Gem::Version
|
|
103
|
-
version:
|
|
131
|
+
version: '0'
|
|
104
132
|
type: :development
|
|
105
133
|
prerelease: false
|
|
106
134
|
version_requirements: !ruby/object:Gem::Requirement
|
|
107
135
|
requirements:
|
|
108
|
-
- - "
|
|
136
|
+
- - ">="
|
|
109
137
|
- !ruby/object:Gem::Version
|
|
110
|
-
version:
|
|
138
|
+
version: '0'
|
|
111
139
|
- !ruby/object:Gem::Dependency
|
|
112
140
|
name: simplecov
|
|
113
141
|
requirement: !ruby/object:Gem::Requirement
|
|
114
142
|
requirements:
|
|
115
|
-
- - "
|
|
143
|
+
- - ">="
|
|
116
144
|
- !ruby/object:Gem::Version
|
|
117
|
-
version: 0
|
|
145
|
+
version: '0'
|
|
118
146
|
type: :development
|
|
119
147
|
prerelease: false
|
|
120
148
|
version_requirements: !ruby/object:Gem::Requirement
|
|
121
149
|
requirements:
|
|
122
|
-
- - "
|
|
150
|
+
- - ">="
|
|
123
151
|
- !ruby/object:Gem::Version
|
|
124
|
-
version: 0
|
|
152
|
+
version: '0'
|
|
153
|
+
- !ruby/object:Gem::Dependency
|
|
154
|
+
name: rubocop
|
|
155
|
+
requirement: !ruby/object:Gem::Requirement
|
|
156
|
+
requirements:
|
|
157
|
+
- - ">="
|
|
158
|
+
- !ruby/object:Gem::Version
|
|
159
|
+
version: '0'
|
|
160
|
+
type: :development
|
|
161
|
+
prerelease: false
|
|
162
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
163
|
+
requirements:
|
|
164
|
+
- - ">="
|
|
165
|
+
- !ruby/object:Gem::Version
|
|
166
|
+
version: '0'
|
|
125
167
|
description: Banner Management engine for Twice Baked
|
|
126
168
|
email:
|
|
127
|
-
- greg@
|
|
169
|
+
- greg.woods@moserit.com.com
|
|
128
170
|
executables: []
|
|
129
171
|
extensions: []
|
|
130
172
|
extra_rdoc_files: []
|
|
@@ -156,7 +198,6 @@ files:
|
|
|
156
198
|
- app/views/admin/banners/_banner.html.erb
|
|
157
199
|
- app/views/admin/banners/_form.html.erb
|
|
158
200
|
- app/views/admin/banners/edit.html.erb
|
|
159
|
-
- app/views/admin/banners/legacy.js.erb
|
|
160
201
|
- app/views/admin/banners/new.html.erb
|
|
161
202
|
- app/views/admin/banners/show.html.erb
|
|
162
203
|
- config/routes.rb
|
|
@@ -218,7 +259,7 @@ files:
|
|
|
218
259
|
- spec/dummy/script/rails
|
|
219
260
|
- spec/rails_helper.rb
|
|
220
261
|
- spec/spec_helper.rb
|
|
221
|
-
homepage: http://bitbucket.org/
|
|
262
|
+
homepage: http://bitbucket.org/moser-inc/tb_banners
|
|
222
263
|
licenses: []
|
|
223
264
|
metadata: {}
|
|
224
265
|
post_install_message:
|
|
@@ -232,12 +273,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
232
273
|
version: '0'
|
|
233
274
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
234
275
|
requirements:
|
|
235
|
-
- - "
|
|
276
|
+
- - ">"
|
|
236
277
|
- !ruby/object:Gem::Version
|
|
237
|
-
version:
|
|
278
|
+
version: 1.3.1
|
|
238
279
|
requirements: []
|
|
239
280
|
rubyforge_project:
|
|
240
|
-
rubygems_version: 2.
|
|
281
|
+
rubygems_version: 2.5.1
|
|
241
282
|
signing_key:
|
|
242
283
|
specification_version: 4
|
|
243
284
|
summary: Twice Baked Banners
|
|
@@ -1,5 +0,0 @@
|
|
|
1
|
-
<% if @banner.errors.any? %>
|
|
2
|
-
spud.admin.banners.onLegacyUploadError("<%= escape_javascript(render :partial => 'form', :locals => {:path => admin_banner_set_banners_path(@banner_set)}) %>");
|
|
3
|
-
<% else %>
|
|
4
|
-
spud.admin.banners.onLegacyUploadComplete("<%= escape_javascript(render :partial => 'banner', :locals => {:banner => @banner}) %>");
|
|
5
|
-
<% end %>
|