db @@ -1,3 +1,4 @@ tmp/* log/* db/* +waves .gitignore @@ -4,16 +4,11 @@ module Pages class Development < Default reloadable [ Pages ] - - #include Waves::Cache::RackCache - application.use Rack::Session::Cookie, :key => 'rack.session', - # :domain => 'foo.com', - :path => '/', - :expire_after => 2592000, - :secret => 'Change it' + port 2030 + debug true application.run Waves::Dispatchers::Default.new - + server Waves::Servers::Mongrel end end configurations/development.rb @@ -19,7 +19,7 @@ module Pages :secret => 'Change it' application.run Waves::Dispatchers::Default.new - + server Waves::Servers::Mongrel end end configurations/production.rb @@ -49,8 +49,8 @@ module Pages private def resolve( path ) - unless File.extname( path ).empty? - path = [ :db / domain / :file / path, :public / :images / path ].find do | path | + unless request.extension.nil? + path = [ :db / domain / :file / "#{path}.#{extension}", :public / :images / "#{path}.#{extension}" ].find do | path | File.exist?( path ) end path or not_found controllers/image.rb @@ -1,23 +1,24 @@ -require 'RMagick' +require 'rmagick' + class Image - + API = Magick::Image # width, height Dimensions = { :xlarge => [ 1200, 900 ], :large => [ 800, 600 ], :medium => [ 600, 400 ], :small => [ 300, 200 ], :xsmall => [ 200, 150 ], :thumb => [ 150, 100 ] } - + attr_reader :data def initialize( data = nil ) @data = data end - + def Image.read( path ) Image.new( ::File.read( path ) ) end - + def resize!( size = nil ) return self unless ( size && Array === size ) width, height = *size @@ -25,7 +26,8 @@ class Image @data = image.resize_to_fit!(width,height).to_blob self end - + def to_blob ; @data ; end -end \ No newline at end of file +end + lib/image.rb @@ -1,5 +1,6 @@ require 'filebase/drivers/yaml' Filebase.storage = Filebase::Drivers::YAML + module Pages module Models models/default.rb @@ -6,8 +6,6 @@ module Pages # special image handling to deal with image resizing on( :get, :get => [ 'images', { :asset => true } ] ) do - # example of http freshness - images are valid for 1 hour - rack-cache will return the cached copy. - response['Cache-Control'] = 'max-age=3600' unless response['Cache-Control'] controller.get( captured.asset * '/' ) end resources/image.rb @@ -9,36 +9,39 @@ module Pages # otherwise assume we are matching against a resource on( true, [ :resource, { :rest => true } ] ) { to( captured.resource ) } - # for accessing admin page and updating site info -- requires authentication - on( [ :get, :post ], [ 'admin' ] ) { to( :site ) } - on( [ :get, :post ], [ 'admin', { :rest => true } ] ) { to( :site ) } + on( :get, [ 'javascript', true ] ) { to( :media ) } + on( :get, [ 'css', true ] ) { to( :media ) } + on( :get, [ 'images', true ] ) { to( :image ) } - # special URL just for login and authenticating - on( [ :get, :post ], [ 'login' ] ) { to( :user ) } - - # logout - on( :get, [ 'logout' ] ) { to( :user ) } - - # register - on( :get, :register => [ 'user' ] ) { to( :user ) } - - # images - on( :get, [ 'images' , true ] ) { to( :image ) } - - # whatever as an extension comes from public or theme directory. - # on( :get, true, :ext => [ :css, :js, :swf, :gif, :png, :jpg, :htm, :ico ] ) { to( :media ) } - # on( :get, true, :ext => [ :* ] ) { to( :media ) } - on( true, [ :resource, { :rest => true } ], :ext => [ :rss, :xml ] ) { to( captured.resource ) } - - # before anything else, check the accepts headers and route accordingly - on( :get, true, :accept => [ :rss ] ) { to( :blog ) } - - # updating status on social network - on( true, [ 'social' , :name ] ) { to( :social ) } - - # # special URL just payment notification - # on( :post, [ 'donation' ] ) { to( :payment ) } - # on( [ :get, :post ], [ 'payment-notification' ] ) { to( :payment ) } + # # for accessing admin page and updating site info -- requires authentication + # on( [ :get, :post ], [ 'admin' ] ) { to( :site ) } + # on( [ :get, :post ], [ 'admin', { :rest => true } ] ) { to( :site ) } + # + # # special URL just for login and authenticating + # on( [ :get, :post ], [ 'login' ] ) { to( :user ) } + # + # # logout + # on( :get, [ 'logout' ] ) { to( :user ) } + # + # # register + # on( :get, :register => [ 'user' ] ) { to( :user ) } + # + # # images + # on( :get, [ 'images' , true ] ) { to( :image ) } + # + # # whatever as an extension comes from public or theme directory. + # on( :get, [ %w( javascript css) ] ) { to( :media ) } + # on( true, [ :resource, { :rest => true } ], :ext => [ :rss, :xml ] ) { to( captured.resource ) } + # + # # before anything else, check the accepts headers and route accordingly + # on( :get, true, :accept => [ :rss ] ) { to( :blog ) } + # + # # updating status on social network + # on( true, [ 'social' , :name ] ) { to( :social ) } + # + # # # special URL just payment notification + # # on( :post, [ 'donation' ] ) { to( :payment ) } + # # on( [ :get, :post ], [ 'payment-notification' ] ) { to( :payment ) } end end resources/map.rb @@ -6,9 +6,7 @@ module Pages include Waves::Resources::Mixin - on( :get, :get => [ 'media', :mediatype, { :asset => true } ] ) do - # example of http freshness - js and css are valid for 1 hour - rack-cache will return the cached copy of css and js. - response['Cache-Control'] = 'max-age=3600' + on( :get, :get => [ :mediatype, { :asset => true } ], :ext => true ) do controller.get( captured.mediatype, (captured.asset * '/') + (request.ext || '')) end resources/media.rb example_db/localhost/blog/test-blog.yml example_db/localhost/file/feed.gif example_db/localhost/file/feed.png example_db/localhost/image/banner.yml example_db/localhost/image/files/.DS_Store.jpg example_db/localhost/image/files/banner example_db/localhost/site.yml example_db/localhost/story/banner.yml example_db/localhost/story/feed.yml example_db/localhost/story/footer.yml example_db/localhost/story/head.yml example_db/localhost/story/home.yml example_db/localhost/story/menu.yml example_db/localhost/story/sidebar.yml example_db/localhost/story/test-story-1.yml example_db/localhost/story/test-story-2.yml example_db/localhost/theme/comments.css example_db/localhost/theme/forms.css example_db/localhost/theme/site.css example_db/localhost/theme/site.js example_db/localhost/user/default-example-com.yml 366011771bc90f6c77f07180bf5ca15497a29e9d Dan Yoder dan@zeraweb.com http://github.com/dyoder/pages/commit/3611209356661cadbefbb8e9625d38bcc0f64d90 3611209356661cadbefbb8e9625d38bcc0f64d90 2009-08-05T00:22:36-07:00 2009-08-05T00:22:36-07:00 Fixed loading image as a file (i.e. not as an image object). 48c54cfbeabd3e70a5aea02147f5ce8b5993f3a3 Dan Yoder dan@zeraweb.com