RubyApp 0.0.88 → 0.0.89

Sign up to get free protection for your applications and to get access to all the features.
Files changed (10) hide show
  1. data/Gemfile.lock +1 -1
  2. data/lib/ruby_app/config.ru +1 -1
  3. data/lib/ruby_app/configuration.rb +0 -3
  4. data/lib/ruby_app/log.rb +12 -8
  5. data/lib/ruby_app/mixins/render_mixin.rb +0 -3
  6. data/lib/ruby_app/rack/application.rb +1 -0
  7. data/lib/ruby_app/session.rb +6 -2
  8. data/lib/ruby_app/templates/application/config.ru +1 -1
  9. data/lib/ruby_app/version.rb +1 -1
  10. metadata +68 -68
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- RubyApp (0.0.88)
4
+ RubyApp (0.0.89)
5
5
  BlueCloth
6
6
  chronic
7
7
  chronic_duration
data/lib/ruby_app/config.ru CHANGED
@@ -9,7 +9,7 @@ require 'ruby_app/rack/route'
9
9
  require 'ruby_app/version'
10
10
 
11
11
  use Rack::ShowExceptions
12
- use Rack::Session::Pool
12
+ use Rack::Session::Pool, :expire_after => 60 * 60 * 24 # expire after 1 day
13
13
  use Rack::Reloader
14
14
  use Rack::ContentLength
15
15
 
data/lib/ruby_app/configuration.rb CHANGED
@@ -1,7 +1,6 @@
1
1
  require 'yaml'
2
2
 
3
3
  module RubyApp
4
- require 'ruby_app/log'
5
4
  require 'ruby_app/mixins/delegate_mixin'
6
5
  require 'ruby_app/mixins/hash_mixin'
7
6
 
@@ -32,8 +31,6 @@ module RubyApp
32
31
  end
33
32
  end
34
33
  @document.symbolize!
35
- RubyApp::Log.debug("#{self.class}##{__method__} @document = ...")
36
- RubyApp::Log.debug_hash(@document)
37
34
  end
38
35
 
39
36
  end
data/lib/ruby_app/log.rb CHANGED
@@ -10,6 +10,13 @@ module RubyApp
10
10
  class Log < ::Logger
11
11
  extend RubyApp::Mixins::DelegateMixin
12
12
 
13
+ def duration(message)
14
+ start = Time.now
15
+ result = yield if block_given?
16
+ self.debug("#{message} duration=#{Time.now - start}s")
17
+ return result
18
+ end
19
+
13
20
  def exception(exception)
14
21
  self.error('-' * 80)
15
22
  self.error("exception=#{exception.class.inspect} #{exception.message}")
@@ -20,7 +27,11 @@ module RubyApp
20
27
  self.error('-' * 80)
21
28
  end
22
29
 
23
- def debug_hash(hash, indent = 0)
30
+ def memory(message)
31
+ self.debug("#{message} memory_usage=#{`ps -o rss= -p #{$$}`.to_i}")
32
+ end
33
+
34
+ def hash(hash, indent = 0)
24
35
  hash.each do |name, value|
25
36
  if value.is_a?(Hash)
26
37
  self.debug("#{' ' * 2 * indent}#{name.inspect}")
@@ -31,13 +42,6 @@ module RubyApp
31
42
  end
32
43
  end
33
44
 
34
- def duration(message)
35
- start = Time.now
36
- result = yield if block_given?
37
- self.debug("#{message} duration=#{Time.now - start}s")
38
- return result
39
- end
40
-
41
45
  def self.get
42
46
  @@_log
43
47
  end
data/lib/ruby_app/mixins/render_mixin.rb CHANGED
@@ -8,7 +8,6 @@ module RubyApp
8
8
  module Mixins
9
9
 
10
10
  module RenderMixin
11
- require 'ruby_app/log'
12
11
  require 'ruby_app/request'
13
12
 
14
13
  def rendered?(template)
@@ -26,7 +25,6 @@ module RubyApp
26
25
  cache = self.is_a?(Class) ? self.get_cache(format) : self.class.get_cache(format)
27
26
  if File.exists?(cache)
28
27
  self.rendered?(cache) do
29
- RubyApp::Log.debug("#{RubyApp::Log.prefix(self, __method__)} File.read(#{cache.inspect})")
30
28
  return File.read(cache)
31
29
  end
32
30
  else
@@ -51,7 +49,6 @@ module RubyApp
51
49
  RubyApp::Request.content_for(self, template, content)
52
50
  end
53
51
  if cache && write_cache
54
- RubyApp::Log.debug("#{RubyApp::Log.prefix(self, __method__)} File.open(#{cache.inspect}, 'w')")
55
52
  cache_directory = File.dirname(cache)
56
53
  Dir.mkdir(cache_directory) unless File.exists?(cache_directory)
57
54
  File.open(cache, 'w') do |file|
data/lib/ruby_app/rack/application.rb CHANGED
@@ -2,6 +2,7 @@ module RubyApp
2
2
 
3
3
  module Rack
4
4
  require 'ruby_app/application'
5
+ require 'ruby_app/log'
5
6
  require 'ruby_app/request'
6
7
 
7
8
  class Application
data/lib/ruby_app/session.rb CHANGED
@@ -27,13 +27,17 @@ module RubyApp
27
27
  attr_accessor :identity
28
28
 
29
29
  def initialize(session_id, page = nil, data = {})
30
- require 'ruby_app/elements/pages/default_page'
31
30
  @session_id = session_id
32
31
  @pages = []
33
- @pages.push(page || RubyApp::Elements::Pages::DefaultPage.new)
34
32
  @dialogs = []
35
33
  @data = data
36
34
  @identity = nil
35
+
36
+ require 'ruby_app/elements/pages/default_page'
37
+ @pages.push(page || RubyApp::Elements::Pages::DefaultPage.new)
38
+
39
+ RubyApp::Log.memory("#{self.class}##{__method__}")
40
+
37
41
  end
38
42
 
39
43
  def [](key)
data/lib/ruby_app/templates/application/config.ru CHANGED
@@ -15,7 +15,7 @@ require '_APPLICATION_DOWNCODE_/session'
15
15
  require '_APPLICATION_DOWNCODE_/version'
16
16
 
17
17
  use Rack::ShowExceptions
18
- use Rack::Session::Pool
18
+ use Rack::Session::Pool, :expire_after => 60 * 60 * 24
19
19
  use Rack::Reloader
20
20
  use Rack::ContentLength
21
21
 
data/lib/ruby_app/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  module RubyApp
2
- VERSION = "0.0.88"
2
+ VERSION = "0.0.89"
3
3
  ROOT = File.expand_path(File.dirname(__FILE__))
4
4
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: RubyApp
3
3
  version: !ruby/object:Gem::Version
4
- hash: 175
4
+ hash: 173
5
5
  prerelease:
6
6
  segments:
7
7
  - 0
8
8
  - 0
9
- - 88
10
- version: 0.0.88
9
+ - 89
10
+ version: 0.0.89
11
11
  platform: ruby
12
12
  authors:
13
13
  - Frank G. Ficnar
@@ -15,9 +15,11 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2012-02-06 00:00:00 Z
18
+ date: 2012-02-19 00:00:00 Z
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency
21
+ prerelease: false
22
+ name: BlueCloth
21
23
  version_requirements: &id001 !ruby/object:Gem::Requirement
22
24
  none: false
23
25
  requirements:
@@ -27,11 +29,11 @@ dependencies:
27
29
  segments:
28
30
  - 0
29
31
  version: "0"
30
- requirement: *id001
31
32
  type: :runtime
32
- prerelease: false
33
- name: BlueCloth
33
+ requirement: *id001
34
34
  - !ruby/object:Gem::Dependency
35
+ prerelease: false
36
+ name: chronic
35
37
  version_requirements: &id002 !ruby/object:Gem::Requirement
36
38
  none: false
37
39
  requirements:
@@ -41,11 +43,11 @@ dependencies:
41
43
  segments:
42
44
  - 0
43
45
  version: "0"
44
- requirement: *id002
45
46
  type: :runtime
46
- prerelease: false
47
- name: chronic
47
+ requirement: *id002
48
48
  - !ruby/object:Gem::Dependency
49
+ prerelease: false
50
+ name: chronic_duration
49
51
  version_requirements: &id003 !ruby/object:Gem::Requirement
50
52
  none: false
51
53
  requirements:
@@ -55,11 +57,11 @@ dependencies:
55
57
  segments:
56
58
  - 0
57
59
  version: "0"
58
- requirement: *id003
59
60
  type: :runtime
60
- prerelease: false
61
- name: chronic_duration
61
+ requirement: *id003
62
62
  - !ruby/object:Gem::Dependency
63
+ prerelease: false
64
+ name: facets
63
65
  version_requirements: &id004 !ruby/object:Gem::Requirement
64
66
  none: false
65
67
  requirements:
@@ -69,11 +71,11 @@ dependencies:
69
71
  segments:
70
72
  - 0
71
73
  version: "0"
72
- requirement: *id004
73
74
  type: :runtime
74
- prerelease: false
75
- name: facets
75
+ requirement: *id004
76
76
  - !ruby/object:Gem::Dependency
77
+ prerelease: false
78
+ name: fileutils
77
79
  version_requirements: &id005 !ruby/object:Gem::Requirement
78
80
  none: false
79
81
  requirements:
@@ -83,11 +85,11 @@ dependencies:
83
85
  segments:
84
86
  - 0
85
87
  version: "0"
86
- requirement: *id005
87
88
  type: :runtime
88
- prerelease: false
89
- name: fileutils
89
+ requirement: *id005
90
90
  - !ruby/object:Gem::Dependency
91
+ prerelease: false
92
+ name: haml
91
93
  version_requirements: &id006 !ruby/object:Gem::Requirement
92
94
  none: false
93
95
  requirements:
@@ -97,11 +99,11 @@ dependencies:
97
99
  segments:
98
100
  - 0
99
101
  version: "0"
100
- requirement: *id006
101
102
  type: :runtime
102
- prerelease: false
103
- name: haml
103
+ requirement: *id006
104
104
  - !ruby/object:Gem::Dependency
105
+ prerelease: false
106
+ name: json
105
107
  version_requirements: &id007 !ruby/object:Gem::Requirement
106
108
  none: false
107
109
  requirements:
@@ -111,11 +113,11 @@ dependencies:
111
113
  segments:
112
114
  - 0
113
115
  version: "0"
114
- requirement: *id007
115
116
  type: :runtime
116
- prerelease: false
117
- name: json
117
+ requirement: *id007
118
118
  - !ruby/object:Gem::Dependency
119
+ prerelease: false
120
+ name: mime-types
119
121
  version_requirements: &id008 !ruby/object:Gem::Requirement
120
122
  none: false
121
123
  requirements:
@@ -125,11 +127,11 @@ dependencies:
125
127
  segments:
126
128
  - 0
127
129
  version: "0"
128
- requirement: *id008
129
130
  type: :runtime
130
- prerelease: false
131
- name: mime-types
131
+ requirement: *id008
132
132
  - !ruby/object:Gem::Dependency
133
+ prerelease: false
134
+ name: r18n-core
133
135
  version_requirements: &id009 !ruby/object:Gem::Requirement
134
136
  none: false
135
137
  requirements:
@@ -139,11 +141,11 @@ dependencies:
139
141
  segments:
140
142
  - 0
141
143
  version: "0"
142
- requirement: *id009
143
144
  type: :runtime
144
- prerelease: false
145
- name: r18n-core
145
+ requirement: *id009
146
146
  - !ruby/object:Gem::Dependency
147
+ prerelease: false
148
+ name: rack
147
149
  version_requirements: &id010 !ruby/object:Gem::Requirement
148
150
  none: false
149
151
  requirements:
@@ -153,11 +155,11 @@ dependencies:
153
155
  segments:
154
156
  - 0
155
157
  version: "0"
156
- requirement: *id010
157
158
  type: :runtime
158
- prerelease: false
159
- name: rack
159
+ requirement: *id010
160
160
  - !ruby/object:Gem::Dependency
161
+ prerelease: false
162
+ name: ruby-event
161
163
  version_requirements: &id011 !ruby/object:Gem::Requirement
162
164
  none: false
163
165
  requirements:
@@ -167,11 +169,11 @@ dependencies:
167
169
  segments:
168
170
  - 0
169
171
  version: "0"
170
- requirement: *id011
171
172
  type: :runtime
172
- prerelease: false
173
- name: ruby-event
173
+ requirement: *id011
174
174
  - !ruby/object:Gem::Dependency
175
+ prerelease: false
176
+ name: ruby-openid
175
177
  version_requirements: &id012 !ruby/object:Gem::Requirement
176
178
  none: false
177
179
  requirements:
@@ -181,11 +183,11 @@ dependencies:
181
183
  segments:
182
184
  - 0
183
185
  version: "0"
184
- requirement: *id012
185
186
  type: :runtime
186
- prerelease: false
187
- name: ruby-openid
187
+ requirement: *id012
188
188
  - !ruby/object:Gem::Dependency
189
+ prerelease: false
190
+ name: sass
189
191
  version_requirements: &id013 !ruby/object:Gem::Requirement
190
192
  none: false
191
193
  requirements:
@@ -195,11 +197,11 @@ dependencies:
195
197
  segments:
196
198
  - 0
197
199
  version: "0"
198
- requirement: *id013
199
200
  type: :runtime
200
- prerelease: false
201
- name: sass
201
+ requirement: *id013
202
202
  - !ruby/object:Gem::Dependency
203
+ prerelease: false
204
+ name: term-ansicolor
203
205
  version_requirements: &id014 !ruby/object:Gem::Requirement
204
206
  none: false
205
207
  requirements:
@@ -209,11 +211,11 @@ dependencies:
209
211
  segments:
210
212
  - 0
211
213
  version: "0"
212
- requirement: *id014
213
214
  type: :runtime
214
- prerelease: false
215
- name: term-ansicolor
215
+ requirement: *id014
216
216
  - !ruby/object:Gem::Dependency
217
+ prerelease: false
218
+ name: yajl-ruby
217
219
  version_requirements: &id015 !ruby/object:Gem::Requirement
218
220
  none: false
219
221
  requirements:
@@ -223,11 +225,11 @@ dependencies:
223
225
  segments:
224
226
  - 0
225
227
  version: "0"
226
- requirement: *id015
227
228
  type: :runtime
228
- prerelease: false
229
- name: yajl-ruby
229
+ requirement: *id015
230
230
  - !ruby/object:Gem::Dependency
231
+ prerelease: false
232
+ name: capybara
231
233
  version_requirements: &id016 !ruby/object:Gem::Requirement
232
234
  none: false
233
235
  requirements:
@@ -237,11 +239,11 @@ dependencies:
237
239
  segments:
238
240
  - 0
239
241
  version: "0"
240
- requirement: *id016
241
242
  type: :development
242
- prerelease: false
243
- name: capybara
243
+ requirement: *id016
244
244
  - !ruby/object:Gem::Dependency
245
+ prerelease: false
246
+ name: cucumber
245
247
  version_requirements: &id017 !ruby/object:Gem::Requirement
246
248
  none: false
247
249
  requirements:
@@ -251,11 +253,11 @@ dependencies:
251
253
  segments:
252
254
  - 0
253
255
  version: "0"
254
- requirement: *id017
255
256
  type: :development
256
- prerelease: false
257
- name: cucumber
257
+ requirement: *id017
258
258
  - !ruby/object:Gem::Dependency
259
+ prerelease: false
260
+ name: launchy
259
261
  version_requirements: &id018 !ruby/object:Gem::Requirement
260
262
  none: false
261
263
  requirements:
@@ -265,11 +267,11 @@ dependencies:
265
267
  segments:
266
268
  - 0
267
269
  version: "0"
268
- requirement: *id018
269
270
  type: :development
270
- prerelease: false
271
- name: launchy
271
+ requirement: *id018
272
272
  - !ruby/object:Gem::Dependency
273
+ prerelease: false
274
+ name: rake
273
275
  version_requirements: &id019 !ruby/object:Gem::Requirement
274
276
  none: false
275
277
  requirements:
@@ -279,11 +281,11 @@ dependencies:
279
281
  segments:
280
282
  - 0
281
283
  version: "0"
282
- requirement: *id019
283
284
  type: :development
284
- prerelease: false
285
- name: rake
285
+ requirement: *id019
286
286
  - !ruby/object:Gem::Dependency
287
+ prerelease: false
288
+ name: rspec
287
289
  version_requirements: &id020 !ruby/object:Gem::Requirement
288
290
  none: false
289
291
  requirements:
@@ -293,11 +295,11 @@ dependencies:
293
295
  segments:
294
296
  - 0
295
297
  version: "0"
296
- requirement: *id020
297
298
  type: :development
298
- prerelease: false
299
- name: rspec
299
+ requirement: *id020
300
300
  - !ruby/object:Gem::Dependency
301
+ prerelease: false
302
+ name: rspec-mocks
301
303
  version_requirements: &id021 !ruby/object:Gem::Requirement
302
304
  none: false
303
305
  requirements:
@@ -307,10 +309,8 @@ dependencies:
307
309
  segments:
308
310
  - 0
309
311
  version: "0"
310
- requirement: *id021
311
312
  type: :development
312
- prerelease: false
313
- name: rspec-mocks
313
+ requirement: *id021
314
314
  description: A web application framework in Ruby
315
315
  email:
316
316
  - frank.ficnar@gmail.com
@@ -618,7 +618,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
618
618
  requirements: []
619
619
 
620
620
  rubyforge_project:
621
- rubygems_version: 1.8.10
621
+ rubygems_version: 1.8.13
622
622
  signing_key:
623
623
  specification_version: 3
624
624
  summary: A web application framework in Ruby