browsercms 3.5.0 → 3.5.1

data/README.markdown

@@ -1,6 +1,6 @@
 # BrowserCMS: Humane Content Management for Rails
 
-BrowserCMS is a general purpose, open source Web Content Management System (CMS), written in Ruby on Rails. It's designed as a Mountable engine and works with Rails 3.1. It is designed to support three distinct groups of users:
+BrowserCMS is a general purpose, open source Web Content Management System (CMS) that supports Ruby on Rails v3.2. It can be used as a standalone CMS, added to existing Rails projects or extended using Rails Engines. It is designed to support three distinct groups of users:
 
 1. Non-technical web editors who want a humane system to manage their site, without needing to understand what HTML or even Rails is.
 2. Designers who want to create large and elegantly designed websites with no artificial constraints by the CMS.
@@ -11,16 +11,18 @@ BrowserCMS is intended to offer features comparable to commercial CMS products,
 
 Here's a quick overview of some of the more notable features:
 
-* Mountable Engine: Each CMS project is a rails project that depends on the BrowserCMS engine. Developers can add new controllers, views, etc; just like any rails project.
+* Stanealone CMS: BrowserCMS is designed to provide a robust CMS capabilities out of the box for content heavy web sites.
 * Mobile Friendly: Sites can be built to use mobile optimized designs that are optimized for small screens, with low bandwidth, with responsive design.
-* In Context Editing: Users can browse their site to locate content and change it right on the page itself.
+* In Context Editing: Users can browse their site to locate content and make changes from the page itself.
 * Design friendly Templates: Pages aren't just a template and giant single chunk of HTML. Templates can be built to have multiple editable areas, to allow for rich designs that are still easy to manage by non-technical users.
+* Highly Extensible: Developer have access to the full Rails development stack, and can customize their project by adding their own controllers, views as well as CMS content types.
 * Sitemap: An explorer/finder style view of sections and pages in a site allowing users to add and organize pages.
 * Content Library: Provides a standardized 'CRUD' interface to allow users to manage both core and custom content types.
 * Content API: A set of behaviors added to ActiveRecord which allow for versioning, auditing, tagging and other content services provided by the CMS.
 * Section Based Security: Admins can control which users can access specific sections (public users), as well as who can edit which pages (cms users).
 * Workflow: Supports larger website teams where some users can contribute, but not publish. Users can assign work to other publishers to review.
 * Page Caching: Full page caching allows the web server (Apache) to serve HTML statically when they don't change.
+* CMSify your Rails App: BrowserCMS can be added to existing Rails applications to add content management capabilities.
 
 ## Getting Started
 See the [Getting Started](https://github.com/browsermedia/browsercms/wiki/Getting-Started) guide for instructions on how to install and start a project with BrowserCMS.

data/app/assets/javascripts/cms/attachment_manager.js.erb

@@ -52,6 +52,7 @@ $(function () {
                     if ($("#assets_table > table tr:visible").length <= 2) {
                         $("#assets_table > table").hide();
                     }
+                    $('#attachments_manager_changed').val(true);
                 }, 'script');
 
             }
@@ -71,6 +72,7 @@ $(function () {
 
     // After an attachment is uploaded, copy the values into the main attachment table.
     $('#asset_add_uploader').load(function () {
+        $('#attachments_manager_changed').val(true); // Mark that the list of attachment has changed
         var response = $(this).contents();
 
         if (response.find('tr').html()) {

data/app/views/cms/form_builder/_cms_attachment_manager.html.erb

@@ -12,6 +12,7 @@
       <%= select_tag :asset_types, options_for_select(asset_types) %>
     </div>
     <%= f.hidden_field :attachment_id_list, :id => "attachment_manager_ids_list" %>
+    <%= f.hidden_field :attachments_changed, :id => "attachments_manager_changed" %>
 
     <div id="asset_add" class="fields file_fields" style="display:<%= asset_types.size > 1 ? "none" : "block" %>">
       <label for="asset_add">Choose file</label>

data/bin/bcms

@@ -30,6 +30,10 @@ class Cms::Install < Thor
   def self.common_options
     method_option :database, :aliases => "-d", :desc => "Preconfigure for selected database (options: mysql/oracle/postgresql/sqlite3/frontbase/ibm_db) [Default: sqlite3]"
     method_option :template, :aliases => "-m", :desc => "Path to an application template (can be a filesystem path or URL)"
+    option_skip_bundle
+  end
+
+  def self.option_skip_bundle
     method_option :skip_bundle, :aliases => "--skip-bundle", :desc => "Don't run bundle install", :default => false, :type => :boolean
   end
 
@@ -101,7 +105,7 @@ TEXT
   end
 
   desc 'install', "Adds BrowserCMS to an existing rails application."
-
+  option_skip_bundle
   def install
     common_setup('.')
     prefix_cms_tables

data/doc/release_notes.md

@@ -1,3 +1,10 @@
+v3.5.1
+======
+
+* Test with Rails 3.2.5 release
+* Update gemspec to enforce Rails 3.2.5 or later (which contains a critical security SQL Injection patch)
+* Fix issue with has_attachments (possibly caused by nested_assignment changes in Rails 3.2.5)
+
 v3.5.0
 ======
 

data/lib/cms/behaviors/attaching.rb

@@ -74,7 +74,7 @@ module Cms
           include InstanceMethods
 
           # Allows a block to be associated with a list of uploaded attachments (done via AJAX)
-          attr_accessor :attachment_id_list
+          attr_accessor :attachment_id_list, :attachments_changed
 
           Cms::Attachment.definitions[self.name] = {}
           has_many :attachments, :as => :attachable, :dependent => :destroy, :class_name => 'Cms::Attachment', :autosave => false
@@ -83,7 +83,7 @@ module Cms
                                         :allow_destroy => true,
                                         # New attachments must have an uploaded file
                                         :reject_if => lambda { |a| a[:data].blank? && a[:id].blank? }
-          attr_accessible :attachments_attributes, :attachment_id_list
+          attr_accessible :attachments_attributes, :attachment_id_list, :attachments_changed
 
           validates_associated :attachments
           before_validation :initialize_attachments, :check_for_updated_attachments
@@ -218,13 +218,19 @@ module Cms
         # This ensures that if a change is made to an attachment, that this model is also marked as changed.
         # Otherwise, if the change isn't detected, this record won't save a new version (since updates are rejected if no changes were made)
         def check_for_updated_attachments
+          if attachments_changed == "true" || attachments_were_updated?
+            changed_attributes['attachments'] = "Uploaded new files"
+          end
+        end
+
+        def attachments_were_updated?
           attachments.each do |a|
             if a.changed?
-              changed_attributes['attachments'] = "Uploaded new files"
+              return true
             end
           end
+          false
         end
-
         # Returns a list of all attachments this content type has defined.
         # @return [Array<String>] Names
         def attachment_names
@@ -309,6 +315,7 @@ module Cms
         #
         # ActiveRecord Callback
         def save_associated_attachments
+          logger.warn "save_associated_attachments #{attachments}"
           attachments.each do |a|
             a.save if a.changed?
           end

data/lib/cms/version.rb

@@ -2,7 +2,7 @@
 # Allows the precise version of BrowserCMS to be determined programatically.
 #
 module Cms
-  VERSION = "3.5.0"
+  VERSION = "3.5.1"
 
   # Return the current version of the CMS.
   def self.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browsercms
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000 Z
+date: 2012-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - <
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -123,8 +129,9 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: BrowserCMS is a a general purpose, open source Web Content Management
-  System (CMS), written using Ruby on Rails.
+description: BrowserCMS is a general purpose, open source Web Content Management System
+  (CMS) that supports Ruby on Rails v3.2. It can be used as a standalone CMS, added
+  to existing Rails projects or extended using Rails Engines.
 email: github@browsermedia.com
 executables:
 - bcms
@@ -765,7 +772,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1483783289705216682
+      hash: -4016751009646854184
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24