browsercms 4.0.0.alpha → 4.0.0.beta

data/lib/cms/commands/actions.rb

@@ -29,9 +29,7 @@ module Cms
 
       # Runs `bundle install` inside the correct project directory (unless --skip_bundle was passed to the command)
       def run_bundle_install
-        inside current_project do
-          run "bundle install" unless options[:skip_bundle]
-        end
+        run "bundle install" unless options[:skip_bundle]
       end
 
       # Run `bundle update`, exiting if it doesn't work.

data/lib/cms/configuration.rb

@@ -10,9 +10,10 @@ module Cms
     # Determines which WYSIWYG editor is the 'default' for a BrowserCMS project
     #
     # bcms modules can changes this by overriding it in their configuration.
+    # @return [String] The single javascript file to include to load the proper WYSIWYG editor.
     def content_editor
       # CKEditor is the default.
-      @wysiwig_editor ||= ['bcms/ckeditor_load', 'ckeditor-jquery']
+      @wysiwig_editor ||= 'ckeditor'
     end
 
     def content_editor=(editor)

data/lib/cms/configure_simple_form_bootstrap.rb

@@ -9,6 +9,15 @@ SimpleForm.setup do |config|
     b.use :hint, wrap_with: {tag: 'p', class: 'help-block'}
   end
 
+  config.wrappers :browsercms, tag: 'div', class: 'control-group row-fluid', error_class: 'error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.use :label
+    b.use :input
+    b.use :error, wrap_with: {tag: 'span', class: 'help-inline'}
+    b.use :hint, wrap_with: {tag: 'p', class: 'help-block'}
+  end
+
   config.wrappers :checkbox, :tag => 'div', :class => 'control-group row-fluid', :error_class => 'error' do |b|
     b.use :html5
     b.use :placeholder

data/lib/cms/engine.rb

@@ -77,7 +77,8 @@ module Cms
 
       # Determines which ckeditor file will be used to configure all instances.
       # There should be at most ONE of these, so use manifest files which require the below one to augement it.
-      app.config.cms.ckeditor.configuration_file = 'bcms/ckeditor_standard_config.js'
+      #app.config.cms.ckeditor.configuration_file = 'bcms/ckeditor_standard_config.js'
+      # Note: This no longer works since we are statically loading it via asset pipeline.
 
       # Define menu items to be added dynamically to the CMS Admin tab.
       app.config.cms.tools_menu = []
@@ -93,6 +94,7 @@ module Cms
       # Sets the default .css file that will be added to forms created via the Forms module.
       # Projects can override this as needed.
       app.config.cms.form_builder_css = 'cms/default-forms'
+
     end
 
     # Needed to ensure routes added to the main app by the Engine are available. (Since engine draws its routes after the main app)
@@ -114,13 +116,20 @@ module Cms
       ActiveSupport::Dependencies.autoload_paths += %W( #{Rails.root}/app/portlets/helpers )
       ActionController::Base.append_view_path DynamicView.base_path
       ActionController::Base.append_view_path %W( #{self.root}/app/views)
-      ActionView::Base.default_form_builder = Cms::FormBuilder::ContentBlockFormBuilder
       require 'jdbc_adapter' if defined?(JRUBY_VERSION)
     end
 
-    initializer "browsercms.precompile_assets" do |app|
-      app.config.assets.precompile += ['cms/application.css']
-    end
+    initializer 'browsercms.precompile_assets' do |app|
+      # Ensure all engine specific assets are compiled when rake asset:precompile is run.
+      app.config.assets.precompile += ['cms/page_toolbar.js', 'cms/page_editor.js', 'cms/site.js']
+
+      app.config.assets.precompile += ['cms/page_editor.css', 'cms/page_content_editing.css', 'cms/site.js']
 
+      # Ckeditor
+      app.config.assets.precompile += ['bcms/ckeditor_inline.js', 'bcms/ckeditor.js', 'bcms/ckeditor_standard_config.js']
+
+      # Unsure why jquery isn't getting precompiled.
+      app.config.assets.precompile += ['jquery']
+    end
   end
 end

data/lib/cms/route_extensions.rb

@@ -49,6 +49,8 @@ module Cms::RouteExtensions
     devise_scope :cms_user do
       get '/forgot-password' => "cms/sites/passwords#new", :as => 'forgot_password'
       post '/forgot-password' => "cms/sites/passwords#create", as: 'cms_user_password'
+      get '/passwords/:id/edit' => "cms/sites/passwords#edit", as: 'edit_password'
+      put '/forgot-password' => "cms/sites/passwords#update", as: 'update_password'
     end
 
     # Handle 'stock' attachments

data/lib/cms/version.rb

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

data/lib/generators/cms/content_block/content_block_generator.rb

@@ -21,6 +21,13 @@ module Cms
         end
       end
 
+      def generate_controller
+        application_controller = File.join('app/controllers', class_path, "application_controller.rb")
+        unless File.exists?(application_controller)
+          template 'application_controller.rb.erb', application_controller
+        end
+      end
+
       hook_for :orm, :in => :rails, :required => true, :as => :model
 
       def alter_the_model
@@ -32,8 +39,14 @@ module Cms
 
       def alter_the_migration
         migration = self.class.migration_exists?(File.absolute_path("db/migrate"), "create_#{table_name}")
+
+        if @in_core_application
+          gsub_file migration, "create_table :#{table_name}", "create_table :#{unnamespaced_table_name}"
+        end
+
         gsub_file migration, "create_table", "create_content_table"
 
+
         # Attachments do not require a FK from this model to attachments.
         self.attributes.select { |attr| attr.type == :attachment }.each do |attribute|
           gsub_file migration, "t.attachment :#{attribute.name}", ""
@@ -70,6 +83,14 @@ module Cms
 
       private
 
+      # @override NamedBase#table_name Copy&Paste of this method to make sure project table names are not actually namespaced in migrations.
+      def unnamespaced_table_name
+        @unnamespaced_table_name ||= begin
+          base = pluralize_table_names? ? plural_name : singular_name
+          (regular_class_path + [base]).join('_')
+        end
+      end
+
       def model_has_attachment?
         !attachment_attributes().empty?
       end

data/lib/generators/cms/content_block/templates/_form.html.erb

@@ -2,7 +2,7 @@
 
    name_attribute = attributes.delete_if {|attr| attr.name == 'name'}
    # Assumes every content block should always have a name attribute
--%><%%= f.input :name, as: :cms_text_field %>
+-%><%%= f.input :name, as: :name %>
 <% for attribute in attributes -%>
 <%= field_tag = case attribute.type
         when :attachment

data/lib/generators/cms/content_block/templates/application_controller.rb.erb

@@ -0,0 +1,4 @@
+module <%= namespace %>
+  class ApplicationController < ActionController::Base
+  end
+end

data/lib/generators/cms/content_block/templates/render.html.erb

@@ -1,21 +1,23 @@
-<% first_attachments = true
+<dl>
+    <% first_attachments = true
 
-   # This 'unless' can be removed if :name is no longer assumed to be a default attribute.
-   unless attributes.find {|attr| attr.name == 'name'}
-%><p><b>Name:</b> <%%= @content_block.name %></p><% end %>
-<%- for attribute in attributes -%>
-<%- case attribute.type
-    when :attachment -%>
-<p><b><%= attribute.name.titleize %>:</b> <%%= link_to "<%= attribute.name.titleize %>", attachment_path_for(@content_block.<%= attribute.name %>) %></p>
-    <%- when :attachments
-        if first_attachments
-    -%>
-<p><b>Attachments:</b> <%%= attachment_viewer @content_block %></p>
-<%- first_attachments = false
-    end -%>
-    <%- when :category -%>
-<p><b>Category:</b> <%%= @content_block.category_name %></p>
-    <%- else -%>
-<p><b><%= attribute.name.titleize %>:</b> <%%= @content_block.<%= attribute.name %> %></p>
-  <%- end -%>
-<% end %>
+       # This 'unless' can be removed if :name is no longer assumed to be a default attribute.
+       unless attributes.find {|attr| attr.name == 'name'}
+    %><dt>Name:</dt><dd><%%= show :name %></dd><% end %>
+    <%- for attribute in attributes -%>
+    <%- case attribute.type
+        when :attachment -%>
+    <dt><%= attribute.name.titleize %>:</dt><dd><%%= link_to "<%= attribute.name.titleize %>", attachment_path_for(@content_block.<%= attribute.name %>) %></dd>
+        <%- when :attachments
+            if first_attachments
+        -%>
+    <dt>Attachments:</dt><dd><%%= attachment_viewer @content_block %></dd>
+    <%- first_attachments = false
+        end -%>
+        <%- when :category -%>
+    <dt>Category:</dt><dd><%%= @content_block.category_name %></dd>
+        <%- else -%>
+    <dt><%= attribute.name.titleize %>:</dt><dd><%%= show :<%= attribute.name %> %></dd>
+      <%- end -%>
+    <% end %>
+</dl>

data/lib/generators/cms/portlet/templates/_form.html.erb

@@ -1,5 +1,5 @@
-<%%= f.cms_text_field :name %>
+<%%= f.input :name %>
 <% for attribute in attributes -%>
-<%%= f.cms_text_field :<%= attribute.name %> %>
+<%%= f.input :<%= attribute.name %> %>
 <% end -%>
-<%%= f.cms_template_editor :template %>
+<%%= f.input :template, as: :template_editor %>

data/lib/generators/cms/portlet/templates/portlet.rb

@@ -1,5 +1,7 @@
 class <%= class_name %>Portlet < Cms::Portlet
 
+  description "TODO: Provide a suitable description for this portlet."
+
   # Mark this as 'true' to allow the portlet's template to be editable via the CMS admin UI.
   enable_template_editor false
      

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: browsercms
 version: !ruby/object:Gem::Version
-  version: 4.0.0.alpha
+  version: 4.0.0.beta
 platform: ruby
 authors:
 - BrowserMedia
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-17 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.1.1
+        version: 4.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.1.1
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: underscore-rails
   requirement: !ruby/object:Gem::Requirement
@@ -128,28 +128,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.5
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.5
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -241,7 +241,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 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
+  (CMS) that supports Ruby on Rails v4.0. It can be used as a standalone CMS, added
   to existing Rails projects or extended using Rails Engines.
 email: github@browsermedia.com
 executables:
@@ -492,15 +492,16 @@ files:
 - app/assets/images/cms/usercontrols_bg_cap.png
 - app/assets/javascripts/bcms/ckeditor.js
 - app/assets/javascripts/bcms/ckeditor_inline.js
-- app/assets/javascripts/bcms/ckeditor_load.js.erb
+- app/assets/javascripts/bcms/ckeditor_load.js
 - app/assets/javascripts/bcms/ckeditor_standard_config.js
 - app/assets/javascripts/ckeditor/plugins/delete_content/plugin.js
 - app/assets/javascripts/ckeditor/plugins/edit_content/plugin.js
 - app/assets/javascripts/ckeditor/plugins/move_content/plugin.js
 - app/assets/javascripts/cms/ajax.js
 - app/assets/javascripts/cms/application.js
-- app/assets/javascripts/cms/attachment_manager.js.erb
+- app/assets/javascripts/cms/attachment_manager.js
 - app/assets/javascripts/cms/content_library.js
+- app/assets/javascripts/cms/content_types.js
 - app/assets/javascripts/cms/core_library.js.erb
 - app/assets/javascripts/cms/form_builder.js
 - app/assets/javascripts/cms/namespace.js
@@ -571,6 +572,7 @@ files:
 - app/controllers/cms/connectors_controller.rb
 - app/controllers/cms/content_block_controller.rb
 - app/controllers/cms/content_controller.rb
+- app/controllers/cms/content_types_controller.rb
 - app/controllers/cms/dashboard_controller.rb
 - app/controllers/cms/dynamic_views_controller.rb
 - app/controllers/cms/email_messages_controller.rb
@@ -609,6 +611,7 @@ files:
 - app/controllers/tests/pretend_controller.rb
 - app/helpers/cms/application_helper.rb
 - app/helpers/cms/content_block_helper.rb
+- app/helpers/cms/content_types_helper.rb
 - app/helpers/cms/form_tag_helper.rb
 - app/helpers/cms/menu_helper.rb
 - app/helpers/cms/mobile_helper.rb
@@ -625,9 +628,9 @@ files:
 - app/helpers/login_portlet_helper.rb
 - app/inputs/attachments_input.rb
 - app/inputs/cms_text_area_input.rb
-- app/inputs/cms_text_field_input.rb
 - app/inputs/date_picker_input.rb
 - app/inputs/file_picker_input.rb
+- app/inputs/name_input.rb
 - app/inputs/path_input.rb
 - app/inputs/tag_list_input.rb
 - app/inputs/template_editor_input.rb
@@ -683,6 +686,8 @@ files:
 - app/portlets/dynamic_portlet.rb
 - app/portlets/email_page_portlet.rb
 - app/portlets/forgot_password_portlet.rb
+- app/portlets/helpers/cms/list_portlet_helper.rb
+- app/portlets/list_portlet.rb
 - app/portlets/login_portlet.rb
 - app/portlets/tag_cloud_portlet.rb
 - app/presenters/cms/user_presenter.rb
@@ -726,6 +731,8 @@ files:
 - app/views/cms/content_block/show.html.erb
 - app/views/cms/content_block/show_in_isolation.html.erb
 - app/views/cms/content_block/versions.html.erb
+- app/views/cms/content_types/_order_field.html.erb
+- app/views/cms/content_types/index.html.erb
 - app/views/cms/dashboard/_page_drafts.html.erb
 - app/views/cms/dashboard/_tasks.html.erb
 - app/views/cms/dashboard/index.html.erb
@@ -787,6 +794,7 @@ files:
 - app/views/cms/pages/edit.html.erb
 - app/views/cms/pages/new.html.erb
 - app/views/cms/pages/versions.html.erb
+- app/views/cms/passwords/new.html.erb
 - app/views/cms/redirects/_form.html.erb
 - app/views/cms/redirects/edit.html.erb
 - app/views/cms/redirects/index.html.erb
@@ -844,6 +852,10 @@ files:
 - app/views/portlets/email_page/render.html.erb
 - app/views/portlets/forgot_password/_form.html.erb
 - app/views/portlets/forgot_password/render.html.erb
+- app/views/portlets/list/_form.html.erb
+- app/views/portlets/list/_list.html.erb
+- app/views/portlets/list/_table.html.erb
+- app/views/portlets/list/render.html.erb
 - app/views/portlets/login/_form.html.erb
 - app/views/portlets/login/render.html.erb
 - app/views/portlets/portlets/_form.html.erb
@@ -855,9 +867,6 @@ files:
 - db/browsercms.seeds.rb
 - db/migrate/20080815014337_browsercms300.rb
 - db/migrate/20130327184912_browsercms400.rb
-- db/migrate/20131206214021_devise_create_users.rb
-- db/migrate/20131211223908_kill_reset_password.rb
-- db/migrate/20131218222005_create_cms_external_users.rb
 - db/schema.rb
 - db/seeds.rb
 - doc/design/blue_button.psd
@@ -959,6 +968,7 @@ files:
 - lib/generators/browser_cms.rb
 - lib/generators/cms/content_block/content_block_generator.rb
 - lib/generators/cms/content_block/templates/_form.html.erb
+- lib/generators/cms/content_block/templates/application_controller.rb.erb
 - lib/generators/cms/content_block/templates/render.html.erb
 - lib/generators/cms/content_block/USAGE
 - lib/generators/cms/install/install_generator.rb

data/app/inputs/cms_text_field_input.rb

@@ -1,29 +0,0 @@
-# Adds additional attributes to text field.
-class CmsTextFieldInput < SimpleForm::Inputs::TextInput
-
-  include Cms::FormBuilder::DefaultInput
-
-  # @todo Generating a slug probably shouldn't be done as a side effect of a :name field.
-  def input
-
-    if should_autogenerate_slug?(attribute_name)
-      input_html_options[:class] << 'slug-source'
-    end
-
-    extract_default
-    html = @builder.text_field(attribute_name, input_html_options).html_safe
-
-    html
-  end
-
-
-  protected
-
-  def should_autogenerate_slug?(method)
-    content_requires_slug_field?(method) && (object.new_record? || (object.name.blank? && object.slug.blank?))
-  end
-
-  def content_requires_slug_field?(method)
-    method == :name && object.class.requires_slug?
-  end
-end

data/db/migrate/20131206214021_devise_create_users.rb

@@ -1,47 +0,0 @@
-class DeviseCreateUsers < ActiveRecord::Migration
-  def change
-    change_table(:cms_users) do |t|
-      ## Database authenticatable
-      #t.string :email,              :null => false, :default => ""
-      t.string :encrypted_password, :null => false, :default => ""
-
-      ## Recoverable
-      t.rename   :reset_token, :reset_password_token
-      t.datetime :reset_password_sent_at
-
-      ## Rememberable
-      t.rename :remember_token_expires_at, :remember_created_at
-      t.remove :remember_token # Not needed by devise.
-
-      # Remove old SHA based encrypted passwords.
-      # Comment out the following line if you have a strong need to preserve old hashed passwords
-      t.remove :crypted_password
-
-      ## Trackable
-      #t.integer  :sign_in_count, :default => 0, :null => false
-      #t.datetime :current_sign_in_at
-      #t.datetime :last_sign_in_at
-      #t.string   :current_sign_in_ip
-      #t.string   :last_sign_in_ip
-
-      ## Confirmable
-      # t.string   :confirmation_token
-      # t.datetime :confirmed_at
-      # t.datetime :confirmation_sent_at
-      # t.string   :unconfirmed_email # Only if using reconfirmable
-
-      ## Lockable
-      # t.integer  :failed_attempts, :default => 0, :null => false # Only if lock strategy is :failed_attempts
-      # t.string   :unlock_token # Only if unlock strategy is :email or :both
-      # t.datetime :locked_at
-
-
-      #t.timestamps
-    end
-
-    add_index :cms_users, :email,                :unique => true
-    add_index :cms_users, :reset_password_token, :unique => true
-    # add_index :users, :confirmation_token,   :unique => true
-    # add_index :users, :unlock_token,         :unique => true
-  end
-end