browsercms 3.1.5 → 3.3.0.beta

data/{rails_generators → lib/generators/cms}/template/USAGE

@@ -2,7 +2,7 @@ Description:
     Generates a basic page template in the project.
 
 Example:
-    `./script/generate template subpage`
+    `rails generate template subpage`
 
         A page template in html format using erb.
             Template:            app/views/layouts/templates/subpage.html.erb

data/lib/generators/cms/template/template_generator.rb

@@ -0,0 +1,18 @@
+module Cms
+  module Generators
+    class TemplateGenerator < Rails::Generators::NamedBase
+
+      source_root File.expand_path('../templates', __FILE__)
+
+      def create_template
+       template 'template.erb', File.join('app/views/layouts/templates', "#{template_name}.html.erb")
+      end
+
+      private
+
+      def template_name
+        file_name
+      end
+    end
+  end
+end

data/lib/generators/cms/template/templates/template.erb

@@ -0,0 +1,2 @@
+<% require 'templates' -%>
+<%= Templates.default_body %>

data/lib/generators/cms/upgrade_module/README.txt

@@ -0,0 +1,3 @@
+This directory is used both by
+1. The bcms-upgrade script for upgrading a BrowserCMS module.
+2. For generating a new BrowserCMS module.

data/lib/generators/cms/upgrade_module/templates/20100705083859_browsercms_3_3_0.rb

@@ -0,0 +1,56 @@
+class Browsercms330 < ActiveRecord::Migration
+  def self.up
+
+    # patch required for LH345
+    cant_fix = []
+    to_fix = []
+    # find all pages whose path ends in slash and is not root
+    Page.find(:all, :conditions => "path LIKE '/%/'").each do |pt_page|
+      # make sure no extant page has this path
+      if Page.count(:conditions => ["path = ?", pt_page.path.sub(/(.+)\/+$/, '\1')]) > 0
+          cant_fix << pt_page
+        else
+          to_fix << pt_page
+        end
+    end
+    version_cant_fix = []
+    version_to_fix = []
+    # find all page versions whose path ends in slash and is not root
+    Page::Version.find(:all, :conditions => "path LIKE '/%/'").each do |pt_page|
+      # make sure no extant page has this path
+      if Page.count(:conditions => ["path = ?", pt_page.path.sub(/(.+)\/+$/, '\1')]) > 0
+          version_cant_fix << pt_page
+        else
+          version_to_fix << pt_page
+        end
+    end
+
+    # raise an error if there are pages (*not* page versions) that will duplicate an extant path if the ending slash is dropped
+    if cant_fix.length > 0
+      raise "Cannot remove trailing slashes from pages with ID(s) (#{cant_fix.map(&:id).join(', ')}). Other pages already exist with their correct path. The offending path may be in an unpublished page version, newer than the current public version. These needed to be corrected manually in your DBMS before running this migration"
+    end
+
+    to_fix.each do |fix_page|
+      # change the path of all pages with a trailing slash to not have one
+      # using sql updates to prevent unwanted callbacks
+      new_path = fix_page.path.to_s.sub(/(.+)\/+$/, '\1')
+      execute "UPDATE pages SET path = '#{new_path}' WHERE id = #{fix_page.id};"
+    end
+    version_to_fix.each do |fix_page|
+      # change the path of all fixable page versions with a trailing slash to not have one
+      # using sql updates to prevent unwanted callbacks
+      new_path = fix_page.path.to_s.sub(/(.+)\/+$/, '\1')
+      execute "UPDATE page_versions SET path = '#{new_path}' WHERE id = #{fix_page.id};"
+    end
+    # end patch for LH345
+  end
+
+  def self.down
+
+    # Cannot restore paths with trailing slash - raise error or show message
+    #
+    # raise IrreversibleMigration, "Cannot reverse migration which removes trailing slash from page paths"
+    puts "Page paths which had trailing slashes removed cannot be restored to their original state."
+
+  end
+end

data/lib/generators/cms/upgrade_module/templates/README

@@ -0,0 +1 @@
+Use this directory to add public files that should be packaged in the gem.

data/lib/generators/cms/upgrade_module/templates/USAGE.erb

@@ -0,0 +1,10 @@
+Description:
+    Installs the <%= name_of_module %> module.
+
+Example:
+    rails generate <%= name_of_module %>:install
+
+    This will:
+		1. Copy any migrations from the gem into the project.
+		2. Add the routes to the config/routes.rb
+

data/lib/generators/cms/upgrade_module/templates/build_gem.rake

@@ -0,0 +1,5 @@
+# Add any tasks from your Rake file here (if you were using, say, Jeweler to build gems)
+
+# Otherwise, this enabled Bundler to build your gem
+require 'bundler'
+Bundler::GemHelper.install_tasks

data/lib/generators/cms/upgrade_module/templates/engine.erb

@@ -0,0 +1,7 @@
+require 'browsercms'
+
+module <%= gem_name %>
+  class Engine < Rails::Engine
+    include Cms::Module
+  end
+end

data/lib/generators/cms/upgrade_module/templates/gemspec.erb

@@ -0,0 +1,25 @@
+Gem::Specification.new do |spec|
+  spec.name = "<%= name_of_module %>"
+  spec.rubyforge_project = spec.name
+  spec.version = "1.0.0"
+  spec.summary = "A <%= name_of_module.titleize %> Module for BrowserCMS"
+  spec.author = "BrowserMedia" 
+  spec.email = "github@browsermedia.com" 
+  spec.homepage = "http://www.github.com/browsermedia/<%= name_of_module %>"
+  spec.files += Dir["app/**/*"]
+  spec.files -= Dir["app/views/layouts/templates/default.html.erb"]
+  spec.files += Dir["db/migrate/*.rb"]
+  spec.files -= Dir["db/migrate/*_browsercms_*.rb"]
+  spec.files += Dir["lib/**/*"]
+  spec.files -= Dir["lib/tasks/build_gem.rake"]
+  spec.files += Dir["public/bcms/<%= short_project_name %>/**/*"]
+  spec.files += Dir["LICENSE.txt"]
+  spec.files += Dir["GPL.txt"]
+  spec.files += Dir["Gemfile"]
+  spec.files += Dir["Copyright.txt"]
+  spec.has_rdoc = true
+  spec.extra_rdoc_files = ["README"]
+
+  spec.add_dependency('browsercms', "<%= cms_version%>")
+
+end

data/lib/generators/cms/upgrade_module/templates/gitignore.erb

@@ -0,0 +1,11 @@
+coverage/**/*
+.DS_Store
+log/*.log
+tmp/**/*
+db/*.sqlite3
+db/schema.rb
+*.gem
+.dotest
+tmp/restart.txt
+public/cache
+Gemfile.lock

data/lib/generators/cms/upgrade_module/templates/install.erb

@@ -0,0 +1,9 @@
+require 'cms/module_installation'
+
+class <%= gem_name %>::InstallGenerator < Cms::ModuleInstallation
+  add_migrations_directory_to_source_root __FILE__
+
+  # Add migrations to be copied, by uncommenting the following file and editing as needed.
+  # copy_migration_file 'DATESTAMP_create_name_of_content_block.rb'
+
+end

data/lib/generators/cms/upgrade_module/templates/module_file.erb

@@ -0,0 +1,3 @@
+require '<%= name_of_module %>/engine'
+require '<%= name_of_module %>/routes'
+

data/lib/generators/cms/upgrade_module/templates/routes.erb

@@ -0,0 +1,7 @@
+module Cms::Routes
+  def routes_for_<%= name_of_module %>
+    namespace(:cms) do
+      #content_blocks :<%= name_of_module.pluralize %>
+    end
+  end
+end

data/lib/generators/cms/upgrade_module/upgrade_module_generator.rb

@@ -0,0 +1,61 @@
+module Cms
+  module Generators
+
+
+    class UpgradeModuleGenerator < Rails::Generators::NamedBase
+
+      source_root File.expand_path('../templates', __FILE__)
+
+      def alter_gemfile
+        append_to_file 'Gemfile', "gemspec"
+      end
+
+      # Needs to be more specific than the core BrowserCMS .gitigore
+      # Assumed to be run 'after' browser_cms:cms
+      def generate_gitignore
+        remove_file '.gitignore'
+        template 'gitignore.erb', '.gitignore'
+      end
+
+      def generate_module_files
+        copy_file 'README', "public/bcms/#{name_of_module}/README"
+
+        copy_file 'build_gem.rake', 'lib/tasks/build_gem.rake'
+        template 'engine.erb', "lib/#{name_of_module}/engine.rb"
+        template 'module_file.erb', "lib/#{name_of_module}.rb"
+        template 'gemspec.erb', "#{name_of_module}.gemspec"
+
+        template 'routes.erb', "lib/#{name_of_module}/routes.rb"
+        route "routes_for_#{name_of_module}"
+        template 'install.erb', "lib/generators/#{name_of_module}/install/install_generator.rb"
+        template 'USAGE.erb', "lib/generators/#{name_of_module}/install/USAGE"
+      end
+
+      # BrowserCMS new generator should probably handle this
+      def generate_default_template
+        generate 'cms:template', 'default'
+      end
+
+      private
+
+      # i.e. bcms_something
+      def name_of_module
+        name
+      end
+
+      # ie. BcmsSomething
+      def gem_name
+        name_of_module.camelize
+      end
+
+      # i.e. Something
+      def short_project_name
+       File.basename(name_of_module).match(/bcms_(.+)/)[1]
+      end
+
+      def cms_version
+        Cms::VERSION
+      end
+    end
+  end
+end

data/lib/tasks/build_gem.rake

@@ -0,0 +1 @@
+# Add any tasks from your Rake file here.

data/lib/tasks/cms.rake

@@ -1,14 +1,29 @@
 namespace :test do
-  Rake::TestTask.new(:all => "db:test:prepare") do |t|
-    t.libs << "test"
-    t.pattern = 'test/**/*_test.rb'
-    t.verbose = true
+
+  desc 'Runs all Tests (Test::Unit) and Features (cucumber)'
+  task :all => ["test", "cucumber"]
+
+  # Could be improved somewhat to get rid of unneeded warnings.
+  desc "run tests against sqlite database"
+  task :sqlite3 do
+    cp(File.join('config', 'database.sqlite3.yml'), File.join('config', 'database.yml'), :verbose => true)
+    Rake::Task['db:drop'].invoke
+    Rake::Task['db:create'].invoke
+    system "rake db:migrate test"
+  end
+
+  # Could be improved somewhat to get rid of unneeded warnings.
+  desc "run tests against mysql database"
+  task :mysql do
+    cp(File.join('config', 'database.mysql.yml'), File.join('config', 'database.yml'), :verbose => true)
+    Rake::Task['db:drop'].invoke
+    Rake::Task['db:create'].invoke
+    system "rake db:migrate test"
   end
-  Rake::Task['test:all'].comment = "Run all tests at once"
 end
 
 # When Jeweler builds the gem, make sure the guides are also rebuilt.
-task :build => ['cms:guides']
+#task :build => ['cms:guides']
 
 namespace :cms do
   
@@ -38,4 +53,17 @@ namespace :cms do
     CmsGuides::Generator.new.generate
 
   end
+
+  desc "Rebuild the browsercms gem locally and install it, Useful for testing releases."
+  task :gem => ["browsercms.gemspec", :build, :install]
+
+  task :install do
+    puts "installing..."
+    if RUBY_PLATFORM =~ /mswin32/
+      system("cmd /c gem install pkg/browsercms-3.1.0")
+    else
+      sh("sudo gem install pkg/browsercms-3.1.0")
+    end
+  end
 end
+

data/lib/tasks/cucumber.rake

@@ -0,0 +1,53 @@
+# IMPORTANT: This file is generated by cucumber-rails - edit at your own peril.
+# It is recommended to regenerate this file in the future when you upgrade to a 
+# newer version of cucumber-rails. Consider adding your own code to a new file 
+# instead of editing this one. Cucumber will automatically load all features/**/*.rb
+# files.
+
+
+unless ARGV.any? {|a| a =~ /^gems/} # Don't load anything when running the gems:* tasks
+
+vendored_cucumber_bin = Dir["#{Rails.root}/vendor/{gems,plugins}/cucumber*/bin/cucumber"].first
+$LOAD_PATH.unshift(File.dirname(vendored_cucumber_bin) + '/../lib') unless vendored_cucumber_bin.nil?
+
+begin
+  require 'cucumber/rake/task'
+
+  namespace :cucumber do
+    Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
+      t.binary = vendored_cucumber_bin # If nil, the gem's binary is used.
+      t.fork = true # You may get faster startup if you set this to false
+      t.profile = 'default'
+    end
+
+    Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|
+      t.binary = vendored_cucumber_bin
+      t.fork = true # You may get faster startup if you set this to false
+      t.profile = 'wip'
+    end
+
+    Cucumber::Rake::Task.new({:rerun => 'db:test:prepare'}, 'Record failing features and run only them if any exist') do |t|
+      t.binary = vendored_cucumber_bin
+      t.fork = true # You may get faster startup if you set this to false
+      t.profile = 'rerun'
+    end
+
+    desc 'Run all features'
+    task :all => [:ok, :wip]
+  end
+  desc 'Alias for cucumber:ok'
+  task :cucumber => 'cucumber:ok'
+
+  task :default => :cucumber
+
+  task :features => :cucumber do
+    STDERR.puts "*** The 'features' task is deprecated. See rake -T cucumber ***"
+  end
+rescue LoadError
+  desc 'cucumber rake task not available (cucumber not installed)'
+  task :cucumber do
+    abort 'Cucumber rake task is not available. Be sure to install cucumber as a gem or plugin'
+  end
+end
+
+end

data/lib/tasks/db.rake

@@ -9,7 +9,7 @@ namespace :db do
     desc 'Dumps all models into fixtures.'
     task :dump => :environment do
       models = []
-      Find.find(RAILS_ROOT + '/app/models') do |path|
+      Find.find(Rails.root + '/app/models') do |path|
         unless File.directory?(path) then models << path.match(/(\w+).rb/)[1] end
       end
   
@@ -53,7 +53,7 @@ namespace :db do
         formatted += "\n"
       end
     
-      model_file = RAILS_ROOT + '/test/fixtures/' + model.table_name + '.yml'
+      model_file = Rails.root + '/test/fixtures/' + model.table_name + '.yml'
       
       # Final munging of file
       formatted = "# auto-generated by rake db:fixtures:dump, DO NOT EDIT BY HAND!\n#{formatted}"

data/public/javascripts/cms/application.js

@@ -1,148 +1,157 @@
-//CMS related functions
+//
+// Defines BrowserCMS functions used throughout the application.
+//
+//
 jQuery(function($) {
-  
-  //It would be cool if these were added to the real jQuery
+
+    //It would be cool if these were added to the real jQuery
     //You can call this a few ways:
     //createElement('p') => "<p/>"
     //createElement('p','hi') => "<p>hi</p>"
     //createElement('p', {align: 'center'}) => "<p align="center"/>"
     //createElement('p','hi',{align: 'center'}) => "<p align="center">hi</p>"    
     $.createElement = function(tag_name, tag_value, tag_attrs) {
-      var name = tag_name
-      if(typeof tag_value == "object") {
-        var value = null
-        var attrs = tag_value
-      } else {
-        var value = tag_value
-        var attrs = tag_attrs
-      }
-      var element = $(document.createElement(tag_name))
-      if(attrs) {
-        $.each(attrs, function(k,v) {
-          element.attr(k,v)
-        })
-      }
-      if(value) {
-        element.html(value)
-      }
-      return element
+        var name = tag_name
+        if (typeof tag_value == "object") {
+            var value = null
+            var attrs = tag_value
+        } else {
+            var value = tag_value
+            var attrs = tag_attrs
+        }
+        var element = $(document.createElement(tag_name))
+        if (attrs) {
+            $.each(attrs, function(k, v) {
+                element.attr(k, v)
+            })
+        }
+        if (value) {
+            element.html(value)
+        }
+        return element
     }
-  
-  var sanitizationRegexes = [[/\s/, "_"], [/[&+()]/, "-"], [/[=?!'"{}\[\]#<>%]/, ""]]
-  
-  $.cms = {
-    sanitizeFileName: function(s) {
-      var split = s.split(/\/|\\/)
-      s = split[split.length-1]
-      $.each(sanitizationRegexes, function(i,e){
-        var r = new RegExp(e[0].source, 'g')
-        s = s.replace(r, e[1])
-      })
-      return s;
-    },
-    slug: function(s) {
-      return $.trim(s.toLowerCase().replace(/\W+/g, ' ')).replace(/\ +/g, '-')
-    },
-    showNotice: function(msg) {
-      $('#message').removeClass('error').addClass('notice').html(msg).parent().show().animate({opacity: 1.0}, 3000).fadeOut("normal")
-    },
-    showError: function(msg) {
-      $('#message').removeClass('notice').addClass('error').html(msg).parent().show().animate({opacity: 1.0}, 3000).fadeOut("normal")
-    },
-    attachEventHandlers: function(context) {
-	$('a.button', context).click(function(){if($(this).hasClass('disabled')) return false;});
-      $('a.http_post, a.http_put, a.http_delete', context).click(function() {
-        if($(this).hasClass('disabled')) return false;
-        if($(this).hasClass('confirm_with_title') ? confirm(this.title) : true) {
-
-          // Create the form
-          var f = document.createElement('form')
-          f.style.display = 'none'
-          this.parentNode.appendChild(f)
-          f.method = "POST"
-          f.action = this.href
-          $(f).attr('target', $(this).attr('target'))
-
-          //Create the _method hidden input
-          var m = document.createElement('input')
-          var http_method = $(this).attr('class').match(/http_([^ ]*)/)[1]
-          $(m).attr('type', 'hidden').attr('name', '_method').attr('value', http_method)
-          f.appendChild(m)
-          
-          //Create the authenticity_token hidden input
-          if($.cms.authenticity_token && $.cms.authenticity_token != '') {
-            var m = document.createElement('input')
-            $(m).attr('type', 'hidden').attr('name', 'authenticity_token').attr('value', $.cms.authenticity_token)  
-            f.appendChild(m)
-          }
-          
-          f.submit()          
+
+
+    var sanitizationRegexes = [
+        [/\s/, "_"],
+        [/[&+()]/, "-"],
+        [/[=?!'"{}\[\]#<>%]/, ""]
+    ]
+
+    $.cms = {
+        sanitizeFileName: function(s) {
+            var split = s.split(/\/|\\/)
+            s = split[split.length - 1]
+            $.each(sanitizationRegexes, function(i, e) {
+                var r = new RegExp(e[0].source, 'g')
+                s = s.replace(r, e[1])
+            })
+            return s;
+        },
+        slug: function(s) {
+            return $.trim(s.toLowerCase().replace(/[^a-zA-Z0-9_\s]+/g, '')).replace(/\ +/g, '-')
+        },
+        showNotice: function(msg) {
+            $('#message').removeClass('error').addClass('notice').html(msg).parent().show().animate({opacity: 1.0}, 3000).fadeOut("normal")
+        },
+        showError: function(msg) {
+            $('#message').removeClass('notice').addClass('error').html(msg).parent().show().animate({opacity: 1.0}, 3000).fadeOut("normal")
+        },
+        attachEventHandlers: function(context) {
+            $('a.button', context).click(function() {
+                if ($(this).hasClass('disabled')) return false;
+            });
+            $('a.http_post, a.http_put, a.http_delete', context).click(function() {
+                if ($(this).hasClass('disabled')) return false;
+                if ($(this).hasClass('confirm_with_title') ? confirm(this.title) : true) {
+
+                    // Create the form
+                    var f = document.createElement('form')
+                    f.style.display = 'none'
+                    this.parentNode.appendChild(f)
+                    f.method = "POST"
+                    f.action = this.href
+                    $(f).attr('target', $(this).attr('target'))
+
+                    //Create the _method hidden input
+                    var m = document.createElement('input')
+                    var http_method = $(this).attr('class').match(/http_([^ ]*)/)[1]
+                    $(m).attr('type', 'hidden').attr('name', '_method').attr('value', http_method)
+                    f.appendChild(m)
+
+                    //Create the authenticity_token hidden input
+                    if ($.cms.authenticity_token && $.cms.authenticity_token != '') {
+                        var m = document.createElement('input')
+                        $(m).attr('type', 'hidden').attr('name', 'authenticity_token').attr('value', $.cms.authenticity_token)
+                        f.appendChild(m)
+                    }
+
+                    f.submit()
+                }
+                return false
+            })
         }
-        return false
-      })      
     }
-  }
-  
-  $.cms.attachEventHandlers(document);
-  
-  $('#message.notice').parent().show().animate({opacity: 1.0}, 3000).fadeOut("normal")
-  $('#message.error').parent().show().animate({opacity: 1.0}, 3000).fadeOut("normal")
-  
-})
+
+    $.cms.attachEventHandlers(document);
+
+    $('#message.notice').parent().show().animate({opacity: 1.0}, 3000).fadeOut("normal")
+    $('#message.error').parent().show().animate({opacity: 1.0}, 3000).fadeOut("normal")
+
+});
 
 //CookieSet allows us to treat one cookie value as a set of values
 jQuery(function($) {
-  
-  var sep = '|'
-  
-  $.cookieSet = {
-    //Treats the cookie as an array 
-    add: function(name, value, options) {
-      this.remove(name, value, options)
-      var set = this.get(name)
-      if(set) {
-        set.push(value)  
-      } else {
-        var set = [value]
-      }
-      $.cookie(name, set.join(sep), options)
-      return this.get(name)
-    },
-
-    get: function(name) {
-      var val = $.cookie(name)
-      if(val) {
-        return val.split(sep)
-      } else {
-        return null
-      }
-    },
-
-    remove: function(name, value, options) {
-      var set = this.get(name)
-      if(set) {
-        var arr = []
-        $.each(set, function() {
-          if(this != value+'') {
-            arr.push(this)  
-          }          
-        })
-        $.cookie(name, arr.join(sep), options)
-        return this.get(name)         
-      } else {
-        return null
-      }
-    },
-
-    //Treats the cookie as an array 
-    contains: function(name, value) {
-      var set = this.get(name)
-      if(set) {
-        return $.inArray(value+'', set) > -1
-      } else {
-        return false
-      }
-    }    
-  }
-  
-})
+    var sep = '|'
+
+    $.cookieSet = {
+        //Treats the cookie as an array
+        add: function(name, value, options) {
+            this.remove(name, value, options)
+            var set = this.get(name)
+            if (set) {
+                set.push(value)
+            } else {
+                var set = [value]
+            }
+            $.cookie(name, set.join(sep), options)
+            return this.get(name)
+        },
+
+        get: function(name) {
+            var val = $.cookie(name)
+            if (val) {
+                return val.split(sep)
+            } else {
+                return null
+            }
+        },
+
+        remove: function(name, value, options) {
+            var set = this.get(name)
+            if (set) {
+                var arr = []
+                $.each(set, function() {
+                    if (this != value + '') {
+                        arr.push(this)
+                    }
+                })
+                $.cookie(name, arr.join(sep), options)
+                return this.get(name)
+            } else {
+                return null
+            }
+        },
+
+        //Treats the cookie as an array
+        contains: function(name, value) {
+            var set = this.get(name)
+            if (set) {
+                return $.inArray(value + '', set) > -1
+            } else {
+                return false
+            }
+        }
+    }
+
+});