padrino-core 0.10.6 → 0.10.7

Sign up to get free protection for your applications and to get access to all the features.
@@ -68,6 +68,11 @@ module Padrino
68
68
  IRB.start
69
69
  end
70
70
 
71
+ desc "c", "Boots up the Padrino application irb console"
72
+ def c(*args)
73
+ invoke(:console, args)
74
+ end
75
+
71
76
  desc "generate", "Executes the Padrino generator with given options."
72
77
  def generate(*args)
73
78
  # Build Padrino g as an alias of padrino-gen
@@ -1,5 +1,6 @@
1
1
  require File.expand_path('../../tasks', __FILE__)
2
2
  require 'rake'
3
+ require 'rake/dsl_definition'
3
4
  require 'thor'
4
5
  require 'securerandom' unless defined?(SecureRandom)
5
6
 
@@ -0,0 +1,34 @@
1
+ ro:
2
+ date:
3
+ formats:
4
+ # Use the strftime parameters for formats.
5
+ # When no format has been given, it uses default.
6
+ # You can provide other formats here if you like!
7
+ default: "%d.%m.%Y"
8
+ short: "%d %b"
9
+ long: "%d %B %Y"
10
+ only_day: "%e"
11
+
12
+ day_names: [Duminică, Luni, Marți, Miercuri, Joi, Vineri, Sâmbătă]
13
+ abbr_day_names: [Dum, Lun, Mar, Mie, Joi, Vin, Sâm]
14
+ month_names: [~, Ianuarie, Februarie, Martie, Aprilie, Mai, Iunie, Iulie, August, Septembrie, Octombrie, Noiembrie, Decembrie]
15
+ abbr_month_names: [~, Ian, Feb, Mar, Apr, Mai, Iun, Iul, Aug, Sep, Oct, Noi, Dec]
16
+ order:
17
+ - day
18
+ - month
19
+ - year
20
+
21
+ time:
22
+ formats:
23
+ default: "%a, %d %b %Y %H:%M:%S %z"
24
+ short: "%d %b %H:%M"
25
+ long: "%d, %B %Y %H:%M"
26
+ am: "am"
27
+ pm: "pm"
28
+
29
+ # Used in array.to_sentence.
30
+ support:
31
+ array:
32
+ words_connector: ", "
33
+ two_words_connector: " și "
34
+ last_word_connector: " și "
@@ -0,0 +1,34 @@
1
+ sv:
2
+ date:
3
+ formats:
4
+ # Use the strftime parameters for formats.
5
+ # When no format has been given, it uses default.
6
+ # You can provide other formats here if you like!
7
+ default: "%Y-%m-%d"
8
+ short: "%b %d"
9
+ long: "%B %d, %Y"
10
+ only_day: "%e"
11
+
12
+ day_names: [söndag, måndag, tisdag, onsdag, torsdag, fredag, lördag]
13
+ abbr_day_names: [sön, mån, tis, ons, tors, fre, lör]
14
+ month_names: [~, januari, februari, mars, april, maj, juni, juli, augusti, september, oktober, november, december]
15
+ abbr_month_names: [~, jan, feb, mar, apr, may, jun, jul, aug, sep, okt, nov, dec]
16
+ order:
17
+ - år
18
+ - månad
19
+ - dag
20
+
21
+ time:
22
+ formats:
23
+ default: "%a, %d %b %Y %H:%M:%S %z"
24
+ short: "%d %b %H:%M"
25
+ long: "%B %d, %Y %H:%M"
26
+ am: "fm"
27
+ pm: "em"
28
+
29
+ # Used in array.to_sentence.
30
+ support:
31
+ array:
32
+ words_connector: ", "
33
+ two_words_connector: " och "
34
+ last_word_connector: ", och "
@@ -103,7 +103,7 @@ module Padrino
103
103
  # We lock dependencies sets to prevent reloading of protected constants
104
104
  #
105
105
  def lock!
106
- klasses = ObjectSpace.classes.map { |klass| klass.name.split('::')[0] }.uniq
106
+ klasses = ObjectSpace.classes.map { |klass| klass._orig_klass_name.split('::')[0] }.uniq
107
107
  klasses = klasses | Padrino.mounted_apps.map { |app| app.app_class }
108
108
  Padrino::Reloader.exclude_constants.concat(klasses)
109
109
  end
@@ -183,8 +183,8 @@ module Padrino
183
183
  # Removes the specified class and constant.
184
184
  #
185
185
  def remove_constant(const)
186
- return if exclude_constants.compact.uniq.any? { |c| const.name.index(c) == 0 } &&
187
- !include_constants.compact.uniq.any? { |c| const.name.index(c) == 0 }
186
+ return if exclude_constants.compact.uniq.any? { |c| const._orig_klass_name.index(c) == 0 } &&
187
+ !include_constants.compact.uniq.any? { |c| const._orig_klass_name.index(c) == 0 }
188
188
  begin
189
189
  parts = const.to_s.sub(/^::(Object)?/, 'Object::').split('::')
190
190
  object = parts.pop
@@ -188,6 +188,14 @@ class String
188
188
  end
189
189
  end
190
190
 
191
+ ##
192
+ # Make sure we can always use the class name
193
+ # In reloader for accessing class_name Foo._orig_klass_name
194
+ #
195
+ class Module
196
+ alias :_orig_klass_name :to_s
197
+ end
198
+
191
199
  ##
192
200
  # Loads our locale configuration files
193
201
  #
@@ -6,7 +6,7 @@
6
6
  #
7
7
  module Padrino
8
8
  # The version constant for the current version of Padrino.
9
- VERSION = '0.10.6' unless defined?(Padrino::VERSION)
9
+ VERSION = '0.10.7' unless defined?(Padrino::VERSION)
10
10
 
11
11
  #
12
12
  # The current Padrino version.
data/padrino-core.gemspec CHANGED
@@ -33,6 +33,6 @@ Gem::Specification.new do |s|
33
33
  s.add_dependency("tilt", "~> 1.3.0")
34
34
  s.add_dependency("sinatra", "~> 1.3.1")
35
35
  s.add_dependency("http_router", "~> 0.10.2")
36
- s.add_dependency("thor", "~> 0.14.3")
36
+ s.add_dependency("thor", "~> 0.15.2")
37
37
  s.add_dependency("activesupport", "~> 3.2.0")
38
38
  end
data/test/test_routing.rb CHANGED
@@ -1448,6 +1448,21 @@ describe "Routing" do
1448
1448
  assert_equal "foo", body
1449
1449
  end
1450
1450
 
1451
+ should_eventually "reset provides for routes that didn't use it" do
1452
+ mock_app do
1453
+ get('/foo', :provides => :js){}
1454
+ get('/bar'){}
1455
+ end
1456
+ get '/foo'
1457
+ assert ok?
1458
+ get '/foo.js'
1459
+ assert ok?
1460
+ get '/bar'
1461
+ assert ok?
1462
+ get '/bar.js'
1463
+ assert_equal 404, status
1464
+ end
1465
+
1451
1466
  should "pass controller conditions to each route" do
1452
1467
  counter = 0
1453
1468
 
metadata CHANGED
@@ -1,10 +1,10 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: padrino-core
3
- version: !ruby/object:Gem::Version
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.10.7
4
5
  prerelease:
5
- version: 0.10.6
6
6
  platform: ruby
7
- authors:
7
+ authors:
8
8
  - Padrino Team
9
9
  - Nathan Esquenazi
10
10
  - Davide D'Agostino
@@ -12,73 +12,96 @@ authors:
12
12
  autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
-
16
- date: 2012-03-15 00:00:00 Z
17
- dependencies:
18
- - !ruby/object:Gem::Dependency
15
+ date: 2012-06-20 00:00:00.000000000 Z
16
+ dependencies:
17
+ - !ruby/object:Gem::Dependency
19
18
  name: tilt
20
- prerelease: false
21
- requirement: &id001 !ruby/object:Gem::Requirement
19
+ requirement: !ruby/object:Gem::Requirement
22
20
  none: false
23
- requirements:
21
+ requirements:
24
22
  - - ~>
25
- - !ruby/object:Gem::Version
23
+ - !ruby/object:Gem::Version
26
24
  version: 1.3.0
27
25
  type: :runtime
28
- version_requirements: *id001
29
- - !ruby/object:Gem::Dependency
30
- name: sinatra
31
26
  prerelease: false
32
- requirement: &id002 !ruby/object:Gem::Requirement
27
+ version_requirements: !ruby/object:Gem::Requirement
28
+ none: false
29
+ requirements:
30
+ - - ~>
31
+ - !ruby/object:Gem::Version
32
+ version: 1.3.0
33
+ - !ruby/object:Gem::Dependency
34
+ name: sinatra
35
+ requirement: !ruby/object:Gem::Requirement
33
36
  none: false
34
- requirements:
37
+ requirements:
35
38
  - - ~>
36
- - !ruby/object:Gem::Version
39
+ - !ruby/object:Gem::Version
37
40
  version: 1.3.1
38
41
  type: :runtime
39
- version_requirements: *id002
40
- - !ruby/object:Gem::Dependency
41
- name: http_router
42
42
  prerelease: false
43
- requirement: &id003 !ruby/object:Gem::Requirement
43
+ version_requirements: !ruby/object:Gem::Requirement
44
+ none: false
45
+ requirements:
46
+ - - ~>
47
+ - !ruby/object:Gem::Version
48
+ version: 1.3.1
49
+ - !ruby/object:Gem::Dependency
50
+ name: http_router
51
+ requirement: !ruby/object:Gem::Requirement
44
52
  none: false
45
- requirements:
53
+ requirements:
46
54
  - - ~>
47
- - !ruby/object:Gem::Version
55
+ - !ruby/object:Gem::Version
48
56
  version: 0.10.2
49
57
  type: :runtime
50
- version_requirements: *id003
51
- - !ruby/object:Gem::Dependency
52
- name: thor
53
58
  prerelease: false
54
- requirement: &id004 !ruby/object:Gem::Requirement
59
+ version_requirements: !ruby/object:Gem::Requirement
55
60
  none: false
56
- requirements:
61
+ requirements:
57
62
  - - ~>
58
- - !ruby/object:Gem::Version
59
- version: 0.14.3
63
+ - !ruby/object:Gem::Version
64
+ version: 0.10.2
65
+ - !ruby/object:Gem::Dependency
66
+ name: thor
67
+ requirement: !ruby/object:Gem::Requirement
68
+ none: false
69
+ requirements:
70
+ - - ~>
71
+ - !ruby/object:Gem::Version
72
+ version: 0.15.2
60
73
  type: :runtime
61
- version_requirements: *id004
62
- - !ruby/object:Gem::Dependency
63
- name: activesupport
64
74
  prerelease: false
65
- requirement: &id005 !ruby/object:Gem::Requirement
75
+ version_requirements: !ruby/object:Gem::Requirement
76
+ none: false
77
+ requirements:
78
+ - - ~>
79
+ - !ruby/object:Gem::Version
80
+ version: 0.15.2
81
+ - !ruby/object:Gem::Dependency
82
+ name: activesupport
83
+ requirement: !ruby/object:Gem::Requirement
66
84
  none: false
67
- requirements:
85
+ requirements:
68
86
  - - ~>
69
- - !ruby/object:Gem::Version
87
+ - !ruby/object:Gem::Version
70
88
  version: 3.2.0
71
89
  type: :runtime
72
- version_requirements: *id005
90
+ prerelease: false
91
+ version_requirements: !ruby/object:Gem::Requirement
92
+ none: false
93
+ requirements:
94
+ - - ~>
95
+ - !ruby/object:Gem::Version
96
+ version: 3.2.0
73
97
  description: The Padrino core gem required for use of this framework
74
98
  email: padrinorb@gmail.com
75
- executables:
99
+ executables:
76
100
  - padrino
77
101
  extensions: []
78
-
79
- extra_rdoc_files:
102
+ extra_rdoc_files:
80
103
  - README.rdoc
81
- files:
104
+ files:
82
105
  - .document
83
106
  - .gitignore
84
107
  - .yardopts
@@ -115,7 +138,9 @@ files:
115
138
  - lib/padrino-core/locale/no.yml
116
139
  - lib/padrino-core/locale/pl.yml
117
140
  - lib/padrino-core/locale/pt_br.yml
141
+ - lib/padrino-core/locale/ro.yml
118
142
  - lib/padrino-core/locale/ru.yml
143
+ - lib/padrino-core/locale/sv.yml
119
144
  - lib/padrino-core/locale/tr.yml
120
145
  - lib/padrino-core/locale/uk.yml
121
146
  - lib/padrino-core/locale/zh_cn.yml
@@ -157,32 +182,30 @@ files:
157
182
  - test/test_routing.rb
158
183
  homepage: http://www.padrinorb.com
159
184
  licenses: []
160
-
161
185
  post_install_message:
162
- rdoc_options:
186
+ rdoc_options:
163
187
  - --charset=UTF-8
164
- require_paths:
188
+ require_paths:
165
189
  - lib
166
- required_ruby_version: !ruby/object:Gem::Requirement
190
+ required_ruby_version: !ruby/object:Gem::Requirement
167
191
  none: false
168
- requirements:
169
- - - ">="
170
- - !ruby/object:Gem::Version
171
- version: "0"
172
- required_rubygems_version: !ruby/object:Gem::Requirement
192
+ requirements:
193
+ - - ! '>='
194
+ - !ruby/object:Gem::Version
195
+ version: '0'
196
+ required_rubygems_version: !ruby/object:Gem::Requirement
173
197
  none: false
174
- requirements:
175
- - - ">="
176
- - !ruby/object:Gem::Version
198
+ requirements:
199
+ - - ! '>='
200
+ - !ruby/object:Gem::Version
177
201
  version: 1.3.6
178
202
  requirements: []
179
-
180
203
  rubyforge_project: padrino-core
181
- rubygems_version: 1.8.19
204
+ rubygems_version: 1.8.21
182
205
  signing_key:
183
206
  specification_version: 3
184
207
  summary: The required Padrino core gem
185
- test_files:
208
+ test_files:
186
209
  - test/fixtures/apps/.components
187
210
  - test/fixtures/apps/.gitignore
188
211
  - test/fixtures/apps/complex.rb
@@ -209,3 +232,4 @@ test_files:
209
232
  - test/test_restful_routing.rb
210
233
  - test/test_router.rb
211
234
  - test/test_routing.rb
235
+ has_rdoc: