browsercms 3.0.4 → 3.0.5

data/app/helpers/application_helper.rb

@@ -1,3 +1,21 @@
 # Any code for core CMS should go in /cms/application_helper.rb rather than here.
 module ApplicationHelper
-end
+
+  def require_stylesheet_link(sources=(), content_area=:html_head)
+    @required_stylesheet_links ||= []
+    new_links = sources.to_a - @required_stylesheet_links
+    if !new_links.empty?
+      @required_stylesheet_links |= new_links
+      content_for(content_area, stylesheet_link_tag(new_links))
+    end
+  end
+
+  def require_javascript_include(sources=(), content_area=:html_head)
+    @required_javascript_includes ||= []
+    new_links = sources.to_a - @required_javascript_includes
+    if !new_links.empty?
+      @required_javascript_includes |= new_links
+      content_for(content_area, javascript_include_tag(new_links))
+    end
+  end
+end

data/app/views/cms/blocks/index.html.erb

@@ -124,5 +124,5 @@
 <% if params[:search] && @blocks.size == 0 %>
   <div class="pagination">No results found for '<%= params[:search][:term] %>'</div>
 <% elsif @blocks.total_pages > 1 %>
-  <%= render_pagination @blocks, content_type.content_block_type, :order => params[:order] %>
+  <%= render_pagination @blocks, content_type.content_block_type, :order => params[:order], :search => params[:search] %>
 <% end %>

data/app/views/cms/pages/_edit_connector.html.erb

@@ -1,4 +1,4 @@
-<div class="cms_edit_connectable" style="display: block; height: auto; position: relative; border: 1px solid #999; margin: 1px -6px 0 -6px; padding: 25px 5px 0 5px;  background: url(/images/cms/containers/beta.png) repeat-x 0 0;">
+<div id="connector_<%= connector.id %>" class="cms_edit_connectable" style="display: block; height: auto; position: relative; border: 1px solid #999; margin: 1px -6px 0 -6px; padding: 25px 5px 0 5px;  background: url(/images/cms/containers/beta.png) repeat-x 0 0;">
   <div style="display: block; width: 100%; position: absolute; top: 5px; left: 5px; height: 30px;">
     <%= link_to image_tag("cms/pages/show_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), cms_connectable_path(connectable), :title => "View this content (#{connectable.name})" , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;"%>
     <%= link_to image_tag("cms/pages/edit_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), edit_cms_connectable_path(connectable, :_redirect_to => @page.path), :title => "Edit this content (#{connectable.name})" , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;"%>
@@ -17,3 +17,5 @@
   </div>
     <%= render_connectable connectable %>
 </div>
+<% require_javascript_include ['jquery', 'cms/application'] %>
+

data/app/views/cms/toolbar/index.html.erb

@@ -1,12 +1 @@
-<% content_for :html_head do %>
-  <script type="text/javascript">
-  jQuery(function($){
-    $.cms.attachEventHandlers(parent.window.document)
-    $('.cms_connectable_header a.cms_connectable_edit', parent.window.document).each(function(){
-      $(this).attr('href', 
-        $(this).parents('.cms_edit_connectable').find('.cms_connectable_edit_link').attr('href'))      
-    })
-  })
-  </script>
-<% end %>
 <%= render_cms_toolbar(:sitemap) %>

data/browsercms.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{browsercms}
-  s.version = "3.0.4"
+  s.version = "3.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["BrowserMedia"]
-  s.date = %q{2009-11-09}
+  s.date = %q{2009-12-23}
   s.email = %q{github@browsermedia.com}
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -1240,70 +1240,70 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{BrowserCMS is a general purpose, open source Web Content Management System (CMS), written in Ruby on Rails.}
   s.test_files = [
-    "test/functional/cms/file_blocks_controller_test.rb",
-     "test/functional/cms/toolbar_controller_test.rb",
-     "test/functional/cms/sessions_controller_test.rb",
-     "test/functional/cms/content_types_controller_test.rb",
-     "test/functional/cms/dashboard_controller_test.rb",
-     "test/functional/cms/cache_controller_test.rb",
-     "test/functional/cms/html_blocks_controller_test.rb",
-     "test/functional/cms/users_controller_test.rb",
-     "test/functional/cms/content_controller_test.rb",
-     "test/functional/cms/links_controller_test.rb",
-     "test/functional/cms/dynamic_views_controller_test.rb",
-     "test/functional/cms/categories_controller_test.rb",
-     "test/functional/cms/content_block_controller_test.rb",
-     "test/functional/cms/pages_controller_test.rb",
-     "test/functional/cms/connectors_controller_test.rb",
-     "test/functional/cms/home_controller_test.rb",
-     "test/functional/cms/section_nodes_controller_test.rb",
-     "test/functional/cms/groups_controller_test.rb",
-     "test/functional/cms/sections_controller_test.rb",
-     "test/functional/cms/portlets_controller_test.rb",
-     "test/functional/cms/image_blocks_controller_test.rb",
-     "test/factories.rb",
-     "test/custom_assertions.rb",
-     "test/test_logging.rb",
-     "test/test_helper.rb",
-     "test/unit/helpers/page_helper_test.rb",
-     "test/unit/helpers/application_helper_test.rb",
-     "test/unit/helpers/path_helper_test.rb",
-     "test/unit/helpers/menu_helper_test.rb",
-     "test/unit/helpers/form_builder_test.rb",
-     "test/unit/schema_statements_test.rb",
+    "test/unit/schema_statements_test.rb",
      "test/unit/models/user_test.rb",
      "test/unit/models/link_test.rb",
-     "test/unit/models/email_page_portlet_test.rb",
      "test/unit/models/group_test.rb",
-     "test/unit/models/site_test.rb",
+     "test/unit/models/email_page_portlet_test.rb",
+     "test/unit/models/connector_test.rb",
      "test/unit/models/sections_test.rb",
-     "test/unit/models/section_node_test.rb",
      "test/unit/models/content_type_test.rb",
-     "test/unit/models/html_block_test.rb",
-     "test/unit/models/portlet_test.rb",
-     "test/unit/models/connector_test.rb",
-     "test/unit/models/task_test.rb",
-     "test/unit/models/page_test.rb",
+     "test/unit/models/file_block_test.rb",
+     "test/unit/models/attachment_test.rb",
+     "test/unit/models/site_test.rb",
      "test/unit/models/category_test.rb",
+     "test/unit/models/html_block_test.rb",
      "test/unit/models/page_route_test.rb",
+     "test/unit/models/section_node_test.rb",
+     "test/unit/models/category_type_test.rb",
      "test/unit/models/page_partial_test.rb",
-     "test/unit/models/attachment_test.rb",
-     "test/unit/models/file_block_test.rb",
-     "test/unit/models/permission_test.rb",
+     "test/unit/models/task_test.rb",
      "test/unit/models/page_template_test.rb",
-     "test/unit/models/category_type_test.rb",
-     "test/unit/behaviors/publishable_test.rb",
+     "test/unit/models/permission_test.rb",
+     "test/unit/models/page_test.rb",
+     "test/unit/models/portlet_test.rb",
+     "test/unit/helpers/page_helper_test.rb",
+     "test/unit/helpers/path_helper_test.rb",
+     "test/unit/helpers/form_builder_test.rb",
+     "test/unit/helpers/application_helper_test.rb",
+     "test/unit/helpers/menu_helper_test.rb",
+     "test/unit/behaviors/attaching_test.rb",
      "test/unit/behaviors/searching_test.rb",
-     "test/unit/behaviors/dynamic_attributes_test.rb",
      "test/unit/behaviors/taggable_test.rb",
-     "test/unit/behaviors/attaching_test.rb",
-     "test/unit/extensions/hash_test.rb",
+     "test/unit/behaviors/dynamic_attributes_test.rb",
+     "test/unit/behaviors/publishable_test.rb",
      "test/unit/extensions/active_record/base_test.rb",
      "test/unit/extensions/integer_test.rb",
-     "test/unit/lib/routes_test.rb",
+     "test/unit/extensions/hash_test.rb",
      "test/unit/lib/generators_test.rb",
+     "test/unit/lib/routes_test.rb",
      "test/unit/lib/content_block_test.rb",
-     "test/integration/login_test.rb"
+     "test/test_helper.rb",
+     "test/custom_assertions.rb",
+     "test/functional/cms/connectors_controller_test.rb",
+     "test/functional/cms/section_nodes_controller_test.rb",
+     "test/functional/cms/dashboard_controller_test.rb",
+     "test/functional/cms/sessions_controller_test.rb",
+     "test/functional/cms/groups_controller_test.rb",
+     "test/functional/cms/file_blocks_controller_test.rb",
+     "test/functional/cms/links_controller_test.rb",
+     "test/functional/cms/sections_controller_test.rb",
+     "test/functional/cms/content_types_controller_test.rb",
+     "test/functional/cms/pages_controller_test.rb",
+     "test/functional/cms/portlets_controller_test.rb",
+     "test/functional/cms/image_blocks_controller_test.rb",
+     "test/functional/cms/categories_controller_test.rb",
+     "test/functional/cms/content_block_controller_test.rb",
+     "test/functional/cms/cache_controller_test.rb",
+     "test/functional/cms/home_controller_test.rb",
+     "test/functional/cms/users_controller_test.rb",
+     "test/functional/cms/dynamic_views_controller_test.rb",
+     "test/functional/cms/content_controller_test.rb",
+     "test/functional/cms/html_blocks_controller_test.rb",
+     "test/functional/cms/toolbar_controller_test.rb",
+     "test/factories.rb",
+     "test/integration/login_test.rb",
+     "test/test_logging.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -1316,4 +1316,3 @@ Gem::Specification.new do |s|
   else
   end
 end
-

data/lib/cms/behaviors/versioning.rb

@@ -77,11 +77,9 @@ module Cms
           # First get the values from the draft
           attrs = draft_attributes
 
-          # Now overwrite any changed values      
-          self.class.versioned_columns.each do |col|
-            if(send("#{col}_changed?"))
-              attrs[col] = send(col)
-            end
+          # Now overwrite all values
+          (self.class.versioned_columns - %w(version)).each do |col|
+            attrs[col] = send(col)
           end
 
           attrs[:version_comment] = @version_comment || default_version_comment
@@ -112,7 +110,7 @@ module Cms
             #logger.info "..... Calling valid?"
             return false unless !perform_validations || valid?            
             
-            if changed?
+            if different_from_last_draft?
               #logger.info "..... Changes => #{changes.inspect}"
             else
               #logger.info "..... No Changes"
@@ -258,6 +256,16 @@ module Cms
           send(:changed_attributes)["version_comment"] = @version_comment
         end
 
+        def different_from_last_draft?
+          return true if self.changed?
+          last_draft = self.draft
+          return true unless last_draft
+          (self.class.versioned_columns - %w(version)).each do |col|
+            return true if self.send(col) != last_draft.send(col)
+          end
+          return false
+        end
+
       end
     end
 

data/test/unit/helpers/application_helper_test.rb

@@ -27,3 +27,54 @@ class Cms::ApplicationHelperTest < ActionView::TestCase
   end
   
 end
+
+class ApplicationHelperTest < ActionView::TestCase
+  # returns content supplied to this method for testing
+  def content_for(name, content = nil, &block)
+    return name, content
+  end
+  def test_require_stylesheet_link_renders_to_correct_area
+    stylesheet = 'site'
+    stylesheet2 = 'site2'
+    # default = :html_head
+    assert_equal :html_head, require_stylesheet_link(stylesheet)[0]
+    assert_equal :other_place, require_stylesheet_link(stylesheet2, :other_place)[0]
+  end
+
+  def test_require_stylesheet_link_renders_link_tag
+    stylesheet = 'site'
+    assert_equal stylesheet_link_tag(stylesheet), require_stylesheet_link(stylesheet)[1]
+  end
+  def test_require_stylesheet_link_renders_link_tags
+    stylesheet = ['site','site2']
+    assert_equal stylesheet_link_tag(stylesheet), require_stylesheet_link(stylesheet)[1]
+  end
+  def test_require_stylesheet_link_does_not_re_render_tag
+    stylesheet = 'site'
+    stylesheet2 = ['site','site2']
+    require_stylesheet_link(stylesheet)
+    assert_equal stylesheet_link_tag('site2'), require_stylesheet_link(stylesheet2)[1]    
+  end
+  def test_require_javascript_include_renders_to_correct_area
+    js = 'site'
+    js2 = 'site2'
+    # default = :html_head
+    assert_equal :html_head, require_javascript_include(js)[0]
+    assert_equal :other_place, require_javascript_include(js2, :other_place)[0]
+  end
+
+  def test_require_javascript_include_renders_link_tag
+    js = 'site'
+    assert_equal javascript_include_tag(js), require_javascript_include(js)[1]
+  end
+  def test_require_javascript_include_renders_link_tags
+    js = ['site','site2']
+    assert_equal javascript_include_tag(js), require_javascript_include(js)[1]
+  end
+  def test_require_javascript_include_does_not_re_render_tag
+    js = 'site'
+    js2 = ['site','site2']
+    require_javascript_include(js)
+    assert_equal javascript_include_tag('site2'), require_javascript_include(js2)[1]    
+  end
+end

data/test/unit/lib/content_block_test.rb

@@ -10,7 +10,6 @@ class ContentBlockTest < ActiveSupport::TestCase
     assert !@block.published?
 
     @block.publish
-
     assert @block.published?
 
     @block.publish_on_save = true
@@ -71,6 +70,45 @@ class ContentBlockTest < ActiveSupport::TestCase
   
 end
 
+class VersionedContentBlock < ActiveSupport::TestCase
+  def setup
+    @block = Factory(:html_block, :name => "Versioned Content Block")
+  end  
+
+  def test_edit
+    old_name = "Versioned Content Block"
+    new_name  = "New version of content block"
+    @block.publish!
+    @block.reload
+    assert_equal @block.draft.name, old_name
+    @block.name = new_name
+    @block.save
+    @block.reload
+    assert_equal @block.draft.name, new_name
+    @block.name = old_name
+    @block.save
+    @block.reload
+    assert_equal @block.draft.name, old_name    
+  end
+
+  def test_revert
+    old_name = "Versioned Content Block"
+    new_name  = "New version of content block"
+    @block.publish!
+    @block.reload
+    assert_equal @block.draft.name, old_name
+    version = @block.version
+    @block.name = new_name
+    @block.save
+    @block.reload
+    assert_equal @block.draft.name, new_name
+    @block.revert_to(version)
+    @block.reload
+    assert_equal @block.draft.name, old_name
+  end
+
+end
+
 class VersionedContentBlockConnectedToAPageTest < ActiveSupport::TestCase
   def setup
     @page = Factory(:page, :section => root_section)
@@ -137,8 +175,7 @@ class NonVersionedContentBlockConnectedToAPageTest < ActiveSupport::TestCase
   def test_editing_connected_to_an_unpublished_page
     page_version_count = Page::Version.count
 
-    assert_equal "Dynamic Portlet 'Non-Versioned Content Block' was added to the 'main' container",
-      @page.draft.version_comment
+    assert_equal "Dynamic Portlet 'Non-Versioned Content Block' was added to the 'main' container", @page.draft.version_comment
     assert !@page.published?
 
     assert @block.update_attributes(:name => "something different", :publish_on_save => true)
@@ -163,4 +200,4 @@ class NonVersionedContentBlockConnectedToAPageTest < ActiveSupport::TestCase
     
     assert @page.published?
   end  
-end
+end

data/test/unit/models/attachment_test.rb

@@ -53,8 +53,8 @@ class AttachmentTest < ActiveSupport::TestCase
     # log_table_with Attachment, :id, :name, :version, :file_path
     # log_table_with Attachment::Version, :id, :name, :version, :file_path, :attachment_id
     assert_equal 3, attachment.draft.version 
-    assert_equal "/bar.txt", attachment.as_of_draft_version.file_path
-    assert_equal "bar.txt", attachment.as_of_draft_version.file_name
+    assert_equal "/foo.txt", attachment.as_of_draft_version.file_path
+    assert_equal "foo.txt", attachment.as_of_draft_version.file_name
     assert_not_equal original_file_location, attachment.as_of_draft_version.file_location
     assert_equal "This is a new file", open(attachment.as_of_draft_version.full_file_location){|f| f.read}  
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: browsercms
 version: !ruby/object:Gem::Version 
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors: 
 - BrowserMedia
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-09 00:00:00 -05:00
+date: 2009-12-23 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -1270,67 +1270,67 @@ signing_key:
 specification_version: 3
 summary: BrowserCMS is a general purpose, open source Web Content Management System (CMS), written in Ruby on Rails.
 test_files: 
-- test/functional/cms/file_blocks_controller_test.rb
-- test/functional/cms/toolbar_controller_test.rb
-- test/functional/cms/sessions_controller_test.rb
-- test/functional/cms/content_types_controller_test.rb
-- test/functional/cms/dashboard_controller_test.rb
-- test/functional/cms/cache_controller_test.rb
-- test/functional/cms/html_blocks_controller_test.rb
-- test/functional/cms/users_controller_test.rb
-- test/functional/cms/content_controller_test.rb
-- test/functional/cms/links_controller_test.rb
-- test/functional/cms/dynamic_views_controller_test.rb
-- test/functional/cms/categories_controller_test.rb
-- test/functional/cms/content_block_controller_test.rb
-- test/functional/cms/pages_controller_test.rb
-- test/functional/cms/connectors_controller_test.rb
-- test/functional/cms/home_controller_test.rb
-- test/functional/cms/section_nodes_controller_test.rb
-- test/functional/cms/groups_controller_test.rb
-- test/functional/cms/sections_controller_test.rb
-- test/functional/cms/portlets_controller_test.rb
-- test/functional/cms/image_blocks_controller_test.rb
-- test/factories.rb
-- test/custom_assertions.rb
-- test/test_logging.rb
-- test/test_helper.rb
-- test/unit/helpers/page_helper_test.rb
-- test/unit/helpers/application_helper_test.rb
-- test/unit/helpers/path_helper_test.rb
-- test/unit/helpers/menu_helper_test.rb
-- test/unit/helpers/form_builder_test.rb
 - test/unit/schema_statements_test.rb
 - test/unit/models/user_test.rb
 - test/unit/models/link_test.rb
-- test/unit/models/email_page_portlet_test.rb
 - test/unit/models/group_test.rb
-- test/unit/models/site_test.rb
+- test/unit/models/email_page_portlet_test.rb
+- test/unit/models/connector_test.rb
 - test/unit/models/sections_test.rb
-- test/unit/models/section_node_test.rb
 - test/unit/models/content_type_test.rb
-- test/unit/models/html_block_test.rb
-- test/unit/models/portlet_test.rb
-- test/unit/models/connector_test.rb
-- test/unit/models/task_test.rb
-- test/unit/models/page_test.rb
+- test/unit/models/file_block_test.rb
+- test/unit/models/attachment_test.rb
+- test/unit/models/site_test.rb
 - test/unit/models/category_test.rb
+- test/unit/models/html_block_test.rb
 - test/unit/models/page_route_test.rb
+- test/unit/models/section_node_test.rb
+- test/unit/models/category_type_test.rb
 - test/unit/models/page_partial_test.rb
-- test/unit/models/attachment_test.rb
-- test/unit/models/file_block_test.rb
-- test/unit/models/permission_test.rb
+- test/unit/models/task_test.rb
 - test/unit/models/page_template_test.rb
-- test/unit/models/category_type_test.rb
-- test/unit/behaviors/publishable_test.rb
+- test/unit/models/permission_test.rb
+- test/unit/models/page_test.rb
+- test/unit/models/portlet_test.rb
+- test/unit/helpers/page_helper_test.rb
+- test/unit/helpers/path_helper_test.rb
+- test/unit/helpers/form_builder_test.rb
+- test/unit/helpers/application_helper_test.rb
+- test/unit/helpers/menu_helper_test.rb
+- test/unit/behaviors/attaching_test.rb
 - test/unit/behaviors/searching_test.rb
-- test/unit/behaviors/dynamic_attributes_test.rb
 - test/unit/behaviors/taggable_test.rb
-- test/unit/behaviors/attaching_test.rb
-- test/unit/extensions/hash_test.rb
+- test/unit/behaviors/dynamic_attributes_test.rb
+- test/unit/behaviors/publishable_test.rb
 - test/unit/extensions/active_record/base_test.rb
 - test/unit/extensions/integer_test.rb
-- test/unit/lib/routes_test.rb
+- test/unit/extensions/hash_test.rb
 - test/unit/lib/generators_test.rb
+- test/unit/lib/routes_test.rb
 - test/unit/lib/content_block_test.rb
+- test/test_helper.rb
+- test/custom_assertions.rb
+- test/functional/cms/connectors_controller_test.rb
+- test/functional/cms/section_nodes_controller_test.rb
+- test/functional/cms/dashboard_controller_test.rb
+- test/functional/cms/sessions_controller_test.rb
+- test/functional/cms/groups_controller_test.rb
+- test/functional/cms/file_blocks_controller_test.rb
+- test/functional/cms/links_controller_test.rb
+- test/functional/cms/sections_controller_test.rb
+- test/functional/cms/content_types_controller_test.rb
+- test/functional/cms/pages_controller_test.rb
+- test/functional/cms/portlets_controller_test.rb
+- test/functional/cms/image_blocks_controller_test.rb
+- test/functional/cms/categories_controller_test.rb
+- test/functional/cms/content_block_controller_test.rb
+- test/functional/cms/cache_controller_test.rb
+- test/functional/cms/home_controller_test.rb
+- test/functional/cms/users_controller_test.rb
+- test/functional/cms/dynamic_views_controller_test.rb
+- test/functional/cms/content_controller_test.rb
+- test/functional/cms/html_blocks_controller_test.rb
+- test/functional/cms/toolbar_controller_test.rb
+- test/factories.rb
 - test/integration/login_test.rb
+- test/test_logging.rb