browsercms 3.1.4 → 3.1.5

data/lib/cms/content_rendering_support.rb

@@ -14,18 +14,18 @@ module Cms
 
     def handle_not_found_on_page(exception)
       logger.warn "Page Not Found"
-      handle_error_with_cms_page('/system/not_found', exception, :not_found)
+      handle_error_with_cms_page(Cms::ErrorPages::NOT_FOUND_PATH, exception, :not_found)
     end
 
     def handle_access_denied_on_page(exception)
       logger.warn "Access Denied"
-      handle_error_with_cms_page('/system/access_denied', exception, :forbidden)
+      handle_error_with_cms_page(Cms::ErrorPages::FORBIDDEN_PATH, exception, :forbidden)
     end
 
     def handle_server_error_on_page(exception)
       logger.warn "Exception: #{exception.message}\n"
       logger.warn "#{exception.backtrace.join("\n")}\n"
-      handle_error_with_cms_page('/system/server_error', exception, :internal_server_error)
+      handle_error_with_cms_page(Cms::ErrorPages::SERVER_ERROR_PATH, exception, :internal_server_error)
     end
 
     private

data/lib/cms/error_pages.rb

@@ -0,0 +1,8 @@
+module Cms
+  module ErrorPages
+
+    NOT_FOUND_PATH = '/system/not_found'
+    FORBIDDEN_PATH = '/system/access_denied'
+    SERVER_ERROR_PATH = '/system/server_error'
+  end
+end

data/lib/cms/init.rb

@@ -1,15 +1,17 @@
+# This avoids throwing Deprecation warnings for Rails 3 related issues which have already been fixed in the Rails 3 branch.
+# Remove when merged into BrowserCMS 3.3.x
+ActiveSupport::Deprecation.silenced = true
+
 module Cms
   class << self
     __root__ = File.expand_path(File.join(File.dirname(__FILE__), "..", ".."))
 
     define_method(:root) { __root__ }
 
-    ::SPEC = eval(File.read(__root__ + '/browsercms.gemspec'))
-
     attr_accessor :attachment_file_permission
 
     def version
-      @version = SPEC.version.version
+      @version = Cms::VERSION
     end
 
     def load_rake_tasks

data/lib/cms/version.rb

@@ -2,5 +2,5 @@
 # Allows the precise version of BrowserCMS to be determined programmatically.
 #
 module Cms
-  VERSION = "3.1.4"
+  VERSION = "3.1.5"
 end

data/templates/blank.rb

@@ -5,6 +5,8 @@ else
   run "rm public/index.html"
 end
 
+gem "ancestry", :version=>"1.2.4"
+
 # Loads the version, so we can explicitly set in the generated cms project.
 template_root = File.dirname(File.expand_path(template))
 require File.join(template_root, '..', 'lib', 'cms', 'version.rb')

data/templates/demo.rb

@@ -5,6 +5,8 @@ else
   run "rm public/index.html"
 end
 
+gem "ancestry", :version=>"1.2.4"
+
 # Loads the version, so we can explicitly set in the generated cms project.
 template_root = File.dirname(File.expand_path(template))
 require File.join(template_root, '..', 'lib', 'cms', 'version.rb')

data/templates/module.rb

@@ -1,5 +1,7 @@
 run "rm public/index.html"
 
+gem "ancestry", :version=>"1.2.4"
+
 # Loads the version, so we can explicitly set in the generated cms project.
 template_root = File.dirname(File.expand_path(template))
 require File.join(template_root, '..', 'lib', 'cms', 'version.rb')

data/test/custom_assertions.rb

@@ -1,4 +1,10 @@
 module CustomAssertions
+
+  # Remove for Rails 3/1.9.2
+  def refute(value, msg=nil)
+    assert !value, msg
+  end
+
   def assert_file_exists(file_name, message=nil)
     assert File.exists?(file_name), 
       (message || "Expected File '#{file_name}' to exist, but it does not")
@@ -37,7 +43,7 @@ module CustomAssertions
 
   def assert_properties(object, properties)
     properties.each do |property, expected_value|
-      assert_equal expected_value, object.send(property), "Expected '#{property}' to be '#{expected_value}'"
+      assert_equal expected_value, object.send(property), "For #{object.class}:#{object.id}, expected '#{property}' to be '#{expected_value}'"
     end
   end
 

data/test/factories.rb

@@ -18,7 +18,8 @@ Factory.define :connector do |m|
 end
 
 Factory.define :file_block do |m|
-  m.sequence(:name) {|n| "TestFileBlock#{n}"}
+  m.sequence(:name) {|i| "TestFileBlock#{i}"}
+  m.sequence(:attachment_file_path) {|i| "/file-#{i}.txt" }
 end
 
 Factory.define :group do |m|
@@ -40,6 +41,7 @@ end
 
 Factory.define :link do |m|
   m.sequence(:name) {|n| "Link #{n}"}
+  m.publish_on_save true
 end
 
 Factory.define :page do |m|

data/test/factories/sitemap_factories.rb

@@ -0,0 +1,28 @@
+Factory.define :root_section, :class=>Section do |m|
+  m.name "My Site"
+  m.path "/"
+  m.root true
+  m.groups { Group.all }
+end
+
+Factory.define :public_section, :class=>Section do |m|
+  m.sequence(:name) { |n| "Public Section #{n}" }
+  m.sequence(:path) { |n| "/public-section-#{n}" }
+  m.association :parent, :factory=>:root_section
+  m.groups { Group.all }
+end
+
+Factory.define :public_page, :class=>Page do |m|
+  m.sequence(:name) { |n| "Public Page #{n}" }
+  m.sequence(:path) { |n| "/public-page-#{n}" }
+  m.association :section, :factory=>:public_section
+  m.publish_on_save true
+end
+
+Factory.define :content_editor, :class=>User do |m|
+  m.sequence(:login) { |n| "test_#{n}" }
+  m.email { |a| "#{a.login}@example.com" }
+  m.password "password"
+  m.password_confirmation { |a| a.password }
+  m.groups { Group.all }
+end

data/test/fixtures/connectors.yml

@@ -0,0 +1,97 @@
+# auto-generated by rake db:fixtures:dump, DO NOT EDIT BY HAND!
+connector_1:
+  connectable_id: 1
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  page_version: 2
+  container: main
+  page_id: 2
+  id: 1
+  connectable_version: 1
+  position: 1
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+  connectable_type: HtmlBlock
+
+connector_2:
+  connectable_id: 1
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  page_version: 3
+  container: main
+  page_id: 2
+  id: 2
+  connectable_version: 1
+  position: 1
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+  connectable_type: HtmlBlock
+
+connector_3:
+  connectable_id: 2
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  page_version: 2
+  container: main
+  page_id: 3
+  id: 3
+  connectable_version: 1
+  position: 1
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+  connectable_type: HtmlBlock
+
+connector_4:
+  connectable_id: 2
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  page_version: 3
+  container: main
+  page_id: 3
+  id: 4
+  connectable_version: 1
+  position: 1
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+  connectable_type: HtmlBlock
+
+connector_5:
+  connectable_id: 3
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  page_version: 2
+  container: main
+  page_id: 4
+  id: 5
+  connectable_version: 1
+  position: 1
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+  connectable_type: HtmlBlock
+
+connector_6:
+  connectable_id: 3
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  page_version: 3
+  container: main
+  page_id: 4
+  id: 6
+  connectable_version: 1
+  position: 1
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+  connectable_type: HtmlBlock
+
+connector_7:
+  connectable_id: 4
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  page_version: 2
+  container: main
+  page_id: 1
+  id: 7
+  connectable_version: 1
+  position: 1
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+  connectable_type: HtmlBlock
+
+connector_8:
+  connectable_id: 4
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  page_version: 3
+  container: main
+  page_id: 1
+  id: 8
+  connectable_version: 1
+  position: 1
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+  connectable_type: HtmlBlock
+

data/test/fixtures/content_type_groups.yml

@@ -0,0 +1,13 @@
+# auto-generated by rake db:fixtures:dump, DO NOT EDIT BY HAND!
+content_type_group_1:
+  name: Core
+  updated_at: Wed Mar 04 22:55:27 UTC 2009
+  id: 1
+  created_at: Wed Mar 04 22:55:27 UTC 2009
+
+content_type_group_2:
+  name: Categorization
+  updated_at: Wed Mar 04 22:55:27 UTC 2009
+  id: 2
+  created_at: Wed Mar 04 22:55:27 UTC 2009
+

data/test/fixtures/content_types.yml

@@ -0,0 +1,50 @@
+# auto-generated by rake db:fixtures:dump, DO NOT EDIT BY HAND!
+content_type_1:
+  name: CategoryType
+  updated_at: Wed Mar 04 22:55:27 UTC 2009
+  id: 1
+  content_type_group_id: 2
+  created_at: Wed Mar 04 22:55:27 UTC 2009
+
+content_type_2:
+  name: Category
+  updated_at: Wed Mar 04 22:55:27 UTC 2009
+  id: 2
+  content_type_group_id: 2
+  created_at: Wed Mar 04 22:55:27 UTC 2009
+
+content_type_3:
+  name: HtmlBlock
+  updated_at: Wed Mar 04 22:55:27 UTC 2009
+  id: 3
+  content_type_group_id: 1
+  created_at: Wed Mar 04 22:55:27 UTC 2009
+
+content_type_4:
+  name: Portlet
+  updated_at: Wed Mar 04 22:55:27 UTC 2009
+  id: 4
+  content_type_group_id: 1
+  created_at: Wed Mar 04 22:55:27 UTC 2009
+
+content_type_5:
+  name: FileBlock
+  updated_at: Wed Mar 04 22:55:27 UTC 2009
+  id: 5
+  content_type_group_id: 1
+  created_at: Wed Mar 04 22:55:27 UTC 2009
+
+content_type_6:
+  name: ImageBlock
+  updated_at: Wed Mar 04 22:55:27 UTC 2009
+  id: 6
+  content_type_group_id: 1
+  created_at: Wed Mar 04 22:55:27 UTC 2009
+
+content_type_7:
+  name: Tag
+  updated_at: Wed Mar 04 22:55:27 UTC 2009
+  id: 7
+  content_type_group_id: 2
+  created_at: Wed Mar 04 22:55:27 UTC 2009
+

data/test/fixtures/dynamic_view_versions.yml

@@ -0,0 +1,26 @@
+dynamic_view_version_1:
+  id: 1
+  dynamic_view_id: 1
+  version: 1
+  type: PageTemplate
+  name: default
+  format: html
+  handler: erb
+  body: |
+    <html>
+      <head>
+        <title>
+          <%%= @page_title %>
+        </title>
+        <%%= yield :html_head %>
+      </head>
+      <body>
+        <%%= cms_toolbar %>
+        <%%= container :main %>
+      </body>
+    </html>
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  created_by_id: 1
+  updated_by_id: 1
+  deleted: false

data/test/fixtures/dynamic_views.yml

@@ -0,0 +1,26 @@
+dynamic_view_1:
+  id: 1
+  lock_version: 2
+  version: 1
+  type: PageTemplate
+  name: default
+  format: html
+  handler: erb
+  body: |
+    <html>
+      <head>
+        <title>
+          <%%= @page_title %>
+        </title>
+        <%%= yield :html_head %>
+      </head>
+      <body>
+        <%%= cms_toolbar %>
+        <%%= container :main %>
+      </body>
+    </html>
+  created_at: Wed Mar 04 22:55:28 UTC 2009
+  updated_at: Wed Mar 04 22:55:28 UTC 2009
+  created_by_id: 1
+  updated_by_id: 1
+  deleted: false

data/test/fixtures/group_permissions.yml

@@ -0,0 +1,16 @@
+# auto-generated by rake db:fixtures:dump, DO NOT EDIT BY HAND!
+group_permission_1:
+  permission_id: 1
+  id: 1
+  group_id: 2
+
+group_permission_2:
+  permission_id: 2
+  id: 2
+  group_id: 3
+
+group_permission_3:
+  permission_id: 3
+  id: 3
+  group_id: 3
+

data/test/fixtures/group_sections.yml

@@ -0,0 +1,31 @@
+# auto-generated by rake db:fixtures:dump, DO NOT EDIT BY HAND!
+group_section_1:
+  section_id: 1
+  id: 1
+  group_id: 1
+
+group_section_2:
+  section_id: 2
+  id: 2
+  group_id: 1
+
+group_section_3:
+  section_id: 1
+  id: 3
+  group_id: 2
+
+group_section_4:
+  section_id: 2
+  id: 4
+  group_id: 2
+
+group_section_5:
+  section_id: 1
+  id: 5
+  group_id: 3
+
+group_section_6:
+  section_id: 2
+  id: 6
+  group_id: 3
+

data/test/fixtures/group_type_permissions.yml

@@ -0,0 +1,11 @@
+# auto-generated by rake db:fixtures:dump, DO NOT EDIT BY HAND!
+group_type_permission_1:
+  group_type_id: 3
+  permission_id: 2
+  id: 1
+
+group_type_permission_2:
+  group_type_id: 3
+  permission_id: 3
+  id: 2
+