knitkit 2.0.0 → 2.0.1

data/app/widgets/signup/base.rb

@@ -9,6 +9,10 @@ module Widgets
 
       def new
         @website = Website.find_by_host(request.host_with_port)
+        @configuration = @website.configurations.first
+        password_config_option = @configuration.get_item(ConfigurationItemType.find_by_internal_identifier('password_strength_regex')).options.first
+        primary_host = @configuration.get_item(ConfigurationItemType.find_by_internal_identifier('primary_host')).options.first
+
         @email = params[:email]
         @user = User.new(
           :email => @email,
@@ -16,9 +20,11 @@ module Widgets
           :password => params[:password],
           :password_confirmation => params[:password_confirmation]
         )
+        @user.password_validator = {:regex => password_config_option.value, :error_message => password_config_option.comment}
         #set this to tell activation where to redirect_to for login and temp password
         @user.add_instance_attribute(:login_url,params[:login_url])
-        @user.add_instance_attribute(:temp_password, params[:password]);
+        @user.add_instance_attribute(:temp_password, params[:password])
+        @user.add_instance_attribute(:domain, primary_host.value)
         begin
           if @user.save
             @user.roles << @website.role
@@ -29,7 +35,6 @@ module Widgets
           else
             render :update => {:id => "#{@uuid}_result", :view => :error}
           end
-          render :json => {:success => success, :message => message}
         rescue Exception=>ex
           logger.error ex.message
           logger.error ex.backtrace
@@ -47,10 +52,6 @@ module Widgets
         def title
           "Sign Up"
         end
-
-        def views_location
-          File.join(File.dirname(__FILE__),"/views")
-        end
           
         def widget_name
           File.basename(File.dirname(__FILE__))

data/app/widgets/signup/javascript/signup.js

@@ -7,7 +7,8 @@ Compass.ErpApp.Widgets.Signup = {
 Compass.ErpApp.Widgets.AvailableWidgets.push({
     name:'Signup',
     iconUrl:'/images/icons/user/user_48x48.png',
-    onClick:Compass.ErpApp.Widgets.Signup.addSignup
+    onClick:Compass.ErpApp.Widgets.Signup.addSignup,
+    about:'This widget allows new users of a website to sign up.'
 });
 
 

data/app/widgets/signup/views/error.html.erb

@@ -3,7 +3,7 @@
   <%if !@user.errors.empty?%>
   <h3>Please address the following issues</h3>
   <ul>
-    <% @user.errors.full_messages.each do |msg| %>
+    <%  @user.errors.messages.collect{|k,v| v}.flatten.each do |msg| %>
       <li><%=msg%></li>
     <% end %>
   </ul>

data/config/routes.rb

@@ -2,14 +2,16 @@ Rails.application.routes.draw do
   filter :section_router
   
   get 'pages/:section_id' => 'knitkit/website_sections#index', :as => 'page'
-  get 'pages/:section_id/:id' => 'knitkit/articles#show', :as => 'page_article'
+  get 'onlinedocumentsections/:section_id' => 'knitkit/online_document_sections#index', :as => 'document'
+  #get 'onlinedocumentsections/:section_id/:id' => 'knitkit/online_document_sections#show', :as => 'document'
   get 'blogs/:section_id(.:format)' => 'knitkit/blogs#index', :as => 'blogs'
   get 'blogs/:section_id/:id' => 'knitkit/blogs#show', :as => 'blog_article'
   get 'blogs/:section_id/tag/:tag_id(.:format)' => 'knitkit/blogs#tag', :as => 'blog_tag'
   
   match '/comments/add/:section_id/:content_id' => 'knitkit/comments#add', :as => 'comments'
-  match '/unauthorized' => 'unauthorized#index', :as => 'knitkit/unauthorized'
+  match '/unauthorized' => 'knitkit/unauthorized#index', :as => 'knitkit/unauthorized'
   match '/view_current_publication' => 'knitkit/base#view_current_publication'
+  match '/online_document_sections/build_tree' => 'knitkit/online_document_sections#build_tree'
 end
 
 Knitkit::Engine.routes.draw do
@@ -26,6 +28,8 @@ Knitkit::Engine.routes.draw do
   match '/erp_app/desktop/site(/:action)' => 'erp_app/desktop/website'
   #section
   match '/erp_app/desktop/section/:action' => 'erp_app/desktop/website_section'
+  #document
+  match '/erp_app/desktop/online_document_sections/:action' => 'erp_app/desktop/online_document_sections'
   #theme
   match '/erp_app/desktop/theme/:action' => 'erp_app/desktop/theme'
   #versions

data/db/data_migrations/20110509223702_add_publisher_role.rb

@@ -2,10 +2,20 @@ class AddPublisherRole
   
   def self.up
     Role.create(:internal_identifier => 'publisher', :description => 'Publisher')
+    Role.create(:internal_identifier => 'content_author', :description => 'Content Author')
+    Role.create(:internal_identifier => 'layout_author', :description => 'Layout Author')
+    Role.create(:internal_identifier => 'editor', :description => 'Editor')
+    Role.create(:internal_identifier => 'designer', :description => 'Designer')
+    Role.create(:internal_identifier => 'website_author', :description => 'Website Author')
   end
   
   def self.down
     Role.iid('publisher').destroy
+    Role.iid('content_author').destroy
+    Role.iid('layout_author').destroy
+    Role.iid('editor').destroy
+    Role.iid('designer').destroy
+    Role.iid('website_author').destroy
   end
 
 end

data/db/data_migrations/20111118182910_setup_knitkit_capabilities.rb

@@ -0,0 +1,84 @@
+class SetupKnitkitCapabilities
+  
+  def self.up
+    Role.create(:internal_identifier => 'content_author', :description => 'Content Author') unless Role.find_by_internal_identifier("content_author")
+    Role.create(:internal_identifier => 'layout_author', :description => 'Layout Author') unless Role.find_by_internal_identifier("layout_author")
+    Role.create(:internal_identifier => 'editor', :description => 'Editor') unless Role.find_by_internal_identifier("editor")
+    Role.create(:internal_identifier => 'designer', :description => 'Designer') unless Role.find_by_internal_identifier("designer")
+    Role.create(:internal_identifier => 'website_author', :description => 'Website Author') unless Role.find_by_internal_identifier("website_author")
+    
+    CapabilityType.create(:internal_identifier => 'import', :description => 'Import')
+    CapabilityType.create(:internal_identifier => 'publish', :description => 'Publish')
+    CapabilityType.create(:internal_identifier => 'activate', :description => 'Activate')
+    CapabilityType.create(:internal_identifier => 'secure', :description => 'Secure')
+    CapabilityType.create(:internal_identifier => 'unsecure', :description => 'Unsecure')
+    CapabilityType.create(:internal_identifier => 'revert_version', :description => 'Revert Version')
+    CapabilityType.create(:internal_identifier => 'add_existing', :description => 'Add Existing')
+    CapabilityType.create(:internal_identifier => 'upload', :description => 'Upload')
+    CapabilityType.create(:internal_identifier => 'edit_html', :description => 'Edit Html')
+    CapabilityType.create(:internal_identifier => 'edit_excerpt', :description => 'Edit Excerpt')
+    CapabilityType.create(:internal_identifier => 'drag_item', :description => 'Drag Item')
+
+    knitkit_application = DesktopApplication.find_by_internal_identifier('knitkit')
+    knitkit_application.add_capability('create', 'Menu', 'admin', 'website_author')
+    knitkit_application.add_capability('delete', 'Menu', 'admin', 'website_author')
+    knitkit_application.add_capability('edit', 'Menu', 'admin', 'website_author')
+
+    knitkit_application.add_capability('create', 'Website', 'admin', 'website_author')
+    knitkit_application.add_capability('delete', 'Website', 'admin', 'website_author')
+    knitkit_application.add_capability('edit', 'Website', 'admin', 'website_author')
+    knitkit_application.add_capability('import', 'Website', 'admin', 'website_author')
+    knitkit_application.add_capability('publish', 'Website', 'admin', 'publisher')
+    knitkit_application.add_capability('activate', 'Website', 'admin', 'publisher')
+
+    knitkit_application.add_capability('create', 'Host', 'admin', 'website_author')
+    knitkit_application.add_capability('delete', 'Host', 'admin', 'website_author')
+    knitkit_application.add_capability('edit', 'Host', 'admin', 'website_author')
+
+    knitkit_application.add_capability('create', 'Section', 'admin', 'website_author')
+    knitkit_application.add_capability('delete', 'Section', 'admin', 'website_author')
+    knitkit_application.add_capability('edit', 'Section', 'admin', 'website_author')
+    knitkit_application.add_capability('secure', 'Section', 'admin', 'website_author')
+    knitkit_application.add_capability('unsecure', 'Section', 'admin', 'website_author')
+
+    knitkit_application.add_capability('create', 'Layout', 'admin', 'layout_author')
+    knitkit_application.add_capability('edit', 'Layout', 'admin', 'layout_author')
+
+    knitkit_application.add_capability('create', 'Article', 'admin', 'content_author')
+    knitkit_application.add_capability('delete', 'Article', 'admin', 'content_author')
+    knitkit_application.add_capability('edit', 'Article', 'admin', 'content_author')
+    knitkit_application.add_capability('publish', 'Article', 'admin', 'content_author')
+    knitkit_application.add_capability('revert_version', 'Article', 'admin', 'content_author')
+    knitkit_application.add_capability('add_existing', 'Article', 'admin', 'content_author')
+    knitkit_application.add_capability('edit_html', 'Article', 'admin', 'content_author')
+    knitkit_application.add_capability('edit_excerpt', 'Article', 'admin', 'content_author')
+
+    knitkit_application.add_capability('create', 'MenuItem', 'admin', 'website_author')
+    knitkit_application.add_capability('delete', 'MenuItem', 'admin', 'website_author')
+    knitkit_application.add_capability('edit', 'MenuItem', 'admin', 'website_author')
+    knitkit_application.add_capability('secure', 'MenuItem', 'admin', 'website_author')
+    knitkit_application.add_capability('unsecure', 'MenuItem', 'admin', 'website_author')
+
+    knitkit_application.add_capability('view', 'Theme', 'admin', 'designer')
+
+    knitkit_application.add_capability('view', 'SiteImageAsset', 'admin', 'website_author', 'content_author')
+
+    knitkit_application.add_capability('view', 'GlobalImageAsset', 'admin', 'website_author', 'content_author')
+    knitkit_application.add_capability('upload', 'GlobalImageAsset', 'admin', 'website_author')
+    knitkit_application.add_capability('delete', 'GlobalImageAsset', 'admin', 'website_author')
+
+    knitkit_application.add_capability('view', 'SiteFileAsset', 'admin', 'website_author', 'content_author')
+
+    knitkit_application.add_capability('view', 'GlobalFileAsset', 'admin', 'website_author', 'content_author')
+    knitkit_application.add_capability('upload', 'GlobalFileAsset', 'admin', 'website_author')
+    knitkit_application.add_capability('delete', 'GlobalFileAsset', 'admin', 'website_author')
+
+    knitkit_application.add_capability('drag_item', 'WebsiteTree', 'admin', 'website_author')
+  end
+  
+  def self.down
+    knitkit_application = DesktopApplication.find_by_internal_identifier('knitkit')
+    knitkit_application.remove_all_capabilities
+  end
+
+end

data/db/data_migrations/20120127144444_create_website_role_types.rb

@@ -0,0 +1,13 @@
+class CreateWebsiteRoleTypes
+  
+  def self.up
+    RoleType.create(:description => 'Website Owner', :internal_identifier => 'website_owner')
+    RoleType.create(:description => 'Website Member', :internal_identifier => 'website_member')
+  end
+  
+  def self.down
+    RoleType.website_owner.destroy
+    RoleType.website_member.destroy
+  end
+
+end

data/db/data_migrations/20120127150505_create_website_default_configuration.rb

@@ -0,0 +1,72 @@
+class CreateWebsiteDefaultConfiguration
+  
+  def self.up
+    unless ::Configuration.find_template('default_website_configuration')
+      website_setup_category = Category.create(:description => 'Website Setup', :internal_identifier => 'website_setup')
+
+      #configuration
+      configuration = Configuration.create(
+        :description => 'Default Website Configuration',
+        :internal_identifier => 'default_website_configuration',
+        :is_template => true
+      )
+
+      login_url_config_item_type = ConfigurationItemType.create(
+        :description => 'Login Url',
+        :internal_identifier => 'login_url',
+        :allow_user_defined_options => true
+      )
+      CategoryClassification.create(:category => website_setup_category, :classification => login_url_config_item_type)
+      configuration.configuration_item_types << login_url_config_item_type
+
+      home_page_url_config_item_type = ConfigurationItemType.create(
+        :description => 'Homepage Url',
+        :internal_identifier => 'homepage_url',
+        :allow_user_defined_options => true
+      )
+      CategoryClassification.create(:category => website_setup_category, :classification => home_page_url_config_item_type)
+      configuration.configuration_item_types << home_page_url_config_item_type
+
+      contact_us_email_address_item_type = ConfigurationItemType.create(
+        :description => 'Contact Us Email',
+        :internal_identifier => 'contact_us_email_address',
+        :allow_user_defined_options => true
+      )
+      CategoryClassification.create(:category => website_setup_category, :classification => contact_us_email_address_item_type)
+      configuration.configuration_item_types << contact_us_email_address_item_type
+    
+      #password strength
+      simple_password_option = ConfigurationOption.create(
+        :description => 'Simple password',
+        :comment => 'must be at least 8 characters long and start and end with a letter',
+        :internal_identifier => 'simple_password_regex',
+        :value => '^[A-Za-z]\w{6,}[A-Za-z]$'
+      )
+
+      complex_password_option = ConfigurationOption.create(
+        :description => 'Complex password',
+        :comment => 'must be at least 10 characters, must contain at least one lower case letter, one upper case letter, one digit and one special character, valid special characters are @#$%^&+=',
+        :internal_identifier => 'complex_password_regex',
+        :value => '^.*(?=.{10,})(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*[@#$%^&+=]).*$'
+      )
+
+      password_strength_config_item_type = ConfigurationItemType.create(
+        :description => 'Password Strength',
+        :internal_identifier => 'password_strength_regex'
+      )
+      CategoryClassification.create(:category => website_setup_category, :classification => password_strength_config_item_type)
+
+      password_strength_config_item_type.configuration_options << complex_password_option
+      password_strength_config_item_type.add_default_configuration_option(simple_password_option)
+      password_strength_config_item_type.save
+      configuration.configuration_item_types << password_strength_config_item_type
+
+      configuration.save
+    end
+  end
+  
+  def self.down
+    #remove data here
+  end
+
+end

data/db/data_migrations/20120127150506_add_primary_host_to_website_configuration.rb

@@ -0,0 +1,33 @@
+class AddPrimaryHostToWebsiteConfiguration
+  
+  def self.up
+    unless ConfigurationItemType.find_by_internal_identifier('primary_host')
+      website_setup_category = Category.find_by_internal_identifier('website_setup')
+      configuration = ::Configuration.find_template('default_website_configuration')
+
+      primary_host_config_item_type = ConfigurationItemType.create(
+        :description => 'Primary Host',
+        :internal_identifier => 'primary_host',
+        :allow_user_defined_options => true
+      )
+      CategoryClassification.create(:category => website_setup_category, :classification => primary_host_config_item_type)
+      configuration.configuration_item_types << primary_host_config_item_type
+      configuration.save
+
+      #update existing websites
+      Website.all.each do |website|
+        website_config = website.configurations.first
+        if(website_config.internal_identifier == 'default_website_configuration')
+          website_config.configuration_item_types << primary_host_config_item_type
+          website_config.add_configuration_item(primary_host_config_item_type, website.hosts.first.host)
+          website_config.save
+        end
+      end
+    end
+  end
+  
+  def self.down
+    #remove data here
+  end
+
+end

data/db/data_migrations/20120316150424_add_is_template_to_default_website_config.rb

@@ -0,0 +1,16 @@
+class AddIsTemplateToDefaultWebsiteConfig
+  
+  def self.up
+    default_website_config = Configuration.where('internal_identifier = ?', 'default_website_configuration').all
+    unless default_website_config.empty?
+      config = default_website_config.find{|config| config.websites.empty?}
+      config.is_template = true
+      config.save
+    end
+  end
+  
+  def self.down
+    #remove data here
+  end
+
+end

data/db/data_migrations/upgrade/20120210195616_add_website_configs.rb

@@ -0,0 +1,19 @@
+class AddWebsiteConfigs
+  
+  def self.up
+    #insert data here
+    Website.all.each do |w|
+      if w.configurations.empty?
+        config = Configuration.find_by_internal_identifier('default_website_configuration').clone(true)
+        config.update_configuration_item(ConfigurationItemType.find_by_internal_identifier('contact_us_email_address'), w.email)
+        w.configurations << config
+        w.save
+      end
+    end
+  end
+  
+  def self.down
+    #remove data here
+  end
+
+end

data/db/data_migrations/upgrade/20120213205519_populate_website_iids.rb

@@ -0,0 +1,17 @@
+class PopulateWebsiteIids
+  
+  def self.up
+    #insert data here
+    Website.all.each do |w|
+      if w.internal_identifier.blank?
+        w.internal_identifier = "site-#{w.id}"
+        w.save
+      end
+    end
+  end
+  
+  def self.down
+    #remove data here
+  end
+
+end

data/db/migrate/20110211002317_setup_knitkit.rb

@@ -6,6 +6,7 @@ class SetupKnitkit < ActiveRecord::Migration
         t.string :name
         t.string :title
         t.string :subtitle
+        t.string :internal_identifier
         t.string :email
         t.boolean :auto_activate_publication
         t.boolean :email_inquiries
@@ -47,6 +48,7 @@ class SetupKnitkit < ActiveRecord::Migration
         t.integer :position, :default => 0
         t.string :internal_identifier
         t.integer :version
+        t.boolean :render_base_layout, :default => true
 
         #better nested set columns
         t.integer :parent_id
@@ -132,7 +134,7 @@ class SetupKnitkit < ActiveRecord::Migration
       create_table :published_websites do |t|
         t.references :website
         t.text :comment
-        t.decimal :version
+        t.decimal :version, :precision => 18, :scale => 6
         t.boolean :active
         t.integer :published_by_id
 
@@ -215,7 +217,7 @@ class SetupKnitkit < ActiveRecord::Migration
 
       add_index :website_navs, :website_id
     end
-    
+
     unless table_exists?(:tags)
       create_table :tags do |t|
         t.column :name, :string
@@ -228,12 +230,12 @@ class SetupKnitkit < ActiveRecord::Migration
         t.column :taggable_id, :integer
         t.column :tagger_id, :integer
         t.column :tagger_type, :string
-      
+
         # You should make sure that the column created is
         # long enough to store the required class names.
         t.column :taggable_type, :string
         t.column :context, :string
-      
+
         t.column :created_at, :datetime
       end
 
@@ -241,6 +243,21 @@ class SetupKnitkit < ActiveRecord::Migration
       add_index :taggings, [:taggable_id, :taggable_type, :context], :name => 'taggable_poly_idx'
     end
 
+    unless table_exists? :website_party_roles
+      create_table :website_party_roles do |t|
+        #foreign keys
+        t.references :website
+        t.references :role_type
+        t.references :party
+
+        t.timestamps
+      end
+
+      add_index :website_party_roles, :website_id
+      add_index :website_party_roles, :role_type_id
+      add_index :website_party_roles, :party_id
+    end
+
   end
 
   def self.down
@@ -249,7 +266,7 @@ class SetupKnitkit < ActiveRecord::Migration
 
     # check that each table exists before trying to delete it.
     [:websites, :website_sections, :contents, :website_section_contents,
-      :themes, :theme_files, :published_websites, :published_elements,
+      :themes, :theme_files, :published_websites, :published_elements, :website_party_roles,
       :comments,:website_hosts,:website_nav_items, :website_navs, :tags, :taggings].each do |tbl|
       if table_exists?(tbl)
         drop_table tbl