lib/cms/behaviors.rb lib/cms/behaviors/archiving.rb lib/cms/behaviors/attaching.rb lib/cms/behaviors/categorizing.rb lib/cms/behaviors/connecting.rb lib/cms/behaviors/hiding.rb lib/cms/behaviors/publishing.rb lib/cms/behaviors/soft_deleting.rb lib/cms/behaviors/tagging.rb lib/cms/behaviors/versioning.rb @@ -35,10 +35,9 @@ class Cms::BlocksController < Cms::BaseController def create @block = model_class.new(params[model_name]) - @block.updated_by_user = current_user if @block.respond_to?(:updated_by_user) if @block.save! flash[:notice] = "#{content_type.display_name} '#{@block.name}' was created" - if @block.respond_to?(:connected_page) && !@block.connected_page.blank? + if @block.connected_page redirect_to @block.connected_page.path else redirect_to_first params[:_redirect_to], cms_url(:blocks, content_type.name.underscore.pluralize) @@ -56,7 +55,7 @@ class Cms::BlocksController < Cms::BaseController end def revisions - if model_class.respond_to?(:versioned_class_name) + if model_class.versioned? load_block else render :text => "Not Implemented", :status => :not_implemented @@ -69,7 +68,6 @@ class Cms::BlocksController < Cms::BaseController def update attrs = params[model_class.name.underscore] - attrs[:updated_by_user] = current_user if @block.respond_to?(:updated_by_user=) if @block.update_attributes(attrs) flash[:notice] = "#{content_type_name.titleize} '#{@block.name}' was updated" redirect_to_first params[:_redirect_to], cms_url(:blocks, @block.class.name.underscore, :show, @block) @@ -87,18 +85,18 @@ class Cms::BlocksController < Cms::BaseController end def publish - do_command("published") { @block.publish!(current_user) } + do_command("published") { @block.publish! } redirect_to cms_url(@block) end def archive - do_command("archived") { @block.archive(current_user) } + do_command("archived") { @block.archive } redirect_to cms_url(@block) end def revert_to begin - @block.revert_to(params[:version], current_user) + @block.revert_to(params[:version]) flash[:notice] = "Reverted '#{@block.name}' to version #{params[:version]}" rescue Exception => e flash[:error] = "Could not revert '#{@block.name}': #{e}" app/controllers/cms/blocks_controller.rb @@ -10,10 +10,10 @@ class Cms::ConnectorsController < Cms::BaseController end def create - @block_type = ContentType.find_by_key(params[:content_block_type]) + @block_type = ContentType.find_by_key(params[:connectable_type]) raise "Unknown block type" unless @block_type - @block = @block_type.model_class.find(params[:content_block_id]) - if @page.add_content_block!(@block, params[:container]) + @block = @block_type.model_class.find(params[:connectable_id]) + if @page.create_connector(@block, params[:container]) redirect_to @page.path else @blocks = @block_type.model_class.all(:order => "name") @@ -24,11 +24,11 @@ class Cms::ConnectorsController < Cms::BaseController def destroy @connector = Connector.find(params[:id]) @page = @connector.page - @content_block = @connector.content_block - if @page.destroy_connector(@connector) - flash[:notice] = "Removed '#{@content_block.name}' from the '#{@connector.container}' container" + @connectable = @connector.connectable + if @page.remove_connector(@connector) + flash[:notice] = "Removed '#{@connectable.name}' from the '#{@connector.container}' container" else - flash[:error] = "Failed to remove '#{@content_block.name}' from the '#{@connector.container}' container" + flash[:error] = "Failed to remove '#{@connectable.name}' from the '#{@connector.container}' container" end redirect_to @page.path end @@ -42,11 +42,11 @@ class Cms::ConnectorsController < Cms::BaseController define_method "move_#{move}" do @connector = Connector.find(params[:id]) @page = @connector.page - @content_block = @connector.content_block + @connectable = @connector.connectable if @page.send("move_connector_#{move}", @connector) - flash[:notice] = "Moved '#{@content_block.name}' #{where} the '#{@connector.container}' container" + flash[:notice] = "Moved '#{@connectable.name}' #{where} the '#{@connector.container}' container" else - flash[:error] = "Failed to move '#{@content_block.name}' #{where} the '#{@connector.container}' container" + flash[:error] = "Failed to move '#{@connectable.name}' #{where} the '#{@connector.container}' container" end redirect_to @page.path end app/controllers/cms/connectors_controller.rb @@ -89,7 +89,6 @@ class Cms::ContentController < Cms::ApplicationController # This method gives the content type a chance to set some params # This is used to make SEO-friendly URLs possible def prepare_params - logger.info "\n\npreparing_params..." if params[:prepare_with] && params[:prepare_with][:content_type] && params[:prepare_with][:method] content_type = params[:prepare_with][:content_type].constantize if content_type.respond_to?(params[:prepare_with][:method]) app/controllers/cms/content_controller.rb @@ -1,6 +1,6 @@ class Cms::DashboardController < Cms::BaseController def index - @draft_pages = Page.draft.all(:order => "updated_at desc") + @unpublished_pages = Page.unpublished.all(:order => "updated_at desc") end end \ No newline at end of file app/controllers/cms/dashboard_controller.rb @@ -9,7 +9,6 @@ class Cms::LinksController < Cms::BaseController def create @link = Link.new(params[:link]) @link.section = @section - @link.updated_by_user = current_user if @link.save flash[:notice] = "Link was '#{@link.name}' created." redirect_to cms_url(@section) @@ -24,7 +23,7 @@ class Cms::LinksController < Cms::BaseController def update @link = Link.find(params[:id]) - if @link.update_attributes(params[:link].merge(:updated_by_user => current_user)) + if @link.update_attributes(params[:link]) flash[:notice] = "Link '#{@link.name}' was updated" redirect_to cms_url(@link.section || :sitemap) else app/controllers/cms/links_controller.rb @@ -24,7 +24,6 @@ class Cms::PagesController < Cms::BaseController def create @page = Page.new(params[:page]) @page.section = @section - @page.updated_by_user = current_user if @page.save flash[:notice] = "Page was '#{@page.name}' created." redirect_to cms_url(@page) @@ -35,7 +34,7 @@ class Cms::PagesController < Cms::BaseController def update @page = Page.find(params[:id]) - if @page.update_attributes(params[:page].merge(:updated_by_user => current_user)) + if @page.update_attributes(params[:page]) flash[:notice] = "Page was '#{@page.name}' updated." redirect_to cms_url(@page) else @@ -66,13 +65,13 @@ class Cms::PagesController < Cms::BaseController define_method status do if params[:page_ids] params[:page_ids].each do |id| - Page.find(id).send(status, current_user) + Page.find(id).send(status) end flash[:notice] = "#{params[:page_ids].size} pages #{verb}" redirect_to cms_dashboard_url else load_page - if @page.send(status, current_user) + if @page.send(status) flash[:notice] = "Page '#{@page.name}' was #{verb}" end redirect_to @page.path @@ -86,7 +85,7 @@ class Cms::PagesController < Cms::BaseController end def revert_to - if @page.revert_to(params[:version], current_user) + if @page.revert_to(params[:version]) flash[:notice] = "Page '#{@page.name}' was reverted to version #{params[:version]}" end app/controllers/cms/pages_controller.rb @@ -37,7 +37,6 @@ class Cms::ResourceController < Cms::BaseController @object = resource.find(params[:id]) if @object.update_attributes(params[variable_name]) flash[:notice] = "#{resource_name.singularize.titleize} '#{object_name}' was updated" - logger.debug "Redirecting to #{after_update_url}" redirect_to after_update_url else instance_variable_set("@#{variable_name}", @object) app/controllers/cms/resource_controller.rb @@ -88,9 +88,9 @@ class Cms::SectionsController < Cms::BaseController begin case params[:Type].downcase when "file" - FileBlock.create!(:section => @section, :file => params[:NewFile], :updated_by_user => current_user) + FileBlock.create!(:section => @section, :file => params[:NewFile]) when "image" - ImageBlock.create!(:section => @section, :file => params[:NewFile], :updated_by_user => current_user) + ImageBlock.create!(:section => @section, :file => params[:NewFile]) end result = "0" rescue Exception => e app/controllers/cms/sections_controller.rb @@ -17,7 +17,7 @@ module Cms def page_versions(page) text = select_tag(:version, options_for_select(page.versions.all(:order => "version desc").map { |r| - ["v#{r.version}: #{r.revision_comment} by #{r.updated_by.login} at #{time_on_date(r.updated_at)}", r.version] + ["v#{r.version}: #{r.version_comment} by #{r.updated_by.login} at #{time_on_date(r.updated_at)}", r.version] }, page.version), :onchange => 'this.form.submit(); return false') text << javascript_tag("$('version').selectedIndex = 0") if page.current_version? @@ -28,11 +28,11 @@ module Cms if logged_in? && @mode == "edit" render :partial => 'cms/pages/edit_connector', :locals => {:connector => connector} else - render_content_block(connector.content_block) + render_connectable(connector.current_connectable) end end - def render_content_block(block) + def render_connectable(block) instance_eval &block.renderer(block) rescue Exception => e logger.error "Error occurred while rendering #{block.class}:#{block.id}: #{e.message}\n#{e.backtrace.join("\n")}" app/helpers/cms/application_helper.rb @@ -21,7 +21,7 @@ module Cms if [String, Symbol, Hash, Array, Numeric, Date, Time].detect{|e| e === first} paths << first.to_s.sub(/^\//,'') else - if first.class.respond_to?(:content_block?) && first.class.content_block? + if first.class.connectable? paths << 'blocks' paths << first.content_block_type else app/helpers/cms/path_helper.rb @@ -58,7 +58,6 @@ module Attachable def update_attachment_if_changed if attachment - attachment.updated_by = updated_by_user attachment.archived = archived attachment.published = !!(publish_on_save) attachment.save if new_record? || attachment.changed? || attachment.file app/models/attachable.rb @@ -3,9 +3,9 @@ class Attachment < ActiveRecord::Base before_validation :process_file before_validation :prepend_slash before_save :update_file - - version_fu - is_paranoid + + uses_soft_delete + is_versioned attr_accessor :file app/models/attachment.rb @@ -1,30 +1,51 @@ class Connector < ActiveRecord::Base belongs_to :page + belongs_to :connectable, :polymorphic => true - #Can't use just 'block', because 'block_type' is used by rails - belongs_to :content_block, :polymorphic => true - acts_as_list :scope => 'connectors.page_id = #{page_id} and connectors.page_version = #{page_version} and connectors.container = \'#{container}\'' alias :move_up :move_higher - alias :move_down :move_lower - - validates_presence_of :container - - named_scope :for_block, lambda {|b| {:conditions => ['connectors.content_block_id = ? and connectors.content_block_type = ?', b.id, b.class.name]}} - named_scope :for_container, lambda{|container| {:conditions => ['connectors.container = ?', container]} } - - #Returns the content block that this connector is connected to - def content_block - @__content_block__ ||= begin - if content_block_type.constantize.respond_to?(:versioned_class_name) - b = content_block_type.constantize.first(:conditions => {:id => content_block_id, :version => content_block_version}) - - #If this connector is referring to an older version of the block, we have to look in the versions table - b ? b : content_block_type.constantize.find(content_block_id).as_of_version(content_block_version) - else - content_block_type.constantize.find(content_block_id) - end - end + alias :move_down :move_lower + + named_scope :for_page_version, lambda{|pv| {:conditions => {:page_version => pv}}} + named_scope :for_connectable_version, lambda{|cv| {:conditions => {:connectable_version => cv}}} + named_scope :for_connectable, lambda{|c| + {:conditions => { :connectable_id => c.id, :connectable_type => c.class.base_class.name }} + } + named_scope :in_container, lambda{|container| {:conditions => {:container => container}}} + named_scope :at_position, lambda{|position| {:conditions => {:position => position}}} + named_scope :like, lambda{|connector| + {:conditions => { + :connectable_id => connector.connectable_id, + :connectable_type => connector.connectable_type, + :connectable_version => connector.connectable_version, + :container => connector.container, + :position => connector.position + }} + } + + validates_presence_of :page_id, :page_version, :connectable_id, :connectable_type, :container + + def current_connectable + versioned? ? connectable.as_of_version(connectable_version) : connectable + end + + def status + published? ? :published : :draft + end + def status_name + status.to_s.titleize + end + + def published? + publishable? ? connectable.published? : true + end + + def publishable? + connectable_type.constantize.publishable? + end + + def versioned? + connectable_type.constantize.versioned? end end \ No newline at end of file app/models/connector.rb @@ -1,6 +1,6 @@ class ImageBlock < AbstractFileBlock include Attachable - acts_as_content_block + acts_as_content_block :versioned => { :version_foreign_key => :file_block_id } def self.display_name "Image" app/models/image_block.rb @@ -1,5 +1,5 @@ class Link < ActiveRecord::Base - acts_as_content_object + acts_as_content_block has_one :section_node, :as => :node app/models/link.rb @@ -1,37 +1,121 @@ class Page < ActiveRecord::Base - acts_as_content_page + is_archivable + is_hideable + is_publishable + uses_soft_delete + is_userstamped + is_versioned + + has_many :connectors, :order => "connectors.container, connectors.position" + named_scope :connected_to, lambda { |b| {:include => :connectors, + :conditions => ['connectors.connectable_id = ? and connectors.connectable_type = ? and connectors.connectable_version = ?', b.id, b.class.base_class.name, b.version]} + } has_one :section_node, :as => :node belongs_to :template, :class_name => "PageTemplate" - #This association uses the version of the instance - #This should be used when you have a page object that may or may not be the latest version of the page - #Because it will give you the connectors for the specific version - has_many :version_connectors, :class_name => "Connector", :conditions => 'connectors.page_version = #{version}', :order => "connectors.position" - - #This joins with the pages table, so therefore is only used when working with the latest version of the page - has_many :connectors, :include => :page, :conditions => 'pages.version = connectors.page_version', :order => "connectors.position" - - after_update :copy_connectors! before_validation :append_leading_slash_to_path before_destroy :delete_connectors validate :path_unique? - - named_scope :connected_to_block, lambda { |b| {:include => :connectors, :conditions => ['connectors.content_block_id = ? and connectors.content_block_type = ? and connectors.content_block_version = ?', b.id, b.class.name, b.version]} } + + def after_build_new_version(new_version) + copy_connectors + true + end + + def copy_connectors + copy_from_version = @copy_connectors_from_version ? @copy_connectors_from_version : version - 1 + + connectors.for_page_version(copy_from_version).all(:order => "connectors.container, connectors.position").each do |c| + connectable = c.connectable_type.constantize.versioned? ? c.connectable.as_of_version(c.connectable_version) : c.connectable + + #If are publishing this page, We need to publish the other page if it is not already published + if published? && c.connectable_type.constantize.publishable? && !c.connectable.published? + connectable.publish_by_page!(self) + end + + #If we are copying connectors from a previous version, that means we are reverting this page, + #in which case we should create a new version of the block, and connect this page to that block + if @copy_connectors_from_version && connectable.class.versioned? && !connectable.current_version? + connectable = connectable.class.find(connectable.id) + connectable.published_by_page = self if connectable.class.publishable? + connectable.revert_to(c.connectable_version) + end + + connectors.build( + :page_version => version, + :connectable => connectable, + :connectable_version => connectable.version, + :container => c.container, + :position => c.position + ) + end - named_scope :draft, :conditions => {:published => false} - named_scope :not_archived, :conditions => {:archived => false} - named_scope :not_hidden, :conditions => {:hidden => false} + @copy_connectors_from_version = nil + true + end - def self.find_by_content_block(content_block, content_block_version=nil) - all(:include => :connectors, - :conditions => ['connectors.content_block_id = ? and connectors.content_block_type = ? and connectors.content_block_version = ?', - content_block.id, content_block.class.name, (content_block_version || content_block.version)]) + def create_connector(connectable, container) + transaction do + raise "Connectable is nil" unless connectable + raise "Container is required" if container.blank? + update_attributes(:version_comment => "#{connectable} was added to the '#{container}' container", + :publish_on_save => (published? && connectable.connected_page && + (connectable.class.publishable? ? connectable.published? : true))) + Connector.create( + :page => self, + :page_version => version, + :connectable => connectable, + :connectable_version => connectable.class.versioned? ? connectable.version : nil, + :container => container) + end + end + + %w(up down to_top to_bottom).each do |d| + define_method("move_connector_#{d}") do |connector| + move_connector(connector, d) + end end + + def move_connector(connector, direction) + transaction do + raise "Connector is nil" unless connector + raise "Direction is nil" unless direction + orientation = direction[/_/] ? "#{direction.sub('_', ' the ')} of" : "#{direction} within" + update_attributes(:version_comment => "#{connector.connectable} was moved #{orientation} the '#{connector.container}' container") + connectors.for_page_version(version).like(connector).first.send("move_#{direction}") + end + end + def remove_connector(connector) + transaction do + raise "Connector is nil" unless connector + update_attributes(:version_comment => "#{connector.connectable} was removed from the '#{connector.container}' container") + + #The logic of this is to go ahead and let the container get copied forward, then delete the new connector + if new_connector = connectors.for_page_version(version).like(connector).first + new_connector.destroy + else + raise "Error occurred while trying to remove connector #{connector.id}" + end + end + end + + def delete_connectors + connectors.for_page_version(version).all.each{|c| c.destroy } + end + + #This is done to let copy_connectors know which version to pull from + #copy_connectors will get called later as an after_update callback + alias_method :original_revert_to, :revert_to + def revert_to(version) + @copy_connectors_from_version = version + original_revert_to(version) + end + def file_size "?" end @@ -60,121 +144,12 @@ class Page < ActiveRecord::Base title.blank? ? name : title end - #Valid options: - # except = An array of connector ids not to copy - def copy_connectors!(options={}) - - #@_copy_connectors_from_version gets set in the revert_to method, otherwise is unset - page_version = @_copy_connectors_from_version || (version-1) - conditions = ['page_id = ? and page_version = ?', id, page_version] - - #This is primarily for the case of removing a connector, - #where there is a connector we want to not carry forward - if options[:except] - conditions.first << ' and id not in(?)' - conditions << options[:except] - end - - Connector.all(:conditions => conditions, :order => "page_id, page_version, container, position").each do |c| - attrs = c.attributes.without("id", "created_at", "updated_at") - con = Connector.new(attrs) - - if published? && !con.content_block.published? - con.content_block.updated_by_page = self - con.content_block.publish!(updated_by) - con.content_block_version += 1 if con.content_block.versionable? - end - - #If we are copying connectors from a previous version, that means we are reverting this page, - #in which case we should create a new version of the block, and connect this page to that block - if @_copy_connectors_from_version - block = c.content_block - - #If this is connected to an older version of the block, - #then we have to get the latest version of the block, - #revert that to whatever version this connector is pointing to - #and connect the page to the new version of the block - unless block.current_version? - block = block.class.find(block.id) - block.updated_by_page = self - block.revert_to(c.content_block_version, updated_by) - # block.revert_to_without_save(c.content_block_version, updated_by) - # block.instatiate_revision.save! - # block.send(:update_without_callbacks) - end - - con.content_block = block - con.content_block_version = block.version - end - - con.page_version = version - con.save! - end - - end - %w(up down to_top to_bottom).each do |d| define_method("move_connector_#{d}") do |connector| move_connector(connector, d) end end - - def move_connector(connector, direction) - transaction do - orientation = direction[/_/] ? "#{direction.sub('_', ' the ')} of" : "#{direction} within" - self.revision_comment = "#{connector.content_block.display_name} '#{connector.content_block.name}' was moved #{orientation} the '#{connector.container}' container" - create_new_version! - copy_connectors! - Connector.first(:conditions => { :page_id => id, - :page_version => version, - :content_block_id => connector.content_block_id, - :content_block_type => connector.content_block_type, - :content_block_version => connector.content_block_version, - :container => connector.container }).send("move_#{direction}") - end - end - - def add_content_block!(content_block, container) - transaction do - self.revision_comment = "#{content_block.display_name} '#{content_block.name}' was added to the '#{container}' container" - if published? && content_block.published? && content_block.connected_page - self.published = true - else - set_published - end - create_new_version! - copy_connectors! - Connector.create!(:page_id => id, - :page_version => version, - :content_block => content_block, - :content_block_version => content_block.version, - :container => container) - end - end - - def destroy_connector(connector) - transaction do - self.revision_comment = "#{connector.content_block.display_name} '#{connector.content_block.name}' was removed from the '#{connector.container}' container" - set_published - create_new_version! - copy_connectors!(:except => [connector.id]) - reload - connector.freeze - end - end - - #This is done to let copy_connectors! know which version to pull from - #copy_connectors! will get called later as an after_update callback - alias_method :original_revert_to, :revert_to - def revert_to(version, user) - @_copy_connectors_from_version = version - original_revert_to(version, user) - end - def delete_connectors - Connector.delete_all "page_id = #{id}" - end - def append_leading_slash_to_path if path.blank? self.path = "/" @@ -208,37 +183,11 @@ class Page < ActiveRecord::Base #Returns true if the block attached to each connector in the given container are published def container_published?(container) - connectors.all(:include => :page, :conditions => {:container => container.to_s}).all?{|c| c.content_block.published?} - end - - def hide(updated_by) - self.publish_on_save = published? - self.hidden = true - self.updated_by_user = updated_by - save - end - - def hide!(updated_by) - self.publish_on_save = published? - self.hidden = true - self.updated_by_user = updated_by - save! - end - - def archive(updated_by) - self.publish_on_save = published? - self.archived = true - self.updated_by_user = updated_by - save - end - - def archive!(updated_by) - self.publish_on_save = published? - self.archived = true - self.updated_by_user = updated_by - save! + connectors.for_page_version(version).in_container(container.to_s).all? do |c| + c.connectable_type.constantize.publishable? ? c.connectable.published? : true + end end - + def self.find_live_by_path(path) page = find(:first, :conditions => {:path => path}) page ? page.live_version : nil app/models/page.rb @@ -1,7 +1,7 @@ class Portlet < ActiveRecord::Base has_flex_attributes - acts_as_content_block :versioning => false + acts_as_content_block :versioned => false, :publishable => false validates_presence_of :name attr_accessor :request, :response, :params, :session app/models/portlet.rb @@ -5,7 +5,7 @@ <% if @block.respond_to?(:versionable?) && @block.versionable? %> <li><b>Status:</b> <%= status_icon(@block.status) %> <%= @block.status_name %></li> <% end -%> - <% if @block.respond_to?(:connected_pages) %> + <% if @block.class.connectable? %> <li><b>Used on:</b> <%= link_to_usages(@block) %> pages</li> <% end -%> <% if @block.respond_to?(:versionable?) && @block.versionable? && !@block.current_version? %><li> app/views/cms/blocks/_block_info.html.erb @@ -5,7 +5,7 @@ <%= link_to "Add New #{@content_type.display_name}", cms_path(:blocks, @content_type.content_block_type.pluralize, :new) %> <%= link_to 'View', cms_path(:blocks, @content_type.content_block_type.pluralize, :show, @block) %> <%= link_to 'Edit', cms_path(:blocks, @content_type.content_block_type.pluralize, :edit, @block) %> -<%= @block.respond_to?(:versionable?) && @block.versionable? ? (link_to 'Revisions', cms_path(@block, :revisions), {:id => "revisions_link"}) : 'Revisions' %> +<%= @block.class.versioned? ? (link_to 'Revisions', cms_path(@block, :revisions)) : 'Revisions' %> <%= link_to "Delete", cms_path(:blocks, @content_type.name.underscore.pluralize, :destroy, @block), :http_method => :delete, :confirm => "Are you sure you want to delete '#{@block.name}'?" %> <%= false ? (link_to 'Assign', cms_path(@block, :assign), :http_method => :post) : "Assign" %> <% able_to? :publish_content do -%> app/views/cms/blocks/_toolbar.html.erb @@ -41,7 +41,7 @@ <% end %> <td><%= block.updated_at.to_s(:date) %></td> <% if @blocks.first.respond_to?(:connected_pages) %><td class="used"><%= link_to_usages(block) %></td><% end %> - <% if @blocks.first.respond_to?(:status) %><td class="block_status"><%= status_icon(block.status) %></td><% end %> + <% if @blocks.first.respond_to?(:status) %><td class="block_status"><%= status_icon(block.status) %></td><% end %> </tr> <% end %> </tbody> app/views/cms/blocks/index.html.erb @@ -3,5 +3,5 @@ <h2>View <%= @block.name %></h2> <div id="block_content"> <div class="header <%= @block.published? ? 'published' : 'draft' %>">Block Contents</div> - <div class="content"><%= render_content_block(@block) %></div> + <div class="content"><%= render_connectable(@block) %></div> </div> app/views/cms/blocks/show.html.erb @@ -27,8 +27,8 @@ <% form_for :connector, :url => cms_path(:connectors, :create) do |f| %> <%= hidden_field_tag :page_id, @page.to_param %> <%= hidden_field_tag :container, @container %> - <%= hidden_field_tag :content_block_type, block.content_block_type %> - <%= hidden_field_tag :content_block_id, block.id %> + <%= hidden_field_tag :connectable_type, block.class.name %> + <%= hidden_field_tag :connectable_id, block.id %> <%= image_submit_tag action_icon_src(:connect) %> <% end %> </td> app/views/cms/connectors/new.html.erb @@ -5,7 +5,7 @@ <% end %> <iframe src="<%= cms_path(:toolbar, :page_id => @page.id, :page_version => @page.version, :mode => @mode) %>" width="100%" height="100" frameborder="0" marginwidth="0" marginheight="0" scrolling="no" name="cms_toolbar"></iframe> <% end %> -<% @page.version_connectors.each do |c| %> +<% @page.connectors.for_page_version(@page.version).each do |c| %> <% content_for(c.container.to_sym) do %> <%= render_connector c %> <% end %> app/views/cms/content/show.html.erb @@ -2,7 +2,7 @@ <h2>Draft Pages</h2> -<% if @draft_pages.empty? %> +<% if @unpublished_pages.empty? %> <p>All pages are published</p> <% else %> <% form_tag cms_path(:pages, :publish) do %> @@ -18,11 +18,11 @@ <th>Updated At</th> <th></th> </tr> - <% @draft_pages.each do |page| %> + <% @unpublished_pages.each do |page| %> <tr> <td class="name"><%=h page.name %></td> <td class="path"><%= link_to page.path, page.path %></td> - <td class="comment"><%=h page.revision_comment %></td> + <td class="comment"><%=h page.version_comment %></td> <td class="updated_by"><%=h page.updated_by.login %></td> <td class="updated_at"><%= page.updated_at.strftime("%m/%d/%y %l:%M %p") %></td> <td class="select"><%= check_box_tag "page_ids[]", page.id, false, :id => "publish_page_#{page.id}" %></td> app/views/cms/dashboard/index.html.erb @@ -1,11 +1,11 @@ <div class="edit_block"> - <div class="header <%= connector.content_block.published? ? 'published' : 'draft' %>"> - <%= connector.content_block.name %> + <div class="header <%= (connector.connectable.published? ? 'published' : 'draft') if connector.publishable? %>"> + <%= connector.connectable.name %> <div class="actions"> - <%= link_to status_icon(connector.content_block.status), cms_path(connector.content_block) %> - <%= link_to action_icon(:view), cms_path(connector.content_block) %> - <%= link_to action_icon(:edit), cms_path(connector.content_block, :edit, :_redirect_to => @page.path) %> - <% if @page.connectors.for_container(connector.container).count > 1 %> + <%= link_to status_icon(connector.status), cms_path(connector.connectable) %> + <%= link_to action_icon(:view), cms_path(connector.connectable) %> + <%= link_to action_icon(:edit), cms_path(connector.connectable, :edit, :_redirect_to => @page.path) %> + <% if @page.connectors.for_page_version(@page.version).in_container(connector.container).count > 1 %> <%= link_to action_icon(:up), cms_path(connector, :move_up), :http_method => :put %> <%= link_to action_icon(:down), cms_path(connector, :move_down), :http_method => :put %> <% end %> @@ -13,6 +13,6 @@ </div> </div> <div class="content"> - <%= render_content_block(connector.content_block) %> + <%= render_connectable(connector.connectable) %> </div> </div> \ No newline at end of file app/views/cms/pages/_edit_connector.html.erb @@ -12,7 +12,7 @@ <% @page.versions.all(:order => "version desc").each_with_index do |r, i| %><tr> <td><%= link_to "v.#{r.version}", cms_path(@page, :show_version, :version => r.version)%></td> <td><%= status_icon(r.published?) %></td> - <td><%=h r.revision_comment %></td> + <td><%=h r.version_comment %></td> <td><%= r.created_at.strftime("%b %e, %Y %l:%M %p") %></td> <td><%= r.updated_by.login %></td> <td><% if i > 0 %><%= link_to "Revert", cms_path(@page, :revert_to, :version => r.version) %><% end %></td> app/views/cms/pages/revisions.html.erb @@ -4,7 +4,7 @@ <th>Field</th> <th>Value</th> </tr> - <% other_version.attributes.to_a.reject{|e| ['id', 'deleted','version','lock_version','created_at','updated_by_id','updated_at','revision_comment', 'published','hidden','archived'].include?(e.first) }.sort_by(&:first).each do |field, value| %><tr> + <% other_version.attributes.to_a.reject{|e| ['id', 'deleted','version','lock_version','created_at','updated_by_id','updated_at','version_comment', 'published','hidden','archived'].include?(e.first) }.sort_by(&:first).each do |field, value| %><tr> <td><%=h field %></td> <td><%=h value %></td> </tr><% end %> app/views/cms/shared/_version_conflict_diff.html.erb @@ -10,9 +10,9 @@ <%= link_to "Revisions", cms_path(@page, :revisions), :target => "_top" %> <%= link_to "Delete", cms_path(@page, :destroy), :http_method => :delete, :confirm => "Are you sure you want to delete '#{@page.name}'?", :target => "_top" %> - <%= link_to "Assign", "#" %> + <%= link_to "Assign", "#", :target => "_top" %> <% able_to? :publish_content do %> - <%= @page.published? ? "Publish" : link_to("Publish", cms_path(@page, :publish), :http_method => :put) %> + <%= @page.published? ? "Publish" : link_to("Publish", cms_path(@page, :publish), :http_method => :put, :target => "_top") %> <% end %> </div> <div> app/views/layouts/_page_toolbar.html.erb @@ -20,7 +20,8 @@ module FixtureReplacement a.page = default_page a.page_version = 1 a.container = "main" - a.content_block = default_html_block + a.connectable = default_html_block + a.connectable_version = 1 end attributes_for :content_type do |a| @@ -38,8 +39,7 @@ module FixtureReplacement attributes_for :file_block do |a| a.name = "TestFileBlock#{Sequence.next}" - a.attachment_file_name = "#{a.name.to_slug}.pdf" - a.updated_by_user = default_user + a.attachment_file_name = "#{a.name.to_slug}.pdf" end attributes_for :group do |a| @@ -53,28 +53,23 @@ module FixtureReplacement attributes_for :html_block do |a| a.name = "About Us" a.content = "<h1>About Us</h1>\n<p>Lorem ipsum dolor sit amet...</p>" - a.updated_by_user = default_user end attributes_for :image_block do |a| a.name = "TestImageBlock#{Sequence.next}" a.attachment_file_name = "#{a.name.to_slug}.jpg" - a.updated_by_user = default_user end attributes_for :link do |a| a.name = "ExampleLink#{Sequence.next}" a.url = "http://www.example#{Sequence.next}.com" - a.updated_by_user = default_user end attributes_for :page do |a| - a.name = "Home #{Sequence.next}" + a.name = "Page #{Sequence.next}" a.path = "/#{a.name.gsub(/\s/,'_').downcase}" a.template = default_page_template a.section = default_section - a.updated_by_user = default_user - a.version = 1 end attributes_for :page_template do |a| db/example_data.rb @@ -1,5 +1,5 @@ # Load up data that was created in load seed data migration -cmsadmin = User.first(:conditions => {:login => 'cmsadmin'}) +User.current = User.first(:conditions => {:login => 'cmsadmin'}) root_section = Section.root.first home_page = Page.first(:conditions => {:name => "Home"}) @@ -11,7 +11,7 @@ create_section(:about, :name => "About", :parent => sections(:root), :path => "/ create_section(:people, :name => "People", :parent => sections(:about), :path => "/people") create_section(:careers, :name => "Careers", :parent => sections(:about), :path => "/careers") -cmsadmin.groups.each{|g| g.sections << Section.all } +User.current.groups.each{|g| g.sections << Section.all } create_page_template(:two_column, :name => "Two Column", :file_name => "two_column", :language => "erb", :body=> <<-TEMPLATE) <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> @@ -37,24 +37,24 @@ create_page_template(:two_column, :name => "Two Column", :file_name => "two_colu </html> TEMPLATE -create_page(:about, :name => "About Us", :path => "/about", :section => sections(:about), :template => page_templates(:two_column), :updated_by_user => cmsadmin) -create_page(:kerry, :name => "Kerry Gunther", :path => "/people/kerry", :section => sections(:people), :template => page_templates(:two_column), :updated_by_user => cmsadmin) -create_page(:pat, :name => "Patrick Peak", :path => "/people/pat", :section => sections(:people), :template => page_templates(:two_column), :updated_by_user => cmsadmin) -create_page(:paul, :name => "Paul Barry", :path => "/people/paul", :section => sections(:people), :template => page_templates(:two_column), :updated_by_user => cmsadmin) +create_page(:about, :name => "About Us", :path => "/about", :section => sections(:about), :template => page_templates(:two_column)) +create_page(:kerry, :name => "Kerry Gunther", :path => "/people/kerry", :section => sections(:people), :template => page_templates(:two_column)) +create_page(:pat, :name => "Patrick Peak", :path => "/people/pat", :section => sections(:people), :template => page_templates(:two_column)) +create_page(:paul, :name => "Paul Barry", :path => "/people/paul", :section => sections(:people), :template => page_templates(:two_column)) -create_page(:test, :name => "Test", :path => "/test", :section => sections(:root), :template => page_templates(:main), :updated_by_user => cmsadmin) -create_html_block(:test, :name => "Test", :connect_to_page_id => pages(:test).id, :connect_to_container => "main", :updated_by_user => cmsadmin) -pages(:test).publish!(cmsadmin) +create_page(:test, :name => "Test", :path => "/test", :section => sections(:root), :template => page_templates(:main)) +create_html_block(:test, :name => "Test", :connect_to_page_id => pages(:test).id, :connect_to_container => "main") +pages(:test).publish! -create_html_block(:sidebar, :name => "Sidebar", :content => "<ul><li><a href=\"/\">Home</a></li><li><a href=\"/about\">About Us</a></li></ul>", :publish_on_save => true, :updated_by_user => cmsadmin) -create_html_block(:about_us, :name => "About Us", :content => "We are super fantastic", :publish_on_save => true, :updated_by_user => cmsadmin) +create_html_block(:sidebar, :name => "Sidebar", :content => "<ul><li><a href=\"/\">Home</a></li><li><a href=\"/about\">About Us</a></li></ul>", :publish_on_save => true) +create_html_block(:about_us, :name => "About Us", :content => "We are super fantastic", :publish_on_save => true) -home_page.add_content_block!(html_blocks(:sidebar), "sidebar") -home_page.publish!(cmsadmin) +home_page.create_connector(html_blocks(:sidebar), "sidebar") +home_page.publish! -pages(:about).add_content_block!(html_blocks(:about_us), "main") -pages(:about).add_content_block!(html_blocks(:sidebar), "sidebar") -pages(:about).publish!(cmsadmin) +pages(:about).create_connector(html_blocks(:about_us), "main") +pages(:about).create_connector(html_blocks(:sidebar), "sidebar") +pages(:about).publish! create_attachment_file(:xml, :data => "<root>\n <data>Test</data>\n</root>\n") create_attachment_file(:logo, :data => open(File.join(Rails.root, "public/images/cms/browser_media_logo.png")){|f| f.read}) @@ -62,8 +62,8 @@ create_attachment_file(:logo, :data => open(File.join(Rails.root, "public/images create_attachment(:xml, :file_type => "text/xml", :section => sections(:root), :file_extension => "xml", :file_size => 36, :file_name => "test.xml", :attachment_file => attachment_files(:xml)) create_attachment(:logo, :file_type => "image/png", :section => sections(:root), :file_extension => "png", :file_size => 2305, :file_name => "logo.png", :attachment_file => attachment_files(:logo)) -create_file_block(:xml, :name => "XML", :attachment => attachments(:xml), :updated_by_user => cmsadmin, :publish_on_save => true) -create_image_block(:logo, :name => "Logo", :attachment => attachments(:logo), :updated_by_user => cmsadmin, :publish_on_save => true) +create_file_block(:xml, :name => "XML", :attachment => attachments(:xml), :publish_on_save => true) +create_image_block(:logo, :name => "Logo", :attachment => attachments(:logo), :publish_on_save => true) create_dynamic_portlet(:recently_updated_pages, :name => 'Recently Updated Pages', db/initial_data.rb @@ -3,11 +3,11 @@ class CreateConnectors < ActiveRecord::Migration create_table :connectors do |t| t.integer :page_id t.integer :page_version + t.integer :connectable_id + t.string :connectable_type + t.integer :connectable_version t.string :container - t.integer :content_block_id - t.string :content_block_type - t.integer :content_block_version - t.string :position + t.integer :position t.timestamps end db/migrate/20080815214539_create_connectors.rb @@ -5,6 +5,7 @@ class CreatePortlets < ActiveRecord::Migration t.string :name t.boolean :archived, :default => false t.boolean :deleted, :default => false + t.integer :created_by_id, :updated_by_id t.timestamps end db/migrate/20080819213733_create_portlets.rb @@ -53,16 +53,16 @@ class LoadSeedData < ActiveRecord::Migration </html> TEMPLATE - create_page(:home, :name => "Home", :path => "/", :section => sections(:root), :template => page_templates(:main), :updated_by_user => users(:cmsadmin)) - create_page(:not_found, :name => "Not Found", :path => "/system/not_found", :section => sections(:system), :template => page_templates(:main), :updated_by_user => users(:cmsadmin), :publish_on_save => true) - create_page(:access_denied, :name => "Access Denied", :path => "/system/access_denied", :section => sections(:system), :template => page_templates(:main), :updated_by_user => users(:cmsadmin), :publish_on_save => true) - create_page(:server_error, :name => "Server Error", :path => "/system/server_error", :section => sections(:system), :template => page_templates(:main), :updated_by_user => users(:cmsadmin), :publish_on_save => true) + create_page(:home, :name => "Home", :path => "/", :section => sections(:root), :template => page_templates(:main)) + create_page(:not_found, :name => "Not Found", :path => "/system/not_found", :section => sections(:system), :template => page_templates(:main), :publish_on_save => true) + create_page(:access_denied, :name => "Access Denied", :path => "/system/access_denied", :section => sections(:system), :template => page_templates(:main), :publish_on_save => true) + create_page(:server_error, :name => "Server Error", :path => "/system/server_error", :section => sections(:system), :template => page_templates(:main), :publish_on_save => true) - create_html_block(:hello_world, :name => "Hello World", :content => "<h1>Hello, World!</h1>", :publish_on_save => true, :updated_by_user => users(:cmsadmin)) + create_html_block(:hello_world, :name => "Hello World", :content => "<h1>Hello, World!</h1>", :publish_on_save => true) - pages(:home).add_content_block!(html_blocks(:hello_world), "main") + pages(:home).create_connector(html_blocks(:hello_world), "main") - pages(:home).publish!(users(:cmsadmin)) + pages(:home).publish! puts "*************************************************" puts "* YOUR CMS username/password is: cmsadmin/#{pwd}" db/migrate/20081114172307_load_seed_data.rb @@ -16,9 +16,6 @@ ActiveRecord::Base.send(:include, ActsAsList) require 'flex_attributes' ActiveRecord::Base.send(:include, FlexAttributes) -require 'version_fu' -ActiveRecord::Base.send(:include, VersionFu) - -#Include CMS extensions -ActiveRecord::Base.send(:include, Cms::Acts::ContentObject) -ActiveRecord::Base.extend(Cms::Acts::Paranoid) \ No newline at end of file +#Include CMS Behaviors +ActiveRecord::Base.extend Cms::Acts::ContentObject +require 'cms/behaviors' \ No newline at end of file lib/browser_cms.rb @@ -1,148 +1,20 @@ module Cms module Acts module ContentObject - - def self.included(cls) - cls.extend MacroMethods - end - - module MacroMethods - - def acts_as_content_block(options={}) - acts_as_content_object(options) - include Cms::BlockSupport - if options[:versioning] == false - #has_many :connectors, :conditions => 'content_block_id = #{id} and content_block_type = #{self.class}', :order => "position" - has_many :connectors, :as => :content_block, :order => "position" - else - #after_create :update_connected_page - after_update :update_connected_pages - #has_many :connectors, :conditions => 'content_block_id = #{id} and content_block_type = #{self.class} and content_block_version = #{version}', :order => "position" - has_many :connectors, :as => :content_block, :include => table_name, :conditions => "#{table_name}.version = connectors.content_block_version", :order => "position" - end - end - - def acts_as_content_page(options={}) - acts_as_content_object(options) - end - - private - def acts_as_content_object(options={}) - attr_accessor :publish_on_save - - before_save :set_published - - if options[:versioning] == false - include NotVersionable - else - version_fu - - #We set the value of the the association to the value in the virtual attriute - #This makes sute that updated_by_user is explictly set on each update - versioned_class.belongs_to :updated_by, :class_name => "User" - attr_accessor :updated_by_user, :updated_by_user_id - belongs_to :updated_by, :class_name => "User" - before_validation :set_updated_by - - validates_presence_of :updated_by_id - - end - is_paranoid - - after_destroy :destroy_versions_if_destroyed - - include InstanceMethods - end - - end - - module NotVersionable - #NotVersionable content objects are always published - attr_accessor :published - def published? - true - end - end - - # These methods will be added to any object marked as acts_as_content_object or acts_as_content_page - module InstanceMethods - def publishable? - if versionable? - if new_record? - !connect_to_page_id - else - connected_pages.count < 1 - end - else - false - end - end - def versionable? - self.respond_to?(:versions) - end - - def self.included(cls) - cls.extend ClassMethods - end - - def status_name - published? ? "Published" : "Draft" - end - - def set_published - self.published = !!(publish_on_save) - self.publish_on_save = nil - true - end - - def publish(updated_by) - self.publish_on_save = true - self.updated_by_user = updated_by - save - end - - def publish!(updated_by) - self.publish_on_save = true - self.updated_by_user = updated_by - save! - end + def acts_as_content_block(options={}) + is_archivable(options[:archiveable].is_a?(Hash) ? options[:archiveable] : {}) unless options[:archiveable] == false + is_connectable(options[:connectable].is_a?(Hash) ? options[:connectable] : {}) unless options[:connectable] == false + is_publishable(options[:publishable].is_a?(Hash) ? options[:publishable] : {}) unless options[:publishable] == false + uses_soft_delete(options[:soft_delete].is_a?(Hash) ? options[:soft_delete] : {}) unless options[:soft_delete] == false + is_userstamped(options[:userstamped].is_a?(Hash) ? options[:userstamped] : {}) unless options[:userstamped] == false + is_versioned(options[:versioned].is_a?(Hash) ? options[:versioned] : {}) unless options[:versioned] == false - def live? - versionable? ? versions.count(:conditions => ['version > ? AND published = ?', version, true]) == 0 && published? : true - end - - def live_version - if published? - self - else - live_version = versions.first(:conditions => {:published => true}, :order => "version desc, id desc") - live_version ? as_of_version(live_version.version) : nil - end - end - - def draft? - !published? - end - - alias_method :in_progress?, :draft? - - def destroy_versions_if_destroyed - return unless versionable? - self.class.versioned_class.delete_all("#{self.class.versioned_foreign_key} = #{id}") if destroyed? - end - - def status - published? ? :published : :draft - end - - def set_updated_by - if updated_by_user_id - self.updated_by_id = updated_by_user_id - else - self.updated_by = updated_by_user - end - end - + include InstanceMethods + end + end + module InstanceMethods + def to_s + "#{self.class.name.titleize} '#{name}'" end end end lib/cms/acts/content_object.rb @@ -1,28 +1,35 @@ module Cms module Behaviors module Userstamping - def userstamped? - !!@is_userstamped + def self.included(model_class) + model_class.extend(MacroMethods) end - def is_userstamped - @is_userstamped = true - extend ClassMethods - include InstanceMethods + module MacroMethods + def userstamped? + !!@is_userstamped + end + def is_userstamped(options={}) + @is_userstamped = true + extend ClassMethods + include InstanceMethods - belongs_to :created_by, :class_name => "User" - belongs_to :updated_by, :class_name => "User" + belongs_to :created_by, :class_name => "User" + belongs_to :updated_by, :class_name => "User" - before_save :set_userstamps + before_save :set_userstamps - named_scope :created_by, lambda{|user| {:conditions => {:created_by => user}}} - named_scope :updated_by, lambda{|user| {:conditions => {:updated_by => user}}} - end - module ClassMethods - end - module InstanceMethods - def set_userstamps - self.created_by = User.current if new_record? - self.updated_by = User.current + named_scope :created_by, lambda{|user| {:conditions => {:created_by => user}}} + named_scope :updated_by, lambda{|user| {:conditions => {:updated_by => user}}} + end + module ClassMethods + end + module InstanceMethods + def set_userstamps + if new_record? + self.created_by = User.current + end + self.updated_by = User.current + end end end end lib/cms/behaviors/userstamping.rb @@ -67,7 +67,7 @@ module Cms def connect_to_page unless connect_to_page_id.blank? || connect_to_container.blank? self.connected_page = Page.find(connect_to_page_id) - connected_page.add_content_block!(self, connect_to_container) + connected_page.create_connector(self, connect_to_container) end end @@ -82,7 +82,7 @@ module Cms end def update_page(page) - page.update_attributes!(:new_revision_comment => "Edited block", :publish_on_save => (published? && page.published?), :updated_by_user => updated_by) + page.update_attributes!(:new_version_comment => "Edited block", :publish_on_save => (published? && page.published?), :updated_by_user => updated_by) page.connectors.all(:include => :page, :conditions => {:content_block_id => self.id, :content_block_type => self.class.name }).each do |conn| conn.increment!(:content_block_version) end lib/cms/block_support.rb @@ -7,15 +7,16 @@ module ActiveRecord t = TableDefinition.new(self) t.primary_key(options[:primary_key] || Base.get_primary_key(table_name)) unless options[:id] == false - t.integer :version, :default => 1 + t.integer :version t.integer :lock_version, :default => 0 yield t t.boolean :published, :default => false t.boolean :deleted, :default => false - t.boolean :archived, :default => false - t.timestamps + t.boolean :archived, :default => false + t.integer :created_by_id t.integer :updated_by_id - t.string :revision_comment + t.timestamps + create_table_from_definition(table_name, options, t) @@ -24,14 +25,17 @@ module ActiveRecord vt.primary_key(options[:primary_key] || Base.get_primary_key(table_name)) unless options[:id] == false vt.integer "#{table_name.singularize}_id".to_sym - vt.integer :version, :default => 1 + vt.integer :version yield vt vt.boolean :published, :default => false vt.boolean :deleted, :default => false t.boolean :archived, :default => false - vt.timestamps + vt.string :version_comment + vt.integer :created_by_id vt.integer :updated_by_id - vt.string :revision_comment + vt.timestamps + + create_table_from_definition("#{table_name.singularize}_versions".to_sym, options, vt) lib/cms/extensions/active_record/connection_adapters/abstract/schema_statements.rb @@ -4,8 +4,6 @@ raise "To avoid rake task loading problems: run 'rake clobber' in vendor/plugins # In rails 1.2, plugins aren't available in the path until they're loaded. # Check to see if the rspec plugin is installed first and require # it if it is. If not, use the gem version. -rspec_base = File.expand_path(File.dirname(__FILE__) + '/../../vendor/plugins/rspec/lib') -$LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base) require 'spec/rake/spectask' spec_prereq = File.exist?(File.join(RAILS_ROOT, 'config', 'database.yml')) ? "db:test:prepare" : :noop lib/tasks/rspec.rake @@ -1,4 +1,4 @@ #!/usr/bin/env ruby -$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/rspec/lib")) +require 'rubygems' require 'spec' exit ::Spec::Runner::CommandLine.run(::Spec::Runner::OptionParser.parse(ARGV, STDERR, STDOUT)) script/spec @@ -40,7 +40,7 @@ describe Cms::BlocksController do end it "should have link to revisions" do @action.call - response.should have_tag("a#revisions_link") + response.should have_tag("a", "Revisions") end end @@ -406,13 +406,9 @@ describe Cms::BlocksController do end describe "destroying" do - before(:each) do - @action = lambda { delete :destroy, :id => @block.id, :block_type => "portlet" } - end it "should remove the row" do - @action.call - delete = lambda {Portlet.find(@block.id)} - delete.should raise_error(ActiveRecord::RecordNotFound) + delete :destroy, :id => @block.id, :block_type => "portlet" + lambda { Portlet.find(@block.id) }.should raise_error(ActiveRecord::RecordNotFound) end end end spec/controllers/cms/blocks_controller_spec.rb @@ -8,27 +8,27 @@ describe Cms::ConnectorsController do @page = create_page(:section => root_section) @block = create_html_block(:connect_to_page_id => @page.id, :connect_to_container => "main") @page.reload - @destroy_connector = lambda { delete :destroy, :id => @page.connectors.first.id } + @remove_connector = lambda { delete :destroy, :id => @page.connectors.for_page_version(@page.version).first.id } end it "should create a new version the page" do - @destroy_connector.should change(Page::Version, :count).by(1) + @remove_connector.should change(Page::Version, :count).by(1) end it "should should increment the page version by 1" do @page.version.should == 2 - @destroy_connector.call + @remove_connector.call @page.reload.version.should == 3 end it "should destroy the connector" do - @destroy_connector.call - @page.reload.connectors.should be_empty + @remove_connector.call + @page.reload.connectors.for_page_version(@page.version).should be_empty end it "should redirect to the page" do - @destroy_connector.call + @remove_connector.call response.should redirect_to(@page.path) end end spec/controllers/cms/connector_controller_spec.rb @@ -104,7 +104,7 @@ describe Cms::ContentController do end describe "that has been archived" do it "should not be able to be found" do - @file_block.update_attributes(:archived => true, :updated_by_user => admin_user) + @file_block.update_attributes(:archived => true) reset(:file_block) @file_block.attachment.should be_archived @action.call spec/controllers/cms/content_controller_spec.rb @@ -36,7 +36,7 @@ describe Cms::PagesController do end it "should publish all blocks on the page" do @block = create_html_block(:name => 'foo') - @page.add_content_block!(@block, 'main') + @page.create_connector(@block, 'main') @action.call @block.reload.should be_published end @@ -78,7 +78,7 @@ describe Cms::PagesController do end it "should update the status" do @action.call - @page.should be_in_progress + @page.should_not be_published end end spec/controllers/cms/pages_controller_spec.rb @@ -64,7 +64,7 @@ HTML end it "should not show archived pages" do - @pit.archive(create_user) + @pit.archive helper.render_menu.should_not have_tag("a[href=#{@pit.path}]") end spec/helpers/menu_helper_spec.rb @@ -1,48 +1,48 @@ require File.dirname(__FILE__) + '/../../spec_helper' -describe "A Content Object" do +describe "A Content Object", :type => :model do before(:each) do @block = create_html_block(:name => "Test") end it "should add a default status to a block" do - @block.should be_draft + @block.should_not be_published end it "should allow blocks to be published" do - @block.publish(create_user) + @block.publish @block = HtmlBlock.find(@block.id) @block.should be_published end - it "should be live if it is published" do - @block.publish(create_user) - @block.should be_live + it "should be published if it is published" do + @block.publish + @block.should be_published end - it "should not be live if it is not published" do - @block.should_not be_live + it "should not be published if it is not published" do + @block.should_not be_published end it "should allow blocks to be marked as draft" do - @block.publish(create_user) + @block.publish @block.publish_on_save = false @block.save! - @block.reload.should be_draft + @block.reload.should_not be_published end - it "should support versioning" do - @block.should be_versionable + it "should be versioned" do + @block.class.should be_versioned end it "should respond to publish?" do - @block.publish(create_user) + @block.publish @block.should be_published end it "should respond to in_progress?" do @block.publish_on_save = false - @block.should be_draft + @block.should_not be_published end it "should respond to status_name" do @@ -62,26 +62,26 @@ describe "A Content Object" do describe "revision comment" do it "should be set to 'Created' if it is a new instance" do - @block.revision_comment.should == 'Created' - @block.as_of_version(@block.version).revision_comment.should == 'Created' + @block.current_version.version_comment.should == 'Created' + @block.as_of_version(@block.version).current_version.version_comment.should == 'Created' end it "should be set to 'Name, Content edited' if name and content were changed" do @block.name = "Something Else" @block.content = "Whatever" @block.save - @block.revision_comment.should == 'Name, Content edited' - @block.as_of_version(@block.version).revision_comment.should == 'Name, Content edited' + @block.current_version.version_comment.should == 'Changed content, name' + @block.as_of_version(@block.version).current_version.version_comment.should == 'Changed content, name' end it "should not be changed if the object is not changed" do @block.reload.save - @block.revision_comment.should == 'Created' - @block.as_of_version(@block.version).revision_comment.should == 'Created' + @block.current_version.version_comment.should == 'Created' + @block.as_of_version(@block.version).current_version.version_comment.should == 'Created' end - it "should be set to the value of new_revision_comment if one is set" do - @block.update_attributes(:name => "Something Else", :new_revision_comment => "Something Changed") + it "should be set to the value of version_comment if one is set" do + @block.update_attributes(:name => "Something Else", :version_comment => "Something Changed") @block.save - @block.revision_comment.should == "Something Changed" - @block.as_of_version(@block.version).revision_comment.should == "Something Changed" + @block.current_version.version_comment.should == "Something Changed" + @block.as_of_version(@block.version).current_version.version_comment.should == "Something Changed" end end @@ -95,27 +95,21 @@ describe "A Content Object" do end describe "without a new status" do it "should be draft" do - @block.publish!(create_user) + @block.publish! @block.name = "Whatever" @block.save! - @block.should be_draft + @block.should_not be_published end end end - describe "updating revision" do - it "should mark a content object as dirty anytime a comment is updated" do - @block.new_revision_comment = @block.revision_comment - @block.should be_changed - end - end describe "a non-versioned block that is connected to a page" do describe "when it is edited" do before do @page = create_page(:section => root_section) @block = create_dynamic_portlet(:name => "Test Portlet") - @page.add_content_block!(@block, "main") + @page.create_connector(@block, "main") reset(:page, :block) - @editing_the_block = lambda {@block.update_attribute(:name, "something different")} + @editing_the_block = lambda {@block.update_attributes(:name => "something different")} end it "should not change the page version" do @editing_the_block.call @@ -126,18 +120,18 @@ describe "A Content Object" do end it "should set the revision comment on the page" do @editing_the_block.call - @page.reload.revision_comment.should == "Dynamic Portlet 'Test Portlet' was added to the 'main' container" + @page.reload.current_version.version_comment.should == "Dynamic Portlet 'Test Portlet' was added to the 'main' container" end it "should create the right connectors" do @editing_the_block.call - conns = Connector.all(:conditions => ["content_block_id = ? and content_block_type = ?", @block.id, @block.class.base_class.name], :order => 'id') + conns = Connector.for_connectable(@block).all(:order => 'id') conns.size.should == 1 - conns[0].should_meet_expectations(:page => @page, :page_version => 2, :content_block => @block, :content_block_version => nil, :container => "main") + conns[0].should_meet_expectations(:page => @page, :page_version => 2, :connectable => @block, :connectable_version => nil, :container => "main") end describe "and saved" do - it "the page should not be live" do + it "the page should not be published" do @editing_the_block.call - @page.should_not be_live + @page.should_not be_published end end describe "and save and published" do @@ -145,21 +139,21 @@ describe "A Content Object" do before do @editing_the_block = lambda {@block.update_attributes(:name => "something different", :publish_on_save => true)} end - it "the page should be live" do + it "the page should be published" do @editing_the_block.call - @page.reload.should_not be_live + @page.reload.should_not be_published end end - describe "and the page is live then," do + describe "and the page is published then," do before do - @page.publish!(create_user) + @page.publish! reset(:page) @editing_the_block = lambda {@block.update_attributes(:name => "something different", :publish_on_save => true)} end - it "the page should be live" do + it "the page should be published" do @editing_the_block.call reset(:page) - @page.should be_live + @page.should be_published end end end @@ -169,7 +163,7 @@ describe "A Content Object" do describe "when it is edited" do before do @page = create_page(:section => root_section) - @page.add_content_block!(@block, "main") + @page.create_connector(@block, "main") reset(:page, :block) @editing_the_block = lambda {@block.update_attribute(:name, "something different")} end @@ -182,41 +176,41 @@ describe "A Content Object" do end it "should set the revision comment on the page" do @editing_the_block.call - @page.reload.revision_comment.should =~ /^Edited block.*/ + @page.reload.current_version.version_comment.should =~ /^Edited HtmlBlock#\d+/ end it "should create the right connectors" do @editing_the_block.call - conns = Connector.all(:conditions => ["content_block_id = ? and content_block_type = ?", @block.id, @block.class.name], :order => 'id') + conns = @block.connectors.all(:order => 'id') conns.size.should == 2 - conns[0].should_meet_expectations(:page => @page, :page_version => 2, :content_block => @block, :content_block_version => 1, :container => "main") - conns[1].should_meet_expectations(:page => @page, :page_version => 3, :content_block => @block, :content_block_version => 2, :container => "main") + conns[0].should_meet_expectations(:page => @page, :page_version => 2, :connectable => @block, :connectable_version => 1, :container => "main") + conns[1].should_meet_expectations(:page => @page, :page_version => 3, :connectable => @block, :connectable_version => 2, :container => "main") end describe "and saved" do - it "the page should not be live" do + it "the page should not be published" do @editing_the_block.call - @page.should_not be_live + @page.should_not be_published end end describe "and save and published" do describe "and the page is draft then," do before do - @editing_the_block = lambda {@block.update_attributes(:name => "something different", :publish_on_save => true)} + @editing_the_block = lambda {@block.reload.update_attributes(:name => "something different", :publish_on_save => true)} end - it "the page should be live" do + it "the page should be published" do @editing_the_block.call - @page.reload.should_not be_live + @page.reload.should_not be_published end end - describe "and the page is live then," do + describe "and the page is published then," do before do - @page.publish!(create_user) + @page.publish! reset(:page) - @editing_the_block = lambda {@block.update_attributes(:name => "something different", :publish_on_save => true)} + @editing_the_block = lambda {@block.reload.update_attributes(:name => "something different", :publish_on_save => true)} end - it "the page should be live" do + it "the page should be published" do @editing_the_block.call reset(:page) - @page.should be_live + @page.should be_published end end end @@ -224,7 +218,7 @@ describe "A Content Object" do end end -describe "Destroying a block" do +describe "Destroying a block", :type => :model do before do @block = create_html_block @destroying_the_block = lambda { @block.destroy } @@ -282,9 +276,4 @@ describe "Destroying a block" do HtmlBlock::Version.find(:all, "html_block_id =>#{@block.id}").size.should == 2 end - it "should remove all versions when doing destroy!" do - @block.destroy! - lambda { HtmlBlock.find_with_deleted(@b) }.should raise_error(ActiveRecord::RecordNotFound) - HtmlBlock::Version.find(:all, "html_block_id =>#{@block.id}").size.should == 0 - end end \ No newline at end of file spec/lib/acts/content_object_spec.rb @@ -5,8 +5,8 @@ describe Connector do it "should be able to find by block" do foo = create_html_block(:name => "foo") bar = create_html_block(:name => "bar") - create_connector(:content_block => foo, :content_block_version => foo.version) - blocks = Connector.for_block(foo).map(&:content_block) + create_connector(:connectable => foo, :connectable_version => foo.version) + blocks = Connector.for_connectable(foo).map(&:connectable) blocks.should include(foo) blocks.should_not include(bar) end @@ -15,22 +15,22 @@ describe Connector do @foo = create_html_block(:name => "foo") @foo.update_attribute(:name, "foo v2") @bar = create_html_block(:name => "bar") - @con = create_connector(:content_block => @foo) - @con.update_attribute(:content_block_version, 99) + @con = create_connector(:connectable => @foo) + @con.update_attribute(:connectable_version, 99) reset(:con) - lambda { @con.content_block }.should raise_error(ActiveRecord::RecordNotFound) + lambda { @con.current_connectable }.should raise_error(ActiveRecord::RecordNotFound) end it "should only find connectors for the current version of the page" do @page = create_page(:section => root_section) @connector = create_connector(:page => @page) @page.update_attributes(:name => "Updated") - @page.connectors.reload.size.should == 1 + @page.reload.connectors.for_page_version(@page.version).count.should == 1 end it "should not delete blocks when deleting a connector" do b = create_html_block - c = create_connector(:content_block => b) + c = create_connector(:connectable => b) lambda{ c.destroy }.should change(Connector, :count).by(-1) HtmlBlock.find(b).should_not be_nil end @@ -42,16 +42,16 @@ describe Connector do three = create_connector(:page => page, :container => "foo") two.reload.move_up - page.connectors.for_container("foo").map(&:id).should == [two, one, three].map(&:id) + page.reload.connectors.for_page_version(page.version).in_container("foo").all.map(&:id).should == [two, one, three].map(&:id) two.reload.move_down - page.connectors.for_container("foo").should == [one, two, three] + page.reload.connectors.for_page_version(page.version).in_container("foo").all.should == [one, two, three] three.reload.move_to_top - page.connectors.for_container("foo").should == [three, one, two] + page.reload.connectors.for_page_version(page.version).in_container("foo").all.should == [three, one, two] one.reload.move_to_bottom - page.connectors.for_container("foo").should == [three, two, one] + page.reload.connectors.for_page_version(page.version).in_container("foo").all.should == [three, two, one] end end spec/models/connector_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') describe FileBlock do - + describe "when saving a new record" do describe "without a file" do before do @@ -78,14 +78,14 @@ describe FileBlock do describe "when updating an existing record" do before do - @file_block = create_file_block(:section => root_section, :attachment_file_name => "/test.jpg", :attachment_file => mock_file(:read => "original"), :name => "Test", :updated_by_user => admin_user, :publish_on_save => true) + @file_block = create_file_block(:section => root_section, :attachment_file_name => "/test.jpg", :attachment_file => mock_file(:read => "original"), :name => "Test", :publish_on_save => true) reset(:file_block) @attachment = @file_block.attachment end describe "with changes to the attachment's file name" do before do log FileBlock.to_table_without(:created_at, :updated_at) - @update_file_block = lambda { @file_block.update_attributes!(:updated_by_user => admin_user, :attachment_file_name => "test_new.jpg", :attachment_file => nil, :publish_on_save => true) } + @update_file_block = lambda { @file_block.update_attributes!(:attachment_file_name => "test_new.jpg", :attachment_file => nil, :publish_on_save => true) } end it "should create a new attachment version" do @update_file_block.should change(Attachment::Version, :count).by(1) @@ -102,7 +102,7 @@ describe FileBlock do describe "with changes to the attachment's section" do before do @section = create_section(:parent => root_section, :name => "New") - @updating_the_file_block = lambda { @file_block.update_attributes!(:section => @section, :updated_by_user => admin_user, :publish_on_save => true) } + @updating_the_file_block = lambda { @file_block.update_attributes!(:section => @section, :publish_on_save => true) } end it "should not create a new attachment version" do @updating_the_file_block.should_not change(Attachment::Version, :count) @@ -125,7 +125,7 @@ describe FileBlock do end describe "with changes to the attachment's file data" do before do - @updating_the_file_block = lambda { @file_block.update_attributes!(:attachment_file => mock_file(:read => "new"), :updated_by_user => admin_user) } + @updating_the_file_block = lambda { @file_block.update_attributes!(:attachment_file => mock_file(:read => "new")) } end it "should not change the number of attachments" do @updating_the_file_block.should_not change(Attachment, :count) @@ -158,7 +158,7 @@ describe FileBlock do end describe "with changes to the attachment's file data and publish on save" do before do - @updating_the_file_block = lambda { @file_block.update_attributes!(:attachment_file => mock_file(:read => "new"), :updated_by_user => admin_user, :publish_on_save => true) } + @updating_the_file_block = lambda { @file_block.update_attributes!(:attachment_file => mock_file(:read => "new"), :publish_on_save => true) } end it "should not change the number of attachments" do @updating_the_file_block.should_not change(Attachment, :count) @@ -191,7 +191,7 @@ describe FileBlock do end describe "without changes to the attachment" do before do - @updating_the_file_block = lambda { @file_block.update_attributes!(:name => "Test 2", :updated_by_user => admin_user, :publish_on_save => true) } + @updating_the_file_block = lambda { @file_block.update_attributes!(:name => "Test 2", :publish_on_save => true) } end it "should not create a new attachment" do @updating_the_file_block.should_not change(Attachment, :count) @@ -213,8 +213,8 @@ describe FileBlock do before do @file1 = mock_file(:content_type => "text/plain", :read => "v1") @file2 = mock_file(:content_type => "text/plain", :read => "v2") - @file_block = create_file_block(:attachment_file => @file1, :attachment_file_name => "/test.txt", :section => root_section, :updated_by_user => admin_user) - @file_block.update_attributes(:attachment_file => @file2, :updated_by_user => admin_user) + @file_block = create_file_block(:attachment_file => @file1, :attachment_file_name => "/test.txt", :section => root_section) + @file_block.update_attributes(:attachment_file => @file2) reset(:file_block) end it "should show the correct content" do @@ -224,8 +224,8 @@ describe FileBlock do describe "when archiving a file block" do before do - @file_block = create_file_block(:attachment_file => mock_file, :attachment_file_name => "/test.txt", :section => root_section, :updated_by_user => admin_user) - @file_block.update_attributes(:archived => true, :updated_by_user => admin_user) + @file_block = create_file_block(:attachment_file => mock_file, :attachment_file_name => "/test.txt", :section => root_section) + @file_block.update_attributes(:archived => true) reset(:file_block) end it "should archive the attachment" do @@ -235,7 +235,7 @@ describe FileBlock do describe "when deleting a file block" do before do - @file_block = create_file_block(:attachment_file => mock_file, :attachment_file_name => "/test.txt", :section => root_section, :updated_by_user => admin_user) + @file_block = create_file_block(:attachment_file => mock_file, :attachment_file_name => "/test.txt", :section => root_section) @file_block.destroy end it "should delete the attachment" do @@ -245,11 +245,11 @@ describe FileBlock do describe do before do - @one = create_file_block(:attachment_file => mock_file, :attachment_file_name => "/one.txt", :section => root_section, :updated_by_user => admin_user) - @two = create_file_block(:attachment_file => mock_file, :attachment_file_name => "/two.txt", :section => root_section, :updated_by_user => admin_user) + @one = create_file_block(:attachment_file => mock_file, :attachment_file_name => "/one.txt", :section => root_section) + @two = create_file_block(:attachment_file => mock_file, :attachment_file_name => "/two.txt", :section => root_section) @section = create_section(:name => "A") - @a1 = create_file_block(:attachment_file => mock_file, :attachment_file_name => "/a/1.txt", :section => @section, :updated_by_user => admin_user) - @a2 = create_file_block(:attachment_file => mock_file, :attachment_file_name => "/2.txt", :section => @section, :updated_by_user => admin_user) + @a1 = create_file_block(:attachment_file => mock_file, :attachment_file_name => "/a/1.txt", :section => @section) + @a2 = create_file_block(:attachment_file => mock_file, :attachment_file_name => "/2.txt", :section => @section) reset(:one, :two, :a1, :a2) end it "should be able to find file blocks in the root section" do spec/models/file_block_spec.rb @@ -22,7 +22,7 @@ describe HtmlBlock do describe "versioning for blocks" do it "should support versioning" do h = HtmlBlock.new - h.versionable?.should be_true + h.class.should be_versioned end describe "when creating a record" do @@ -30,7 +30,7 @@ describe HtmlBlock do @html_block = create_html_block end it "should create a version when creating a html_block" do - @html_block.versions.latest.html_block.should == @html_block + @html_block.versions.last.html_block.should == @html_block end end @@ -41,8 +41,8 @@ describe HtmlBlock do @html_block.update_attributes(:name => "Something Different") end it "should create a version with the changed values" do - @html_block.versions.latest.html_block.should == @html_block - @html_block.versions.latest.name.should == "Something Different" + @html_block.versions.last.html_block.should == @html_block + @html_block.versions.last.name.should == "Something Different" @html_block.name.should == "Something Different" end it "should not affect the values in previous versions" do @@ -63,7 +63,7 @@ describe HtmlBlock do describe "when deleting a record" do before do @html_block = create_html_block - @delete_html_block = lambda { @html_block.mark_as_deleted!(create_user) } + @delete_html_block = lambda { @html_block.mark_as_deleted! } end it "should not actually delete the row" do @@ -84,22 +84,22 @@ describe HtmlBlock do @v1_created_at = Time.zone.now - 5.days @html_block.created_at = @v1_created_at @html_block.save - v1 = @html_block.versions.latest + v1 = @html_block.versions.last v1.created_at = @v1_created_at v1.save @html_block.update_attributes(:name => "Version Two") - @v2_created_at = @html_block.versions.latest.created_at + @v2_created_at = @html_block.versions.last.created_at end it "should be able to revert" do @html_block.name.should == "Version Two" - @html_block.revert_to 1, create_user + @html_block.revert_to 1 @html_block.reload.version.should == 3 @html_block.name.should == "Version One" end it "should keep the original created at time" do @html_block.find_version(1).created_at.to_i.should == @v1_created_at.to_i @html_block.find_version(2).created_at.to_i.should == @v2_created_at.to_i - @html_block.revert_to 1, create_user + @html_block.revert_to 1 @html_block.reload @html_block.find_version(1).created_at.to_i.should == @v1_created_at.to_i @html_block.find_version(2).created_at.to_i.should == @v2_created_at.to_i @@ -108,7 +108,7 @@ describe HtmlBlock do end describe "without specifying a version number" do before do - @action = lambda { @html_block.revert_to nil, create_user } + @action = lambda { @html_block.revert_to nil } end it "should raise 'Version parameter missing'" do @action.should raise_error("Version parameter missing") @@ -125,7 +125,7 @@ describe HtmlBlock do end describe "with an invalid version number" do before do - @action = lambda { @html_block.revert_to 99, create_user } + @action = lambda { @html_block.revert_to 99 } end it "should raise 'Could not find version 99'" do @action.should raise_error("Could not find version 99") spec/models/html_block_spec.rb @@ -15,7 +15,7 @@ describe Link do describe "versioning for links" do it "should support versioning" do h = Link.new - h.versionable?.should be_true + h.class.should be_versioned end describe "when creating a record" do @@ -23,7 +23,7 @@ describe Link do @link = create_link end it "should create a version when creating a link" do - @link.versions.latest.link.should == @link + @link.versions.last.link.should == @link end end @@ -34,8 +34,8 @@ describe Link do @link.update_attributes(:name => "Something Different") end it "should create a version with the changed values" do - @link.versions.latest.link.should == @link - @link.versions.latest.name.should == "Something Different" + @link.versions.last.link.should == @link + @link.versions.last.name.should == "Something Different" @link.name.should == "Something Different" end it "should not affect the values in previous versions" do @@ -56,7 +56,7 @@ describe Link do describe "when deleting a record" do before do @link = create_link - @delete_link = lambda { @link.mark_as_deleted!(create_user) } + @delete_link = lambda { @link.mark_as_deleted! } end it "should not actually delete the row" do spec/models/link_spec.rb @@ -7,26 +7,6 @@ describe Page do page.should_not be_valid page.should have(1).error_on(:path) end - - it "should require an updated_by_user on create" do - page = new_page(:path => "test", :section => root_section, :updated_by_user => nil) - page.should_not be_valid - page.should have(1).error_on(:updated_by_id) - end - - it "should require an updated_by_user on update" do - page = create_page(:path => "test", :section => root_section) - page = Page.find(page.id) - page.should_not be_valid - page.should have(1).error_on(:updated_by_id) - end - - it "should be valid if an updated_by_user is specified" do - page = create_page(:path => "test", :section => root_section) - page = Page.find(page.id) - page.updated_by_user = User.first - page.should be_valid - end describe ".find_by_path" do it "should be able to find the home page" do @@ -44,7 +24,7 @@ describe Page do create_page(:name => "Deleted Me", :path => "/test", :section => root_section).destroy @page = create_page(:name => "v1", :path => "/test", :section => root_section, :publish_on_save => true) @page = Page.find(@page.id) - @page.update_attributes!(:name => "v2", :updated_by_user => create_user) + @page.update_attributes!(:name => "v2") end it "should return the latest version of the page" do Page.find_live_by_path("/test").name.should == "v1" @@ -73,77 +53,78 @@ describe Page do describe "revision comment" do before { @page = create_page(:section => root_section, :name => "V1") } it "should be set to 'Created' when the page is created" do - @page.revision_comment.should == 'Created' + @page.current_version.version_comment.should == 'Created' end it "should not be changed if the object is not changed" do @page.reload.save - @page.reload.revision_comment.should == 'Created' - @page.as_of_version(@page.version).revision_comment.should == 'Created' + @page.reload.current_version.version_comment.should == 'Created' + @page.as_of_version(@page.version).current_version.version_comment.should == 'Created' end it "should be set to 'Name edited' when the name is changed" do @page.update_attributes(:name => "V2") - @page.revision_comment.should == 'Name edited' - @page.as_of_version(@page.version).revision_comment.should == 'Name edited' + @page.current_version.version_comment.should == 'Changed name' + @page.as_of_version(@page.version).current_version.version_comment.should == 'Changed name' end it "should be set to 'Html 'Hello, World!' was added to the 'main' container'" do @block = create_html_block(:name => "Hello, World!") - @page.add_content_block!(@block, "main") - @page.revision_comment.should == "Text 'Hello, World!' was added to the 'main' container" - @page.as_of_version(@page.version).revision_comment.should == "Text 'Hello, World!' was added to the 'main' container" + @page.create_connector(@block, "main") + @page.current_version.version_comment.should == "Html Block 'Hello, World!' was added to the 'main' container" + @page.as_of_version(@page.version).current_version.version_comment.should == "Html Block 'Hello, World!' was added to the 'main' container" end it "should be set to 'HtmlBlock 'Hello, World!' was moved up within the 'main' container'" do @block = create_html_block(:name => "Hello, World!") - @page.add_content_block!(create_html_block(:name => "Whatever"), "main") - @page.add_content_block!(@block, "main") - @page.move_connector_up(Connector.first(:conditions => {:content_block_id => @block.id})) - @page.revision_comment.should == "Text 'Hello, World!' was moved up within the 'main' container" - @page.as_of_version(@page.version).revision_comment.should == @page.revision_comment + @page.create_connector(create_html_block(:name => "Whatever"), "main") + @page.create_connector(@block, "main") + @page.move_connector_up(Connector.for_connectable(@block).first) + @page.current_version.version_comment.should == "Html Block 'Hello, World!' was moved up within the 'main' container" + @page.as_of_version(@page.version).current_version.version_comment.should == @page.current_version.version_comment end it "should be set to 'HtmlBlock 'Hello, World!' was moved down within the 'main' container'" do @block = create_html_block(:name => "Hello, World!") - @page.add_content_block!(@block, "main") - @page.add_content_block!(create_html_block(:name => "Whatever"), "main") - @page.move_connector_down(Connector.first(:conditions => {:content_block_id => @block.id})) - @page.revision_comment.should == "Text 'Hello, World!' was moved down within the 'main' container" - @page.as_of_version(@page.version).revision_comment.should == @page.revision_comment + @page.create_connector(@block, "main") + @page.create_connector(create_html_block(:name => "Whatever"), "main") + @page.move_connector_down(Connector.for_connectable(@block).first) + @page.current_version.version_comment.should == "Html Block 'Hello, World!' was moved down within the 'main' container" + @page.as_of_version(@page.version).current_version.version_comment.should == @page.current_version.version_comment end it "should be set to 'Html 'Hello, World!' was removed from the 'main' container'" do @block = create_html_block(:name => "Hello, World!") - @page.destroy_connector(@page.add_content_block!(@block, "main")) - @page.revision_comment.should == "Text 'Hello, World!' was removed from the 'main' container" - @page.as_of_version(@page.version).revision_comment.should == "Text 'Hello, World!' was removed from the 'main' container" + @page.remove_connector(@page.create_connector(@block, "main")) + @page.current_version.version_comment.should == "Html Block 'Hello, World!' was removed from the 'main' container" + @page.as_of_version(@page.version).current_version.version_comment.should == "Html Block 'Hello, World!' was removed from the 'main' container" end it "should be set to 'Reverted to version 1'" do @page.update_attribute(:name, "V2") - @page.revert_to(1, create_user) - @page.revision_comment.should == "Reverted to version 1" - @page.as_of_version(@page.version).revision_comment.should == "Reverted to version 1" + @page.revert_to(1) + @page.reload.current_version.version_comment.should == "Reverted to version 1" + @page.as_of_version(1).current_version.version_comment.should == "Created" + @page.as_of_version(2).current_version.version_comment.should == "Changed name" + @page.as_of_version(3).current_version.version_comment.should == "Reverted to version 1" end end describe "status" do - it "should be in progress when it is created" do + it "should not be published when it is created" do page = create_page - page.should be_in_progress page.should_not be_published end it "should be able to be published when creating" do page = new_page - page.publish(create_user).should be_true + page.publish.should be_true page.should be_published end it "should be able to be hidden" do page = create_page - page.hide!(create_user) + page.hide! page.should be_hidden end it "should be able to be published" do page = create_page(:section => root_section) page = Page.find(page.id) - page.publish(create_user).should be_true + page.publish.should be_true page.reload.should be_published end end @@ -151,14 +132,14 @@ describe Page do describe "#container_live?" do it "should be true if all blocks are published" do page = create_page(:section => root_section) - page.add_content_block!(create_html_block(:publish_on_save => true), "main") - page.add_content_block!(create_html_block(:publish_on_save => true), "main") + page.create_connector(create_html_block(:publish_on_save => true), "main") + page.create_connector(create_html_block(:publish_on_save => true), "main") page.container_published?("main").should be_true end it "should be false if there are any non-published blocks" do page = create_page(:section => root_section) - page.add_content_block!(create_html_block(:publish_on_save => true), "main") - page.add_content_block!(create_html_block, "main") + page.create_connector(create_html_block(:publish_on_save => true), "main") + page.create_connector(create_html_block, "main") page.container_published?("main").should be_false end end @@ -181,7 +162,7 @@ describe Page do @page = create_page end it "should create a version when creating a page" do - @page.versions.latest.page.should == @page + @page.current_version.page.should == @page end end @@ -189,14 +170,19 @@ describe Page do describe "with different values" do before do @first_guy = create_user(:login => "first_guy") - @page = create_page(:name => "Original Value", :updated_by_user => @first_guy) + User.current = @first_guy + @page = create_page(:name => "Original Value") @page = Page.find(@page.id) @new_guy = create_user(:login => "new_guy") - @page.update_attributes(:name => "Something Different", :updated_by_user => @new_guy) + User.current = @new_guy + @page.update_attributes(:name => "Something Different") + end + after do + User.current = nil end it "should create a version with the changed values" do - @page.versions.latest.page.should == @page - @page.versions.latest.name.should == "Something Different" + @page.current_version.page.should == @page + @page.current_version.name.should == "Something Different" @page.name.should == "Something Different" end it "should not affect the values in previous versions" do @@ -228,6 +214,7 @@ describe Page do it "should not actually delete the row" do @delete_page.should_not change(Page, :count_with_deleted) end + it "should create a new version" do @delete_page.should change(@page.versions, :count).by(1) end @@ -253,35 +240,16 @@ describe Page do it "should not remove all versions as well when doing a destroy" do @page.destroy - Page::Version.find(:all, "page_id =>#{@page.id}").size.should == 2 + Page::Version.count(:conditions => {:page_id => @page.id }).should == 2 end - it "should remove all versions when doing destroy!" do - @page.destroy! - lambda { Page.find_with_deleted(@page) }.should raise_error(ActiveRecord::RecordNotFound) - Page::Version.find(:all, "page_id =>#{@page.id}").size.should == 0 - end end - describe "#create_new_version!" do - before do - @page = create_page(:section => root_section) - @increment_version = lambda { @page.create_new_version! } - end - it "should increase the version number" do - @increment_version.call - @page.reload.version.should == 2 - end - it "should create a new version" do - @increment_version.should change(Page::Version, :count).by(1) - end - end - describe "reverting" do before do @page = create_page(:section => root_section, :name => "V1") @page.update_attribute(:name, "V2") - @revert_the_page = lambda { @page.revert_to(1, create_user)} + @revert_the_page = lambda { @page.revert_to(1)} end it "should change the version by 1" do @revert_the_page.should change(@page, :version).by(1) @@ -298,8 +266,8 @@ describe "A page with associated blocks" do before do @page = create_page(:section => root_section, :name => "Bar") @block = create_html_block - @other_connector = create_connector(:page => create_page(:section => root_section), :content_block => @block) - @page_connector = create_connector(:page => @page, :content_block => @block) + @other_connector = create_connector(:page => create_page(:section => root_section), :page_version => 1, :connectable => @block, :connectable_version => @block.version) + @page_connector = create_connector(:page => @page, :page_version => @page.version, :connectable => @block, :connectable_version => @block.version) @destroying_the_page = lambda { @page.destroy } end describe "when updating" do @@ -351,34 +319,36 @@ describe "A page that had 2 blocks added to it" do @page = create_page(:section => root_section) @foo_block = create_html_block(:name => "Foo Block") @bar_block = create_html_block(:name => "Bar Block") - @page.add_content_block!(@foo_block, "whatever") + @page.create_connector(@foo_block, "whatever") @page.reload - @page.add_content_block!(@bar_block, "whatever") + @page.create_connector(@bar_block, "whatever") @page.reload end describe "and then had then removed," do before do - @page.destroy_connector(@page.connectors.reload.first(:order => "connectors.position")) - @page.destroy_connector(@page.connectors.reload.first(:order => "connectors.position")) + @page.remove_connector(@page.reload.connectors.for_page_version(@page.version).first(:order => "connectors.position")) + @page.remove_connector(@page.reload.connectors.for_page_version(@page.version).first(:order => "connectors.position")) end describe "when reverting to the previous version," do before do - @reverting_to_the_previous_version = lambda { @page.revert(create_user) } + @reverting_to_the_previous_version = lambda { + @page.reload.revert + } end it "should restore the connectors from the version being reverted to" do @reverting_to_the_previous_version.should change(Connector, :count).by(1) - @page.connectors.reload.first.should_meet_expectations(:page => @page, :page_version => 6, :content_block => @bar_block, :content_block_version => 1, :container => "whatever") + @page.reload.connectors.for_page_version(@page.version).first.should_meet_expectations(:page => @page, :page_version => 6, :connectable => @bar_block, :connectable_version => 1, :container => "whatever") end end describe "when reverting to the version that had both connectors," do before do - @reverting_to_the_previous_version = lambda { @page.revert_to(3, create_user) } + @reverting_to_the_previous_version = lambda { @page.revert_to(3) } end it "should restore the connectors from version 3" do @reverting_to_the_previous_version.should change(Connector, :count).by(2) - foo, bar = @page.connectors.reload.find(:all, :order => "connectors.position") - foo.should_meet_expectations(:page => @page, :page_version => 6, :content_block => @foo_block, :content_block_version => 1, :container => "whatever") - bar.should_meet_expectations(:page => @page, :page_version => 6, :content_block => @bar_block, :content_block_version => 1, :container => "whatever") + foo, bar = @page.reload.connectors.for_page_version(@page.version).find(:all, :order => "connectors.position") + foo.should_meet_expectations(:page => @page, :page_version => 6, :connectable => @foo_block, :connectable_version => 1, :container => "whatever") + bar.should_meet_expectations(:page => @page, :page_version => 6, :connectable => @bar_block, :connectable_version => 1, :container => "whatever") end end end @@ -389,7 +359,19 @@ describe "A page that had 2 blocks added to it" do end describe "when reverting to a version of the page from before the update to the block," do before do - @reverting_the_page = lambda { @page.revert_to(3, create_user) } + @reverting_the_page = lambda { + # log Page.to_table_without_stamps(:description, :language, :keywords, :cacheable, :template_id, :hidden) + # log Page::Version.to_table_without_stamps(:description, :language, :keywords, :cacheable, :template_id, :hidden, :version_comment) + # log Connector.to_table_without_stamps(:container, :position) + # log HtmlBlock.to_table_without_stamps(:content) + # log HtmlBlock::Version.to_table_without_stamps(:content) + @page.revert_to(3) + # log Page.to_table_without_stamps(:description, :language, :keywords, :cacheable, :template_id, :hidden) + # log Page::Version.to_table_without_stamps(:description, :language, :keywords, :cacheable, :template_id, :hidden, :version_comment) + # log Connector.to_table_without_stamps(:container, :position) + # log HtmlBlock.to_table_without_stamps(:content) + # log HtmlBlock::Version.to_table_without_stamps(:content) + } end it "should change the block version from 2 to 3" do @foo_block.version.should == 2 @@ -398,12 +380,10 @@ describe "A page that had 2 blocks added to it" do end it "should return the block to the state as of the original version" do @reverting_the_page.call - @page.connectors.reload.first.content_block.name.should == "Foo Block" + @page.connectors.for_page_version(@page.version).reload.first.connectable.name.should == "Foo Block" end - it "should change the the page version from 4 to 5" do - @page.version.should == 4 - @reverting_the_page.call - @page.version.should == 5 + it "should change the the page version by 1" do + @reverting_the_page.should change(@page, :version).by(1) end end end @@ -413,7 +393,7 @@ describe "Adding a block to a page" do before do @page = create_page(:section => root_section) @block = create_html_block() - @adding_block = lambda { @conn = @page.add_content_block!(@block, "testing") } + @adding_block = lambda { @conn = @page.create_connector(@block, "testing") } end it "should set the page version to new page version" do @adding_block.call @@ -421,7 +401,7 @@ describe "Adding a block to a page" do end it "should set the content block version to existing block version" do @adding_block.call - @conn.content_block_version.should == 1 + @conn.connectable_version.should == 1 end it "should increment the page version by 1" do @adding_block.should change(@page, :version).by(1) @@ -430,9 +410,9 @@ describe "Adding a block to a page" do @adding_block.should change(Connector, :count).by(1) end it "should make the page be draft" do - @page.publish(create_user) + @page.publish @adding_block.call - @page.should be_draft + @page.should_not be_published end end @@ -441,9 +421,9 @@ describe "Adding a second block to a page" do @page = create_page(:section => root_section) @block = create_html_block() @block2 = create_html_block() - @first_conn = @page.add_content_block!(@block, "testing") + @first_conn = @page.create_connector(@block, "testing") @adding_block = lambda do - @conn = @page.add_content_block!(@block2, "testing") + @conn = @page.create_connector(@block2, "testing") end end it "should set the page version to new page version" do @@ -452,14 +432,14 @@ describe "Adding a second block to a page" do end it "should set the content block version to existing block version" do @adding_block.call - @conn.content_block_version.should == 1 + @conn.connectable_version.should == 1 end it "should increment the page version by 1" do @adding_block.should change(@page, :version).by(1) end it "should add 2 new connectors to the page" do @adding_block.call - @page.connectors.count.should == 2 + @page.connectors.for_page_version(@page.version).count.should == 2 end it "should create 2 new connectors" do @adding_block.should change(Connector, :count).by(2) @@ -467,24 +447,24 @@ describe "Adding a second block to a page" do it "should leave the connector for the first block untouched" do @adding_block.call @first_conn.reload - @first_conn.content_block.should == @block + @first_conn.connectable.should == @block @first_conn.page.should == @page @first_conn.page_version.should == 2 - @first_conn.content_block_version.should == 1 + @first_conn.connectable_version.should == 1 end it "should correctly wire up the 2 new connectors" do @adding_block.call @conns = Connector.all(:conditions => {:page_version => 3}, :order => "id") @conns.size.should == 2 - @conns[0].content_block.should == @block + @conns[0].connectable.should == @block @conns[0].page.should == @page @conns[0].page_version.should == 3 - @conns[0].content_block_version.should == 1 + @conns[0].connectable_version.should == 1 - @conns[1].content_block.should == @block2 + @conns[1].connectable.should == @block2 @conns[1].page.should == @page @conns[1].page_version.should == 3 - @conns[1].content_block_version.should == 1 + @conns[1].connectable_version.should == 1 end end @@ -493,10 +473,10 @@ describe "Adding a third block to a page" do @page = create_page(:section => root_section) @block = create_html_block() @block2 = create_html_block() - @first_conn = @page.add_content_block!(@block, "testing") - @second_conn = @page.add_content_block!(@block2, "testing") + @first_conn = @page.create_connector(@block, "testing") + @second_conn = @page.create_connector(@block2, "testing") @adding_block = lambda do - @conn = @page.add_content_block!(@block2, "testing") + @conn = @page.create_connector(@block2, "testing") end end it "should set the page version to 4" do @@ -509,14 +489,14 @@ describe "Adding a third block to a page" do end it "should set the content block version to existing block version" do @adding_block.call - @conn.content_block_version.should == 1 + @conn.connectable_version.should == 1 end it "should increment the page version by 1" do @adding_block.should change(@page, :version).by(1) end it "should add 3 new connectors to the page" do @adding_block.call - @page.connectors.count.should == 3 + @page.connectors.for_page_version(@page.version).count.should == 3 end it "should create 3 new connectors" do @adding_block.should change(Connector, :count).by(3) @@ -526,39 +506,39 @@ describe "Adding a third block to a page" do @conns = Connector.all(:conditions => ["page_version < 4"], :order => "id") @conns.size.should == 3 - @conns[0].content_block.should == @block + @conns[0].connectable.should == @block @conns[0].page.should == @page @conns[0].page_version.should == 2 - @conns[0].content_block_version.should == 1 + @conns[0].connectable_version.should == 1 - @conns[1].content_block.should == @block + @conns[1].connectable.should == @block @conns[1].page.should == @page @conns[1].page_version.should == 3 - @conns[1].content_block_version.should == 1 + @conns[1].connectable_version.should == 1 - @conns[2].content_block.should == @block2 + @conns[2].connectable.should == @block2 @conns[2].page.should == @page @conns[2].page_version.should == 3 - @conns[2].content_block_version.should == 1 + @conns[2].connectable_version.should == 1 end it "should correctly wire up the 3 new connectors" do @adding_block.call @conns = Connector.all(:conditions => {:page_version => 4}, :order => "id") @conns.size.should == 3 - @conns[0].content_block.should == @block + @conns[0].connectable.should == @block @conns[0].page.should == @page @conns[0].page_version.should == 4 - @conns[0].content_block_version.should == 1 + @conns[0].connectable_version.should == 1 - @conns[1].content_block.should == @block2 + @conns[1].connectable.should == @block2 @conns[1].page.should == @page @conns[1].page_version.should == 4 - @conns[1].content_block_version.should == 1 + @conns[1].connectable_version.should == 1 - @conns[2].content_block.should == @block2 + @conns[2].connectable.should == @block2 @conns[2].page.should == @page @conns[2].page_version.should == 4 - @conns[2].content_block_version.should == 1 + @conns[2].connectable_version.should == 1 end end @@ -566,43 +546,40 @@ describe "Removing a connector from a page" do before do @page = create_page(:section => root_section) @block = create_html_block() - @conn = @page.add_content_block!(@block, "testing") - @destroy_connector = lambda { @page.destroy_connector(@conn) } + @conn = @page.create_connector(@block, "testing") + @remove_connector = lambda { @page.remove_connector(@conn) } end it "should create a new version the page" do - @destroy_connector.should change(Page::Version, :count).by(1) + @remove_connector.should change(Page::Version, :count).by(1) end it "should should increment the page version by 1" do - @destroy_connector.should change(@page, :version).by(1) + @remove_connector.should change(@page, :version).by(1) end it "should not alter the original connector" do - @destroy_connector.call + @remove_connector.call conns = Connector.find(:all) conns.size.should == 1 conns[0].page.should == @page conns[0].page_version.should == 2 - conns[0].content_block.should == @block - conns[0].content_block_version.should == 1 + conns[0].connectable.should == @block + conns[0].connectable_version.should == 1 end it "should destroy the connector" do - @destroy_connector.call - @page.reload.connectors.should be_empty + @remove_connector.call + @page.reload.connectors.for_page_version(@page.version).should be_empty end - it "should return the frozen connector" do - c = @destroy_connector.call - c.should be_frozen - c.should == @conn - end - it "should mark the page as draft" do - @page.publish!(create_user) - @destroy_connector.call - @page.should be_draft + it "should mark the page as not published" do + @page.reload.publish! + @conn.connectable_version += 1 + con = @page.connectors.for_page_version(@page.version).like(@conn).first + @page.remove_connector(con) + @page.should_not be_published end end @@ -611,51 +588,51 @@ describe "Removing multiple blocks from a page" do @page = create_page(:section => root_section) @block1 = create_html_block() @block2 = create_html_block() - @conn = @page.add_content_block!(@block1, "bar") - @conn2 = @page.add_content_block!(@block2, "bar") - @conn3 = @page.add_content_block!(@block2, "foo") + @conn = @page.create_connector(@block1, "bar") + @conn2 = @page.create_connector(@block2, "bar") + @conn3 = @page.create_connector(@block2, "foo") #Need to get the new connector that matches @conn2, otherwise you will delete an older version, not the latest connector - @conn2 = Connector.first(:conditions => {:page_id => @page.reload.id, :page_version => @page.version, :content_block_id => @block2.id, :content_block_version => @block2.version, :container => "bar"}) - @page.destroy_connector(@conn2) - @destroy_connector = lambda { - @conn = Connector.first(:conditions => {:page_id => @page.reload.id, :page_version => @page.version, :content_block_id => @block2.id, :content_block_version => @block2.version, :container => "foo"}) - @page.destroy_connector(@conn) + @conn2 = Connector.first(:conditions => {:page_id => @page.reload.id, :page_version => @page.version, :connectable_id => @block2.id, :connectable_version => @block2.version, :container => "bar"}) + @page.remove_connector(@conn2) + @remove_connector = lambda { + @conn = Connector.first(:conditions => {:page_id => @page.reload.id, :page_version => @page.version, :connectable_id => @block2.id, :connectable_version => @block2.version, :container => "foo"}) + @page.remove_connector(@conn) } end it "should create a new version the page" do - @destroy_connector.should change(Page::Version, :count).by(1) + @remove_connector.should change(Page::Version, :count).by(1) end it "should have 5 total versions" do - @destroy_connector.call + @remove_connector.call Page::Version.count.should == 6 end it "should should increment the page version by 1" do - @destroy_connector.should change(@page, :version).by(1) + @remove_connector.should change(@page, :version).by(1) end it "should end up with the correct connectors" do - @destroy_connector.call - conns = Connector.find(:all, :order => "page_version, content_block_id, container") + @remove_connector.call + conns = Connector.find(:all, :order => "page_version, connectable_id, container") conns.size.should == 9 - conns[0].should_meet_expectations(:page => @page, :page_version => 2, :content_block => @block1, :content_block_version => 1, :container => "bar") - conns[1].should_meet_expectations(:page => @page, :page_version => 3, :content_block => @block1, :content_block_version => 1, :container => "bar") - conns[2].should_meet_expectations(:page => @page, :page_version => 3, :content_block => @block2, :content_block_version => 1, :container => "bar") - conns[3].should_meet_expectations(:page => @page, :page_version => 4, :content_block => @block1, :content_block_version => 1, :container => "bar") - conns[4].should_meet_expectations(:page => @page, :page_version => 4, :content_block => @block2, :content_block_version => 1, :container => "bar") - conns[5].should_meet_expectations(:page => @page, :page_version => 4, :content_block => @block2, :content_block_version => 1, :container => "foo") - conns[6].should_meet_expectations(:page => @page, :page_version => 5, :content_block => @block1, :content_block_version => 1, :container => "bar") - conns[7].should_meet_expectations(:page => @page, :page_version => 5, :content_block => @block2, :content_block_version => 1, :container => "foo") - conns[8].should_meet_expectations(:page => @page, :page_version => 6, :content_block => @block1, :content_block_version => 1, :container => "bar") + conns[0].should_meet_expectations(:page => @page, :page_version => 2, :connectable => @block1, :connectable_version => 1, :container => "bar") + conns[1].should_meet_expectations(:page => @page, :page_version => 3, :connectable => @block1, :connectable_version => 1, :container => "bar") + conns[2].should_meet_expectations(:page => @page, :page_version => 3, :connectable => @block2, :connectable_version => 1, :container => "bar") + conns[3].should_meet_expectations(:page => @page, :page_version => 4, :connectable => @block1, :connectable_version => 1, :container => "bar") + conns[4].should_meet_expectations(:page => @page, :page_version => 4, :connectable => @block2, :connectable_version => 1, :container => "bar") + conns[5].should_meet_expectations(:page => @page, :page_version => 4, :connectable => @block2, :connectable_version => 1, :container => "foo") + conns[6].should_meet_expectations(:page => @page, :page_version => 5, :connectable => @block1, :connectable_version => 1, :container => "bar") + conns[7].should_meet_expectations(:page => @page, :page_version => 5, :connectable => @block2, :connectable_version => 1, :container => "foo") + conns[8].should_meet_expectations(:page => @page, :page_version => 6, :connectable => @block1, :connectable_version => 1, :container => "bar") end it "should destroy one of the connectors" do - @destroy_connector.call - @page.reload.connectors.size.should == 1 + @remove_connector.call + @page.reload.connectors.for_page_version(@page.version).size.should == 1 end end @@ -663,13 +640,17 @@ end describe "A published page" do before do @user = create_user - @page = create_page(:section => root_section, :updated_by_user => @user) - @page.publish!(@user) + User.current = @user + @page = create_page(:section => root_section) + @page.publish! @page = Page.find(@page.id) end + after do + User.current = nil + end describe "when adding a block by 'save and publish'" do before do - @save_and_publish_the_block = lambda { @block = create_html_block(:connect_to_page_id => @page.id, :publish_on_save => true, :connect_to_container => "testing", :updated_by_user => @user, :name => "Home") } + @save_and_publish_the_block = lambda { @block = create_html_block(:connect_to_page_id => @page.id, :publish_on_save => true, :connect_to_container => "testing", :name => "Home") } end it "should change the connector count by 1" do @@ -677,7 +658,9 @@ describe "A published page" do end it "should make the page have one connector" do - @save_and_publish_the_block.should change(@page.connectors, :count).by(1) + count = @page.connectors.for_page_version(@page.version).count + @save_and_publish_the_block.call + @page.reload.connectors.for_page_version(@page.version).count.should == count + 1 end it "should set the page version to 4" do @@ -697,7 +680,7 @@ describe "A published page" do end describe "when adding a block by 'save'" do before do - @save_the_block = lambda { @block = create_html_block(:connect_to_page_id => @page.id, :connect_to_container => "testing", :updated_by_user => @user, :name => "Home") } + @save_the_block = lambda { @block = create_html_block(:connect_to_page_id => @page.id, :connect_to_container => "testing", :name => "Home") } end it "should change the connector count by 1" do @@ -705,7 +688,9 @@ describe "A published page" do end it "should make the page have one connector" do - @save_the_block.should change(@page.connectors, :count).by(1) + count = @page.connectors.for_page_version(@page.version).count + @save_the_block.call + @page.reload.connectors.for_page_version(@page.version).count.should == count + 1 end it "should set the page version to 4" do @@ -743,21 +728,21 @@ describe "An unpublished page with 1 published and an 1 unpublished block," do @page = create_page(:section => root_section) @published_block = create_html_block(:name => "Published") @unpublished_block = create_html_block(:name => "Unpublished") - @page.add_content_block!(@published_block, "main") - @page.add_content_block!(@unpublished_block, "main") - @published_block.publish!(create_user) + @page.create_connector(@published_block, "main") + @page.create_connector(@unpublished_block, "main") + @published_block.publish! @page.reload end describe "when publishing the block" do - it "the block should be live" do - @published_block.should be_live + it "the block should be published" do + @published_block.should be_published end - it "the page should not be live" do - @page.should_not be_live + it "the page should not be published" do + @page.should_not be_published end end describe "when publishing the page," do - before { @publishing_the_page = lambda { @page.publish!(create_user) } } + before { @publishing_the_page = lambda { @page.publish! } } it "should create a new version of the page" do @publishing_the_page.should change(Page::Version, :count).by(1) end @@ -767,21 +752,21 @@ describe "An unpublished page with 1 published and an 1 unpublished block," do it "should not create a new version of the published block" do @publishing_the_page.should_not change(@published_block.versions, :count) end - it "the page should be live" do + it "the page should be published" do @publishing_the_page.call - @page.should be_live + @page.should be_published end - it "the unpublished block should be live" do + it "the unpublished block should be published" do @publishing_the_page.call - @unpublished_block.reload.should be_live + @unpublished_block.reload.should be_published end - it "the published block should be live" do + it "the published block should be published" do @publishing_the_page.call - @published_block.reload.should be_live + @published_block.reload.should be_published end it "the page should be connected to the latest version of the unpublished block" do @publishing_the_page.call - @page.reload.connectors.last.content_block_version.should == 2 + @page.reload.connectors.for_page_version(@page.version).last.connectable_version.should == 2 end end end @@ -805,34 +790,28 @@ describe "Reverting a block that is on multiple pages" do @page2.version.should == 1 # 4. Goto page 2, and select that block. (Page 2, v2) - @page2.add_content_block!(@block, "main") + @page2.create_connector(@block, "main") reset(:page1, :page2, :block) @page1.version.should == 2 @page2.version.should == 2 # 5. Edit the block (Page 1, v3, Page 2, v3, Block v2) - @block.update_attributes!(:name => "Block v2", :updated_by_user => create_user) + @block.update_attributes!(:name => "Block v2") reset(:page1, :page2, :block) @page1.version.should == 3 @page2.version.should == 3 @block.version.should == 2 # 6. Revert page 1 to version 2. (Page 1, v4, Page 2, v4, Block v3) - log Page.to_table_with(:id, :version, :name) - log HtmlBlock.to_table_with(:id, :version, :name) - log Connector.to_table_without(:created_at, :updated_at) - @page1.revert_to(2, create_user) - log Page.to_table_with(:id, :version, :name) - log HtmlBlock.to_table_with(:id, :version, :name) - log Connector.to_table_without(:created_at, :updated_at) + @page1.revert_to(2) reset(:page1, :page2, :block) @page1.version.should == 4 @page2.version.should == 4 @block.version.should == 3 # Expected: Both page 1 and 2 will display the same version of the block (v1). - @page1.connectors.first.content_block.name.should == "Block v1" - @page2.connectors.first.content_block.name.should == "Block v1" + @page1.connectors.first.connectable.name.should == "Block v1" + @page2.connectors.first.connectable.name.should == "Block v1" end end @@ -844,7 +823,7 @@ describe "Viewing a previous version of a page" do # @page = create_page(:section => root_section) # @section = create_section(:parent => root_section, :name => "Other") # reset(:page) - # @page.update_attributes!(:section => @section, :updated_by_user => create_user) + # @page.update_attributes!(:section => @section) # reset(:page) # @page.section.should == @section # @page.as_of_version(1).section.should == root_section @@ -855,7 +834,7 @@ describe "Viewing a previous version of a page" do @bar = create_page_template(:name => "Bar") @page = create_page(:section => root_section, :template => @foo) reset(:page) - @page.update_attributes!(:template => @bar, :updated_by_user => create_user) + @page.update_attributes!(:template => @bar) reset(:page) @page.template.should == @bar @page.as_of_version(1).template.should == @foo @@ -874,13 +853,13 @@ describe "Viewing a previous version of a page" do @block.version.should == 1 # 3. Publish Page A (Page A v3, Block A v2) - @page.publish!(create_user) + @page.publish! reset(:page, :block) @page.version.should == 3 @block.version.should == 2 # 4. Edit Block A (Page A v4, Block A v3) - @block.update_attributes!(:name => "Block 2", :updated_by_user => create_user) + @block.update_attributes!(:name => "Block 2") reset(:page, :block) @page.version.should == 4 @block.version.should == 3 @@ -888,7 +867,7 @@ describe "Viewing a previous version of a page" do # Open Page A in a different browser (as guest) @live_page = Page.find_live_by_path(@page.path) @live_page.version.should == 3 - @live_page.version_connectors.first.content_block.name.should == "Block 1" + @live_page.connectors.for_page_version(@live_page.version).first.connectable.live_version.name.should == "Block 1" end end @@ -900,7 +879,7 @@ describe "Selecting a block" do reset(:page, :block) @page.should be_published @block.should be_published - @page.add_content_block!(@block, "main") + @page.create_connector(@block, "main") reset(:page, :block) end it "should put the page into draft mode" do spec/models/page_spec.rb @@ -12,7 +12,7 @@ describe Portlet do it "should be marked as not supporting revisioning" do p = new_dynamic_portlet - p.versionable?.should be_false + p.class.should_not be_versioned end describe "when appearing in a list" do spec/models/portlet_spec.rb @@ -103,7 +103,8 @@ class ActiveRecord::Base else columns = column_names end - all.to_table(*columns) + (uses_soft_delete? ? find_with_deleted(:all) : all).to_table(*columns) + #connection.select_all("select * from #{table_name}").map{|r| OpenStruct.new(r)}.to_table(*columns) end def self.to_table_with(*columns) to_table(:include_columns => columns) @@ -111,4 +112,7 @@ class ActiveRecord::Base def self.to_table_without(*columns) to_table(:exclude_columns => columns) end + def self.to_table_without_stamps(*columns) + to_table(:exclude_columns => %w[created_at updated_at created_by_id updated_by_id] + columns) + end end \ No newline at end of file spec/spec_extensions.rb lib/cms/acts/paranoid.rb lib/version_fu.rb spec/lib/block_support_spec.rb vendor/plugins/rspec-rails/.gitignore vendor/plugins/rspec-rails/History.txt vendor/plugins/rspec-rails/Manifest.txt vendor/plugins/rspec-rails/README.txt vendor/plugins/rspec-rails/Rakefile vendor/plugins/rspec-rails/UPGRADE vendor/plugins/rspec-rails/generators/rspec/CHANGES vendor/plugins/rspec-rails/generators/rspec/rspec_generator.rb vendor/plugins/rspec-rails/generators/rspec/templates/all_stories.rb vendor/plugins/rspec-rails/generators/rspec/templates/previous_failures.txt vendor/plugins/rspec-rails/generators/rspec/templates/rcov.opts vendor/plugins/rspec-rails/generators/rspec/templates/rspec.rake vendor/plugins/rspec-rails/generators/rspec/templates/script/autospec vendor/plugins/rspec-rails/generators/rspec/templates/script/spec vendor/plugins/rspec-rails/generators/rspec/templates/script/spec_server vendor/plugins/rspec-rails/generators/rspec/templates/spec.opts vendor/plugins/rspec-rails/generators/rspec/templates/spec_helper.rb vendor/plugins/rspec-rails/generators/rspec/templates/stories_helper.rb vendor/plugins/rspec-rails/generators/rspec_controller/USAGE vendor/plugins/rspec-rails/generators/rspec_controller/rspec_controller_generator.rb vendor/plugins/rspec-rails/generators/rspec_controller/templates/controller_spec.rb vendor/plugins/rspec-rails/generators/rspec_controller/templates/helper_spec.rb vendor/plugins/rspec-rails/generators/rspec_controller/templates/view_spec.rb vendor/plugins/rspec-rails/generators/rspec_default_values.rb vendor/plugins/rspec-rails/generators/rspec_model/USAGE vendor/plugins/rspec-rails/generators/rspec_model/rspec_model_generator.rb vendor/plugins/rspec-rails/generators/rspec_model/templates/model_spec.rb vendor/plugins/rspec-rails/generators/rspec_scaffold/rspec_scaffold_generator.rb vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/controller_spec.rb vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/edit_erb_spec.rb vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/helper_spec.rb vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/index_erb_spec.rb vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/new_erb_spec.rb vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/routing_spec.rb vendor/plugins/rspec-rails/generators/rspec_scaffold/templates/show_erb_spec.rb vendor/plugins/rspec-rails/init.rb vendor/plugins/rspec-rails/lib/autotest/discover.rb vendor/plugins/rspec-rails/lib/autotest/rails_rspec.rb vendor/plugins/rspec-rails/lib/spec/rails.rb vendor/plugins/rspec-rails/lib/spec/rails/example.rb vendor/plugins/rspec-rails/lib/spec/rails/example/assigns_hash_proxy.rb vendor/plugins/rspec-rails/lib/spec/rails/example/controller_example_group.rb vendor/plugins/rspec-rails/lib/spec/rails/example/cookies_proxy.rb vendor/plugins/rspec-rails/lib/spec/rails/example/functional_example_group.rb vendor/plugins/rspec-rails/lib/spec/rails/example/helper_example_group.rb vendor/plugins/rspec-rails/lib/spec/rails/example/model_example_group.rb vendor/plugins/rspec-rails/lib/spec/rails/example/rails_example_group.rb vendor/plugins/rspec-rails/lib/spec/rails/example/render_observer.rb vendor/plugins/rspec-rails/lib/spec/rails/example/view_example_group.rb vendor/plugins/rspec-rails/lib/spec/rails/extensions.rb vendor/plugins/rspec-rails/lib/spec/rails/extensions/action_controller/base.rb vendor/plugins/rspec-rails/lib/spec/rails/extensions/action_controller/rescue.rb vendor/plugins/rspec-rails/lib/spec/rails/extensions/action_controller/test_response.rb vendor/plugins/rspec-rails/lib/spec/rails/extensions/action_view/base.rb vendor/plugins/rspec-rails/lib/spec/rails/extensions/active_record/base.rb vendor/plugins/rspec-rails/lib/spec/rails/extensions/object.rb vendor/plugins/rspec-rails/lib/spec/rails/extensions/spec/example/configuration.rb vendor/plugins/rspec-rails/lib/spec/rails/extensions/spec/matchers/have.rb vendor/plugins/rspec-rails/lib/spec/rails/interop/testcase.rb vendor/plugins/rspec-rails/lib/spec/rails/matchers.rb vendor/plugins/rspec-rails/lib/spec/rails/matchers/assert_select.rb vendor/plugins/rspec-rails/lib/spec/rails/matchers/have_text.rb vendor/plugins/rspec-rails/lib/spec/rails/matchers/include_text.rb vendor/plugins/rspec-rails/lib/spec/rails/matchers/redirect_to.rb vendor/plugins/rspec-rails/lib/spec/rails/matchers/render_template.rb vendor/plugins/rspec-rails/lib/spec/rails/mocks.rb vendor/plugins/rspec-rails/lib/spec/rails/story_adapter.rb vendor/plugins/rspec-rails/lib/spec/rails/version.rb vendor/plugins/rspec-rails/spec/rails/autotest/mappings_spec.rb vendor/plugins/rspec-rails/spec/rails/example/assigns_hash_proxy_spec.rb vendor/plugins/rspec-rails/spec/rails/example/configuration_spec.rb vendor/plugins/rspec-rails/spec/rails/example/controller_isolation_spec.rb vendor/plugins/rspec-rails/spec/rails/example/controller_spec_spec.rb vendor/plugins/rspec-rails/spec/rails/example/cookies_proxy_spec.rb vendor/plugins/rspec-rails/spec/rails/example/example_group_factory_spec.rb vendor/plugins/rspec-rails/spec/rails/example/helper_spec_spec.rb vendor/plugins/rspec-rails/spec/rails/example/model_spec_spec.rb vendor/plugins/rspec-rails/spec/rails/example/shared_behaviour_spec.rb vendor/plugins/rspec-rails/spec/rails/example/test_unit_assertion_accessibility_spec.rb vendor/plugins/rspec-rails/spec/rails/example/view_spec_spec.rb vendor/plugins/rspec-rails/spec/rails/extensions/action_controller_rescue_action_spec.rb vendor/plugins/rspec-rails/spec/rails/extensions/action_view_base_spec.rb vendor/plugins/rspec-rails/spec/rails/extensions/active_record_spec.rb vendor/plugins/rspec-rails/spec/rails/interop/testcase_spec.rb vendor/plugins/rspec-rails/spec/rails/matchers/assert_select_spec.rb vendor/plugins/rspec-rails/spec/rails/matchers/description_generation_spec.rb vendor/plugins/rspec-rails/spec/rails/matchers/errors_on_spec.rb vendor/plugins/rspec-rails/spec/rails/matchers/have_text_spec.rb vendor/plugins/rspec-rails/spec/rails/matchers/include_text_spec.rb vendor/plugins/rspec-rails/spec/rails/matchers/redirect_to_spec.rb vendor/plugins/rspec-rails/spec/rails/matchers/render_spec.rb vendor/plugins/rspec-rails/spec/rails/mocks/ar_classes.rb vendor/plugins/rspec-rails/spec/rails/mocks/mock_model_spec.rb vendor/plugins/rspec-rails/spec/rails/mocks/stub_model_spec.rb vendor/plugins/rspec-rails/spec/rails/sample_modified_fixture.rb vendor/plugins/rspec-rails/spec/rails/sample_spec.rb vendor/plugins/rspec-rails/spec/rails/spec_server_spec.rb vendor/plugins/rspec-rails/spec/rails/spec_spec.rb vendor/plugins/rspec-rails/spec/rails_suite.rb vendor/plugins/rspec-rails/spec/spec_helper.rb vendor/plugins/rspec-rails/spec_resources/controllers/action_view_base_spec_controller.rb vendor/plugins/rspec-rails/spec_resources/controllers/controller_spec_controller.rb vendor/plugins/rspec-rails/spec_resources/controllers/redirect_spec_controller.rb vendor/plugins/rspec-rails/spec_resources/controllers/render_spec_controller.rb vendor/plugins/rspec-rails/spec_resources/controllers/rjs_spec_controller.rb vendor/plugins/rspec-rails/spec_resources/helpers/explicit_helper.rb vendor/plugins/rspec-rails/spec_resources/helpers/more_explicit_helper.rb vendor/plugins/rspec-rails/spec_resources/helpers/plugin_application_helper.rb vendor/plugins/rspec-rails/spec_resources/helpers/view_spec_helper.rb vendor/plugins/rspec-rails/spec_resources/views/controller_spec/_partial.rhtml vendor/plugins/rspec-rails/spec_resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml vendor/plugins/rspec-rails/spec_resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml vendor/plugins/rspec-rails/spec_resources/views/controller_spec/action_setting_the_assigns_hash.rhtml vendor/plugins/rspec-rails/spec_resources/views/controller_spec/action_with_errors_in_template.rhtml vendor/plugins/rspec-rails/spec_resources/views/controller_spec/action_with_template.rhtml vendor/plugins/rspec-rails/spec_resources/views/render_spec/_a_partial.rhtml vendor/plugins/rspec-rails/spec_resources/views/render_spec/some_action.js.rjs vendor/plugins/rspec-rails/spec_resources/views/render_spec/some_action.rhtml vendor/plugins/rspec-rails/spec_resources/views/render_spec/some_action.rjs vendor/plugins/rspec-rails/spec_resources/views/rjs_spec/_replacement_partial.rhtml vendor/plugins/rspec-rails/spec_resources/views/rjs_spec/hide_div.rjs vendor/plugins/rspec-rails/spec_resources/views/rjs_spec/hide_page_element.rjs vendor/plugins/rspec-rails/spec_resources/views/rjs_spec/insert_html.rjs vendor/plugins/rspec-rails/spec_resources/views/rjs_spec/replace.rjs vendor/plugins/rspec-rails/spec_resources/views/rjs_spec/replace_html.rjs vendor/plugins/rspec-rails/spec_resources/views/rjs_spec/replace_html_with_partial.rjs vendor/plugins/rspec-rails/spec_resources/views/rjs_spec/visual_effect.rjs vendor/plugins/rspec-rails/spec_resources/views/rjs_spec/visual_toggle_effect.rjs vendor/plugins/rspec-rails/spec_resources/views/tag_spec/no_tags.rhtml vendor/plugins/rspec-rails/spec_resources/views/tag_spec/single_div_with_no_attributes.rhtml vendor/plugins/rspec-rails/spec_resources/views/tag_spec/single_div_with_one_attribute.rhtml vendor/plugins/rspec-rails/spec_resources/views/view_spec/_partial.rhtml vendor/plugins/rspec-rails/spec_resources/views/view_spec/_partial_used_twice.rhtml vendor/plugins/rspec-rails/spec_resources/views/view_spec/_partial_with_local_variable.rhtml vendor/plugins/rspec-rails/spec_resources/views/view_spec/_partial_with_sub_partial.rhtml vendor/plugins/rspec-rails/spec_resources/views/view_spec/_spacer.rhtml vendor/plugins/rspec-rails/spec_resources/views/view_spec/accessor.rhtml vendor/plugins/rspec-rails/spec_resources/views/view_spec/entry_form.rhtml vendor/plugins/rspec-rails/spec_resources/views/view_spec/explicit_helper.rhtml vendor/plugins/rspec-rails/spec_resources/views/view_spec/foo/show.rhtml vendor/plugins/rspec-rails/spec_resources/views/view_spec/implicit_helper.rhtml vendor/plugins/rspec-rails/spec_resources/views/view_spec/multiple_helpers.rhtml vendor/plugins/rspec-rails/spec_resources/views/view_spec/template_with_partial.rhtml vendor/plugins/rspec-rails/spec_resources/views/view_spec/template_with_partial_using_collection.rhtml vendor/plugins/rspec-rails/spec_resources/views/view_spec/template_with_partial_with_array.rhtml vendor/plugins/rspec-rails/stories/all.rb vendor/plugins/rspec-rails/stories/configuration/stories.rb vendor/plugins/rspec-rails/stories/helper.rb vendor/plugins/rspec-rails/stories/steps/people.rb vendor/plugins/rspec-rails/stories/transactions_should_rollback vendor/plugins/rspec-rails/stories/transactions_should_rollback.rb vendor/plugins/rspec/.autotest vendor/plugins/rspec/.gitignore vendor/plugins/rspec/History.txt vendor/plugins/rspec/Manifest.txt vendor/plugins/rspec/README.txt vendor/plugins/rspec/Rakefile vendor/plugins/rspec/TODO vendor/plugins/rspec/bin/autospec vendor/plugins/rspec/bin/spec vendor/plugins/rspec/examples/pure/autogenerated_docstrings_example.rb vendor/plugins/rspec/examples/pure/before_and_after_example.rb vendor/plugins/rspec/examples/pure/behave_as_example.rb vendor/plugins/rspec/examples/pure/custom_expectation_matchers.rb vendor/plugins/rspec/examples/pure/custom_formatter.rb vendor/plugins/rspec/examples/pure/dynamic_spec.rb vendor/plugins/rspec/examples/pure/file_accessor.rb vendor/plugins/rspec/examples/pure/file_accessor_spec.rb vendor/plugins/rspec/examples/pure/greeter_spec.rb vendor/plugins/rspec/examples/pure/helper_method_example.rb vendor/plugins/rspec/examples/pure/io_processor.rb vendor/plugins/rspec/examples/pure/io_processor_spec.rb vendor/plugins/rspec/examples/pure/legacy_spec.rb vendor/plugins/rspec/examples/pure/mocking_example.rb vendor/plugins/rspec/examples/pure/multi_threaded_behaviour_runner.rb vendor/plugins/rspec/examples/pure/nested_classes_example.rb vendor/plugins/rspec/examples/pure/partial_mock_example.rb vendor/plugins/rspec/examples/pure/pending_example.rb vendor/plugins/rspec/examples/pure/predicate_example.rb vendor/plugins/rspec/examples/pure/priority.txt vendor/plugins/rspec/examples/pure/shared_example_group_example.rb vendor/plugins/rspec/examples/pure/shared_stack_examples.rb vendor/plugins/rspec/examples/pure/spec_helper.rb vendor/plugins/rspec/examples/pure/stack.rb vendor/plugins/rspec/examples/pure/stack_spec.rb vendor/plugins/rspec/examples/pure/stack_spec_with_nested_example_groups.rb vendor/plugins/rspec/examples/pure/stubbing_example.rb vendor/plugins/rspec/examples/stories/adder.rb vendor/plugins/rspec/examples/stories/addition vendor/plugins/rspec/examples/stories/addition.rb vendor/plugins/rspec/examples/stories/calculator.rb vendor/plugins/rspec/examples/stories/game-of-life/.loadpath vendor/plugins/rspec/examples/stories/game-of-life/README.txt vendor/plugins/rspec/examples/stories/game-of-life/behaviour/everything.rb vendor/plugins/rspec/examples/stories/game-of-life/behaviour/examples/examples.rb vendor/plugins/rspec/examples/stories/game-of-life/behaviour/examples/game_behaviour.rb vendor/plugins/rspec/examples/stories/game-of-life/behaviour/examples/grid_behaviour.rb vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/CellsWithLessThanTwoNeighboursDie.story vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/CellsWithMoreThanThreeNeighboursDie.story vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/EmptySpacesWithThreeNeighboursCreateACell.story vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/ICanCreateACell.story vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/ICanKillACell.story vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/TheGridWraps.story vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/create_a_cell.rb vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/helper.rb vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/kill_a_cell.rb vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/steps.rb vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/stories.rb vendor/plugins/rspec/examples/stories/game-of-life/behaviour/stories/stories.txt vendor/plugins/rspec/examples/stories/game-of-life/life.rb vendor/plugins/rspec/examples/stories/game-of-life/life/game.rb vendor/plugins/rspec/examples/stories/game-of-life/life/grid.rb vendor/plugins/rspec/examples/stories/helper.rb vendor/plugins/rspec/examples/stories/steps/addition_steps.rb vendor/plugins/rspec/failing_examples/README.txt vendor/plugins/rspec/failing_examples/diffing_spec.rb vendor/plugins/rspec/failing_examples/failing_autogenerated_docstrings_example.rb vendor/plugins/rspec/failing_examples/failure_in_setup.rb vendor/plugins/rspec/failing_examples/failure_in_teardown.rb vendor/plugins/rspec/failing_examples/mocking_example.rb vendor/plugins/rspec/failing_examples/mocking_with_flexmock.rb vendor/plugins/rspec/failing_examples/mocking_with_mocha.rb vendor/plugins/rspec/failing_examples/mocking_with_rr.rb vendor/plugins/rspec/failing_examples/partial_mock_example.rb vendor/plugins/rspec/failing_examples/predicate_example.rb vendor/plugins/rspec/failing_examples/raising_example.rb vendor/plugins/rspec/failing_examples/spec_helper.rb vendor/plugins/rspec/failing_examples/syntax_error_example.rb vendor/plugins/rspec/failing_examples/team_spec.rb vendor/plugins/rspec/failing_examples/timeout_behaviour.rb vendor/plugins/rspec/init.rb vendor/plugins/rspec/lib/autotest/discover.rb vendor/plugins/rspec/lib/autotest/rspec.rb vendor/plugins/rspec/lib/spec.rb vendor/plugins/rspec/lib/spec/adapters.rb vendor/plugins/rspec/lib/spec/adapters/ruby_engine.rb vendor/plugins/rspec/lib/spec/adapters/ruby_engine/mri.rb vendor/plugins/rspec/lib/spec/adapters/ruby_engine/rubinius.rb vendor/plugins/rspec/lib/spec/example.rb vendor/plugins/rspec/lib/spec/example/configuration.rb vendor/plugins/rspec/lib/spec/example/errors.rb vendor/plugins/rspec/lib/spec/example/example_group.rb vendor/plugins/rspec/lib/spec/example/example_group_factory.rb vendor/plugins/rspec/lib/spec/example/example_group_methods.rb vendor/plugins/rspec/lib/spec/example/example_matcher.rb vendor/plugins/rspec/lib/spec/example/example_methods.rb vendor/plugins/rspec/lib/spec/example/module_inclusion_warnings.rb vendor/plugins/rspec/lib/spec/example/module_reopening_fix.rb vendor/plugins/rspec/lib/spec/example/pending.rb vendor/plugins/rspec/lib/spec/example/shared_example_group.rb vendor/plugins/rspec/lib/spec/expectations.rb vendor/plugins/rspec/lib/spec/expectations/differs/default.rb vendor/plugins/rspec/lib/spec/expectations/errors.rb vendor/plugins/rspec/lib/spec/expectations/extensions.rb vendor/plugins/rspec/lib/spec/expectations/extensions/object.rb vendor/plugins/rspec/lib/spec/expectations/extensions/string_and_symbol.rb vendor/plugins/rspec/lib/spec/expectations/handler.rb vendor/plugins/rspec/lib/spec/extensions.rb vendor/plugins/rspec/lib/spec/extensions/class.rb vendor/plugins/rspec/lib/spec/extensions/main.rb vendor/plugins/rspec/lib/spec/extensions/metaclass.rb vendor/plugins/rspec/lib/spec/extensions/object.rb vendor/plugins/rspec/lib/spec/interop/test.rb vendor/plugins/rspec/lib/spec/interop/test/unit/autorunner.rb vendor/plugins/rspec/lib/spec/interop/test/unit/testcase.rb vendor/plugins/rspec/lib/spec/interop/test/unit/testresult.rb vendor/plugins/rspec/lib/spec/interop/test/unit/testsuite_adapter.rb vendor/plugins/rspec/lib/spec/interop/test/unit/ui/console/testrunner.rb vendor/plugins/rspec/lib/spec/matchers.rb vendor/plugins/rspec/lib/spec/matchers/be.rb vendor/plugins/rspec/lib/spec/matchers/be_close.rb vendor/plugins/rspec/lib/spec/matchers/change.rb vendor/plugins/rspec/lib/spec/matchers/eql.rb vendor/plugins/rspec/lib/spec/matchers/equal.rb vendor/plugins/rspec/lib/spec/matchers/exist.rb vendor/plugins/rspec/lib/spec/matchers/has.rb vendor/plugins/rspec/lib/spec/matchers/have.rb vendor/plugins/rspec/lib/spec/matchers/include.rb vendor/plugins/rspec/lib/spec/matchers/match.rb vendor/plugins/rspec/lib/spec/matchers/operator_matcher.rb vendor/plugins/rspec/lib/spec/matchers/raise_error.rb vendor/plugins/rspec/lib/spec/matchers/respond_to.rb vendor/plugins/rspec/lib/spec/matchers/satisfy.rb vendor/plugins/rspec/lib/spec/matchers/simple_matcher.rb vendor/plugins/rspec/lib/spec/matchers/throw_symbol.rb vendor/plugins/rspec/lib/spec/mocks.rb vendor/plugins/rspec/lib/spec/mocks/argument_constraint_matchers.rb vendor/plugins/rspec/lib/spec/mocks/argument_expectation.rb vendor/plugins/rspec/lib/spec/mocks/error_generator.rb vendor/plugins/rspec/lib/spec/mocks/errors.rb vendor/plugins/rspec/lib/spec/mocks/extensions.rb vendor/plugins/rspec/lib/spec/mocks/extensions/object.rb vendor/plugins/rspec/lib/spec/mocks/framework.rb vendor/plugins/rspec/lib/spec/mocks/message_expectation.rb vendor/plugins/rspec/lib/spec/mocks/methods.rb vendor/plugins/rspec/lib/spec/mocks/mock.rb vendor/plugins/rspec/lib/spec/mocks/order_group.rb vendor/plugins/rspec/lib/spec/mocks/proxy.rb vendor/plugins/rspec/lib/spec/mocks/space.rb vendor/plugins/rspec/lib/spec/mocks/spec_methods.rb vendor/plugins/rspec/lib/spec/rake/spectask.rb vendor/plugins/rspec/lib/spec/rake/verify_rcov.rb vendor/plugins/rspec/lib/spec/runner.rb vendor/plugins/rspec/lib/spec/runner/backtrace_tweaker.rb vendor/plugins/rspec/lib/spec/runner/class_and_arguments_parser.rb vendor/plugins/rspec/lib/spec/runner/command_line.rb vendor/plugins/rspec/lib/spec/runner/drb_command_line.rb vendor/plugins/rspec/lib/spec/runner/example_group_runner.rb vendor/plugins/rspec/lib/spec/runner/formatter/base_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/base_text_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/failing_example_groups_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/failing_examples_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/html_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/nested_text_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/profile_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/progress_bar_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/snippet_extractor.rb vendor/plugins/rspec/lib/spec/runner/formatter/specdoc_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/story/html_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/story/plain_text_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/story/progress_bar_formatter.rb vendor/plugins/rspec/lib/spec/runner/formatter/text_mate_formatter.rb vendor/plugins/rspec/lib/spec/runner/heckle_runner.rb vendor/plugins/rspec/lib/spec/runner/heckle_runner_unsupported.rb vendor/plugins/rspec/lib/spec/runner/option_parser.rb vendor/plugins/rspec/lib/spec/runner/options.rb vendor/plugins/rspec/lib/spec/runner/reporter.rb vendor/plugins/rspec/lib/spec/runner/spec_parser.rb vendor/plugins/rspec/lib/spec/story.rb vendor/plugins/rspec/lib/spec/story/extensions.rb vendor/plugins/rspec/lib/spec/story/extensions/main.rb vendor/plugins/rspec/lib/spec/story/extensions/regexp.rb vendor/plugins/rspec/lib/spec/story/extensions/string.rb vendor/plugins/rspec/lib/spec/story/given_scenario.rb vendor/plugins/rspec/lib/spec/story/runner.rb vendor/plugins/rspec/lib/spec/story/runner/plain_text_story_runner.rb vendor/plugins/rspec/lib/spec/story/runner/scenario_collector.rb vendor/plugins/rspec/lib/spec/story/runner/scenario_runner.rb vendor/plugins/rspec/lib/spec/story/runner/story_mediator.rb vendor/plugins/rspec/lib/spec/story/runner/story_parser.rb vendor/plugins/rspec/lib/spec/story/runner/story_runner.rb vendor/plugins/rspec/lib/spec/story/scenario.rb vendor/plugins/rspec/lib/spec/story/step.rb vendor/plugins/rspec/lib/spec/story/step_group.rb vendor/plugins/rspec/lib/spec/story/step_mother.rb vendor/plugins/rspec/lib/spec/story/story.rb vendor/plugins/rspec/lib/spec/story/world.rb vendor/plugins/rspec/lib/spec/version.rb vendor/plugins/rspec/plugins/mock_frameworks/flexmock.rb vendor/plugins/rspec/plugins/mock_frameworks/mocha.rb vendor/plugins/rspec/plugins/mock_frameworks/rr.rb vendor/plugins/rspec/plugins/mock_frameworks/rspec.rb vendor/plugins/rspec/rake_tasks/examples.rake vendor/plugins/rspec/rake_tasks/examples_with_rcov.rake vendor/plugins/rspec/rake_tasks/failing_examples_with_html.rake vendor/plugins/rspec/rake_tasks/verify_rcov.rake vendor/plugins/rspec/spec/README.jruby vendor/plugins/rspec/spec/autotest/discover_spec.rb vendor/plugins/rspec/spec/autotest/rspec_spec.rb vendor/plugins/rspec/spec/autotest_helper.rb vendor/plugins/rspec/spec/autotest_matchers.rb vendor/plugins/rspec/spec/rspec_suite.rb vendor/plugins/rspec/spec/ruby_forker.rb vendor/plugins/rspec/spec/spec.opts vendor/plugins/rspec/spec/spec/adapters/ruby_engine_spec.rb vendor/plugins/rspec/spec/spec/example/configuration_spec.rb vendor/plugins/rspec/spec/spec/example/example_group/described_module_spec.rb vendor/plugins/rspec/spec/spec/example/example_group/warning_messages_spec.rb vendor/plugins/rspec/spec/spec/example/example_group_class_definition_spec.rb vendor/plugins/rspec/spec/spec/example/example_group_factory_spec.rb vendor/plugins/rspec/spec/spec/example/example_group_methods_spec.rb vendor/plugins/rspec/spec/spec/example/example_group_spec.rb vendor/plugins/rspec/spec/spec/example/example_matcher_spec.rb vendor/plugins/rspec/spec/spec/example/example_methods_spec.rb vendor/plugins/rspec/spec/spec/example/example_runner_spec.rb vendor/plugins/rspec/spec/spec/example/example_spec.rb vendor/plugins/rspec/spec/spec/example/nested_example_group_spec.rb vendor/plugins/rspec/spec/spec/example/pending_module_spec.rb vendor/plugins/rspec/spec/spec/example/predicate_matcher_spec.rb vendor/plugins/rspec/spec/spec/example/shared_example_group_spec.rb vendor/plugins/rspec/spec/spec/example/subclassing_example_group_spec.rb vendor/plugins/rspec/spec/spec/expectations/differs/default_spec.rb vendor/plugins/rspec/spec/spec/expectations/extensions/object_spec.rb vendor/plugins/rspec/spec/spec/expectations/fail_with_spec.rb vendor/plugins/rspec/spec/spec/extensions/main_spec.rb vendor/plugins/rspec/spec/spec/interop/test/unit/resources/spec_that_fails.rb vendor/plugins/rspec/spec/spec/interop/test/unit/resources/spec_that_passes.rb vendor/plugins/rspec/spec/spec/interop/test/unit/resources/spec_with_errors.rb vendor/plugins/rspec/spec/spec/interop/test/unit/resources/test_case_that_fails.rb vendor/plugins/rspec/spec/spec/interop/test/unit/resources/test_case_that_passes.rb vendor/plugins/rspec/spec/spec/interop/test/unit/resources/test_case_with_errors.rb vendor/plugins/rspec/spec/spec/interop/test/unit/resources/testsuite_adapter_spec_with_test_unit.rb vendor/plugins/rspec/spec/spec/interop/test/unit/spec_spec.rb vendor/plugins/rspec/spec/spec/interop/test/unit/test_unit_spec_helper.rb vendor/plugins/rspec/spec/spec/interop/test/unit/testcase_spec.rb vendor/plugins/rspec/spec/spec/interop/test/unit/testsuite_adapter_spec.rb vendor/plugins/rspec/spec/spec/matchers/be_close_spec.rb vendor/plugins/rspec/spec/spec/matchers/be_spec.rb vendor/plugins/rspec/spec/spec/matchers/change_spec.rb vendor/plugins/rspec/spec/spec/matchers/description_generation_spec.rb vendor/plugins/rspec/spec/spec/matchers/eql_spec.rb vendor/plugins/rspec/spec/spec/matchers/equal_spec.rb vendor/plugins/rspec/spec/spec/matchers/exist_spec.rb vendor/plugins/rspec/spec/spec/matchers/handler_spec.rb vendor/plugins/rspec/spec/spec/matchers/has_spec.rb vendor/plugins/rspec/spec/spec/matchers/have_spec.rb vendor/plugins/rspec/spec/spec/matchers/include_spec.rb vendor/plugins/rspec/spec/spec/matchers/match_spec.rb vendor/plugins/rspec/spec/spec/matchers/matcher_methods_spec.rb vendor/plugins/rspec/spec/spec/matchers/mock_constraint_matchers_spec.rb vendor/plugins/rspec/spec/spec/matchers/operator_matcher_spec.rb vendor/plugins/rspec/spec/spec/matchers/raise_error_spec.rb vendor/plugins/rspec/spec/spec/matchers/respond_to_spec.rb vendor/plugins/rspec/spec/spec/matchers/satisfy_spec.rb vendor/plugins/rspec/spec/spec/matchers/simple_matcher_spec.rb vendor/plugins/rspec/spec/spec/matchers/throw_symbol_spec.rb vendor/plugins/rspec/spec/spec/mocks/any_number_of_times_spec.rb vendor/plugins/rspec/spec/spec/mocks/argument_expectation_spec.rb vendor/plugins/rspec/spec/spec/mocks/at_least_spec.rb vendor/plugins/rspec/spec/spec/mocks/at_most_spec.rb vendor/plugins/rspec/spec/spec/mocks/bug_report_10260_spec.rb vendor/plugins/rspec/spec/spec/mocks/bug_report_10263_spec.rb vendor/plugins/rspec/spec/spec/mocks/bug_report_11545_spec.rb vendor/plugins/rspec/spec/spec/mocks/bug_report_15719_spec.rb vendor/plugins/rspec/spec/spec/mocks/bug_report_7611_spec.rb vendor/plugins/rspec/spec/spec/mocks/bug_report_7805_spec.rb vendor/plugins/rspec/spec/spec/mocks/bug_report_8165_spec.rb vendor/plugins/rspec/spec/spec/mocks/bug_report_8302_spec.rb vendor/plugins/rspec/spec/spec/mocks/failing_mock_argument_constraints_spec.rb vendor/plugins/rspec/spec/spec/mocks/hash_including_matcher_spec.rb vendor/plugins/rspec/spec/spec/mocks/mock_ordering_spec.rb vendor/plugins/rspec/spec/spec/mocks/mock_space_spec.rb vendor/plugins/rspec/spec/spec/mocks/mock_spec.rb vendor/plugins/rspec/spec/spec/mocks/multiple_return_value_spec.rb vendor/plugins/rspec/spec/spec/mocks/null_object_mock_spec.rb vendor/plugins/rspec/spec/spec/mocks/once_counts_spec.rb vendor/plugins/rspec/spec/spec/mocks/options_hash_spec.rb vendor/plugins/rspec/spec/spec/mocks/partial_mock_spec.rb vendor/plugins/rspec/spec/spec/mocks/partial_mock_using_mocks_directly_spec.rb vendor/plugins/rspec/spec/spec/mocks/passing_mock_argument_constraints_spec.rb vendor/plugins/rspec/spec/spec/mocks/precise_counts_spec.rb vendor/plugins/rspec/spec/spec/mocks/record_messages_spec.rb vendor/plugins/rspec/spec/spec/mocks/stub_spec.rb vendor/plugins/rspec/spec/spec/mocks/twice_counts_spec.rb vendor/plugins/rspec/spec/spec/package/bin_spec_spec.rb vendor/plugins/rspec/spec/spec/runner/class_and_argument_parser_spec.rb vendor/plugins/rspec/spec/spec/runner/command_line_spec.rb vendor/plugins/rspec/spec/spec/runner/drb_command_line_spec.rb vendor/plugins/rspec/spec/spec/runner/empty_file.txt vendor/plugins/rspec/spec/spec/runner/examples.txt vendor/plugins/rspec/spec/spec/runner/execution_context_spec.rb vendor/plugins/rspec/spec/spec/runner/failed.txt vendor/plugins/rspec/spec/spec/runner/formatter/failing_example_groups_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/failing_examples_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.4.html vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.5-jruby.html vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.5.html vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.6-jruby.html vendor/plugins/rspec/spec/spec/runner/formatter/html_formatted-1.8.6.html vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/nested_text_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/profile_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/progress_bar_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/snippet_extractor_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/spec_mate_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/specdoc_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/story/html_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/story/plain_text_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/story/progress_bar_formatter_spec.rb vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.4.html vendor/plugins/rspec/spec/spec/runner/formatter/text_mate_formatted-1.8.6.html vendor/plugins/rspec/spec/spec/runner/heckle_runner_spec.rb vendor/plugins/rspec/spec/spec/runner/heckler_spec.rb vendor/plugins/rspec/spec/spec/runner/noisy_backtrace_tweaker_spec.rb vendor/plugins/rspec/spec/spec/runner/option_parser_spec.rb vendor/plugins/rspec/spec/spec/runner/options_spec.rb vendor/plugins/rspec/spec/spec/runner/output_one_time_fixture.rb vendor/plugins/rspec/spec/spec/runner/output_one_time_fixture_runner.rb vendor/plugins/rspec/spec/spec/runner/output_one_time_spec.rb vendor/plugins/rspec/spec/spec/runner/quiet_backtrace_tweaker_spec.rb vendor/plugins/rspec/spec/spec/runner/reporter_spec.rb vendor/plugins/rspec/spec/spec/runner/resources/a_bar.rb vendor/plugins/rspec/spec/spec/runner/resources/a_foo.rb vendor/plugins/rspec/spec/spec/runner/resources/a_spec.rb vendor/plugins/rspec/spec/spec/runner/spec.opts vendor/plugins/rspec/spec/spec/runner/spec_drb.opts vendor/plugins/rspec/spec/spec/runner/spec_parser/spec_parser_fixture.rb vendor/plugins/rspec/spec/spec/runner/spec_parser_spec.rb vendor/plugins/rspec/spec/spec/runner/spec_spaced.opts vendor/plugins/rspec/spec/spec/runner_spec.rb vendor/plugins/rspec/spec/spec/spec_classes.rb vendor/plugins/rspec/spec/spec/story/builders.rb vendor/plugins/rspec/spec/spec/story/extensions/main_spec.rb vendor/plugins/rspec/spec/spec/story/extensions_spec.rb vendor/plugins/rspec/spec/spec/story/given_scenario_spec.rb vendor/plugins/rspec/spec/spec/story/runner/plain_text_story_runner_spec.rb vendor/plugins/rspec/spec/spec/story/runner/scenario_collector_spec.rb vendor/plugins/rspec/spec/spec/story/runner/scenario_runner_spec.rb vendor/plugins/rspec/spec/spec/story/runner/story_mediator_spec.rb vendor/plugins/rspec/spec/spec/story/runner/story_parser_spec.rb vendor/plugins/rspec/spec/spec/story/runner/story_runner_spec.rb vendor/plugins/rspec/spec/spec/story/runner_spec.rb vendor/plugins/rspec/spec/spec/story/scenario_spec.rb vendor/plugins/rspec/spec/spec/story/step_group_spec.rb vendor/plugins/rspec/spec/spec/story/step_mother_spec.rb vendor/plugins/rspec/spec/spec/story/step_spec.rb vendor/plugins/rspec/spec/spec/story/story_helper.rb vendor/plugins/rspec/spec/spec/story/story_spec.rb vendor/plugins/rspec/spec/spec/story/world_spec.rb vendor/plugins/rspec/spec/spec_helper.rb vendor/plugins/rspec/stories/all.rb vendor/plugins/rspec/stories/configuration/before_blocks.story vendor/plugins/rspec/stories/configuration/stories.rb vendor/plugins/rspec/stories/example_groups/autogenerated_docstrings vendor/plugins/rspec/stories/example_groups/example_group_with_should_methods vendor/plugins/rspec/stories/example_groups/nested_groups vendor/plugins/rspec/stories/example_groups/output vendor/plugins/rspec/stories/example_groups/stories.rb vendor/plugins/rspec/stories/helper.rb vendor/plugins/rspec/stories/interop/examples_and_tests_together vendor/plugins/rspec/stories/interop/stories.rb vendor/plugins/rspec/stories/interop/test_case_with_should_methods vendor/plugins/rspec/stories/mock_framework_integration/stories.rb vendor/plugins/rspec/stories/mock_framework_integration/use_flexmock.story vendor/plugins/rspec/stories/pending_stories/README vendor/plugins/rspec/stories/resources/helpers/cmdline.rb vendor/plugins/rspec/stories/resources/helpers/story_helper.rb vendor/plugins/rspec/stories/resources/matchers/smart_match.rb vendor/plugins/rspec/stories/resources/spec/before_blocks_example.rb vendor/plugins/rspec/stories/resources/spec/example_group_with_should_methods.rb vendor/plugins/rspec/stories/resources/spec/simple_spec.rb vendor/plugins/rspec/stories/resources/spec/spec_with_flexmock.rb vendor/plugins/rspec/stories/resources/steps/running_rspec.rb vendor/plugins/rspec/stories/resources/stories/failing_story.rb vendor/plugins/rspec/stories/resources/test/spec_and_test_together.rb vendor/plugins/rspec/stories/resources/test/test_case_with_should_methods.rb vendor/plugins/rspec/stories/stories/multiline_steps.story vendor/plugins/rspec/stories/stories/steps/multiline_steps.rb vendor/plugins/rspec/stories/stories/stories.rb vendor/plugins/rspec/story_server/prototype/javascripts/builder.js vendor/plugins/rspec/story_server/prototype/javascripts/controls.js vendor/plugins/rspec/story_server/prototype/javascripts/dragdrop.js vendor/plugins/rspec/story_server/prototype/javascripts/effects.js vendor/plugins/rspec/story_server/prototype/javascripts/prototype.js vendor/plugins/rspec/story_server/prototype/javascripts/rspec.js vendor/plugins/rspec/story_server/prototype/javascripts/scriptaculous.js vendor/plugins/rspec/story_server/prototype/javascripts/slider.js vendor/plugins/rspec/story_server/prototype/javascripts/sound.js vendor/plugins/rspec/story_server/prototype/javascripts/unittest.js vendor/plugins/rspec/story_server/prototype/lib/server.rb vendor/plugins/rspec/story_server/prototype/stories.html vendor/plugins/rspec/story_server/prototype/stylesheets/rspec.css vendor/plugins/rspec/story_server/prototype/stylesheets/test.css 08f44d82f500a0262590d77af0a8926fe9df29e1 pbarry pbarry@0d4fd071-7843-0410-978a-dc594407b538 http://github.com/browsermedia/browsercms/commit/06a70f0f1e769906e77189294d23e10338800430 06a70f0f1e769906e77189294d23e10338800430 2008-12-03T17:38:51-08:00 2008-12-03T17:38:51-08:00 Major refactoring for behaviors, User.current, using just rspec gems now git-svn-id: https://svn.browsermedia.com/bmedia/browsercms/trunk@3462 0d4fd071-7843-0410-978a-dc594407b538 178d2a6726332da9a67cd4c6e809d74258785725 pbarry pbarry@0d4fd071-7843-0410-978a-dc594407b538