trusty-multi-site-extension 2.0.11 → 3.0.0

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.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +4 -27
  3. data/Gemfile.lock +182 -176
  4. data/lib/multi_site/page_extensions.rb +5 -4
  5. data/multi_site_extension.rb +1 -1
  6. data/trusty-multi-site-extension.gemspec +4 -4
  7. metadata +9 -9
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 537b26c5a78463256d937554b79597a4bff067fd
4
- data.tar.gz: 3d1f88e2cbe1ab79e8b6eb89c92aae89d855b356
3
+ metadata.gz: 416d5c9859a6a4e61a7645fdaf368d44ad65e8a2
4
+ data.tar.gz: b460add97ab74fc36de8866e1136eda33df74772
5
5
  SHA512:
6
- metadata.gz: 2b70e7c022868ff4bc2ba89862e5d95da79c3faf91007d7efa41072f4c528efdda6a86d4507c9e2721489e892b8fbe1c4d310e46eb7fc36cb81a4000bb33d77b
7
- data.tar.gz: 8992c2bae4f1a6b2f4f2f9a85a251e2d4c5f9bf40a859c86e92ac931c04789a4583b36256d5fd93001ab593c2ed3cc32e96ab9017bef4dc6a749ab7e85cf76e6
6
+ metadata.gz: 35713fe83a142427388e0779be235ededc74d460e795d5b9debbc6125fe75f00d8b20b826178e495d053216e0b8facd7e945e83d60dc7bc284198a5905a3f355
7
+ data.tar.gz: 66e09a9134f4a8f1fc5f23eb59ce87e4f9828bb0c90768295b8329fb379cc46b6b0c0805810da60fed4147ef99849c08f59f6346f3e0aa4bdfb70ef853dbe1bd
data/Gemfile CHANGED
@@ -11,39 +11,16 @@ gem 'trustygems', '~> 0.2.0'
11
11
 
12
12
  gemspec
13
13
 
14
- # When trusty is installed as a gem you can run all of
15
- # its tests and specs from an instance. If you're working
16
- # on trusty itself and you want to run specs from the
17
- # radiant root directory, uncomment the lines below and
18
- # run `bundle install`.
19
-
20
- # gemspec
21
- # gem "compass-rails", "~> 1.0.3"
22
-
23
- # gem "radiant-archive-extension", "~> 1.0.7"
24
- # gem "radiant-clipped-extension", "~> 1.1.0"
25
- # gem "radiant-debug-extension", "~> 1.0.2"
26
- # gem "radiant-exporter-extension", "~> 1.1.0"
27
- # gem "radiant-markdown_filter-extension", "~> 1.0.2"
28
- # gem "radiant-sheets-extension", "~> 1.1.0.alpha"
29
- # gem "radiant-snippets-extension", "~> 1.1.0.alpha"
30
- # gem "radiant-site_templates-extension", "~> 1.0.4"
31
- # gem "radiant-smarty_pants_filter-extension", "~> 1.0.2"
32
- # gem "radiant-textile_filter-extension", "~> 1.0.4"
33
-
34
-
35
14
  group :development, :test do
36
- gem "compass-rails", "~> 2.0.1"
37
15
  gem 'thin', '~> 1.6.2'
38
16
  gem 'pry', '~> 0.10.0'
39
- gem 'capybara', '~> 2.3.0'
40
- gem 'rspec-rails', '~> 3.0.0'
17
+ gem 'capybara', '~> 2.14.0'
18
+ gem 'rspec-rails'
41
19
  gem 'launchy', '~> 2.4.2'
42
20
  gem 'database_cleaner', '~> 1.3.0'
43
21
  gem 'poltergeist', '~> 1.5.1'
44
- gem "ckeditor", "~> 4.1.0"
45
22
  gem 'factory_girl_rails', '~> 4.5.0'
46
- gem 'rails-observers'
47
- gem "protected_attributes"
23
+ gem 'rails-observers', :git => 'https://github.com/rails/rails-observers'
24
+ gem 'protected_attributes_continued'
48
25
  gem "pry-byebug"
49
26
  end
data/Gemfile.lock CHANGED
@@ -1,71 +1,81 @@
1
+ GIT
2
+ remote: https://github.com/rails/rails-observers
3
+ revision: 7d3c9c331242d58ed8ebdbd2eff1f7d6f68a1b2c
4
+ specs:
5
+ rails-observers (0.1.3.alpha)
6
+ activemodel (>= 4.0, < 5.1)
7
+
1
8
  PATH
2
9
  remote: .
3
10
  specs:
4
- trusty-multi-site-extension (2.0.11)
5
- acts_as_list (= 0.4.0)
11
+ trusty-multi-site-extension (3.0.0)
12
+ acts_as_list (= 0.9.5)
6
13
  rake (< 11.0)
7
- trusty-cms (~> 2.0.16)
8
- trusty-snippets-extension (~> 2.0.0)
14
+ trusty-cms (~> 3.0.0)
15
+ trusty-snippets-extension (~> 3.0.0)
9
16
 
10
17
  GEM
11
18
  remote: https://rubygems.org/
12
19
  specs:
13
- RedCloth (4.2.9)
14
- actionmailer (4.2.6)
15
- actionpack (= 4.2.6)
16
- actionview (= 4.2.6)
17
- activejob (= 4.2.6)
20
+ RedCloth (4.3.2)
21
+ actioncable (5.0.2)
22
+ actionpack (= 5.0.2)
23
+ nio4r (>= 1.2, < 3.0)
24
+ websocket-driver (~> 0.6.1)
25
+ actionmailer (5.0.2)
26
+ actionpack (= 5.0.2)
27
+ actionview (= 5.0.2)
28
+ activejob (= 5.0.2)
18
29
  mail (~> 2.5, >= 2.5.4)
19
- rails-dom-testing (~> 1.0, >= 1.0.5)
20
- actionpack (4.2.6)
21
- actionview (= 4.2.6)
22
- activesupport (= 4.2.6)
23
- rack (~> 1.6)
24
- rack-test (~> 0.6.2)
25
- rails-dom-testing (~> 1.0, >= 1.0.5)
30
+ rails-dom-testing (~> 2.0)
31
+ actionpack (5.0.2)
32
+ actionview (= 5.0.2)
33
+ activesupport (= 5.0.2)
34
+ rack (~> 2.0)
35
+ rack-test (~> 0.6.3)
36
+ rails-dom-testing (~> 2.0)
26
37
  rails-html-sanitizer (~> 1.0, >= 1.0.2)
27
- actionview (4.2.6)
28
- activesupport (= 4.2.6)
38
+ actionview (5.0.2)
39
+ activesupport (= 5.0.2)
29
40
  builder (~> 3.1)
30
41
  erubis (~> 2.7.0)
31
- rails-dom-testing (~> 1.0, >= 1.0.5)
32
- rails-html-sanitizer (~> 1.0, >= 1.0.2)
33
- activejob (4.2.6)
34
- activesupport (= 4.2.6)
35
- globalid (>= 0.3.0)
36
- activemodel (4.2.6)
37
- activesupport (= 4.2.6)
38
- builder (~> 3.1)
39
- activerecord (4.2.6)
40
- activemodel (= 4.2.6)
41
- activesupport (= 4.2.6)
42
- arel (~> 6.0)
43
- activesupport (4.2.6)
42
+ rails-dom-testing (~> 2.0)
43
+ rails-html-sanitizer (~> 1.0, >= 1.0.3)
44
+ activejob (5.0.2)
45
+ activesupport (= 5.0.2)
46
+ globalid (>= 0.3.6)
47
+ activemodel (5.0.2)
48
+ activesupport (= 5.0.2)
49
+ activerecord (5.0.2)
50
+ activemodel (= 5.0.2)
51
+ activesupport (= 5.0.2)
52
+ arel (~> 7.0)
53
+ activesupport (5.0.2)
54
+ concurrent-ruby (~> 1.0, >= 1.0.2)
44
55
  i18n (~> 0.7)
45
- json (~> 1.7, >= 1.7.7)
46
56
  minitest (~> 5.1)
47
- thread_safe (~> 0.3, >= 0.3.4)
48
57
  tzinfo (~> 1.1)
49
- acts_as_list (0.4.0)
58
+ acts_as_list (0.9.5)
50
59
  activerecord (>= 3.0)
51
- acts_as_tree (2.4.0)
60
+ acts_as_tree (2.6.1)
52
61
  activerecord (>= 3.0.0)
53
- addressable (2.4.0)
54
- arel (6.0.3)
55
- builder (3.2.2)
56
- byebug (8.2.2)
57
- capybara (2.3.0)
62
+ addressable (2.5.1)
63
+ public_suffix (~> 2.0, >= 2.0.2)
64
+ arel (7.1.4)
65
+ builder (3.2.3)
66
+ byebug (9.0.6)
67
+ capybara (2.14.0)
68
+ addressable
58
69
  mime-types (>= 1.16)
59
70
  nokogiri (>= 1.3.3)
60
71
  rack (>= 1.0.0)
61
72
  rack-test (>= 0.5.4)
62
73
  xpath (~> 2.0)
63
- chunky_png (1.3.5)
64
- ckeditor (4.1.6)
74
+ chunky_png (1.3.8)
75
+ ckeditor (4.2.3)
65
76
  cocaine
66
77
  orm_adapter (~> 0.5.0)
67
- climate_control (0.0.3)
68
- activesupport (>= 3.0)
78
+ climate_control (0.1.0)
69
79
  cliver (0.3.2)
70
80
  cocaine (0.5.8)
71
81
  climate_control (>= 0.0.3, < 1.0)
@@ -82,203 +92,201 @@ GEM
82
92
  sass (>= 3.3.0, < 3.5)
83
93
  compass-import-once (1.0.5)
84
94
  sass (>= 3.2, < 3.5)
85
- compass-rails (2.0.5)
95
+ compass-rails (3.0.2)
86
96
  compass (~> 1.0.0)
87
97
  sass-rails (< 5.1)
88
- sprockets (< 2.13)
89
- daemons (1.2.3)
98
+ sprockets (< 4.0)
99
+ concurrent-ruby (1.0.5)
100
+ daemons (1.2.4)
90
101
  database_cleaner (1.3.0)
91
102
  delocalize (0.4.0)
92
103
  rails (>= 3.0)
93
- diff-lcs (1.2.5)
104
+ diff-lcs (1.3)
94
105
  erubis (2.7.0)
95
- eventmachine (1.2.0.1)
96
- execjs (2.6.0)
106
+ eventmachine (1.2.3)
107
+ execjs (2.7.0)
97
108
  factory_girl (4.5.0)
98
109
  activesupport (>= 3.0.0)
99
110
  factory_girl_rails (4.5.0)
100
111
  factory_girl (~> 4.5.0)
101
112
  railties (>= 3.0.0)
102
- ffi (1.9.10)
103
- globalid (0.3.6)
104
- activesupport (>= 4.1.0)
105
- haml (4.0.7)
113
+ ffi (1.9.18)
114
+ globalid (0.4.0)
115
+ activesupport (>= 4.2.0)
116
+ haml (5.0.1)
117
+ temple (>= 0.8.0)
106
118
  tilt
107
- haml-rails (0.9.0)
119
+ haml-rails (1.0.0)
108
120
  actionpack (>= 4.0.1)
109
121
  activesupport (>= 4.0.1)
110
- haml (>= 4.0.6, < 5.0)
122
+ haml (>= 4.0.6, < 6.0)
111
123
  html2haml (>= 1.0.1)
112
124
  railties (>= 4.0.1)
113
125
  highline (1.7.8)
114
- hike (1.2.3)
115
- html2haml (2.0.0)
126
+ html2haml (2.2.0)
116
127
  erubis (~> 2.7.0)
117
- haml (~> 4.0.0)
118
- nokogiri (~> 1.6.0)
128
+ haml (>= 4.0, < 6)
129
+ nokogiri (>= 1.6.0)
119
130
  ruby_parser (~> 3.5)
120
- i18n (0.7.0)
121
- jquery-rails (3.1.4)
122
- railties (>= 3.0, < 5.0)
131
+ i18n (0.8.1)
132
+ jquery-rails (4.3.1)
133
+ rails-dom-testing (>= 1, < 3)
134
+ railties (>= 4.2.0)
123
135
  thor (>= 0.14, < 2.0)
124
- json (1.8.3)
125
136
  launchy (2.4.3)
126
137
  addressable (~> 2.3)
127
- libv8 (3.16.14.13)
138
+ libv8 (3.16.14.19-x86_64-darwin-16)
128
139
  loofah (2.0.3)
129
140
  nokogiri (>= 1.5.9)
130
- mail (2.6.4)
141
+ mail (2.6.5)
131
142
  mime-types (>= 1.16, < 4)
132
143
  method_source (0.8.2)
133
- mime-types (3.0)
144
+ mime-types (3.1)
134
145
  mime-types-data (~> 3.2015)
135
- mime-types-data (3.2016.0221)
136
- mini_portile2 (2.0.0)
137
- minitest (5.8.4)
138
- multi_json (1.11.2)
139
- mysql2 (0.4.3)
140
- nokogiri (1.6.7.2)
141
- mini_portile2 (~> 2.0.0.rc2)
146
+ mime-types-data (3.2016.0521)
147
+ mini_portile2 (2.1.0)
148
+ minitest (5.10.1)
149
+ multi_json (1.12.1)
150
+ mysql2 (0.4.6)
151
+ nio4r (2.0.0)
152
+ nokogiri (1.7.1)
153
+ mini_portile2 (~> 2.1.0)
142
154
  orm_adapter (0.5.0)
143
155
  poltergeist (1.5.1)
144
156
  capybara (~> 2.1)
145
157
  cliver (~> 0.3.1)
146
158
  multi_json (~> 1.0)
147
159
  websocket-driver (>= 0.2.0)
148
- protected_attributes (1.0.9)
149
- activemodel (>= 4.0.1, < 5.0)
150
- pry (0.10.3)
160
+ protected_attributes_continued (1.3.0)
161
+ activemodel (~> 5.0)
162
+ pry (0.10.4)
151
163
  coderay (~> 1.1.0)
152
164
  method_source (~> 0.8.1)
153
165
  slop (~> 3.4)
154
- pry-byebug (3.3.0)
155
- byebug (~> 8.0)
166
+ pry-byebug (3.4.2)
167
+ byebug (~> 9.0)
156
168
  pry (~> 0.10)
157
- rack (1.6.4)
158
- rack-cache (1.6.1)
169
+ public_suffix (2.0.5)
170
+ rack (2.0.2)
171
+ rack-cache (1.7.0)
159
172
  rack (>= 0.4)
160
173
  rack-test (0.6.3)
161
174
  rack (>= 1.0)
162
175
  radius (0.7.4)
163
- rails (4.2.6)
164
- actionmailer (= 4.2.6)
165
- actionpack (= 4.2.6)
166
- actionview (= 4.2.6)
167
- activejob (= 4.2.6)
168
- activemodel (= 4.2.6)
169
- activerecord (= 4.2.6)
170
- activesupport (= 4.2.6)
176
+ rails (5.0.2)
177
+ actioncable (= 5.0.2)
178
+ actionmailer (= 5.0.2)
179
+ actionpack (= 5.0.2)
180
+ actionview (= 5.0.2)
181
+ activejob (= 5.0.2)
182
+ activemodel (= 5.0.2)
183
+ activerecord (= 5.0.2)
184
+ activesupport (= 5.0.2)
171
185
  bundler (>= 1.3.0, < 2.0)
172
- railties (= 4.2.6)
173
- sprockets-rails
174
- rails-deprecated_sanitizer (1.0.3)
175
- activesupport (>= 4.2.0.alpha)
176
- rails-dom-testing (1.0.7)
177
- activesupport (>= 4.2.0.beta, < 5.0)
178
- nokogiri (~> 1.6.0)
179
- rails-deprecated_sanitizer (>= 1.0.1)
186
+ railties (= 5.0.2)
187
+ sprockets-rails (>= 2.0.0)
188
+ rails-dom-testing (2.0.2)
189
+ activesupport (>= 4.2.0, < 6.0)
190
+ nokogiri (~> 1.6)
180
191
  rails-html-sanitizer (1.0.3)
181
192
  loofah (~> 2.0)
182
- rails-observers (0.1.2)
183
- activemodel (~> 4.0)
184
- railties (4.2.6)
185
- actionpack (= 4.2.6)
186
- activesupport (= 4.2.6)
193
+ railties (5.0.2)
194
+ actionpack (= 5.0.2)
195
+ activesupport (= 5.0.2)
196
+ method_source
187
197
  rake (>= 0.8.7)
188
198
  thor (>= 0.18.1, < 2.0)
189
199
  rake (10.5.0)
190
- rb-fsevent (0.9.7)
191
- rb-inotify (0.9.7)
200
+ rb-fsevent (0.9.8)
201
+ rb-inotify (0.9.8)
192
202
  ffi (>= 0.5.0)
193
- rdoc (3.12.2)
194
- json (~> 1.4)
203
+ rdoc (5.1.0)
195
204
  ref (2.0.0)
196
- rspec-core (3.0.4)
197
- rspec-support (~> 3.0.0)
198
- rspec-expectations (3.0.4)
205
+ rspec-core (3.6.0)
206
+ rspec-support (~> 3.6.0)
207
+ rspec-expectations (3.6.0)
208
+ diff-lcs (>= 1.2.0, < 2.0)
209
+ rspec-support (~> 3.6.0)
210
+ rspec-mocks (3.6.0)
199
211
  diff-lcs (>= 1.2.0, < 2.0)
200
- rspec-support (~> 3.0.0)
201
- rspec-mocks (3.0.4)
202
- rspec-support (~> 3.0.0)
203
- rspec-rails (3.0.2)
212
+ rspec-support (~> 3.6.0)
213
+ rspec-rails (3.6.0)
204
214
  actionpack (>= 3.0)
205
215
  activesupport (>= 3.0)
206
216
  railties (>= 3.0)
207
- rspec-core (~> 3.0.0)
208
- rspec-expectations (~> 3.0.0)
209
- rspec-mocks (~> 3.0.0)
210
- rspec-support (~> 3.0.0)
211
- rspec-support (3.0.4)
212
- ruby_parser (3.8.1)
217
+ rspec-core (~> 3.6.0)
218
+ rspec-expectations (~> 3.6.0)
219
+ rspec-mocks (~> 3.6.0)
220
+ rspec-support (~> 3.6.0)
221
+ rspec-support (3.6.0)
222
+ ruby_parser (3.9.0)
213
223
  sexp_processor (~> 4.1)
214
- sass (3.4.21)
215
- sass-rails (5.0.4)
216
- railties (>= 4.0.0, < 5.0)
224
+ sass (3.4.23)
225
+ sass-rails (5.0.6)
226
+ railties (>= 4.0.0, < 6)
217
227
  sass (~> 3.1)
218
228
  sprockets (>= 2.8, < 4.0)
219
229
  sprockets-rails (>= 2.0, < 4.0)
220
230
  tilt (>= 1.1, < 3)
221
- sexp_processor (4.7.0)
231
+ sexp_processor (4.9.0)
222
232
  slop (3.6.0)
223
- sprockets (2.12.4)
224
- hike (~> 1.2)
225
- multi_json (~> 1.0)
226
- rack (~> 1.0)
227
- tilt (~> 1.1, != 1.3.0)
228
- sprockets-rails (2.3.3)
229
- actionpack (>= 3.0)
230
- activesupport (>= 3.0)
231
- sprockets (>= 2.8, < 4.0)
232
- stringex (1.5.1)
233
- therubyracer (0.12.2)
234
- libv8 (~> 3.16.14.0)
233
+ sprockets (3.7.1)
234
+ concurrent-ruby (~> 1.0)
235
+ rack (> 1, < 3)
236
+ sprockets-rails (3.2.0)
237
+ actionpack (>= 4.0)
238
+ activesupport (>= 4.0)
239
+ sprockets (>= 3.0.0)
240
+ stringex (2.7.1)
241
+ temple (0.8.0)
242
+ therubyracer (0.12.3)
243
+ libv8 (~> 3.16.14.15)
235
244
  ref
236
- thin (1.6.4)
237
- daemons (~> 1.0, >= 1.0.9)
238
- eventmachine (~> 1.0, >= 1.0.4)
239
- rack (~> 1.0)
240
- thor (0.19.1)
241
- thread_safe (0.3.5)
242
- tilt (1.4.1)
243
- trusty-cms (2.0.19)
244
- RedCloth (~> 4.2)
245
- acts_as_tree (~> 2.1)
245
+ thin (1.6.2)
246
+ daemons (>= 1.0.9)
247
+ eventmachine (>= 1.0.0)
248
+ rack (>= 1.0.0)
249
+ thor (0.19.4)
250
+ thread_safe (0.3.6)
251
+ tilt (2.0.7)
252
+ trusty-cms (3.0.0)
253
+ RedCloth (~> 4.3.2)
254
+ acts_as_tree (~> 2.6.1)
246
255
  bundler (~> 1.7)
247
- ckeditor (~> 4.1)
248
- compass-rails (~> 2.0)
256
+ ckeditor (~> 4.2.2)
257
+ compass-rails (~> 3.0.2)
249
258
  delocalize (~> 0.2)
250
- execjs (~> 2.2)
251
- haml (~> 4.0)
252
- haml-rails (~> 0.5)
253
- highline (~> 1.6)
254
- jquery-rails (~> 3.1)
259
+ execjs (~> 2.7)
260
+ haml (~> 5.0)
261
+ haml-rails (~> 1.0.0)
262
+ highline (~> 1.7.8)
263
+ jquery-rails (~> 4.3.1)
255
264
  mysql2 (~> 0.4.2)
256
- protected_attributes (~> 1.0.9)
257
- rack (~> 1.4)
258
- rack-cache (~> 1.2)
265
+ rack (~> 2.0.1)
266
+ rack-cache (~> 1.7)
259
267
  radius (~> 0.7)
260
- rails (~> 4.2)
268
+ rails (~> 5.0.2)
261
269
  rake (< 11.0)
262
- rdoc (~> 3.9)
263
- stringex (~> 1.3)
264
- therubyracer (~> 0.12)
265
- tzinfo (~> 1.2)
266
- uglifier (~> 2.6)
270
+ rdoc (~> 5.1)
271
+ sass-rails (~> 5.0.6)
272
+ stringex (~> 2.7.1)
273
+ therubyracer (~> 0.12.3)
274
+ tzinfo (~> 1.2.3)
275
+ uglifier (~> 3.2)
267
276
  will_paginate (~> 3.0)
268
- trusty-snippets-extension (2.0.6)
277
+ trusty-snippets-extension (3.0.0)
269
278
  rake (< 11.0)
270
- trusty-cms (~> 2.0.16)
279
+ trusty-cms (~> 3.0.0)
271
280
  trustygems (0.2.1)
272
281
  rake
273
- tzinfo (1.2.2)
282
+ tzinfo (1.2.3)
274
283
  thread_safe (~> 0.1)
275
- uglifier (2.7.2)
276
- execjs (>= 0.3.0)
277
- json (>= 1.8.0)
278
- websocket-driver (0.6.3)
284
+ uglifier (3.2.0)
285
+ execjs (>= 0.3.0, < 3)
286
+ websocket-driver (0.6.5)
279
287
  websocket-extensions (>= 0.1.0)
280
288
  websocket-extensions (0.1.2)
281
- will_paginate (3.1.0)
289
+ will_paginate (3.1.5)
282
290
  xpath (2.0.0)
283
291
  nokogiri (~> 1.3)
284
292
 
@@ -286,21 +294,19 @@ PLATFORMS
286
294
  ruby
287
295
 
288
296
  DEPENDENCIES
289
- capybara (~> 2.3.0)
290
- ckeditor (~> 4.1.0)
291
- compass-rails (~> 2.0.1)
297
+ capybara (~> 2.14.0)
292
298
  database_cleaner (~> 1.3.0)
293
299
  factory_girl_rails (~> 4.5.0)
294
300
  launchy (~> 2.4.2)
295
301
  poltergeist (~> 1.5.1)
296
- protected_attributes
302
+ protected_attributes_continued
297
303
  pry (~> 0.10.0)
298
304
  pry-byebug
299
- rails-observers
300
- rspec-rails (~> 3.0.0)
305
+ rails-observers!
306
+ rspec-rails
301
307
  thin (~> 1.6.2)
302
308
  trusty-multi-site-extension!
303
309
  trustygems (~> 0.2.0)
304
310
 
305
311
  BUNDLED WITH
306
- 1.11.2
312
+ 1.14.5
data/lib/multi_site/page_extensions.rb CHANGED
@@ -51,10 +51,11 @@ module MultiSite::PageExtensions
51
51
 
52
52
  module InstanceMethods
53
53
  def associate_with_site
54
+ binding.pry
54
55
  self.site_id = self.parent.site.id if self.site_id.nil?
55
56
  end
56
57
  end
57
-
58
+
58
59
  module ClassMethods
59
60
 
60
61
  def find_by_slug_for_site(slug)
@@ -68,7 +69,7 @@ module MultiSite::PageExtensions
68
69
  homepage ||= find_by_parent_id(nil)
69
70
  end
70
71
  end
71
-
72
+
72
73
  def url_with_sites
73
74
  if parent
74
75
  parent.child_url(self)
@@ -76,5 +77,5 @@ module MultiSite::PageExtensions
76
77
  "/"
77
78
  end
78
79
  end
79
-
80
- end
80
+
81
+ end
data/multi_site_extension.rb CHANGED
@@ -1,7 +1,7 @@
1
1
  require_dependency 'application_controller'
2
2
 
3
3
  class MultiSiteExtension < TrustyCms::Extension
4
- version "2.0.10"
4
+ version "3.0.0"
5
5
  description %{ Enables virtual sites to be created with associated domain names.
6
6
  Also scopes the sitemap view to any given page (or the root of an
7
7
  individual site) and allows model classes to be scoped by site. }
data/trusty-multi-site-extension.gemspec CHANGED
@@ -4,7 +4,7 @@ require "trusty-multi-site-extension"
4
4
 
5
5
  Gem::Specification.new do |s|
6
6
  s.name = "trusty-multi-site-extension"
7
- s.version = "2.0.11"
7
+ s.version = "3.0.0"
8
8
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
9
9
  s.authors = ["Sean Cribbs", "Eric Sipple", "Danielle Greaves", "Brittany Martin"]
10
10
  s.description = %q{Extends Trusty CMS Layouts to support multiple sites, defined by domain}
@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
21
21
  s.test_files = Dir['test/**/*','spec/**/*','features/**/*'] - ignores
22
22
  # s.executables = Dir['bin/*'] - ignores
23
23
  s.require_paths = ["lib"]
24
- s.add_dependency "acts_as_list", "0.4.0"
25
- s.add_dependency "trusty-snippets-extension", "~> 2.0.0"
26
- s.add_dependency "trusty-cms", "~> 2.0.16"
24
+ s.add_dependency "acts_as_list", "0.9.5"
25
+ s.add_dependency "trusty-snippets-extension", "~> 3.0.0"
26
+ s.add_dependency "trusty-cms", "~> 3.0.0"
27
27
  s.add_dependency "rake", "< 11.0"
28
28
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: trusty-multi-site-extension
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.11
4
+ version: 3.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Cribbs
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2016-03-25 00:00:00.000000000 Z
14
+ date: 2017-05-08 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: acts_as_list
@@ -19,42 +19,42 @@ dependencies:
19
19
  requirements:
20
20
  - - '='
21
21
  - !ruby/object:Gem::Version
22
- version: 0.4.0
22
+ version: 0.9.5
23
23
  type: :runtime
24
24
  prerelease: false
25
25
  version_requirements: !ruby/object:Gem::Requirement
26
26
  requirements:
27
27
  - - '='
28
28
  - !ruby/object:Gem::Version
29
- version: 0.4.0
29
+ version: 0.9.5
30
30
  - !ruby/object:Gem::Dependency
31
31
  name: trusty-snippets-extension
32
32
  requirement: !ruby/object:Gem::Requirement
33
33
  requirements:
34
34
  - - "~>"
35
35
  - !ruby/object:Gem::Version
36
- version: 2.0.0
36
+ version: 3.0.0
37
37
  type: :runtime
38
38
  prerelease: false
39
39
  version_requirements: !ruby/object:Gem::Requirement
40
40
  requirements:
41
41
  - - "~>"
42
42
  - !ruby/object:Gem::Version
43
- version: 2.0.0
43
+ version: 3.0.0
44
44
  - !ruby/object:Gem::Dependency
45
45
  name: trusty-cms
46
46
  requirement: !ruby/object:Gem::Requirement
47
47
  requirements:
48
48
  - - "~>"
49
49
  - !ruby/object:Gem::Version
50
- version: 2.0.16
50
+ version: 3.0.0
51
51
  type: :runtime
52
52
  prerelease: false
53
53
  version_requirements: !ruby/object:Gem::Requirement
54
54
  requirements:
55
55
  - - "~>"
56
56
  - !ruby/object:Gem::Version
57
- version: 2.0.16
57
+ version: 3.0.0
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rake
60
60
  requirement: !ruby/object:Gem::Requirement
@@ -160,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
160
160
  version: '0'
161
161
  requirements: []
162
162
  rubyforge_project:
163
- rubygems_version: 2.4.8
163
+ rubygems_version: 2.5.1
164
164
  signing_key:
165
165
  specification_version: 4
166
166
  summary: Extends Trusty CMS Layouts to support multiple sites, defined by domain