app/controllers/mcms/content_items.rb app/models/mcms/content_item.rb app/models/mcms/user.rb app/views/mcms/content_items/edit.html.haml app/views/mcms/content_items/index.html.haml app/views/mcms/content_items/new.html.haml app/views/mcms/content_items/show.html.haml @@ -34,16 +34,3 @@ task :default => 'spec' # NAME YOUR RAKE FILES file_name.rake ############################################################################## -desc 'after doing a gem bundle --cached and updating application.yml run this task and set a hosts entry for site1, then open your browser' -task :gogogooo => [:merb_env] do - server = CouchRest::Server.new(Merb::Config[:couchdb_url]) - server.database!(Merb::Config[:database]) - user = User.create(:email => "a@a.com", :password => "123", :password_confirmation => "123") - site = Site.create(:name => "site1", :default_domain => "site1", :couchdb => "#{Merb::Config[:couchdb_url]}/#{Merb::Config[:database]}_site1",:domains => ["site1"], :admins => [user.id]) - ContentItem.use_database CouchRest.database!(site.couchdb) - ContentItem.create(:title => "Home", :url => "site1/", :pieces => {:main => "home page"}) - Mcms::Layout.use_database CouchRest.database!(site.couchdb) - layout = Mcms::Layout.create(:name => "default", :haml => "!!! XML\n!!!\n%html{ html_attrs('en-AU') }\n %head\n %meta{ :content => \"text/html; charset=utf-8\", :\"http-equiv\" => \"content-type\" }\n %title= @content_item.title\n %link{ :href => \"#layout_sass#\", :rel => \"stylesheet\", :type => \"text/css\"}\n %body\n #content= @content_item.to_html\n", :sass => "#content\n :color #f0f\n") - Mcms::SiteConfig.use_database CouchRest.database!(site.couchdb) - Mcms::SiteConfig.create(:"_id" => "thesiteconfig", :layouts => [layout.id]) -end Rakefile @@ -42,8 +42,8 @@ module Mcms @site.admins = [session.user.id] if @site.save - ContentItem.use_database CouchRest.database!(@site.couchdb) - ContentItem.create(:title => "Home", :url => "#{@site.default_domain}/", :pieces => {:main => "home page"}) + Mcms::ContentItem.use_database CouchRest.database!(@site.couchdb) + Mcms::ContentItem.create(:title => "Home", :url => "#{@site.default_domain}/", :pieces => {:main => "home page"}) Mcms::Layout.use_database CouchRest.database(@site.couchdb) layout = Mcms::Layout.create(:name => "default", :haml => "!!! XML\n!!!\n%html{ html_attrs('en-AU') }\n %head\n %meta{ :content => \"text/html; charset=utf-8\", :\"http-equiv\" => \"content-type\" }\n %title= @content_item.title\n %link{ :href => \"#layout_sass#\", :rel => \"stylesheet\", :type => \"text/css\"}\n %body\n #content= @content_item.to_html\n", :sass => "#content\n :color #f0f\n") Mcms::SiteConfig.use_database CouchRest.database(@site.couchdb) app/controllers/mcms/sites.rb @@ -53,10 +53,10 @@ Merb::Router.prepare do # site doesn't exist, create one redirect url(:"new_mcms/site") else - ContentItem.use_database CouchRest.database!(site_couchdb) + Mcms::ContentItem.use_database CouchRest.database!(site_couchdb) params.merge!(:url => "#{request.server_name}#{request.env["PATH_INFO"]}") p "ContentItem key: #{params[:url]}" - if p = ContentItem.by_url(:key => params[:url], :limit => 1).first then + if p = Mcms::ContentItem.by_url(:key => params[:url], :limit => 1).first then # p "layout_id is nil" layout_id = nil if p.has_layout? config/router.rb @@ -10,7 +10,7 @@ begin # Sets the default class ofr authentication. This is primarily used for # Plugins and the default strategies - Merb::Authentication.user_class = User + Merb::Authentication.user_class = Mcms::User Merb::Plugins.config[:"merb-auth"][:login_param] = :email merb/merb-auth/setup.rb app/controllers/content_items.rb app/models/content_item.rb app/models/user.rb app/views/content_items/edit.html.haml app/views/content_items/index.html.haml app/views/content_items/new.html.haml app/views/content_items/show.html.haml 5a72848adc49bdf6e28805e05ea255d19cd574ee Nicholas Orr nicholas.orr@zxgen.net http://github.com/MagnitudeCMS/magnitudecms/commit/900d86935a88a054c53989497dada6294d2357af 900d86935a88a054c53989497dada6294d2357af 2009-10-05T06:31:02-07:00 2009-10-05T06:31:02-07:00 user & content_item namespaced. remove rake task as it is all handled by mcms now 9aa06a2a4940e5812a285031b58e584c65812625 Nicholas Orr nicholas.orr@zxgen.net