@@ -2,4 +2,7 @@ class TextblockCell < Cell::Base def index "Testing index" end + + def edit + end end app/cells/textblock_cell.rb @@ -28,9 +28,37 @@ class JivepagesController < ApplicationController def new end + # Automatically create a site if none is given. + # Anonymous user owns all pages if there's no logged in user. def create begin - @jivepage = jivepage_scope.create_and_setup(params[:jivepage]) + @user = current_owner + begin + site_id = params[:jivepage][:site_id] + raise "Create a site" if site_id.blank? + site = Site.find(site_id, :conditions => {:user_id => @user.id}) + rescue + begin + logger.debug "\n\nCreating site with user_id: #{@user.id}\n\n" + site = Site.new + site.user = @user + site.save! + rescue + logger.debug "\n\nFAIL! #{$!}\n\n" + @jivepage = Jivepage.new + @jivepage.errors.add_to_base("Unable to create site: #{$!}, user: #{@user.inspect}") + flash[:notice] = 'Unable to create site' + respond_to do |format| + format.html { render :action => "new" } + format.xml { render :xml => @jivepage.errors, :status => :unprocessable_entity } + end + return + end + end + + @jivepage = site.jivepages.create_and_setup(params[:jivepage].merge( + :user => @user, :site => site)) + respond_to do |format| flash[:notice] = 'Page created' format.html { redirect_to(edit_jivepage_path(@jivepage)) } @@ -107,13 +135,6 @@ class JivepagesController < ApplicationController return false end end - - # - # - # - def load_box_classes - # Box.subclasses - end # # @@ -122,20 +143,13 @@ class JivepagesController < ApplicationController @jivepage.boxes.each do |box| self.append_view_path(box.plugin_view_path) end - end - + end # # # def current_owner - Jivepage.uses_users? ? current_user : Jivepage + current_user || Jivepage.anonymous_user end - # - # - # - def jivepage_scope - Jivepage.uses_users? ? current_owner.jivepages : Jivepage - end end app/controllers/jivepages_controller.rb @@ -3,8 +3,8 @@ module JivepagesHelper # # def dom_id(o, suffix=nil) - return unless o - o.dom_id + (suffix ? "-#{suffix}" : '') + return unless o + o.class.name.underscore + (suffix ? "-#{suffix}" : '') end def render_one_cell(cell, options={}, &block) app/helpers/jivepages_helper.rb @@ -2,7 +2,8 @@ class Jivepage < ActiveRecord::Base include ActionView::Helpers::DateHelper include ActionView::Helpers::TextHelper - # belongs_to :user + validates_presence_of :user + belongs_to :user has_many :contributorships, :dependent => :delete_all has_many :contributors, :through => :contributorships, :source => :user has_many :rows, :order => "position ASC" do @@ -20,6 +21,7 @@ class Jivepage < ActiveRecord::Base end end has_many :edit_sessions, :dependent => :destroy + belongs_to :site # has_many :editors, :through => :edit_sessions, :source => :user before_save :restructure @@ -40,23 +42,41 @@ class Jivepage < ActiveRecord::Base def setup row = self.rows.create! end + + def self.anonymous_user + Jivepage.ensure_user_is_defined! + user = User.find_by_login("anonymous") + unless user + password = Digest::SHA1.hexdigest(Time.now.to_s.split(//).sort_by {rand}.join) + user = User.create!(:login => "anonymous", :email => "anonymous@jivepages.com", + :password => password, :password_confirmation => password) + user.activate + end + user + end - def self.uses_users? - defined?(User) + def Jivepage.ensure_user_is_defined! + raise "Jivepages plugin requires that a User class is defined." unless self.user_is_defined? + end + + def self.user_is_defined? + # TODO: make the user class configurable + # defined?(User) + true end def editable_by?(user) - return true unless Jivepage.uses_users? + Jivepage.ensure_user_is_defined! user && (user.id == user_id || user.contributor_to?(self)) end def being_edited_by?(user) - return true unless Jivepage.uses_users? + Jivepage.ensure_user_is_defined! being_edited? and edit_sessions.exists?(:user_id => user.id) end def being_edited? - return true unless Jivepage.uses_users? + Jivepage.ensure_user_is_defined! !edit_sessions.blank? end @@ -65,7 +85,7 @@ class Jivepage < ActiveRecord::Base # ...although only pmark is editing it currently. # ...There are 3 people currently editing this page. def heading - return "" unless Jivepage.uses_users? + Jivepage.ensure_user_is_defined! owner = self.user || User.find_anonymous who = owner.summary app/models/jivepage.rb @@ -5,22 +5,7 @@ <%= rows_for(:body, @jivepage) %> <% content_for(:footer) do %> - <%= rows_for(:footer, @jivepage) %> - <%= link_to('View this page', jivepage_path(@jivepage)) %> - -<% if @jivepage.editable_by?(page_user) %> -<%= link_to('Delete this page', jivepage_path(@jivepage), :method => :delete, - :confirm => 'Are you sure?') %> - -<% end %> -<%= link_to 'All pages', jivepages_path %> - - -<% form_for Jivepage.new, :jivepage do %> - <%= submit_tag "New page" %> -<% end %> - -<%= render :partial => "jivepages/tool_shed" %> + <%= render :partial => "jivepages/tool_shed" %> <% end %> app/views/jivepages/edit.html.erb @@ -17,6 +17,7 @@ <% content_for(:footer) do %> <blockquote> <% form_for :jivepage do %> + <%= hidden_field_tag "jivepage[site_id]", nil %> <%= submit_tag "Make your own page right now" %> <% end %> </blockquote> app/views/jivepages/index.html.erb @@ -6,17 +6,6 @@ <blockquote> <%= error_messages_for :jivepage %> -<% form_for(@jivepage) do |f| %> - - What is the title of your new page? - <%= f.text_field :title %> - - - - <%= f.submit "create" %> or - <%= link_to 'cancel', jivepages_path %> - -<% end %> </blockquote> <% content_for(:footer) do %> app/views/jivepages/new.html.erb @@ -1,5 +1,6 @@ # NOT SURE IF THIS WORKS... resources :jivepages +resources :sites resources :rows, :member => {:up => :put, :down => :put} resources :columns resources :boxes routes.rb @@ -137,27 +137,7 @@ describe JivepagesController do it "should be successful" do do_get response.should be_success - end - - it "should render new template" do - do_get - response.should render_template('new') - end - - it "should create an new jivepage" do - Jivepage.should_receive(:new).and_return(@jivepage) - do_get - end - - it "should not save the new jivepage" do - @jivepage.should_not_receive(:save) - do_get - end - - it "should assign the new jivepage for the view" do - do_get - assigns[:jivepage].should equal(@jivepage) - end + end end describe "handling GET /jivepages/1/edit" do spec/controllers/jivepages_controller_spec.rb a3b7ac7423e102fa9cc1086ec11f3f72b7261508 Mark Anderson wayoutwest@gmail.com http://github.com/pmark/jivepages/commit/3d0fb032f02abb7942fafc3e6d723d84aa9bf7da 3d0fb032f02abb7942fafc3e6d723d84aa9bf7da

2008-06-15T02:14:41-07:00

Site config 8857f91d9222a2a1f13250a4adb48227ebf0b32c Mark Anderson wayoutwest@gmail.com