merb 0.3.0 → 0.3.1
Sign up to get free protection for your applications and to get access to all the features.
- data/Rakefile +1 -1
- data/lib/merb.rb +10 -3
- data/lib/merb/core_ext/merb_object.rb +3 -0
- data/lib/merb/merb_controller.rb +1 -1
- data/lib/merb/merb_dispatcher.rb +1 -1
- data/lib/merb/merb_upload_handler.rb +13 -11
- data/lib/merb/template/haml.rb +1 -0
- metadata +39 -39
data/Rakefile
CHANGED
data/lib/merb.rb
CHANGED
@@ -1,5 +1,13 @@
|
|
1
1
|
require 'rubygems'
|
2
|
-
|
2
|
+
if ENV['SWIFT']
|
3
|
+
require 'swiftcore/swiftiplied_mongrel'
|
4
|
+
puts "Using Swiftiplied Mongrel"
|
5
|
+
elsif ENV['EVENT']
|
6
|
+
require 'swiftcore/evented_mongrel'
|
7
|
+
puts "Using Evented Mongrel"
|
8
|
+
else
|
9
|
+
require 'mongrel'
|
10
|
+
end
|
3
11
|
require 'fileutils'
|
4
12
|
require 'erubis'
|
5
13
|
require 'logger'
|
@@ -12,7 +20,7 @@ end
|
|
12
20
|
|
13
21
|
|
14
22
|
module Merb
|
15
|
-
VERSION='0.3.
|
23
|
+
VERSION='0.3.1' unless defined?VERSION
|
16
24
|
class Server
|
17
25
|
class << self
|
18
26
|
def config
|
@@ -72,7 +80,6 @@ MERB_LOGGER.level = case (Merb::Server.log_level.downcase rescue '')
|
|
72
80
|
module Mongrel::Const
|
73
81
|
HTTP_COOKIE = 'HTTP_COOKIE'.freeze
|
74
82
|
QUERY_STRING = 'QUERY_STRING'.freeze
|
75
|
-
CONTENT_TYPE_TEXT_HTML_HASH = {'Content-Type' =>'text/html'}
|
76
83
|
APPLICATION_JSON = 'application/json'.freeze
|
77
84
|
TEXT_JSON = 'text/x-json'.freeze
|
78
85
|
UPCASE_CONTENT_TYPE = 'CONTENT_TYPE'.freeze
|
@@ -6,8 +6,11 @@ class Object
|
|
6
6
|
end
|
7
7
|
|
8
8
|
def meta_class() class << self; self end end
|
9
|
+
|
9
10
|
def meta_eval(&blk) meta_class.instance_eval( &blk ) end
|
11
|
+
|
10
12
|
def meta_def(name, &blk) meta_eval { define_method name, &blk } end
|
13
|
+
|
11
14
|
def class_def name, &blk
|
12
15
|
self.class.class_eval { define_method name, &blk }
|
13
16
|
end
|
data/lib/merb/merb_controller.rb
CHANGED
@@ -39,7 +39,7 @@ module Merb
|
|
39
39
|
def initialize(request, env, args, response)
|
40
40
|
@env = MerbHash[env.to_hash]
|
41
41
|
@status, @method, @response, @headers = 200, (env[Mongrel::Const::REQUEST_METHOD]||Mongrel::Const::GET).downcase.to_sym, response,
|
42
|
-
|
42
|
+
{'Content-Type' =>'text/html'}
|
43
43
|
cookies = query_parse(@env[Mongrel::Const::HTTP_COOKIE], ';,')
|
44
44
|
querystring = query_parse(@env[Mongrel::Const::QUERY_STRING])
|
45
45
|
|
data/lib/merb/merb_dispatcher.rb
CHANGED
@@ -11,7 +11,7 @@ module Merb
|
|
11
11
|
|
12
12
|
@@mutex = Mutex.new
|
13
13
|
@@use_mutex = ::Merb::Server.use_mutex
|
14
|
-
# This is where we grab the incoming request
|
14
|
+
# This is where we grab the incoming request REQUEST_URI
|
15
15
|
# and use that in the merb routematcher to determine
|
16
16
|
# which controller and method to run.
|
17
17
|
# returns a 2 element tuple of:
|
@@ -5,19 +5,21 @@ module Mongrel
|
|
5
5
|
UPLOAD_ID = 'upload_id'.freeze
|
6
6
|
end
|
7
7
|
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
HttpRequest.class_eval do
|
14
|
-
def initialize_with_abort(params, socket, dispatchers)
|
15
|
-
initialize_without_abort(params, socket, dispatchers)
|
16
|
-
dispatchers.each {|d| d.request_aborted(params) if @body.nil? && d }
|
8
|
+
unless ENV['EVENT'] || ENV['SWIFT']
|
9
|
+
HttpHandler.class_eval do
|
10
|
+
def request_aborted(params)
|
11
|
+
end
|
17
12
|
end
|
18
13
|
|
19
|
-
|
20
|
-
|
14
|
+
HttpRequest.class_eval do
|
15
|
+
def initialize_with_abort(params, socket, dispatchers)
|
16
|
+
initialize_without_abort(params, socket, dispatchers)
|
17
|
+
dispatchers.each {|d| d.request_aborted(params) if @body.nil? && d }
|
18
|
+
end
|
19
|
+
|
20
|
+
alias_method :initialize_without_abort, :initialize
|
21
|
+
alias_method :initialize, :initialize_with_abort
|
22
|
+
end
|
21
23
|
end
|
22
24
|
end
|
23
25
|
|
data/lib/merb/template/haml.rb
CHANGED
metadata
CHANGED
@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
|
|
3
3
|
specification_version: 1
|
4
4
|
name: merb
|
5
5
|
version: !ruby/object:Gem::Version
|
6
|
-
version: 0.3.
|
7
|
-
date: 2007-04-
|
6
|
+
version: 0.3.1
|
7
|
+
date: 2007-04-30 00:00:00 -07:00
|
8
8
|
summary: Merb == Mongrel + Erb. Pocket rocket web framework.
|
9
9
|
require_paths:
|
10
10
|
- lib
|
@@ -35,14 +35,29 @@ files:
|
|
35
35
|
- TODO
|
36
36
|
- bin/merb
|
37
37
|
- lib/merb
|
38
|
-
- lib/merb.rb
|
39
|
-
- lib/merb_tasks.rb
|
40
|
-
- lib/tasks
|
41
38
|
- lib/merb/caching
|
39
|
+
- lib/merb/caching/action_cache.rb
|
40
|
+
- lib/merb/caching/fragment_cache.rb
|
41
|
+
- lib/merb/caching/store
|
42
|
+
- lib/merb/caching/store/file_cache.rb
|
43
|
+
- lib/merb/caching/store/memory_cache.rb
|
42
44
|
- lib/merb/caching.rb
|
43
45
|
- lib/merb/core_ext
|
46
|
+
- lib/merb/core_ext/merb_class.rb
|
47
|
+
- lib/merb/core_ext/merb_enumerable.rb
|
48
|
+
- lib/merb/core_ext/merb_hash.rb
|
49
|
+
- lib/merb/core_ext/merb_inflections.rb
|
50
|
+
- lib/merb/core_ext/merb_inflector.rb
|
51
|
+
- lib/merb/core_ext/merb_kernel.rb
|
52
|
+
- lib/merb/core_ext/merb_module.rb
|
53
|
+
- lib/merb/core_ext/merb_numeric.rb
|
54
|
+
- lib/merb/core_ext/merb_object.rb
|
55
|
+
- lib/merb/core_ext/merb_string.rb
|
56
|
+
- lib/merb/core_ext/merb_symbol.rb
|
44
57
|
- lib/merb/core_ext.rb
|
45
58
|
- lib/merb/generators
|
59
|
+
- lib/merb/generators/merb_app
|
60
|
+
- lib/merb/generators/merb_app/merb_app.rb
|
46
61
|
- lib/merb/merb_constants.rb
|
47
62
|
- lib/merb/merb_controller.rb
|
48
63
|
- lib/merb/merb_dispatcher.rb
|
@@ -58,28 +73,6 @@ files:
|
|
58
73
|
- lib/merb/merb_view_context.rb
|
59
74
|
- lib/merb/merb_yaml_store.rb
|
60
75
|
- lib/merb/mixins
|
61
|
-
- lib/merb/session
|
62
|
-
- lib/merb/template
|
63
|
-
- lib/merb/template.rb
|
64
|
-
- lib/merb/vendor
|
65
|
-
- lib/merb/caching/action_cache.rb
|
66
|
-
- lib/merb/caching/fragment_cache.rb
|
67
|
-
- lib/merb/caching/store
|
68
|
-
- lib/merb/caching/store/file_cache.rb
|
69
|
-
- lib/merb/caching/store/memory_cache.rb
|
70
|
-
- lib/merb/core_ext/merb_class.rb
|
71
|
-
- lib/merb/core_ext/merb_enumerable.rb
|
72
|
-
- lib/merb/core_ext/merb_hash.rb
|
73
|
-
- lib/merb/core_ext/merb_inflections.rb
|
74
|
-
- lib/merb/core_ext/merb_inflector.rb
|
75
|
-
- lib/merb/core_ext/merb_kernel.rb
|
76
|
-
- lib/merb/core_ext/merb_module.rb
|
77
|
-
- lib/merb/core_ext/merb_numeric.rb
|
78
|
-
- lib/merb/core_ext/merb_object.rb
|
79
|
-
- lib/merb/core_ext/merb_string.rb
|
80
|
-
- lib/merb/core_ext/merb_symbol.rb
|
81
|
-
- lib/merb/generators/merb_app
|
82
|
-
- lib/merb/generators/merb_app/merb_app.rb
|
83
76
|
- lib/merb/mixins/basic_authentication_mixin.rb
|
84
77
|
- lib/merb/mixins/controller_mixin.rb
|
85
78
|
- lib/merb/mixins/erubis_capture_mixin.rb
|
@@ -87,52 +80,59 @@ files:
|
|
87
80
|
- lib/merb/mixins/render_mixin.rb
|
88
81
|
- lib/merb/mixins/responder_mixin.rb
|
89
82
|
- lib/merb/mixins/view_context_mixin.rb
|
83
|
+
- lib/merb/session
|
90
84
|
- lib/merb/session/merb_ar_session.rb
|
91
85
|
- lib/merb/session/merb_memory_session.rb
|
86
|
+
- lib/merb/template
|
92
87
|
- lib/merb/template/erubis.rb
|
93
88
|
- lib/merb/template/haml.rb
|
94
89
|
- lib/merb/template/markaby.rb
|
95
90
|
- lib/merb/template/xml_builder.rb
|
91
|
+
- lib/merb/template.rb
|
92
|
+
- lib/merb/vendor
|
96
93
|
- lib/merb/vendor/paginator
|
97
94
|
- lib/merb/vendor/paginator/paginator.rb
|
98
95
|
- lib/merb/vendor/paginator/README.txt
|
96
|
+
- lib/merb.rb
|
97
|
+
- lib/merb_tasks.rb
|
98
|
+
- lib/tasks
|
99
99
|
- lib/tasks/db.rake
|
100
100
|
- lib/tasks/merb.rake
|
101
101
|
- examples/README_EXAMPLES
|
102
102
|
- examples/skeleton
|
103
|
-
- examples/skeleton.tar
|
104
103
|
- examples/skeleton/dist
|
105
|
-
- examples/skeleton/log
|
106
|
-
- examples/skeleton/Rakefile
|
107
|
-
- examples/skeleton/script
|
108
|
-
- examples/skeleton/test
|
109
104
|
- examples/skeleton/dist/app
|
110
|
-
- examples/skeleton/dist/conf
|
111
|
-
- examples/skeleton/dist/lib
|
112
|
-
- examples/skeleton/dist/plugins
|
113
|
-
- examples/skeleton/dist/public
|
114
|
-
- examples/skeleton/dist/schema
|
115
105
|
- examples/skeleton/dist/app/controllers
|
106
|
+
- examples/skeleton/dist/app/controllers/application.rb
|
116
107
|
- examples/skeleton/dist/app/helpers
|
108
|
+
- examples/skeleton/dist/app/helpers/global_helper.rb
|
117
109
|
- examples/skeleton/dist/app/models
|
118
110
|
- examples/skeleton/dist/app/views
|
119
|
-
- examples/skeleton/dist/app/controllers/application.rb
|
120
|
-
- examples/skeleton/dist/app/helpers/global_helper.rb
|
121
111
|
- examples/skeleton/dist/app/views/layout
|
122
112
|
- examples/skeleton/dist/app/views/layout/application.herb
|
113
|
+
- examples/skeleton/dist/conf
|
123
114
|
- examples/skeleton/dist/conf/merb.yml
|
124
115
|
- examples/skeleton/dist/conf/merb_init.rb
|
125
116
|
- examples/skeleton/dist/conf/router.rb
|
126
117
|
- examples/skeleton/dist/conf/upload.conf
|
118
|
+
- examples/skeleton/dist/lib
|
119
|
+
- examples/skeleton/dist/plugins
|
120
|
+
- examples/skeleton/dist/public
|
127
121
|
- examples/skeleton/dist/public/images
|
128
122
|
- examples/skeleton/dist/public/javascripts
|
129
123
|
- examples/skeleton/dist/public/stylesheets
|
124
|
+
- examples/skeleton/dist/schema
|
130
125
|
- examples/skeleton/dist/schema/migrations
|
131
126
|
- examples/skeleton/dist/schema/migrations/001_add_sessions_table.rb
|
127
|
+
- examples/skeleton/log
|
128
|
+
- examples/skeleton/Rakefile
|
129
|
+
- examples/skeleton/script
|
132
130
|
- examples/skeleton/script/new_migration
|
133
131
|
- examples/skeleton/script/stop_merb
|
132
|
+
- examples/skeleton/test
|
134
133
|
- examples/skeleton/test/specs
|
135
134
|
- examples/skeleton/test/unit
|
135
|
+
- examples/skeleton.tar
|
136
136
|
test_files: []
|
137
137
|
|
138
138
|
rdoc_options: []
|