waves-stable 0.7.7 → 2009.3.10
Sign up to get free protection for your applications and to get access to all the features.
- data/bin/waves +20 -74
- data/doc/HISTORY +1 -44
- data/doc/README +1 -0
- data/doc/VERSION +1 -0
- data/lib/caches/file.rb +48 -0
- data/lib/caches/memcached.rb +40 -0
- data/lib/caches/simple.rb +25 -0
- data/lib/caches/synchronized.rb +25 -0
- data/lib/commands/console.rb +35 -0
- data/lib/commands/generate.rb +52 -0
- data/lib/commands/help.rb +5 -0
- data/lib/commands/{waves-server.rb → server.rb} +16 -3
- data/lib/dispatchers/base.rb +22 -21
- data/lib/dispatchers/default.rb +10 -66
- data/lib/ext/float.rb +13 -0
- data/lib/{utilities → ext}/hash.rb +2 -2
- data/lib/{utilities → ext}/integer.rb +5 -2
- data/lib/ext/kernel.rb +20 -0
- data/lib/ext/module.rb +20 -0
- data/lib/{utilities → ext}/object.rb +3 -5
- data/lib/ext/string.rb +20 -0
- data/lib/ext/symbol.rb +11 -0
- data/lib/ext/tempfile.rb +5 -0
- data/lib/foundations/classic.rb +66 -0
- data/lib/foundations/compact.rb +50 -0
- data/lib/helpers/basic.rb +11 -0
- data/lib/helpers/doc_type.rb +34 -0
- data/lib/helpers/extended.rb +21 -0
- data/lib/helpers/form.rb +3 -1
- data/lib/helpers/formatting.rb +3 -3
- data/lib/helpers/layouts.rb +37 -0
- data/lib/helpers/model.rb +8 -4
- data/lib/helpers/view.rb +2 -4
- data/lib/layers/inflect/english.rb +48 -5
- data/lib/layers/mvc.rb +18 -18
- data/lib/layers/mvc/controllers.rb +41 -0
- data/lib/layers/mvc/extensions.rb +52 -0
- data/lib/layers/orm/migration.rb +1 -1
- data/lib/layers/orm/{active_record.rb → providers/active_record.rb} +9 -14
- data/lib/layers/orm/{active_record → providers/active_record}/migrations/empty.rb.erb +0 -0
- data/lib/layers/orm/{active_record → providers/active_record}/tasks/generate.rb +1 -1
- data/lib/layers/orm/{active_record → providers/active_record}/tasks/schema.rb +1 -1
- data/lib/layers/orm/{data_mapper.rb → providers/data_mapper.rb} +3 -4
- data/lib/layers/orm/providers/filebase.rb +25 -0
- data/lib/layers/orm/{sequel.rb → providers/sequel.rb} +11 -7
- data/lib/layers/orm/{sequel → providers/sequel}/migrations/empty.rb.erb +0 -0
- data/lib/layers/orm/{sequel → providers/sequel}/tasks/generate.rb +5 -3
- data/lib/layers/orm/{sequel → providers/sequel}/tasks/schema.rb +2 -2
- data/lib/{renderers → layers/renderers}/erubis.rb +13 -16
- data/lib/{renderers → layers/renderers}/haml.rb +27 -25
- data/lib/layers/renderers/markaby.rb +29 -0
- data/lib/matchers/accept.rb +21 -0
- data/lib/matchers/base.rb +30 -0
- data/lib/matchers/content_type.rb +17 -0
- data/lib/matchers/path.rb +67 -0
- data/lib/matchers/query.rb +21 -0
- data/lib/matchers/request.rb +27 -0
- data/lib/matchers/resource.rb +19 -0
- data/lib/matchers/traits.rb +19 -0
- data/lib/matchers/uri.rb +20 -0
- data/lib/renderers/mixin.rb +15 -29
- data/lib/resources/mixin.rb +134 -0
- data/lib/resources/paths.rb +34 -0
- data/lib/runtime/configuration.rb +51 -136
- data/lib/runtime/console.rb +4 -1
- data/lib/runtime/logger.rb +24 -48
- data/lib/runtime/mime_types.rb +516 -2
- data/lib/runtime/mocks.rb +14 -0
- data/lib/runtime/monitor.rb +32 -0
- data/lib/runtime/request.rb +107 -39
- data/lib/runtime/response.rb +5 -2
- data/lib/runtime/response_mixin.rb +41 -22
- data/lib/runtime/runtime.rb +67 -0
- data/lib/runtime/server.rb +14 -101
- data/lib/runtime/session.rb +4 -43
- data/lib/runtime/worker.rb +86 -0
- data/lib/servers/base.rb +42 -0
- data/lib/servers/mongrel.rb +13 -0
- data/lib/servers/webrick.rb +13 -0
- data/lib/tasks/gem.rb +1 -0
- data/lib/tasks/generate.rb +67 -62
- data/lib/views/errors.rb +49 -0
- data/lib/views/mixin.rb +34 -82
- data/lib/waves.rb +36 -57
- data/samples/blog/Rakefile +16 -5
- data/samples/blog/configurations/default.rb +11 -0
- data/samples/blog/configurations/development.rb +9 -11
- data/samples/blog/configurations/production.rb +11 -15
- data/samples/blog/models/comment.rb +9 -0
- data/samples/blog/models/entry.rb +17 -0
- data/samples/blog/public/css/site.css +13 -2
- data/samples/blog/public/javascript/jquery-1.2.6.min.js +32 -0
- data/samples/blog/resources/entry.rb +39 -0
- data/samples/blog/resources/map.rb +9 -0
- data/samples/blog/schema/migrations/001_initial_schema.rb +3 -3
- data/samples/blog/schema/migrations/002_add_comments.rb +2 -2
- data/samples/blog/startup.rb +8 -6
- data/samples/blog/templates/comment/add.mab +6 -4
- data/samples/blog/templates/comment/list.mab +4 -4
- data/samples/blog/templates/entry/{editor.mab → edit.mab} +7 -6
- data/samples/blog/templates/entry/list.mab +10 -5
- data/samples/blog/templates/entry/show.mab +16 -7
- data/samples/blog/templates/entry/summary.mab +8 -4
- data/samples/blog/templates/errors/not_found_404.mab +6 -1
- data/samples/blog/templates/layouts/default.mab +5 -3
- data/samples/blog/templates/waves/status.mab +85 -0
- data/{app → templates/classic}/Rakefile +21 -3
- data/templates/classic/configurations/default.rb.erb +9 -0
- data/{app → templates/classic}/configurations/development.rb.erb +3 -8
- data/{app → templates/classic}/configurations/production.rb.erb +3 -5
- data/{app → templates/classic}/controllers/.gitignore +0 -0
- data/{app/doc → templates/classic/helpers}/.gitignore +0 -0
- data/{app/helpers → templates/classic/lib/tasks}/.gitignore +0 -0
- data/{app/lib/tasks → templates/classic/models}/.gitignore +0 -0
- data/{app/log → templates/classic/public/css}/.gitignore +0 -0
- data/{app/models → templates/classic/public/flash}/.gitignore +0 -0
- data/{app/public/css → templates/classic/public/images}/.gitignore +0 -0
- data/{app/public/flash → templates/classic/public/javascript}/.gitignore +0 -0
- data/{app/public/images → templates/classic/resources}/.gitignore +0 -0
- data/templates/classic/resources/map.rb.erb +8 -0
- data/{app/public/javascript → templates/classic/schema/migrations}/.gitignore +0 -0
- data/templates/classic/startup.rb.erb +11 -0
- data/templates/classic/templates/errors/not_found_404.mab +7 -0
- data/templates/classic/templates/errors/server_error_500.mab +7 -0
- data/{app → templates/classic}/templates/layouts/default.mab +0 -0
- data/{app/schema/migrations → templates/classic/tmp/sessions}/.gitignore +0 -0
- data/{app/tmp/sessions → templates/classic/views}/.gitignore +0 -0
- data/templates/compact/startup.rb.erb +11 -0
- metadata +152 -258
- data/app/bin/waves-console +0 -4
- data/app/bin/waves-server +0 -4
- data/app/configurations/mapping.rb.erb +0 -14
- data/app/lib/application.rb.erb +0 -5
- data/app/startup.rb +0 -5
- data/app/templates/errors/not_found_404.mab +0 -2
- data/app/templates/errors/server_error_500.mab +0 -2
- data/app/views/.gitignore +0 -0
- data/bin/waves-console +0 -4
- data/bin/waves-server +0 -4
- data/lib/commands/waves-console.rb +0 -21
- data/lib/controllers/base.rb +0 -11
- data/lib/controllers/mixin.rb +0 -165
- data/lib/foundations/default.rb +0 -27
- data/lib/foundations/simple.rb +0 -30
- data/lib/helpers/asset_helper.rb +0 -67
- data/lib/helpers/common.rb +0 -66
- data/lib/helpers/default.rb +0 -13
- data/lib/helpers/number_helper.rb +0 -25
- data/lib/helpers/tag_helper.rb +0 -58
- data/lib/helpers/url_helper.rb +0 -77
- data/lib/layers/default_errors.rb +0 -26
- data/lib/layers/inflect/english/rules.rb +0 -88
- data/lib/layers/inflect/english/string.rb +0 -24
- data/lib/layers/orm/filebase.rb +0 -22
- data/lib/layers/simple.rb +0 -32
- data/lib/layers/simple_errors.rb +0 -23
- data/lib/mapping/mapping.rb +0 -289
- data/lib/mapping/pretty_urls.rb +0 -96
- data/lib/renderers/markaby.rb +0 -33
- data/lib/runtime/application.rb +0 -69
- data/lib/runtime/blackboard.rb +0 -57
- data/lib/runtime/debugger.rb +0 -9
- data/lib/runtime/response_proxy.rb +0 -30
- data/lib/tasks/cluster.rb +0 -26
- data/lib/utilities/inflect.rb +0 -110
- data/lib/utilities/module.rb +0 -21
- data/lib/utilities/proc.rb +0 -16
- data/lib/utilities/string.rb +0 -49
- data/lib/utilities/symbol.rb +0 -10
- data/lib/utilities/tempfile.rb +0 -9
- data/lib/views/base.rb +0 -9
- data/samples/blog/bin/waves-console +0 -3
- data/samples/blog/bin/waves-server +0 -3
- data/samples/blog/configurations/mapping.rb +0 -23
- data/samples/blog/doc/EMTPY +0 -0
- data/samples/blog/lib/application.rb +0 -5
- data/verify/app_generation/helpers.rb +0 -24
- data/verify/app_generation/startup.rb +0 -39
- data/verify/blackboard/blackboard_verify.rb +0 -92
- data/verify/blackboard/helpers.rb +0 -5
- data/verify/configurations/attributes.rb +0 -37
- data/verify/configurations/helpers.rb +0 -1
- data/verify/configurations/rack_integration.rb +0 -29
- data/verify/controllers/base.rb +0 -37
- data/verify/controllers/helpers.rb +0 -13
- data/verify/controllers/interface.rb +0 -51
- data/verify/core/helpers.rb +0 -3
- data/verify/core/utilities.rb +0 -177
- data/verify/foundations/default.rb +0 -86
- data/verify/foundations/default_application/Rakefile +0 -14
- data/verify/foundations/default_application/bin/waves-console +0 -3
- data/verify/foundations/default_application/bin/waves-server +0 -3
- data/verify/foundations/default_application/configurations/development.rb +0 -26
- data/verify/foundations/default_application/configurations/mapping.rb +0 -14
- data/verify/foundations/default_application/configurations/production.rb +0 -30
- data/verify/foundations/default_application/controllers/default.rb +0 -15
- data/verify/foundations/default_application/controllers/loaded.rb +0 -15
- data/verify/foundations/default_application/defaultapplication.db +0 -0
- data/verify/foundations/default_application/helpers/loaded.rb +0 -10
- data/verify/foundations/default_application/lib/application.rb +0 -5
- data/verify/foundations/default_application/models/default.rb +0 -13
- data/verify/foundations/default_application/models/loaded.rb +0 -13
- data/verify/foundations/default_application/schema/migrations/templates/empty.rb.erb +0 -9
- data/verify/foundations/default_application/startup.rb +0 -7
- data/verify/foundations/default_application/templates/errors/not_found_404.mab +0 -2
- data/verify/foundations/default_application/templates/errors/server_error_500.mab +0 -2
- data/verify/foundations/default_application/templates/layouts/default.mab +0 -14
- data/verify/foundations/default_application/views/default.rb +0 -7
- data/verify/foundations/default_application/views/loaded.rb +0 -15
- data/verify/foundations/helpers.rb +0 -1
- data/verify/foundations/simple.rb +0 -25
- data/verify/helpers.rb +0 -76
- data/verify/layers/data_mapper/association_verify.rb +0 -87
- data/verify/layers/default_errors.rb +0 -29
- data/verify/layers/helpers.rb +0 -1
- data/verify/layers/migration.rb +0 -33
- data/verify/layers/sequel/model.rb +0 -41
- data/verify/mapping/always.rb +0 -19
- data/verify/mapping/filters.rb +0 -65
- data/verify/mapping/handle.rb +0 -24
- data/verify/mapping/helpers.rb +0 -7
- data/verify/mapping/matches.rb +0 -27
- data/verify/mapping/named.rb +0 -29
- data/verify/mapping/options.rb +0 -17
- data/verify/mapping/path.rb +0 -40
- data/verify/mapping/response_proxy.rb +0 -50
- data/verify/mapping/threaded.rb +0 -25
- data/verify/requests/helpers.rb +0 -16
- data/verify/requests/request.rb +0 -73
- data/verify/requests/response.rb +0 -59
- data/verify/requests/session.rb +0 -54
- data/verify/views/helpers.rb +0 -1
- data/verify/views/rendering.rb +0 -34
- data/verify/views/templates/foo.erb +0 -0
- data/verify/views/templates/moo.erb +0 -0
- data/verify/views/templates/moo.mab +0 -0
data/lib/helpers/formatting.rb
CHANGED
@@ -19,9 +19,9 @@ module Waves
|
|
19
19
|
# Treat content as Textile.
|
20
20
|
def textile( content )
|
21
21
|
return if content.nil? or content.empty?
|
22
|
-
( ::RedCloth::TEXTILE_TAGS << [ 96.chr, '&8216;'] ).each do |pat,ent|
|
23
|
-
|
24
|
-
end
|
22
|
+
#( ::RedCloth::TEXTILE_TAGS << [ 96.chr, '&8216;'] ).each do |pat,ent|
|
23
|
+
# content.gsub!( pat, ent.gsub('&','&#') )
|
24
|
+
#end
|
25
25
|
self << ::RedCloth.new( content ).to_html
|
26
26
|
end
|
27
27
|
|
@@ -0,0 +1,37 @@
|
|
1
|
+
module Waves
|
2
|
+
|
3
|
+
module Helpers
|
4
|
+
|
5
|
+
module Layouts
|
6
|
+
|
7
|
+
# Invokes a layout view (i.e., a view from the layouts template directory), using
|
8
|
+
# the assigns parameter to define instance variables for the view. The block is
|
9
|
+
# evaluated and also passed into the view as the +layout_content+ instance variable.
|
10
|
+
#
|
11
|
+
# You can define a layout just by creating a template and then calling the
|
12
|
+
# +layout_content+ accessor when you want to embed the caller's content.
|
13
|
+
#
|
14
|
+
# == Example
|
15
|
+
#
|
16
|
+
# doctype :html4_transitional
|
17
|
+
# html do
|
18
|
+
# title @title # passed as an assigns parameter
|
19
|
+
# end
|
20
|
+
# body do
|
21
|
+
# layout_content
|
22
|
+
# end
|
23
|
+
#
|
24
|
+
def layout( name, assigns = {}, &block )
|
25
|
+
assigns[ :layout_content ] = capture(&block)
|
26
|
+
self << Waves.main::Views[:layouts].process( request ) do
|
27
|
+
send( name, assigns )
|
28
|
+
end
|
29
|
+
end
|
30
|
+
|
31
|
+
def layout_content
|
32
|
+
self << @layout_content
|
33
|
+
end
|
34
|
+
|
35
|
+
end
|
36
|
+
end
|
37
|
+
end
|
data/lib/helpers/model.rb
CHANGED
@@ -17,15 +17,19 @@ module Waves
|
|
17
17
|
# then be called from the template instead of the model helper.
|
18
18
|
#
|
19
19
|
module Model
|
20
|
-
|
20
|
+
|
21
|
+
def model( name )
|
22
|
+
Waves.main::Models[ name ][ domain ]
|
23
|
+
end
|
24
|
+
|
21
25
|
# Just like model.all. Returns all the instances of that model.
|
22
26
|
def all( model )
|
23
|
-
|
27
|
+
model( model ).all
|
24
28
|
end
|
25
|
-
|
29
|
+
|
26
30
|
# Finds a specific instance using the name field
|
27
31
|
def find( model, name )
|
28
|
-
|
32
|
+
model( model )[name ] rescue nil
|
29
33
|
end
|
30
34
|
|
31
35
|
end
|
data/lib/helpers/view.rb
CHANGED
@@ -10,12 +10,10 @@ module Waves
|
|
10
10
|
# view) and returns the result of evaluating the view as content in the current
|
11
11
|
# template.
|
12
12
|
module View
|
13
|
-
|
13
|
+
|
14
14
|
# Invokes the view for the given model, passing the assigns as instance variables.
|
15
15
|
def view( model, view, assigns = {} )
|
16
|
-
self << Waves.
|
17
|
-
send( view, assigns )
|
18
|
-
end
|
16
|
+
self << Waves.main::Views[ model ].new( request ).send( view, assigns )
|
19
17
|
end
|
20
18
|
|
21
19
|
|
@@ -1,16 +1,59 @@
|
|
1
|
-
require 'layers/inflect/english/rules'
|
2
|
-
require 'layers/inflect/english/string'
|
3
1
|
module Waves
|
4
2
|
module Layers
|
5
3
|
module Inflect
|
4
|
+
|
5
|
+
# Adds plural/singular methods for English to String
|
6
6
|
module English
|
7
7
|
|
8
8
|
def self.included(app)
|
9
9
|
|
10
|
-
|
10
|
+
require 'english/inflect'
|
11
|
+
|
12
|
+
Waves::Resources::Mixin::ClassMethods.module_eval do
|
13
|
+
def singular ; basename.snake_case.singular ; end
|
14
|
+
def plural ; basename.snake_case.plural ; end
|
15
|
+
end
|
16
|
+
|
17
|
+
Waves::Resources::Mixin.module_eval do
|
18
|
+
def singular ; self.class.singular ; end
|
19
|
+
def plural ; self.class.plural ; end
|
20
|
+
end
|
11
21
|
|
12
|
-
|
13
|
-
|
22
|
+
Waves::Resources::Paths.module_eval do
|
23
|
+
def resource ; self.class.resource.singular ; end
|
24
|
+
def resources ; self.class.resource.plural ; end
|
25
|
+
|
26
|
+
# TODO: be nice to DRY this up ... basically the same code
|
27
|
+
# as the mixin except with the singular / plural stuff
|
28
|
+
# mixed in ...
|
29
|
+
def generate( template, args )
|
30
|
+
return "/#{ args * '/' }" unless template.is_a?( Array ) and not template.empty?
|
31
|
+
path = []
|
32
|
+
( "/#{ path * '/' }" ) if template.all? do | want |
|
33
|
+
case want
|
34
|
+
when true then path += args
|
35
|
+
when String then path << want
|
36
|
+
when Symbol
|
37
|
+
case want
|
38
|
+
when :resource then path << resource
|
39
|
+
when :resources then path << resources
|
40
|
+
else path << args.shift
|
41
|
+
end
|
42
|
+
when Regexp then path << args.shift
|
43
|
+
when Hash
|
44
|
+
key, value = want.to_a.first
|
45
|
+
case key
|
46
|
+
when :resource then path << resource
|
47
|
+
when :resources then path << resources
|
48
|
+
else
|
49
|
+
case value
|
50
|
+
when true then path += args
|
51
|
+
when String, Symbol, RegExp then path << args.unshift
|
52
|
+
end
|
53
|
+
end
|
54
|
+
end
|
55
|
+
end
|
56
|
+
end
|
14
57
|
end
|
15
58
|
|
16
59
|
end
|
data/lib/layers/mvc.rb
CHANGED
@@ -1,22 +1,16 @@
|
|
1
1
|
module Waves
|
2
2
|
module Layers
|
3
|
-
# The MVC layer establishes the Models, Views, Controllers, and Helpers namespaces inside
|
4
|
-
# a Waves application. In each namespace, undefined constants are handled by AutoCode, which
|
5
|
-
# loads the constant from the correct file in the appropriate directory if it exists, or creates
|
6
|
-
# from default otherwise.
|
7
3
|
module MVC
|
8
4
|
|
9
5
|
def self.included( app )
|
10
6
|
|
11
|
-
|
12
|
-
|
13
|
-
def app.controllers ; self::Controllers ; end
|
14
|
-
def app.helpers ; self::Helpers ; end
|
7
|
+
require 'layers/mvc/extensions'
|
8
|
+
require 'layers/mvc/controllers'
|
15
9
|
|
16
10
|
app.auto_create_module( :Models ) do
|
17
11
|
include AutoCode
|
18
12
|
auto_create_class :Default
|
19
|
-
auto_load :Default, :directories => [:models]
|
13
|
+
auto_load :Default, :directories => [ :models ]
|
20
14
|
end
|
21
15
|
|
22
16
|
app.auto_eval( :Models ) do
|
@@ -24,30 +18,36 @@ module Waves
|
|
24
18
|
auto_load true, :directories => [ :models ]
|
25
19
|
end
|
26
20
|
|
27
|
-
app.auto_create_module( :Views )
|
21
|
+
app.auto_create_module( :Views ) do
|
22
|
+
include AutoCode
|
23
|
+
auto_create_class :Default, Waves::Views::Base
|
24
|
+
auto_load :Default, :directories => [ :views ]
|
25
|
+
end
|
28
26
|
|
29
27
|
app.auto_eval( :Views ) do
|
30
|
-
auto_create_class :Default, Waves::Views::Base
|
31
|
-
auto_load :Default, :directories => [:views]
|
32
28
|
auto_create_class true, app::Views::Default
|
33
29
|
auto_load true, :directories => [ :views ]
|
34
30
|
end
|
35
31
|
|
36
|
-
app.auto_create_module( :Controllers )
|
32
|
+
app.auto_create_module( :Controllers ) do
|
33
|
+
include AutoCode
|
34
|
+
auto_create_class :Default, Waves::Controllers::Base
|
35
|
+
auto_load :Default, :directories => [ :controllers ]
|
36
|
+
end
|
37
37
|
|
38
38
|
app.auto_eval( :Controllers ) do
|
39
|
-
auto_create_class :Default, Waves::Controllers::Base
|
40
|
-
auto_load :Default, :directories => [:controllers]
|
41
39
|
auto_create_class true, app::Controllers::Default
|
42
40
|
auto_load true, :directories => [ :controllers ]
|
43
41
|
end
|
44
42
|
|
45
43
|
app.auto_create_module( :Helpers ) do
|
46
44
|
include AutoCode
|
47
|
-
auto_create_module { include Waves::Helpers::
|
45
|
+
auto_create_module( :Default ) { include Waves::Helpers::Extended }
|
46
|
+
auto_load :Default, :directories => [ :helpers ]
|
47
|
+
auto_create_module( true ) { include app::Helpers::Default }
|
48
48
|
auto_load true, :directories => [ :helpers ]
|
49
|
-
end
|
50
|
-
|
49
|
+
end
|
50
|
+
|
51
51
|
end
|
52
52
|
end
|
53
53
|
end
|
@@ -0,0 +1,41 @@
|
|
1
|
+
module Waves
|
2
|
+
|
3
|
+
module Controllers
|
4
|
+
|
5
|
+
module Mixin
|
6
|
+
|
7
|
+
attr_reader :request
|
8
|
+
|
9
|
+
include Waves::ResponseMixin
|
10
|
+
|
11
|
+
def initialize( request )
|
12
|
+
@request = request
|
13
|
+
end
|
14
|
+
|
15
|
+
def find( name )
|
16
|
+
model.find( name )
|
17
|
+
end
|
18
|
+
|
19
|
+
def create( attributes )
|
20
|
+
model.create( attributes )
|
21
|
+
end
|
22
|
+
|
23
|
+
def update( name, attributes )
|
24
|
+
find( name ).attributes = attributes
|
25
|
+
end
|
26
|
+
|
27
|
+
def delete( name )
|
28
|
+
model.delete( name )
|
29
|
+
end
|
30
|
+
|
31
|
+
def list
|
32
|
+
model.all
|
33
|
+
end
|
34
|
+
|
35
|
+
end
|
36
|
+
|
37
|
+
class Base ; include Mixin ; end
|
38
|
+
|
39
|
+
end
|
40
|
+
|
41
|
+
end
|
@@ -0,0 +1,52 @@
|
|
1
|
+
module Waves
|
2
|
+
|
3
|
+
module Resources
|
4
|
+
|
5
|
+
module Mixin
|
6
|
+
|
7
|
+
def controller( resource = nil )
|
8
|
+
resource ||= self.class.basename
|
9
|
+
@controller ||= app::Controllers[ resource ].new( @request )
|
10
|
+
end
|
11
|
+
|
12
|
+
def view( resource = nil )
|
13
|
+
resource ||= self.class.basename
|
14
|
+
@view ||= app::Views[ resource ].new( @request )
|
15
|
+
end
|
16
|
+
|
17
|
+
end
|
18
|
+
|
19
|
+
end
|
20
|
+
|
21
|
+
module ResponseMixin
|
22
|
+
|
23
|
+
# Returns the name of the model corresponding to this controller by taking the basename
|
24
|
+
# of the module and converting it to snake case. If the model plurality is different than
|
25
|
+
# the controller, this will not, in fact, be the model name.
|
26
|
+
def model_name; self.class.basename.snake_case; end
|
27
|
+
|
28
|
+
# Returns the model corresponding to this controller by naively assuming that
|
29
|
+
# +model_name+ must be correct. This allows you to write generic controller methods such as:
|
30
|
+
#
|
31
|
+
# model.find( name )
|
32
|
+
#
|
33
|
+
# to find an instance of a given model. Again, the plurality of the controller and
|
34
|
+
# model must be the same for this to work.
|
35
|
+
def model; app::Models[ model_name.intern ]; end
|
36
|
+
|
37
|
+
# MVC Params get automatically destructured with the keys as accessors methods.
|
38
|
+
# You can still access the original query by calling request.query
|
39
|
+
def query
|
40
|
+
@query ||= Waves::Request::Query.new(
|
41
|
+
Waves::Request::Utilities.destructure( request.query ) )
|
42
|
+
end
|
43
|
+
|
44
|
+
# Attributes are just the query elements specific to the model associated with
|
45
|
+
# the current resource.
|
46
|
+
def attributes
|
47
|
+
query[ model_name ]
|
48
|
+
end
|
49
|
+
|
50
|
+
end
|
51
|
+
|
52
|
+
end
|
data/lib/layers/orm/migration.rb
CHANGED
@@ -56,7 +56,7 @@ module Waves
|
|
56
56
|
# <em>orm</em> can be a symbol or string
|
57
57
|
def self.migration_template(orm, name=nil)
|
58
58
|
file = ( name || 'empty' ) + '.rb.erb'
|
59
|
-
source = File.dirname(__FILE__) / orm / :migrations / file
|
59
|
+
source = File.dirname(__FILE__) / :providers / orm / :migrations / file
|
60
60
|
end
|
61
61
|
|
62
62
|
# Given a migration name, returns the path of the file that would be created.
|
@@ -17,15 +17,10 @@ module Waves
|
|
17
17
|
# - create
|
18
18
|
# - delete(name)
|
19
19
|
# - update(name)
|
20
|
-
|
20
|
+
|
21
|
+
|
21
22
|
def self.included(app)
|
22
|
-
|
23
|
-
class Symbol
|
24
|
-
# Protect ActiveRecord from itself by undefining the to_proc method.
|
25
|
-
# Don't worry, AR will redefine it.
|
26
|
-
alias :extensions_to_proc :to_proc
|
27
|
-
remove_method :to_proc
|
28
|
-
end
|
23
|
+
|
29
24
|
require 'active_record'
|
30
25
|
require "#{File.dirname(__FILE__)}/active_record/tasks/schema" if defined?(Rake)
|
31
26
|
require "#{File.dirname(__FILE__)}/active_record/tasks/generate" if defined?(Rake)
|
@@ -66,20 +61,20 @@ module Waves
|
|
66
61
|
model.find(:all)
|
67
62
|
end
|
68
63
|
|
69
|
-
def find(
|
70
|
-
model.
|
64
|
+
def find( name )
|
65
|
+
model.find_by_name(name) or not_found
|
71
66
|
end
|
72
67
|
|
73
68
|
def create
|
74
69
|
model.create( attributes )
|
75
70
|
end
|
76
71
|
|
77
|
-
def delete(
|
78
|
-
find(
|
72
|
+
def delete( name )
|
73
|
+
find( name ).destroy
|
79
74
|
end
|
80
75
|
|
81
|
-
def update(
|
82
|
-
instance = find(
|
76
|
+
def update( name )
|
77
|
+
instance = find( name )
|
83
78
|
instance.update_attributes( attributes )
|
84
79
|
instance
|
85
80
|
end
|
File without changes
|
@@ -1,7 +1,3 @@
|
|
1
|
-
gem 'dm-core', '=0.9.0'
|
2
|
-
|
3
|
-
require 'data_mapper'
|
4
|
-
|
5
1
|
module Waves
|
6
2
|
module Layers
|
7
3
|
module ORM
|
@@ -10,6 +6,9 @@ module Waves
|
|
10
6
|
module DataMapper
|
11
7
|
|
12
8
|
def self.included(app)
|
9
|
+
gem 'dm-core', '=0.9.0'
|
10
|
+
|
11
|
+
require 'data_mapper'
|
13
12
|
|
14
13
|
def app.database
|
15
14
|
@adapter ||= ::DataMapper.setup(:main_repository, config.database[:database])
|
@@ -0,0 +1,25 @@
|
|
1
|
+
module Waves
|
2
|
+
module Layers
|
3
|
+
module ORM
|
4
|
+
|
5
|
+
# The Filebase ORM layer configures model classes to use Filebase with a datastore located in
|
6
|
+
# <tt>db/model_name</tt>, where @model_name@ is the snakecased version of the class name.
|
7
|
+
#
|
8
|
+
# The Filebase store for Blog::Models::Entry would be located in <tt>db/entry</tt>, for example.
|
9
|
+
module Filebase
|
10
|
+
|
11
|
+
def self.included(app)
|
12
|
+
app.module_eval do
|
13
|
+
auto_eval( :Models ) do
|
14
|
+
auto_eval( true ) { include ::Filebase::Model[ :db / self.basename.snake_case ] }
|
15
|
+
end
|
16
|
+
end
|
17
|
+
end
|
18
|
+
|
19
|
+
end
|
20
|
+
|
21
|
+
end
|
22
|
+
|
23
|
+
end
|
24
|
+
|
25
|
+
end
|