sinatra-contrib 1.4.6 → 1.4.7
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.
- checksums.yaml +4 -4
- data/Rakefile +0 -9
- data/lib/sinatra/content_for.rb +1 -1
- data/lib/sinatra/contrib/version.rb +1 -1
- data/lib/sinatra/reloader.rb +3 -10
- data/sinatra-contrib.gemspec +37 -32
- metadata +41 -36
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 07b51967ed5d44b1b33b30808e889bea7f108f23
|
|
4
|
+
data.tar.gz: 10bb9a0e8d0242f9b965925831faddb891621366
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a1cf5ddaab8baa205ddd02411904e7c7eac393573a352f0a9be0757797a60e07ff9ce7a2d84b870ca7495724ac8bf116f788c517ed0b0023c5823d492071a7d7
|
|
7
|
+
data.tar.gz: d7c55267680752f344a9248d3af5ef8440689edd415c08a31324cb3e8c290e18418df275afc8b7e7dc8b55d4026b94a47581c1ee3dd14beef04c48d5ab1b2519
|
data/Rakefile
CHANGED
|
@@ -49,15 +49,6 @@ end
|
|
|
49
49
|
|
|
50
50
|
task :gemspec => 'sinatra-contrib.gemspec'
|
|
51
51
|
|
|
52
|
-
desc 'update travis config to correspond to sinatra'
|
|
53
|
-
task :travis, [:branch] do |t, a|
|
|
54
|
-
a.with_defaults :branch => :master
|
|
55
|
-
data = YAML.load open("https://raw.github.com/sinatra/sinatra/#{a.branch}/.travis.yml")
|
|
56
|
-
data["notifications"]["recipients"] << "ohhgabriel@gmail.com"
|
|
57
|
-
File.open('.travis.yml', 'w') { |f| f << data.to_yaml }
|
|
58
|
-
system 'git add .travis.yml && git diff --cached .travis.yml'
|
|
59
|
-
end
|
|
60
|
-
|
|
61
52
|
task :release => :gemspec do
|
|
62
53
|
sh <<-SH
|
|
63
54
|
rm -Rf sinatra-contrib*.gem &&
|
data/lib/sinatra/content_for.rb
CHANGED
|
@@ -55,7 +55,7 @@ module Sinatra
|
|
|
55
55
|
#
|
|
56
56
|
# For example, some of your views might need a few javascript tags and
|
|
57
57
|
# stylesheets, but you don't want to force this files in all your pages.
|
|
58
|
-
# Then you can put <tt
|
|
58
|
+
# Then you can put <tt><%= yield_content :scripts_and_styles %></tt> on your
|
|
59
59
|
# layout, inside the <head> tag, and each view can call <tt>content_for</tt>
|
|
60
60
|
# setting the appropriate set of tags that should be added to the layout.
|
|
61
61
|
#
|
data/lib/sinatra/reloader.rb
CHANGED
|
@@ -203,6 +203,8 @@ module Sinatra
|
|
|
203
203
|
end
|
|
204
204
|
end
|
|
205
205
|
|
|
206
|
+
MUTEX_FOR_PERFORM = Mutex.new
|
|
207
|
+
|
|
206
208
|
# When the extension is registered it extends the Sinatra application
|
|
207
209
|
# +klass+ with the modules +BaseMethods+ and +ExtensionMethods+ and
|
|
208
210
|
# defines a before filter to +perform+ the reload of the modified files.
|
|
@@ -218,11 +220,7 @@ module Sinatra
|
|
|
218
220
|
klass.set(:reload_templates) { klass.reloader? }
|
|
219
221
|
klass.before do
|
|
220
222
|
if klass.reloader?
|
|
221
|
-
|
|
222
|
-
Thread.exclusive { Reloader.perform(klass) }
|
|
223
|
-
else
|
|
224
|
-
Reloader.perform(klass)
|
|
225
|
-
end
|
|
223
|
+
MUTEX_FOR_PERFORM.synchronize { Reloader.perform(klass) }
|
|
226
224
|
end
|
|
227
225
|
end
|
|
228
226
|
klass.set(:inline_templates, klass.app_file) if klass == Sinatra::Application
|
|
@@ -240,11 +238,6 @@ module Sinatra
|
|
|
240
238
|
end
|
|
241
239
|
end
|
|
242
240
|
|
|
243
|
-
# Indicates whether or not we can and need to run thread-safely.
|
|
244
|
-
def self.thread_safe?
|
|
245
|
-
Thread and Thread.list.size > 1 and Thread.respond_to?(:exclusive)
|
|
246
|
-
end
|
|
247
|
-
|
|
248
241
|
# Contains the methods defined in Sinatra::Base that are overridden.
|
|
249
242
|
module BaseMethods
|
|
250
243
|
# Protects Sinatra::Base.run! from being called more than once.
|
data/sinatra-contrib.gemspec
CHANGED
|
@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
|
|
|
13
13
|
# generated from git shortlog -sn
|
|
14
14
|
s.authors = [
|
|
15
15
|
"Konstantin Haase",
|
|
16
|
-
"Gabriel Andretta",
|
|
17
16
|
"Zachary Scott",
|
|
17
|
+
"Gabriel Andretta",
|
|
18
18
|
"Trevor Bramble",
|
|
19
19
|
"Katrina Owen",
|
|
20
20
|
"Ashley Williams",
|
|
@@ -23,14 +23,28 @@ Gem::Specification.new do |s|
|
|
|
23
23
|
"Masahiro Fujiwara",
|
|
24
24
|
"Rafael Magana",
|
|
25
25
|
"Vipul A M",
|
|
26
|
-
"Jack Chu",
|
|
27
26
|
"ashley williams",
|
|
27
|
+
"Jack Chu",
|
|
28
|
+
"Sumeet Singh",
|
|
28
29
|
"Ilya Shindyapin",
|
|
30
|
+
"lest",
|
|
29
31
|
"Jake Worth",
|
|
30
32
|
"Kashyap",
|
|
31
|
-
"
|
|
32
|
-
"
|
|
33
|
+
"Matt Lyon",
|
|
34
|
+
"Matthew Conway",
|
|
35
|
+
"Meck",
|
|
36
|
+
"Michi Huber",
|
|
37
|
+
"Nic Benders",
|
|
38
|
+
"Patricio Mac Adden",
|
|
39
|
+
"Reed Lipman",
|
|
40
|
+
"Samy Dindane",
|
|
41
|
+
"Sergey Nartimov",
|
|
42
|
+
"Thibaut Sacreste",
|
|
43
|
+
"Uchio KONDO",
|
|
44
|
+
"Will Bailey",
|
|
45
|
+
"mono",
|
|
33
46
|
"Adrian Pacała",
|
|
47
|
+
"undr",
|
|
34
48
|
"Aish",
|
|
35
49
|
"Alexey Chernenkov",
|
|
36
50
|
"Andrew Crump",
|
|
@@ -42,24 +56,12 @@ Gem::Specification.new do |s|
|
|
|
42
56
|
"Gray Manley",
|
|
43
57
|
"Guillaume Bouteille",
|
|
44
58
|
"Jamie Hodge",
|
|
59
|
+
"Julie Ng",
|
|
45
60
|
"Koichi Sasada",
|
|
46
61
|
"Kyle Lacy",
|
|
47
62
|
"Lars Vonk",
|
|
48
63
|
"Martin Frost",
|
|
49
|
-
"Mathieu Allaire"
|
|
50
|
-
"Matt Lyon",
|
|
51
|
-
"Matthew Conway",
|
|
52
|
-
"Meck",
|
|
53
|
-
"Michi Huber",
|
|
54
|
-
"Nic Benders",
|
|
55
|
-
"Patricio Mac Adden",
|
|
56
|
-
"Reed Lipman",
|
|
57
|
-
"Samy Dindane",
|
|
58
|
-
"Sergey Nartimov",
|
|
59
|
-
"Thibaut Sacreste",
|
|
60
|
-
"Uchio KONDO",
|
|
61
|
-
"Will Bailey",
|
|
62
|
-
"undr"
|
|
64
|
+
"Mathieu Allaire"
|
|
63
65
|
]
|
|
64
66
|
|
|
65
67
|
# generated from git shortlog -sne
|
|
@@ -73,19 +75,30 @@ Gem::Specification.new do |s|
|
|
|
73
75
|
"ashley@bocoup.com",
|
|
74
76
|
"contacto@nicolassanguinetti.info",
|
|
75
77
|
"shime.ferovac@gmail.com",
|
|
76
|
-
"m-fujiwara@axsh.net",
|
|
77
78
|
"raf.magana@gmail.com",
|
|
79
|
+
"m-fujiwara@axsh.net",
|
|
78
80
|
"vipulnsward@gmail.com",
|
|
79
|
-
"jack@jackchu.com",
|
|
80
81
|
"konstantin.haase@gmail.com",
|
|
82
|
+
"jack@jackchu.com",
|
|
81
83
|
"ashley666ashley@gmail.com",
|
|
82
84
|
"ilya@shindyapin.com",
|
|
83
|
-
"
|
|
85
|
+
"just.lest@gmail.com",
|
|
84
86
|
"kashyap.kmbc@gmail.com",
|
|
85
87
|
"ortuna@gmail.com",
|
|
86
88
|
"tbramble@chef.io",
|
|
89
|
+
"jworth@prevailhs.com",
|
|
90
|
+
"mail@zzak.io",
|
|
91
|
+
"nic@newrelic.com",
|
|
92
|
+
"patriciomacadden@gmail.com",
|
|
93
|
+
"rmlipman@gmail.com",
|
|
94
|
+
"samy@dindane.com",
|
|
87
95
|
"just.lest@gmail.com",
|
|
96
|
+
"thibaut.sacreste@gmail.com",
|
|
97
|
+
"udzura@udzura.jp",
|
|
98
|
+
"will.bailey@gmail.com",
|
|
99
|
+
"mono@mono0x.net",
|
|
88
100
|
"altpacala@gmail.com",
|
|
101
|
+
"undr@yandex.ru",
|
|
89
102
|
"aisha.fenton@visfleet.com",
|
|
90
103
|
"laise@pisem.net",
|
|
91
104
|
"andrew.crump@ieee.org",
|
|
@@ -97,6 +110,7 @@ Gem::Specification.new do |s|
|
|
|
97
110
|
"g.manley@tukaiz.com",
|
|
98
111
|
"duffman@via.ecp.fr",
|
|
99
112
|
"jamiehodge@me.com",
|
|
113
|
+
"uxjulie@gmail.com",
|
|
100
114
|
"ko1@atdot.net",
|
|
101
115
|
"kylewlacy@me.com",
|
|
102
116
|
"lars.vonk@gmail.com",
|
|
@@ -105,16 +119,7 @@ Gem::Specification.new do |s|
|
|
|
105
119
|
"matt@flowerpowered.com",
|
|
106
120
|
"himself@mattonrails.com",
|
|
107
121
|
"yesmeck@gmail.com",
|
|
108
|
-
"michi.huber@gmail.com"
|
|
109
|
-
"nic@newrelic.com",
|
|
110
|
-
"patriciomacadden@gmail.com",
|
|
111
|
-
"rmlipman@gmail.com",
|
|
112
|
-
"samy@dindane.com",
|
|
113
|
-
"just.lest@gmail.com",
|
|
114
|
-
"thibaut.sacreste@gmail.com",
|
|
115
|
-
"udzura@udzura.jp",
|
|
116
|
-
"will.bailey@gmail.com",
|
|
117
|
-
"undr@yandex.ru"
|
|
122
|
+
"michi.huber@gmail.com"
|
|
118
123
|
]
|
|
119
124
|
|
|
120
125
|
# generated from git ls-files
|
|
@@ -232,5 +237,5 @@ Gem::Specification.new do |s|
|
|
|
232
237
|
s.add_development_dependency "creole"
|
|
233
238
|
s.add_development_dependency "wikicloth"
|
|
234
239
|
s.add_development_dependency "markaby"
|
|
235
|
-
s.add_development_dependency "rake"
|
|
240
|
+
s.add_development_dependency "rake", "< 11"
|
|
236
241
|
end
|
metadata
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: sinatra-contrib
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.4.
|
|
4
|
+
version: 1.4.7
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Konstantin Haase
|
|
8
|
-
- Gabriel Andretta
|
|
9
8
|
- Zachary Scott
|
|
9
|
+
- Gabriel Andretta
|
|
10
10
|
- Trevor Bramble
|
|
11
11
|
- Katrina Owen
|
|
12
12
|
- Ashley Williams
|
|
@@ -15,14 +15,28 @@ authors:
|
|
|
15
15
|
- Masahiro Fujiwara
|
|
16
16
|
- Rafael Magana
|
|
17
17
|
- Vipul A M
|
|
18
|
-
- Jack Chu
|
|
19
18
|
- ashley williams
|
|
19
|
+
- Jack Chu
|
|
20
|
+
- Sumeet Singh
|
|
20
21
|
- Ilya Shindyapin
|
|
22
|
+
- lest
|
|
21
23
|
- Jake Worth
|
|
22
24
|
- Kashyap
|
|
23
|
-
-
|
|
24
|
-
-
|
|
25
|
+
- Matt Lyon
|
|
26
|
+
- Matthew Conway
|
|
27
|
+
- Meck
|
|
28
|
+
- Michi Huber
|
|
29
|
+
- Nic Benders
|
|
30
|
+
- Patricio Mac Adden
|
|
31
|
+
- Reed Lipman
|
|
32
|
+
- Samy Dindane
|
|
33
|
+
- Sergey Nartimov
|
|
34
|
+
- Thibaut Sacreste
|
|
35
|
+
- Uchio KONDO
|
|
36
|
+
- Will Bailey
|
|
37
|
+
- mono
|
|
25
38
|
- Adrian Pacała
|
|
39
|
+
- undr
|
|
26
40
|
- Aish
|
|
27
41
|
- Alexey Chernenkov
|
|
28
42
|
- Andrew Crump
|
|
@@ -34,28 +48,16 @@ authors:
|
|
|
34
48
|
- Gray Manley
|
|
35
49
|
- Guillaume Bouteille
|
|
36
50
|
- Jamie Hodge
|
|
51
|
+
- Julie Ng
|
|
37
52
|
- Koichi Sasada
|
|
38
53
|
- Kyle Lacy
|
|
39
54
|
- Lars Vonk
|
|
40
55
|
- Martin Frost
|
|
41
56
|
- Mathieu Allaire
|
|
42
|
-
- Matt Lyon
|
|
43
|
-
- Matthew Conway
|
|
44
|
-
- Meck
|
|
45
|
-
- Michi Huber
|
|
46
|
-
- Nic Benders
|
|
47
|
-
- Patricio Mac Adden
|
|
48
|
-
- Reed Lipman
|
|
49
|
-
- Samy Dindane
|
|
50
|
-
- Sergey Nartimov
|
|
51
|
-
- Thibaut Sacreste
|
|
52
|
-
- Uchio KONDO
|
|
53
|
-
- Will Bailey
|
|
54
|
-
- undr
|
|
55
57
|
autorequire:
|
|
56
58
|
bindir: bin
|
|
57
59
|
cert_chain: []
|
|
58
|
-
date:
|
|
60
|
+
date: 2016-04-11 00:00:00.000000000 Z
|
|
59
61
|
dependencies:
|
|
60
62
|
- !ruby/object:Gem::Dependency
|
|
61
63
|
name: sinatra
|
|
@@ -389,16 +391,16 @@ dependencies:
|
|
|
389
391
|
name: rake
|
|
390
392
|
requirement: !ruby/object:Gem::Requirement
|
|
391
393
|
requirements:
|
|
392
|
-
- - "
|
|
394
|
+
- - "<"
|
|
393
395
|
- !ruby/object:Gem::Version
|
|
394
|
-
version: '
|
|
396
|
+
version: '11'
|
|
395
397
|
type: :development
|
|
396
398
|
prerelease: false
|
|
397
399
|
version_requirements: !ruby/object:Gem::Requirement
|
|
398
400
|
requirements:
|
|
399
|
-
- - "
|
|
401
|
+
- - "<"
|
|
400
402
|
- !ruby/object:Gem::Version
|
|
401
|
-
version: '
|
|
403
|
+
version: '11'
|
|
402
404
|
description: Collection of useful Sinatra extensions
|
|
403
405
|
email:
|
|
404
406
|
- konstantin.mailinglists@googlemail.com
|
|
@@ -410,19 +412,30 @@ email:
|
|
|
410
412
|
- ashley@bocoup.com
|
|
411
413
|
- contacto@nicolassanguinetti.info
|
|
412
414
|
- shime.ferovac@gmail.com
|
|
413
|
-
- m-fujiwara@axsh.net
|
|
414
415
|
- raf.magana@gmail.com
|
|
416
|
+
- m-fujiwara@axsh.net
|
|
415
417
|
- vipulnsward@gmail.com
|
|
416
|
-
- jack@jackchu.com
|
|
417
418
|
- konstantin.haase@gmail.com
|
|
419
|
+
- jack@jackchu.com
|
|
418
420
|
- ashley666ashley@gmail.com
|
|
419
421
|
- ilya@shindyapin.com
|
|
420
|
-
-
|
|
422
|
+
- just.lest@gmail.com
|
|
421
423
|
- kashyap.kmbc@gmail.com
|
|
422
424
|
- ortuna@gmail.com
|
|
423
425
|
- tbramble@chef.io
|
|
426
|
+
- jworth@prevailhs.com
|
|
427
|
+
- mail@zzak.io
|
|
428
|
+
- nic@newrelic.com
|
|
429
|
+
- patriciomacadden@gmail.com
|
|
430
|
+
- rmlipman@gmail.com
|
|
431
|
+
- samy@dindane.com
|
|
424
432
|
- just.lest@gmail.com
|
|
433
|
+
- thibaut.sacreste@gmail.com
|
|
434
|
+
- udzura@udzura.jp
|
|
435
|
+
- will.bailey@gmail.com
|
|
436
|
+
- mono@mono0x.net
|
|
425
437
|
- altpacala@gmail.com
|
|
438
|
+
- undr@yandex.ru
|
|
426
439
|
- aisha.fenton@visfleet.com
|
|
427
440
|
- laise@pisem.net
|
|
428
441
|
- andrew.crump@ieee.org
|
|
@@ -434,6 +447,7 @@ email:
|
|
|
434
447
|
- g.manley@tukaiz.com
|
|
435
448
|
- duffman@via.ecp.fr
|
|
436
449
|
- jamiehodge@me.com
|
|
450
|
+
- uxjulie@gmail.com
|
|
437
451
|
- ko1@atdot.net
|
|
438
452
|
- kylewlacy@me.com
|
|
439
453
|
- lars.vonk@gmail.com
|
|
@@ -443,15 +457,6 @@ email:
|
|
|
443
457
|
- himself@mattonrails.com
|
|
444
458
|
- yesmeck@gmail.com
|
|
445
459
|
- michi.huber@gmail.com
|
|
446
|
-
- nic@newrelic.com
|
|
447
|
-
- patriciomacadden@gmail.com
|
|
448
|
-
- rmlipman@gmail.com
|
|
449
|
-
- samy@dindane.com
|
|
450
|
-
- just.lest@gmail.com
|
|
451
|
-
- thibaut.sacreste@gmail.com
|
|
452
|
-
- udzura@udzura.jp
|
|
453
|
-
- will.bailey@gmail.com
|
|
454
|
-
- undr@yandex.ru
|
|
455
460
|
executables: []
|
|
456
461
|
extensions: []
|
|
457
462
|
extra_rdoc_files: []
|
|
@@ -563,7 +568,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
563
568
|
version: '0'
|
|
564
569
|
requirements: []
|
|
565
570
|
rubyforge_project:
|
|
566
|
-
rubygems_version: 2.
|
|
571
|
+
rubygems_version: 2.5.2
|
|
567
572
|
signing_key:
|
|
568
573
|
specification_version: 4
|
|
569
574
|
summary: Collection of useful Sinatra extensions
|