knitkit 2.0.0 → 2.0.1

data/app/models/extensions/configuration.rb

@@ -0,0 +1,5 @@
+::Configuration.class_eval do
+  has_many_polymorphic :configured_items,
+    :through => :valid_configurations,
+    :models => [:websites]
+end

data/app/models/extensions/party.rb

@@ -0,0 +1,13 @@
+Party.class_eval do
+  has_many :website_party_roles, :dependent => :destroy
+  has_many :websites, :through =>:website_party_roles do
+    def owned
+      where('role_type_id = ?',RoleType.website_owner).collect(&:website)
+    end
+  end
+
+  def add_website_with_role(website, role_type)
+    self.website_party_roles << WebsitePartyRole.create(:website => website, :role_type => role_type)
+    self.save
+  end
+end

data/app/models/online_document_section.rb

@@ -0,0 +1,40 @@
+class OnlineDocumentSection < WebsiteSection
+  has_one :documented_item, :dependent => :destroy
+  delegate :content, :to => :documented_item, :prefix => true
+  delegate :published_content, :to => :documented_item, :prefix => true
+  has_permalink :title, :url_attribute => :permalink, :sync_url => true, :only_when_blank => true, :scope => [:website_id, :parent_id]
+  
+  def documented_item_content_html
+    documented_item_content.body_html
+  rescue
+    nil
+  end
+  
+  def documented_item_published_content_html(active_publication)
+    documented_item_published_content(active_publication).body_html
+  rescue
+    nil
+  end
+  
+  def build_section_hash
+    section_hash = {
+      :name => self.title,
+      :has_layout => false,
+      :type => self.class.to_s,
+      :in_menu => self.in_menu,
+      :roles => self.roles.collect{|role| role.internal_identifier},
+      :path => self.path,
+      :permalink => self.permalink,
+      :internal_identifier => self.internal_identifier,
+      :position => self.position,
+      :online_document_sections => self.children.each.map{|child| child.build_section_hash},
+      :articles => [],
+      :documented_item => {
+        :name => documented_item_content.title,
+        :display_title => documented_item_content.display_title,
+        :internal_identifier => documented_item_content.internal_identifier
+      }
+    }
+    section_hash
+  end
+end

data/app/models/theme.rb

@@ -15,7 +15,7 @@ class Theme < ActiveRecord::Base
     end
 
     def base_dir(website)
-      "#{root_dir}/sites/site-#{website.id}/themes"
+      "#{root_dir}/sites/#{website.iid}/themes"
     end
 
     def import(file, website)
@@ -29,8 +29,7 @@ class Theme < ActiveRecord::Base
     end
 
     def make_tmp_dir
-      random = Time.now.to_i.to_s.split('').sort_by { rand }
-      Pathname.new(Rails.root.to_s + "/tmp/themes/tmp_#{random}/").tap do |dir|
+      Pathname.new(Rails.root.to_s + "/tmp/themes/tmp_#{Time.now.to_i.to_s}/").tap do |dir|
         FileUtils.mkdir_p(dir) unless dir.exist?
       end
     end
@@ -63,7 +62,7 @@ class Theme < ActiveRecord::Base
   end
 
   def url
-    "sites/site-#{website.id}/themes/#{theme_id}"
+    "/public/sites/#{website.iid}/themes/#{theme_id}"
   end
   
   def activate!
@@ -75,26 +74,23 @@ class Theme < ActiveRecord::Base
   end
 
   def themed_widgets
-    widgets = []
-    ErpApp::Widgets::Base.installed_widgets.each do |widget_name|
-      widgets << widget_name unless self.files.where("directory like '/#{File.join(self.url, 'widgets', widget_name)}%'").empty?
-    end
-    widgets
+    Rails.application.config.erp_app.widgets.select do |widget_hash|
+      !(self.files.where("directory like '#{File.join(self.url, 'widgets', widget_hash[:name])}%'").all.empty?)
+    end.collect{|item| item[:name]}
   end
 
   def non_themed_widgets
     already_themed_widgets = self.themed_widgets
-    widgets = []
-    ErpApp::Widgets::Base.installed_widgets.each do |widget_name|
-      widgets << widget_name unless already_themed_widgets.include?(widget_name)
-    end
-    widgets
+    Rails.application.config.erp_app.widgets.select do |widget_hash|
+      !already_themed_widgets.include?(widget_hash[:name])
+    end.collect{|item| item[:name]}
   end
 
   def create_layouts_for_widget(widget)
-    file_support = ErpTechSvcs::FileSupport::Base.new
-    views_location = "::Widgets::#{widget.camelize}::Base".constantize.views_location
-    create_theme_files_for_directory_node(file_support.build_tree(views_location, :preload => true), :widgets, :path_to_replace => views_location, :widget_name => widget)
+    widget_hash = Rails.application.config.erp_app.widgets.find{|item| item[:name] == widget}
+    widget_hash[:view_files].each do |view_file|
+      save_theme_file(view_file[:path], :widgets, {:path_to_replace => view_file[:path].split('/views')[0], :widget_name => widget})
+    end
   end
 
   def about
@@ -105,7 +101,7 @@ class Theme < ActiveRecord::Base
   end
   
   def import(file)
-    file_support = ErpTechSvcs::FileSupport::Base.new(:storage => ErpTechSvcs::FileSupport.options[:storage])
+    file_support = ErpTechSvcs::FileSupport::Base.new(:storage => Rails.application.config.erp_tech_svcs.file_storage)
     file = ActionController::UploadedTempfile.new("uploaded-theme").tap do |f|
       f.puts file.read
       f.original_filename = file.original_filename
@@ -133,12 +129,12 @@ class Theme < ActiveRecord::Base
           data = ''
           entry.get_input_stream { |io| data = io.read }
           data = StringIO.new(data) if data.present?
-          theme_file = self.files.where("name = ? and directory = ?", File.basename(name), File.join("",self.url,File.dirname(name))).first
+          theme_file = self.files.where("name = ? and directory = ?", File.basename(name), File.join(self.url,File.dirname(name))).first
           unless theme_file.nil?
             theme_file.data = data
             theme_file.save
           else
-            self.add_file(data, File.join(file_support.root,self.url,name)) rescue next
+            self.add_file(data, File.join(file_support.root, self.url,name)) rescue next
           end
         end
       end
@@ -146,17 +142,17 @@ class Theme < ActiveRecord::Base
   end
 
   def export
-    file_support = ErpTechSvcs::FileSupport::Base.new(:storage => ErpTechSvcs::FileSupport.options[:storage])
+    file_support = ErpTechSvcs::FileSupport::Base.new(:storage => Rails.application.config.erp_tech_svcs.file_storage)
     tmp_dir = Theme.make_tmp_dir
     (tmp_dir + "#{name}[#{theme_id}].zip").tap do |file_name|
       file_name.unlink if file_name.exist?
       Zip::ZipFile.open(file_name, Zip::ZipFile::CREATE) do |zip|
         files.each {|file|
           contents = file_support.get_contents(File.join(file_support.root,file.directory,file.name))
-          relative_path = file.directory.sub("/#{url}",'')
+          relative_path = file.directory.sub("#{url}",'')
           path = FileUtils.mkdir_p(File.join(tmp_dir,relative_path))
           full_path = File.join(path,file.name)
-          File.open(full_path, 'w+') {|f| f.puts(contents) }
+          File.open(full_path, 'w+:ASCII-8BIT') {|f| f.puts(contents) }
           zip.add(File.join(relative_path[1..relative_path.length],file.name), full_path) if ::File.exists?(full_path)
         }
         ::File.open(tmp_dir + 'about.yml', 'w') { |f| f.puts(about.to_yaml) }
@@ -202,7 +198,7 @@ class Theme < ActiveRecord::Base
   end
 
   def delete_theme_files!
-    file_support = ErpTechSvcs::FileSupport::Base.new(:storage => ErpTechSvcs::FileSupport.options[:storage])
+    file_support = ErpTechSvcs::FileSupport::Base.new(:storage => ErpTechSvcs::Config.file_storage)
     file_support.delete_file(File.join(file_support.root,self.url), :force => true)
   end
 
@@ -228,9 +224,9 @@ class Theme < ActiveRecord::Base
   
     path = case type
     when :widgets
-      path.gsub(options[:path_to_replace], "/#{self.url}/widgets/#{options[:widget_name]}")
+      path.gsub(options[:path_to_replace], "#{self.url}/widgets/#{options[:widget_name]}")
     else
-      path.gsub(options[:path_to_replace], "/#{self.url}/#{type.to_s}")
+      path.gsub(options[:path_to_replace], "#{self.url}/#{type.to_s}")
     end
 
     self.add_file(contents, path)

data/app/models/valid_document.rb

@@ -0,0 +1,4 @@
+class ValidDocument < ActiveRecord::Base
+  belongs_to :documented_model, :polymorphic => true
+  belongs_to :document, :dependent => :destroy
+end

data/app/models/website.rb

@@ -1,16 +1,20 @@
 class Website < ActiveRecord::Base
   after_destroy :remove_sites_directory, :remove_website_role
   after_create  :setup_website
-  
+
   has_file_assets
-  
+  has_permalink :name, :internal_identifier, :update => false
+
   has_many :published_websites, :dependent => :destroy
   has_many :website_hosts, :dependent => :destroy
   has_many :website_navs, :dependent => :destroy
   has_many :website_inquiries, :dependent => :destroy
-
-  alias :hosts :website_hosts
-
+  has_many :website_party_roles, :dependent => :destroy
+  has_many :parties, :through => :website_party_roles do
+    def owners
+      where('role_type_id = ?', RoleType.website_owner)
+    end
+  end
   has_many :website_sections, :dependent => :destroy, :order => :lft do
     def paths
       collect{|website_section| website_section.paths}.flatten
@@ -20,21 +24,44 @@ class Website < ActiveRecord::Base
     def positioned
       where('parent_id is null').sort_by!(&:position)
     end
-    
+
     def update_paths!
       all.each{|section| section.self_and_descendants.each{|_section| _section.update_path!}}
     end
   end
+
   alias :sections :website_sections
-  
+
+  has_many :online_document_sections, :dependent => :destroy, :order => :lft, :class_name => 'OnlineDocumentSection'
+
   has_many :themes, :dependent => :destroy do
     def active
       where('active = 1')
     end
   end
 
+  validates_uniqueness_of :internal_identifier
+
+  alias :sections :website_sections
+  alias :hosts :website_hosts
+
+  def to_label
+    self.name
+  end
+
+  # creating method because we only want a getter, not a setter for iid
+  def iid
+    self.internal_identifier
+  end
+
+  def add_party_with_role(party, role_type)
+    self.website_party_roles << WebsitePartyRole.create(:party => party, :role_type => role_type)
+    self.save
+  end
+
   def all_section_paths
-    ActiveRecord::Base.connection.execute("select path from website_sections where website_id = #{self.id}").collect{|row| row['path']}
+    WebsiteSection.select(:path).where(:website_id => self.id).collect{|row| row['path']}
+    #ActiveRecord::Base.connection.execute("select path from website_sections where website_id = #{self.id}").collect{|row| row['path']}
   end
 
   def self.find_by_host(host)
@@ -63,7 +90,7 @@ class Website < ActiveRecord::Base
   end
 
   def active_publication
-    self.published_websites.all.find{|item| item.active}
+    self.published_websites.where(:active => true).first
   end
 
   def role
@@ -73,12 +100,18 @@ class Website < ActiveRecord::Base
   def setup_website
     PublishedWebsite.create(:website => self, :version => 0, :active => true, :comment => 'New Site Created')
     Role.create(:description => "Website #{self.title}", :internal_identifier => website_role_iid)
+    configuration = ::Configuration.find_template('default_website_configuration').clone(true)
+    configuration.update_configuration_item(ConfigurationItemType.find_by_internal_identifier('contact_us_email_address'), self.email)
+    configuration.update_configuration_item(ConfigurationItemType.find_by_internal_identifier('login_url'), '/login')
+    configuration.update_configuration_item(ConfigurationItemType.find_by_internal_identifier('homepage_url'), '/home')
+    self.configurations << configuration
+    self.save
   end
 
   def remove_sites_directory
-    file_support = ErpTechSvcs::FileSupport::Base.new(:storage => ErpTechSvcs::FileSupport.options[:storage])
+    file_support = ErpTechSvcs::FileSupport::Base.new(:storage => Rails.application.config.erp_tech_svcs.file_storage)
     begin
-      file_support.delete_file(File.join(file_support.root,"sites/site-#{self.id}"), :force => true)
+      file_support.delete_file(File.join(file_support.root,"sites/#{self.iid}"), :force => true)
     rescue
       #do nothing it may not exist
     end
@@ -87,17 +120,17 @@ class Website < ActiveRecord::Base
   def remove_website_role
     role.destroy if role
   end
-  
+
   def setup_default_pages
     # create default sections for each widget using widget layout
     widget_classes = [
-      ::Widgets::ContactUs::Base, 
-      ::Widgets::Search::Base, 
+      ::Widgets::ContactUs::Base,
+      ::Widgets::Search::Base,
       ::Widgets::ManageProfile::Base,
       ::Widgets::Login::Base,
       ::Widgets::Signup::Base,
       ::Widgets::ResetPassword::Base
-    ] 
+    ]
     widget_classes.each do |widget_class|
       website_section = WebsiteSection.new
       website_section.title = widget_class.title
@@ -118,6 +151,7 @@ class Website < ActiveRecord::Base
       :hosts => hosts.collect(&:host),
       :title => title,
       :subtitle => subtitle,
+      :internal_identifier => internal_identifier,
       :email => email,
       :auto_activate_publication => auto_activate_publication,
       :email_inquiries => email_inquiries,
@@ -128,7 +162,7 @@ class Website < ActiveRecord::Base
     }
 
     setup_hash[:sections] = sections.positioned.collect do |website_section|
-      build_section_hash(website_section)
+      website_section.build_section_hash
     end
 
     setup_hash[:website_navs] = website_navs.collect do |website_nav|
@@ -138,11 +172,11 @@ class Website < ActiveRecord::Base
       }
     end
 
-    self.files.where("directory like '%/sites/site-#{self.id}/images%'").all.each do |image_asset|
+    self.files.where("directory like '%/sites/#{self.iid}/images%'").all.each do |image_asset|
       setup_hash[:images] << {:path => image_asset.directory, :name => image_asset.name}
     end
 
-    self.files.where("directory like '%/sites/site-#{self.id}/file_assets%'").all.each do |file_asset|
+    self.files.where("directory like '%/#{Rails.application.config.erp_tech_svcs.file_assets_location}/sites/#{self.iid}%'").all.each do |file_asset|
       setup_hash[:files] << {:path => file_asset.directory, :name => file_asset.name}
     end
 
@@ -151,13 +185,16 @@ class Website < ActiveRecord::Base
 
   def export
     tmp_dir = Website.make_tmp_dir
-    file_support = ErpTechSvcs::FileSupport::Base.new(:storage => ErpTechSvcs::FileSupport.options[:storage])
-    
+    file_support = ErpTechSvcs::FileSupport::Base.new(:storage => Rails.application.config.erp_tech_svcs.file_storage)
+
     sections_path = Pathname.new(File.join(tmp_dir,'sections'))
     FileUtils.mkdir_p(sections_path) unless sections_path.exist?
 
     articles_path = Pathname.new(File.join(tmp_dir,'articles'))
     FileUtils.mkdir_p(articles_path) unless articles_path.exist?
+    
+    documented_contents_path = Pathname.new(File.join(tmp_dir, 'documented contents'))
+    FileUtils.mkdir_p(documented_contents_path) unless documented_contents_path.exist?
 
     excerpts_path = Pathname.new(File.join(tmp_dir,'excerpts'))
     FileUtils.mkdir_p(excerpts_path) unless excerpts_path.exist?
@@ -170,62 +207,49 @@ class Website < ActiveRecord::Base
 
     sections.each do |website_section|
       unless website_section.layout.blank?
-        File.open(File.join(sections_path,"#{website_section.title}.rhtml"), 'w+') {|f| f.puts(website_section.layout) }
+        File.open(File.join(sections_path,"#{website_section.internal_identifier}.rhtml"), 'w+') {|f| f.puts(website_section.layout) }
       end
     end
 
     contents = sections.collect(&:contents).flatten.uniq
     contents.each do |content|
-      File.open(File.join(articles_path,"#{content.title}.html"), 'w+') {|f| f.puts(content.body_html) }
+      File.open(File.join(articles_path,"#{content.internal_identifier}.html"), 'w+') {|f| f.puts(content.body_html) }
       unless content.excerpt_html.blank?
-        File.open(File.join(excerpts_path,"#{content.title}.html"), 'w+') {|f| f.puts(content.excerpt_html) }
+        File.open(File.join(excerpts_path,"#{content.internal_identifier}.html"), 'w+') {|f| f.puts(content.excerpt_html) }
       end
     end
 
-    self.files.where("directory like '%/sites/site-#{self.id}/images%'").all.each do |image_asset|
+    online_document_sections.each do |online_documented_section|
+      File.open(File.join(documented_contents_path,"#{online_documented_section.internal_identifier}.html"), 'w+') {|f| f.puts(online_documented_section.documented_item_published_content_html(active_publication)) }
+    end
+
+    self.files.where("directory like '%/sites/#{self.iid}/images%'").all.each do |image_asset|
       contents = file_support.get_contents(File.join(file_support.root,image_asset.directory,image_asset.name))
-      File.open(File.join(image_assets_path,image_asset.name), 'w+') {|f| f.puts(contents) }
+      FileUtils.mkdir_p(File.join(image_assets_path,image_asset.directory))
+      File.open(File.join(image_assets_path,image_asset.directory,image_asset.name), 'w+:ASCII-8BIT') {|f| f.puts(contents) }
     end
 
-    self.files.where("directory like '%/sites/site-#{self.id}/file_assets%'").all.each do |file_asset|
+    self.files.where("directory like '%/#{Rails.application.config.erp_tech_svcs.file_assets_location}/sites/#{self.iid}%'").all.each do |file_asset|
       contents = file_support.get_contents(File.join(file_support.root,file_asset.directory,file_asset.name))
-      File.open(File.join(file_assets_path,file_asset.name), 'w+') {|f| f.puts(contents) }
+      FileUtils.mkdir_p(File.join(file_assets_path,file_asset.directory))
+      File.open(File.join(file_assets_path,file_asset.directory,file_asset.name), 'w+:ASCII-8BIT') {|f| f.puts(contents) }
     end
 
     files = []
-
-    Dir.entries(sections_path).each do |entry|
+    Dir.glob("#{tmp_dir.to_s}/**/*").each do |entry|
       next if entry =~ /^\./
-      files << {:path => File.join(sections_path,entry), :name => File.join('sections/',File.basename(entry))}
+      path = entry
+      entry = entry.gsub(Regexp.new(tmp_dir.to_s), '')
+      entry = entry.gsub(Regexp.new(/^\//), '')
+      files << {:path => path, :name => entry}
     end
 
-    Dir.entries(articles_path).each do |entry|
-      next if entry =~ /^\./
-      files << {:path => File.join(articles_path,entry), :name => File.join('articles/',File.basename(entry))}
-    end
-
-    Dir.entries(excerpts_path).each do |entry|
-      next if entry =~ /^\./
-      files << {:path => File.join(excerpts_path,entry), :name => File.join('excerpts/',File.basename(entry))}
-    end
-
-    Dir.entries(image_assets_path).each do |entry|
-      next if entry =~ /^\./
-      files << {:path => File.join(image_assets_path,entry), :name => File.join('images/',File.basename(entry))}
-    end
-
-    Dir.entries(file_assets_path).each do |entry|
-      next if entry =~ /^\./
-      files << {:path => File.join(file_assets_path,entry), :name => File.join('files/',File.basename(entry))}
-    end
-
-    files.uniq!
+    File.open(tmp_dir + 'setup.yml', 'w') { |f| f.puts(export_setup.to_yaml) }
 
     (tmp_dir + "#{name}.zip").tap do |file_name|
       file_name.unlink if file_name.exist?
       Zip::ZipFile.open(file_name, Zip::ZipFile::CREATE) do |zip|
         files.each { |file| zip.add(file[:name], file[:path]) if File.exists?(file[:path]) }
-        File.open(tmp_dir + 'setup.yml', 'w') { |f| f.puts(export_setup.to_yaml) }
         zip.add('setup.yml', tmp_dir + 'setup.yml')
       end
     end
@@ -233,14 +257,13 @@ class Website < ActiveRecord::Base
 
   class << self
     def make_tmp_dir
-      random = Time.now.to_i.to_s.split('').sort_by { rand }
-      Pathname.new(Rails.root + "/tmp/website_export/tmp_#{random}/").tap do |dir|
+      Pathname.new(Rails.root + "/tmp/website_export/tmp_#{Time.now.to_i.to_s}/").tap do |dir|
         FileUtils.mkdir_p(dir) unless dir.exist?
       end
     end
 
     def import(file, current_user)
-      file_support = ErpTechSvcs::FileSupport::Base.new(:storage => ErpTechSvcs::FileSupport.options[:storage])
+      file_support = ErpTechSvcs::FileSupport::Base.new(:storage => Rails.application.config.erp_tech_svcs.file_storage)
       message = ''
       success = true
 
@@ -249,12 +272,17 @@ class Website < ActiveRecord::Base
         f.original_filename = file.original_filename
         f.read # no idea why we need this here, otherwise the zip can't be opened
       end unless file.path
-      
+
       entries = []
       setup_hash = nil
 
+      tmp_dir = Website.make_tmp_dir
       Zip::ZipFile.open(file.path) do |zip|
         zip.each do |entry|
+          f_path = File.join(tmp_dir.to_s, entry.name)
+          FileUtils.mkdir_p(File.dirname(f_path))
+          zip.extract(entry, f_path) unless File.exist?(f_path)
+
           next if entry.name =~ /__MACOSX\//
           if entry.name =~ /setup.yml/
             data = ''
@@ -262,46 +290,64 @@ class Website < ActiveRecord::Base
             data = StringIO.new(data) if data.present?
             setup_hash = YAML.load(data)
           else
-            type =  entry.name.split('/')[(entry.name.split('/').count - 2)]
+            type =  entry.name.split('/')[0]
             name = entry.name.split('/').last
             next if name.nil?
-            data = ''
-            entry_hash = {:type => type, :name => name}
-            entries << entry_hash unless name == 'sections' || name == 'articles' || name == 'excerpts'
-            entries.uniq!
-            data = entry.get_input_stream.read
-            entry_hash[:data] = data
+
+            if File.exist?(f_path) and !File.directory?(f_path)
+              entry_hash = {:type => type, :name => name, :path => entry.name}
+              entries << entry_hash unless name == 'sections' || name == 'articles' || name == 'excerpts' || name == 'documented contents'
+              entry_hash[:data] = File.open(f_path,"rb") {|io| io.read}
+            end
           end
+
         end
       end
+      entries.uniq!
+      FileUtils.rm_rf(tmp_dir.to_s)
 
-      if Website.find_by_name(setup_hash[:name]).nil?
+      if Website.find_by_internal_identifier(setup_hash[:internal_identifier]).nil?
         website = Website.create(
           :name => setup_hash[:name],
           :title => setup_hash[:title],
           :subtitle => setup_hash[:subtitle],
+          :internal_identifier => setup_hash[:internal_identifier],
           :email => setup_hash[:email],
           :email_inquiries => setup_hash[:email_inquiries],
           :auto_activate_publication => setup_hash[:auto_activate_publication]
         )
-        
+
         #set default publication published by user
         first_publication = website.published_websites.first
         first_publication.published_by = current_user
         first_publication.save
-        
-        begin
 
+        begin
           #handle images
+          # entries.each do |entry|
+          #   puts "entry type '#{entry[:type]}'"
+          #   puts "entry name '#{entry[:name]}'"
+          #   puts "entry path '#{entry[:path]}'"
+          #   puts "entry data #{!entry[:data].blank?}"
+          # end
+          # puts "------------------"
           setup_hash[:images].each do |image_asset|
-            content = entries.find{|entry| entry[:type] == 'images' and entry[:name] == image_asset[:name]}[:data]
-            website.add_file(content, File.join(file_support.root, image_asset[:path].sub(/site-[0-9][0-9]*/, "site-#{website.id}"), image_asset[:name]))
+            filename = 'images' + image_asset[:path] + '/' + image_asset[:name]
+            #puts "image_asset '#{filename}'"
+            content = entries.find{|entry| entry[:type] == 'images' and entry[:path] == filename }
+            unless content.nil?
+              website.add_file(content[:data], File.join(file_support.root, image_asset[:path], image_asset[:name]))
+            end
           end
 
           #handle files
           setup_hash[:files].each do |file_asset|
-            content = entries.find{|entry| entry[:type] == 'files' and entry[:name] == file_asset[:name]}[:data]
-            website.add_file(content, File.join(file_support.root, file_asset[:path].sub(/site-[0-9][0-9]*/, "site-#{website.id}"), file_asset[:name]))
+            filename = 'files' + file_asset[:path] + '/' + file_asset[:name]
+            #puts "file_asset '#{filename}'"
+            content = entries.find{|entry| entry[:type] == 'files' and entry[:path] == filename }
+            unless content.nil?
+              website.add_file(content[:data], File.join(file_support.root, file_asset[:path], file_asset[:name]))
+            end
           end
 
           #handle hosts
@@ -312,7 +358,7 @@ class Website < ActiveRecord::Base
 
           #handle sections
           setup_hash[:sections].each do |section_hash|
-            build_section(section_hash, entries, website)
+            build_section(section_hash, entries, website, current_user)
           end
           website.website_sections.update_paths!
 
@@ -335,10 +381,10 @@ class Website < ActiveRecord::Base
         website.save
         success = true
       else
-        message = 'Website already exists with that name'
+        message = 'Website already exists with that internal_identifier'
         success = false
       end
-
+      
       return success, message
     end
 
@@ -366,22 +412,30 @@ class Website < ActiveRecord::Base
       website_item
     end
 
-    def build_section(hash, entries, website)
+    def build_section(hash, entries, website, current_user)
       klass = hash[:type].constantize
-      section = klass.new(:title => hash[:name], :in_menu => hash[:in_menu], :position => hash[:position])
+      section = klass.new(:title => hash[:name],
+        :in_menu => hash[:in_menu],
+        :render_base_layout => hash[:render_base_layout],
+        :position => hash[:position],
+        :render_base_layout => hash[:render_base_layout])
+      section.internal_identifier = hash[:internal_identifier]
       section.permalink = hash[:permalink]
       section.path = hash[:path]
-      unless entries.find{|entry| entry[:type] == 'sections' and entry[:name] == "#{hash[:name]}.rhtml"}.nil?
-        section.layout = entries.find{|entry| entry[:type] == 'sections' and entry[:name] == "#{hash[:name]}.rhtml"}[:data]
+      content = entries.find{|entry| entry[:type] == 'sections' and entry[:name] == "#{hash[:internal_identifier]}.rhtml"}
+      unless content.nil?
+        section.layout = content[:data]
       end
       hash[:articles].each do |article_hash|
-        article = Article.find_by_title(article_hash[:name])
+        article = Article.find_by_internal_identifier(article_hash[:internal_identifier])
         if article.nil?
           article = Article.new(:title => article_hash[:name], :display_title => article_hash[:display_title])
+          article.created_by = current_user
           article.tag_list = article_hash[:tag_list].split(',').collect{|t| t.strip() } unless article_hash[:tag_list].blank?
-          article.body_html = entries.find{|entry| entry[:type] == 'articles' and entry[:name] == "#{article_hash[:name]}.html"}[:data]
-          unless entries.find{|entry| entry[:type] == 'excerpts' and entry[:name] == "#{article_hash[:name]}.html"}.nil?
-            article.excerpt_html = entries.find{|entry| entry[:type] == 'excerpts' and entry[:name] == "#{article_hash[:name]}.html"}[:data]
+          article.body_html = entries.find{|entry| entry[:type] == 'articles' and entry[:name] == "#{article_hash[:internal_identifier]}.html"}[:data]
+          content = entries.find{|entry| entry[:type] == 'excerpts' and entry[:name] == "#{article_hash[:internal_identifier]}.html"}
+          unless content.nil?
+            article.excerpt_html = content[:data]
           end
         end
         section.contents << article
@@ -390,9 +444,26 @@ class Website < ActiveRecord::Base
       end
       website.website_sections << section
       section.save
-      hash[:sections].each do |section_hash|
-        child_section = build_section(section_hash, entries, website)
-        child_section.move_to_child_of(section)
+      if hash[:sections]
+        hash[:sections].each do |section_hash|
+          child_section = build_section(section_hash, entries, website, current_user)
+          child_section.move_to_child_of(section)
+        end
+      end
+      if section.is_a? OnlineDocumentSection
+        entry_data = entries.find{|entry| entry[:type] == 'documented contents' and entry[:name] == "#{section.internal_identifier}.html"}[:data]
+        documented_content = DocumentedContent.create(:title => section.title, :body_html => entry_data)
+        DocumentedItem.create(:documented_content_id => documented_content.id, :online_document_section_id => section.id)
+      end
+      if hash[:online_document_sections]
+        hash[:online_document_sections].each do |section_hash|
+          child_section = build_section(section_hash, entries, website, current_user)
+          child_section.move_to_child_of(section)
+          # CREATE THE DOCUMENTED CONTENT HERE
+          entry_data = entries.find{|entry| entry[:type] == 'documented contents' and entry[:name] == "#{child_section.internal_identifier}.html"}[:data]
+          documented_content = DocumentedContent.create(:title => child_section.title, :body_html => entry_data)
+          DocumentedItem.create(:documented_content_id => documented_content.id, :online_document_section_id => child_section.id)
+        end
       end
       unless hash[:roles].empty?
         hash[:roles].each do |role|
@@ -401,46 +472,14 @@ class Website < ActiveRecord::Base
       end
       section
     end
-    
+
   end
 
-  private
-  
   def website_role_iid
     "website_#{self.name.underscore.gsub("'","").gsub(",","")}_access"
   end
-  
-  def build_section_hash(section)
-    section_hash = {
-      :name => section.title,
-      :has_layout => !section.layout.blank?,
-      :type => section.class.to_s,
-      :in_menu => section.in_menu,
-      :articles => [],
-      :roles => section.roles.collect{|role| role.internal_identifier},
-      :path => section.path,
-      :permalink => section.permalink,
-      :internal_identifier => section.internal_identifier,
-      :position => section.position,
-      :sections => section.children.each.map{|child| build_section_hash(child)}
-    }
-
-    section.contents.each do |content|
-      content_area = content.content_area_by_website_section(section)
-      position = content.position_by_website_section(section)
-      section_hash[:articles] << {
-        :name => content.title,
-        :tag_list => content.tag_list.join(', '),
-        :content_area => content_area,
-        :position => position,
-        :display_title => content.display_title,
-        :internal_identifier => content.internal_identifier
-      }
-    end
-
-    section_hash
-  end
 
+  private
 
   def build_menu_item_hash(menu_item)
     {