browsercms 3.4.2.rc1 → 3.4.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    browsercms (3.4.2.rc1)
+    browsercms (3.4.2)
       ancestry (~> 1.2.4)
       ckeditor_rails (~> 3.6.2.2)
       jquery-rails (~> 1.0.14)
@@ -168,7 +168,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.32)
+    tzinfo (0.3.33)
     xpath (0.1.4)
       nokogiri (~> 1.3)
     yard (0.7.2)

data/app/controllers/cms/dynamic_views_controller.rb

@@ -18,7 +18,7 @@ module Cms
     end
 
     def create
-      @view = dynamic_view_type.new(params[dynamic_view_type.resource_collection_name])
+      @view = dynamic_view_type.new(params[view_param_name])
       if @view.save
         flash[:notice] = "#{dynamic_view_type} '#{@view.name}' was created"
         redirect_to cms_index_path_for(dynamic_view_type)
@@ -32,9 +32,9 @@ module Cms
     end
 
     def update
-      if @view.update_attributes(params[ActionController::RecordIdentifier.singular_class_name(dynamic_view_type)])
+      if @view.update_attributes(params[view_param_name])
         flash[:notice] = "#{dynamic_view_type} '#{@view.name}' was updated"
-        redirect_to cms_index_path_for(dynamic_view_type.name.underscore.pluralize)
+        redirect_to cms_index_path_for(dynamic_view_type)
       else
         render :action => "edit"
       end
@@ -43,10 +43,15 @@ module Cms
     def destroy
       @view.destroy
       flash[:notice] = "#{dynamic_view_type} '#{@view.name}' was deleted"
-      redirect_to cms_index_path_for(dynamic_view_type.name.underscore.pluralize)
+      redirect_to cms_index_path_for(dynamic_view_type)
     end
 
     protected
+
+    def view_param_name
+      dynamic_view_type.resource_collection_name
+    end
+
     def dynamic_view_type
       @dynamic_view_type ||= begin
         url = request.path.sub(/\?.*/, '')

data/app/helpers/cms/application_helper.rb

@@ -42,17 +42,6 @@ module Cms
       image_tag "cms/icons/status/#{status.to_s.underscore}.gif", {:alt => status.to_s.titleize}.merge(options)
     end
 
-    def link_to_usages(block)
-      count = block.connected_pages.count
-      if count > 0
-        # Would love a cleaner solution to this problem, see http://stackoverflow.com/questions/702728
-        path = Portlet === block ? usages_portlet_path(block) : [:usages, block]
-        link_to count, path, :id => block.id, :block_type => block.content_block_type
-      else
-        count
-      end
-    end
-
     def time_on_date(time)
       time && "#{time.strftime("%l:%M %p")} on #{time.strftime("%b %e, %Y")}"
     end

data/app/helpers/cms/path_helper.rb

@@ -27,7 +27,7 @@ module Cms
       if Portlet === connectable
         cms.portlet_path(connectable)
       else
-        connectable
+        polymorphic_path(build_path_for(connectable), options)
       end
     end
 
@@ -38,7 +38,26 @@ module Cms
       if Portlet === connectable
         edit_portlet_path(connectable, options)
       else
-        polymorphic_path([:edit, connectable], options)
+        edit_polymorphic_path(build_path_for(connectable), options)
+      end
+    end
+
+    def link_to_usages(block)
+      count = block.connected_pages.count
+      if count > 0
+        # Would love a cleaner solution to this problem, see http://stackoverflow.com/questions/702728
+        path = if Portlet === block
+                 usages_portlet_path(block)
+               else
+                 p = []
+                 p << engine_for(block)
+                 p << :usages
+                 p.concat path_elements_for(block)
+                 p
+               end
+        link_to count, path, :id => block.id, :block_type => block.content_block_type
+      else
+        count
       end
     end
 

data/app/views/cms/dynamic_views/edit.html.erb

@@ -1,3 +1,3 @@
 <% @page_title = @toolbar_title = "Edit '#{@view.name}' #{dynamic_view_type.name.titleize}" %>
-<%= content_for :functions, link_to(span_tag("List All"), cms_index_path_for(dynamic_view_type.name.underscore.pluralize), :class => "button") %>
+<%= content_for :functions, link_to(span_tag("List All"), cms_index_path_for(dynamic_view_type), :class => "button") %>
 <%= render :partial => 'form' %>

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

@@ -1,10 +1,10 @@
 <div class="cms_edit_container" style="height: auto; background: url(<%= asset_path "cms/containers/alpha.png" %>) repeat-x 0 0; border: 1px solid #999; margin: -8px 0 0 -8px; padding: 24px 7px 1px 7px; position: relative;">
     <div style="display: block; width: 100%; position: absolute; top: 5px; left: 5px; height: 30px;">
-      <%= link_to image_tag("cms/pages/add_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), cms.content_types_path(:connect_to_page_id => @page, :connect_to_container => name), :title => "Add new content to this container (#{name})" , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;"%>
+      <%= link_to image_tag("cms/pages/add_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), cms.content_types_path(:connect_to_page_id => @page, :connect_to_container => name), :title => "Add new content to this container (#{name})" , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;",  :id=>"add_new_content_#{name}"%>
       <%= link_to image_tag("cms/pages/connect_connectable.gif", :style => "text-decoration: none; padding: 0; background: none; margin: 0; float: none; border: none;"), cms.new_connector_path(:page_id => @page, :container => name), :title => "Insert existing content into this container (#{name})" , :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none;", :id=>"insert_existing_content_#{name}"%>
-      <%= image_tag "cms/#{@page.container_published?(name) ? 'published' : 'draft'}_status.gif", 
+      <%= image_tag "cms/#{@page.container_published?(name) ? 'published' : 'draft'}_status.gif",
             :class => "published_status",
-            :title => @page.container_published?(name) ? "This content is published and can be seen by site visitors." : "This content is a draft and won't be seen by site visitors until this page is published.", 
+            :title => @page.container_published?(name) ? "This content is published and can be seen by site visitors." : "This content is a draft and won't be seen by site visitors until this page is published.",
             :style => "text-decoration: none; padding: 0 2px 0 0; background: none; margin: 0; float: none; border: none; position: absolute; top: -1px; right: 12px;" %>
   </div>
   <%= content %>

data/doc/release_notes.md

@@ -1,3 +1,13 @@
+v3.4.2
+======
+
+Maintenance Release
+
+* [#502] Fix issue where Page templates/partials could not be editted through the UI
+* [#491] Fix issue where custom blocks couldn't be viewed in page edit mode
+* [#470] Fix issue where loading throws errors on some OS's (Ubuntu)
+
+
 v3.4.0
 ======
 

data/features/commands/new_projects.feature

@@ -6,7 +6,7 @@ Feature: New Project Generator
 
   Scenario: Output the Version
     When I run `bcms -v`
-    Then the output should contain "BrowserCMS 3.4.0"
+    Then the output should contain "BrowserCMS 3.4.2"
 
   Scenario: Create a new BrowserCMS project
     When I create a new BrowserCMS project named "hello"

data/features/content_blocks/manage_custom_blocks.feature

@@ -40,6 +40,25 @@ Feature: Manage Content Blocks
     When I delete "Kindle Fire"
     Then I should be redirected to /cms/products
 
+  Scenario: Add to a page
+    When I visit /
+    And I turn on edit mode for /
+    And I add content to the main area of the page
+    And I click on "Product"
+    And I fill in "Name" with "iPhone"
+    And I click on "Save"
+    Then the response should be 200
+    And I should see "Name: iPhone"
+
+  Scenario: View Usages
+    Given a product "iPhone" has been added to a page
+    When I view that product
+    Then the response should be 200
+    And the page header should be "View Product 'iPhone'"
+    And I should see "Used on: 1 page"
+
+
+
 
 
 

data/features/content_blocks/manage_html_blocks.feature

@@ -38,5 +38,11 @@ Feature: Manage Html Blocks
       | published               |
       | View Text 'Hello World' |
 
+  Scenario: View Usages
+    Given html with "Hello World" has been added to a page
+    When I view that block
+    Then the response should be 200
+    And the page header should be "View Text"
+    And I should see "Used on: 1 page"
     
   

data/features/page_templates.feature

@@ -23,3 +23,27 @@ Feature: Page Templates
     Then I should see "Displaying 1 - 15 of 20"
     When I click on "next_page_link"
     Then I should see "Displaying 16 - 20 of 20"
+
+  Scenario: Edit a template
+    Given the following page template exists:
+      | name  |
+      | hello |
+    When I edit that page template
+    Then the response should be 200
+    And the page header should be "Edit 'hello' Cms/Page Template"
+    When I fill in "Name" with "hello_world"
+    And I press "Save"
+    Then the response should be 200
+    And the page header should be "List Page Templates"
+    And I should see the following content:
+      | hello_world |
+
+
+  Scenario: Delete a template
+    Given the following page template exists:
+      | name  |
+      | hello |
+    When I delete that page template
+    Then the response should be 200
+    And the page header should be "List Page Templates"
+    And I should not see the "hello" template in the table

data/features/portlets/portlets.feature

@@ -90,4 +90,11 @@ Feature: Portlets
     Given I am not logged in
     And a page with a portlet that raises both a 403 and any other error exists
     When I visit that page
-    Then I should see the CMS :forbidden page
+    Then I should see the CMS :forbidden page
+
+  Scenario: View Usages
+    Given portlet named "Hello World" has been added to a page
+    When I view that portlet
+    Then the response should be 200
+    And the page header should be "View Portlet 'Hello World'"
+    And I should see "Used on: 1 page"

data/features/step_definitions/command_line_steps.rb

@@ -122,7 +122,7 @@ When /^BrowserCMS should be added the Gemfile$/ do
 end
 
 Then /^Gemfile should have the correct version of BrowserCMS$/ do
-  check_file_content("Gemfile", %!gem "browsercms", "3.4.0.rc3"!, true)
+  check_file_content("Gemfile", %!gem "browsercms", "#{Cms::VERSION}"!, true)
 end
 
 When /^the production environment should be configured with reasonable defaults$/ do

data/features/step_definitions/edit_page_templates_steps.rb

@@ -0,0 +1,21 @@
+Given /^the following page template exists:$/ do |table|
+  @page_templates =[]
+  table.hashes.each do |r|
+    @page_templates << Factory(:page_template, r)
+  end
+end
+
+When /^I edit that page template$/ do
+  visit "/cms/page_templates/#{@page_templates.first.id}/edit"
+end
+When /^I delete that page template$/ do
+  page.driver.delete "/cms/page_templates/#{@page_templates.first.id}"
+  assert_equal 302, page.status_code, "Should redirect after deleting"
+  visit "/cms/page_templates"
+end
+
+When /^I should not see the "([^"]*)" template in the table$/ do |content|
+  within ".data" do
+    assert !page.has_content?(content)
+  end
+end

data/features/step_definitions/more_custom_block_steps.rb

@@ -0,0 +1,34 @@
+# Merge this into manage_content_block_steps after pulling this forward into 3.5.x
+
+When /^I add content to the main area of the page$/ do
+  click_on "add_new_content_main"
+end
+
+Given /^a product "([^"]*)" has been added to a page$/ do |name|
+  @product = Product.create!(:name => name)
+  page = Factory(:public_page)
+  page.add_content(@product)
+  page.publish!
+end
+
+When /^I view that product$/ do
+  visit "/cms/products/#{@product.id}"
+end
+
+Given /^html with "([^"]*)" has been added to a page$/ do |body|
+  @block = Factory(:html_block, :content => body)
+  page = Factory(:public_page)
+  page.add_content(@block)
+  page.publish!
+end
+
+When /^I view that block/ do
+  visit "/cms/html_blocks/#{@block.id}"
+end
+
+Given /^portlet named "([^"]*)" has been added to a page$/ do |name|
+  @subject = Factory(:portlet, :name=>name)
+  page = Factory(:public_page)
+  page.add_content(@subject)
+  page.publish!
+end

data/lib/cms/version.rb

@@ -2,5 +2,5 @@
 # Allows the precise version of BrowserCMS to be determined programatically.
 #
 module Cms
-  VERSION = "3.4.2.rc1"
+  VERSION = "3.4.2"
 end

data/test/unit/helpers/path_helper_test.rb

@@ -13,17 +13,8 @@ class Cms::PathHelperTest < ActionController::TestCase
   def teardown
   end
 
-  def test_edit_cms_connectable_path_for_html
-    block = Cms::HtmlBlock.create!(:name=>"Testing")
-    expected_path = "/cms/html_blocks/#{block.id}/edit"
-    self.expects(:polymorphic_path).with([:edit, block], {}).returns(expected_path)
-
-    path = edit_cms_connectable_path(block)
-
-    assert_equal expected_path, path
-  end
-
-
+  # These tests are probably redundant now since we have Scenario coverage.
+  # However, it will be easier to merge forward with an editted file rather than a deleted one.
   def test_edit_cms_connectable_path_for_portlets
     portlet = DynamicPortlet.create(:name => "Testing Route generation")
     expected_path = "/cms/portlets/#{portlet.id}/edit"
@@ -34,17 +25,6 @@ class Cms::PathHelperTest < ActionController::TestCase
     assert_equal(expected_path, path)
   end
 
-  def test_edit_cms_connectable_path_includes_options_for_html
-    block = Cms::HtmlBlock.create!(:name=>"Testing")
-    expected_path = "/cms/html_blocks/#{block.id}/edit?_redirect_to=some_path"
-    self.expects(:polymorphic_path).with([:edit, block], {:_redirect_to => "some_path"}).returns(expected_path)
-
-    path = edit_cms_connectable_path(block, :_redirect_to => "some_path")
-
-    assert_equal expected_path, path
-
-  end
-
   def test_edit_cms_connectable_path_includes_options_for_portlets
     portlet = DynamicPortlet.create(:name => "Testing Route generation")
     expected_path = "/cms/portlets/#{portlet.id}/edit?_redirect_to=some_path"

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: browsercms
 version: !ruby/object:Gem::Version
-  version: 3.4.2.rc1
-  prerelease: 6
+  version: 3.4.2
+  prerelease: 
 platform: ruby
 authors:
 - BrowserMedia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70352468859460 !ruby/object:Gem::Requirement
+  requirement: &70199854735120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70352468859460
+  version_requirements: *70199854735120
 - !ruby/object:Gem::Dependency
   name: ancestry
-  requirement: &70352468884060 !ruby/object:Gem::Requirement
+  requirement: &70199854734640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *70352468884060
+  version_requirements: *70199854734640
 - !ruby/object:Gem::Dependency
   name: ckeditor_rails
-  requirement: &70352468883560 !ruby/object:Gem::Requirement
+  requirement: &70199854734120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 3.6.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70352468883560
+  version_requirements: *70199854734120
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70352468883040 !ruby/object:Gem::Requirement
+  requirement: &70199854733620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.14
   type: :runtime
   prerelease: false
-  version_requirements: *70352468883040
+  version_requirements: *70199854733620
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70352468882620 !ruby/object:Gem::Requirement
+  requirement: &70199854733220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70352468882620
+  version_requirements: *70199854733220
 description: Web Content Management in Rails.
 email: github@browsermedia.com
 executables:
@@ -631,12 +631,14 @@ files:
 - features/step_definitions/command_line_steps.rb
 - features/step_definitions/content_pages_steps.rb
 - features/step_definitions/data_steps.rb
+- features/step_definitions/edit_page_templates_steps.rb
 - features/step_definitions/html_blocks_steps.rb
 - features/step_definitions/install_content_steps.rb
 - features/step_definitions/manage_content_blocks_steps.rb
 - features/step_definitions/manage_image_blocks_steps.rb
 - features/step_definitions/manage_sections_steps.rb
 - features/step_definitions/manage_user_steps.rb
+- features/step_definitions/more_custom_block_steps.rb
 - features/step_definitions/page_route_steps.rb
 - features/step_definitions/page_template_steps.rb
 - features/step_definitions/permissions_steps.rb
@@ -924,9 +926,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -211829332800878731
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
@@ -974,12 +979,14 @@ test_files:
 - features/step_definitions/command_line_steps.rb
 - features/step_definitions/content_pages_steps.rb
 - features/step_definitions/data_steps.rb
+- features/step_definitions/edit_page_templates_steps.rb
 - features/step_definitions/html_blocks_steps.rb
 - features/step_definitions/install_content_steps.rb
 - features/step_definitions/manage_content_blocks_steps.rb
 - features/step_definitions/manage_image_blocks_steps.rb
 - features/step_definitions/manage_sections_steps.rb
 - features/step_definitions/manage_user_steps.rb
+- features/step_definitions/more_custom_block_steps.rb
 - features/step_definitions/page_route_steps.rb
 - features/step_definitions/page_template_steps.rb
 - features/step_definitions/permissions_steps.rb