browsercms 3.3.1 → 3.3.2

data/app/helpers/cms/menu_helper.rb

@@ -133,16 +133,16 @@ module Cms
           item[:id] = "#{section_node.node_type.underscore}_#{section_node.node_id}"
           
           # If we are showing a section item, we want to use the path for the first page
-          page = section_node.section? ? node.first_page_or_link : node
-          if section_node.section? && page
-            item[:selected] = true if page.hidden? && selected_page == page
+          page_or_link = section_node.section? ? node.first_page_or_link : node
+          if section_node.section? && page_or_link
+            item[:selected] = true if page_or_link.respond_to?(:hidden?) && page_or_link.hidden? && selected_page == page_or_link
           else
-            item[:selected] = true if selected_page == page
+            item[:selected] = true if selected_page == page_or_link
           end
          
-          item[:url] = page && page.path || '#'
+          item[:url] = page_or_link.try(:path) || '#'
           item[:name] = node.name
-          item[:target] = "_blank" if page.respond_to?(:new_window?) && page.new_window?
+          item[:target] = "_blank" if page_or_link.respond_to?(:new_window?) && page_or_link.new_window?
           
           # Now if this is a section, we do the child nodes, 
           # but only if the show_all_siblings parameter is true, 

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

@@ -60,9 +60,9 @@
                       !content_type.model_class.connectable? && 
                       !content_type.model_class.publishable? && 
                       content_type.columns_for_index.size == i + 1
-             %Q{ colspan="2" class="last"}
+             %Q{ colspan='2' class='last'}
            elsif i == 0
-             %Q{ colspan="2" class="name first"}
+             %Q{ colspan='2' class='name first'}
           end %>
         <th<%= attrs %>>
           <div class="dividers">

data/bin/bcms

@@ -95,16 +95,45 @@ class App < Thor
     route "routes_for_browser_cms"
 
     generate "browser_cms:cms"
-    environment 'SITE_DOMAIN="localhost:3000"', :env => "development"
-    environment 'SITE_DOMAIN="localhost:3000"', :env => "test"
-    environment 'SITE_DOMAIN="localhost:3000"', :env => "production"
+
+    %w{development test production}.each do |env|
+      prepend_to_file "config/environments/#{env}.rb" do
+        <<-CODE
+SITE_DOMAIN="localhost:3000"
+        CODE
+      end
+    end
 
     insert_into_file "config/environments/production.rb", :after => "Application.configure do\n" do
       <<-CODE
-  config.action_view.cache_template_loading = false
-  config.action_controller.page_cache_directory = Rails.root + '/public/cache/'
+  config.action_controller.page_cache_directory = File.join(Rails.root, 'public', 'cache')
+      CODE
+    end
+
+    insert_into_file "config/environments/production.rb", :before => 'config.action_dispatch.x_sendfile_header = "X-Sendfile"' do
+      <<-CODE
+# If you want to enable webservers to send binary files, you will need to uncomment X-Sendfile line below and configure Apache mod_sendfile
+  # See http://codequest.eu/articles/rails3-apache-passenger-and-empty-file-using-send-file for details
       CODE
     end
+
+    gsub_file "config/environments/production.rb", /(config\.action_dispatch\.x_sendfile_header = "X-Sendfile")/, '  # \1'
+
+    insert_into_file "config/environments/production.rb", :before => 'config.serve_static_assets = false' do
+      <<-COMMENT
+# This allows bcms to serve static assets (like admin css files) from the gem
+      COMMENT
+    end
+
+    gsub_file "config/environments/production.rb", /(config\.serve_static_assets =) false/, '  \1 true'
+
+    insert_into_file "config/environments/production.rb", :after => "config.active_support.deprecation = :notify" do
+      %q{
+
+  # Configure your mail server's address below
+  config.action_mailer.smtp_settings = {:address => 'mail.yourmailserver.com', :domain => "#{SITE_DOMAIN}"}}
+    end
+
     initializer 'browsercms.rb', <<-CODE
 Cms.attachment_file_permission = 0640
     CODE
@@ -114,4 +143,3 @@ Cms.attachment_file_permission = 0640
 end
 
 App.start
-

data/db/seeds.rb

@@ -4,7 +4,7 @@ extend Cms::DataLoader
 if %w[development test dev local].include?(Rails.env)
   pwd = "cmsadmin"
 else
-  pwd = (0..8).inject(""){|s,i| s << (('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a).rand}
+  pwd = (0..8).inject(""){|s,i| s << (('a'..'z').to_a + ('A'..'Z').to_a + ('0'..'9').to_a).sample}
 end
 User.current = create_user(:cmsadmin, :login => "cmsadmin", :first_name => "CMS", :last_name => "Administrator", :email => "cmsadmin@example.com", :password => pwd, :password_confirmation => pwd)
 

data/lib/cms/version.rb

@@ -2,5 +2,5 @@
 # Allows the precise version of BrowserCMS to be determined problematically.
 #
 module Cms
-  VERSION = "3.3.1"
+  VERSION = "3.3.2"
 end

metadata

@@ -1,51 +1,49 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: browsercms
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 3.3.2
   prerelease: 
-  version: 3.3.1
 platform: ruby
-authors: 
+authors:
 - BrowserMedia
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-03-15 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2158453140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2158453140
+- !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2158452760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
+  version_requirements: *2158452760
 description: Web Content Management in Rails.
 email: github@browsermedia.com
-executables: 
+executables:
 - browsercms
 - bcms
 - bcms-upgrade
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.markdown
-files: 
+files:
 - rails/init.rb
 - bin/browsercms
 - bin/bcms
@@ -1332,31 +1330,27 @@ files:
 - public/themes/blue_steel/stylesheets/style.css
 homepage: 
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: BrowserCMS is a a general purpose, open source Web Content Management System (CMS), written using Ruby on Rails.
+summary: BrowserCMS is a a general purpose, open source Web Content Management System
+  (CMS), written using Ruby on Rails.
 test_files: []
-
-has_rdoc: