app/models/attachments.rb app/models/resources.rb app/models/templates.rb app/views/admin/themes/_theme.rhtml test/fixtures/themes/site-1/other/encytemedia/about.yml test/fixtures/themes/site-1/other/encytemedia/preview.png test/unit/site_template_test.rb @@ -1,5 +1,4 @@ class Admin::ThemesController < Admin::BaseController - def index end app/controllers/admin/themes_controller.rb @@ -1,8 +1,9 @@ class Site < ActiveRecord::Base + @@theme_path = Pathname.new(RAILS_ROOT) + 'themes' + cattr_reader :theme_path PERMALINK_OPTIONS = { 'year' => '\d{4}', 'month' => '\d{1,2}', 'day' => '\d{1,2}', 'permalink' => '[a-z0-9-]+', 'id' => '\d+' } PERMALINK_VAR = /^:([a-z]+)$/ - include Mephisto::Attachments::AttachmentMethods cattr_accessor :multi_sites_enabled has_many :sections do @@ -95,14 +96,31 @@ class Site < ActiveRecord::Base theme.path end + def theme_path + @theme_path ||= self.class.theme_path + "site-#{id}" + end + def attachment_base_path - @attachment_base_path ||= File.join(RAILS_ROOT, 'themes', "site-#{id}", 'current') + @attachment_base_path ||= theme_path + 'current' end - def site_themes_path - @site_themes_path ||= File.join(RAILS_ROOT, 'themes', "site-#{id}", 'other') + def other_themes_path + @other_themes_path ||= theme_path + 'other' + end + + def themes + return @themes unless @themes.nil? + @themes = [] + FileUtils.mkdir_p other_themes_path + Dir.foreach other_themes_path do |e| + next if e.first == '.' + entry = other_themes_path + e + next unless entry.directory? + @themes << Theme.new(entry) + end + @themes end - + def theme return @theme unless @theme.nil? @theme = Theme.new(attachment_base_path) app/models/site.rb @@ -1,18 +1,23 @@ class Theme attr_reader :path, :base_path - def initialize(base) - @base_path = base - @path = Pathname.new(@base_path) + if base.is_a?(Pathname) + @base_path = base.to_s + @path = base + else + @base_path = base + @path = Pathname.new(@base_path) + end + end + + def name + @name ||= @path.basename.to_s end def attachments return @attachments unless @attachments.nil? - @attachments, @templates, @resources = [], [], [] - @attachments.send(:extend, Mephisto::Attachments::AttachmentMethods::InstanceMethods) ; @attachments.theme = self - [@resources, @templates].each { |a| a.send(:extend, Mephisto::Attachments::AttachmentMethods::BaseMethods); a.theme = self } - @resources.send(:extend, Mephisto::Attachments::ResourceMethods) - @templates.send(:extend, Mephisto::Attachments::TemplateMethods) + @attachments, @templates, @resources = Attachments.new, Templates.new, Resources.new + [@attachments, @templates, @resources].each { |a| a.theme = self } Pathname.glob(File.join(base_path, '**/*')).each do |path| next unless path.file? @attachments << path @@ -26,4 +31,26 @@ class Theme attachments && instance_variable_get("@#{attr}") end end + + def export_as_zip(name, options = {}) + path = options[:to] || '.' + Zip::ZipFile.open(File.join(path, "#{name}.zip"), Zip::ZipFile::CREATE) do |zip| + %w(templates layouts javascripts stylesheets images).each { |d| zip.dir.mkdir(d) } + write_theme_files_with zip.file + end + end + + def export(name, options = {}) + path = File.join(options[:to] || '.', name) + %w(templates layouts javascripts stylesheets images).each { |d| FileUtils.mkdir_p File.join(path, d) } + write_theme_files_with File, path + end + + protected + def write_theme_files_with(file_class, path = '') + write_mode = file_class.is_a?(Zip::ZipFileSystem::ZipFsFile) ? 'w' : 'wb' + attachments.each do |full_path| + file_class.open((Pathname.new(path) + full_path.relative_path_from(self.path)).to_s, write_mode) { |f| f.write full_path.read } + end + end end \ No newline at end of file app/models/theme.rb @@ -8,73 +8,6 @@ <div id="themes"> <ul id="themelist"> - <li class="theme"> - <h3> - A nice theme - <span class="thememeta"> - v0.5 | by Dude Yo - </span> - </h3> - <img src="/images/mephisto/preview.png" alt="Theme preview" title="A nice theme (v0.5)" /> - <div class="tools" style="display:none"> - <ul> - <li><a href="#" title="title">Use this theme</a></li> - <li><a href="#" title="title">Edit source code</a></li> - <li><a href="#" title="title">Change info</a></li> - <li><a href="#" title="title">Export</a></li> - </ul> - </div> - </li> - <li class="theme" id="inuse"> - <h3> - A nice theme - <span class="thememeta"> - v0.5 | by Dude Yo - </span> - </h3> - <img src="/images/mephisto/preview.png" alt="Theme preview" title="A nice theme (v0.5)" /> - <div class="tools" style="display:none"> - <ul> - <li><a href="#" title="title">Use this theme</a></li> - <li><a href="#" title="title">Edit source code</a></li> - <li><a href="#" title="title">Change info</a></li> - <li><a href="#" title="title">Export</a></li> - </ul> - </div> - </li> - <li class="theme"> - <h3> - A nice theme - <span class="thememeta"> - v0.5 | by Dude Yo - </span> - </h3> - <img src="/images/mephisto/preview.png" alt="Theme preview" title="A nice theme (v0.5)" /> - <div class="tools" style="display:none"> - <ul> - <li><a href="#" title="title">Use this theme</a></li> - <li><a href="#" title="title">Edit source code</a></li> - <li><a href="#" title="title">Change info</a></li> - <li><a href="#" title="title">Export</a></li> - </ul> - </div> - </li> - <li class="theme"> - <h3> - A nice theme - <span class="thememeta"> - v0.5 | by Dude Yo - </span> - </h3> - <img src="/images/mephisto/preview.png" alt="Theme preview" title="A nice theme (v0.5)" /> - <div class="tools" style="display:none"> - <ul> - <li><a href="#" title="title">Use this theme</a></li> - <li><a href="#" title="title">Edit source code</a></li> - <li><a href="#" title="title">Change info</a></li> - <li><a href="#" title="title">Export</a></li> - </ul> - </div> - </li> +<%= render :partial => "theme", :collection => site.themes %> </ul> </div> \ No newline at end of file app/views/admin/themes/index.rhtml @@ -1,9 +1,10 @@ +SITE_DIR = File.join(RAILS_ROOT, 'themes/site-' + (ENV['SITE_ID'] || '1')) namespace :db do desc "Loads a schema.rb file into the database and then loads the initial database fixtures." task :bootstrap do mkdir_p File.join(RAILS_ROOT, 'log') %w(environment db:schema:load db:bootstrap:load tmp:create).each { |t| Rake::Task[t].execute } - site_dir = File.join(RAILS_ROOT, 'themes/site-1') + site_dir = SITE_DIR if File.exists?(site_dir) puts "skipping default theme creation..." else @@ -37,7 +38,7 @@ namespace :db do desc "Copy default theme to site theme" task :copy_default_theme do - FileUtils.cp_r File.join(RAILS_ROOT, 'themes/default'), File.join(RAILS_ROOT, 'themes/site-' + (ENV['SITE_ID'] || '1'), 'current') + FileUtils.cp_r File.join(RAILS_ROOT, 'themes/default'), File.join(SITE_DIR, 'current') end end end \ No newline at end of file lib/tasks/bootstrap.rake @@ -1,15 +1,8 @@ require File.join(RAILS_ROOT, 'app/models/site') class Site + @@theme_path = Pathname.new(RAILS_ROOT) + 'tmp/themes' attr_reader :recent_template_type, :recent_preferred_template, :recent_layout_template - - def attachment_base_path - @attachment_base_path ||= File.join(RAILS_ROOT, 'tmp/themes', "site-#{id}", 'current') - end - - def site_themes_path - @site_themes_path ||= File.join(RAILS_ROOT, 'tmp/themes', "site-#{id}", 'other') - end def set_template_type_for_with_testing(section, template_type) @recent_template_type = set_template_type_for_without_testing(section, template_type) test/mocks/test/site.rb @@ -1,5 +1,4 @@ require File.dirname(__FILE__) + '/../test_helper' - context "Site" do fixtures :sites, :contents @@ -163,53 +162,4 @@ context "Site Validations" do assert_valid @site assert_equal 'article/:id', @site.permalink_style end -end - -context "Site Template" do - fixtures :sites, :sections - - def setup - prepare_theme_fixtures - end - - specify "should raise error on missing template" do - sites(:first).templates[:archive].unlink - assert_raise Mephisto::MissingTemplateError do - sites(:first).send(:parse_template, sites(:first).templates[:archive], {}, {}) - end - end - - specify "should find preferred for site" do - assert_site_template_name :home, :section - end - - specify "should find fallback for site with preferred template" do - FileUtils.rm File.join(THEME_ROOT, 'site-1', 'current', 'templates', 'home.liquid') - assert_site_template_name :section, :section - end - - specify "should find preferred for site layout" do - FileUtils.cp File.join(THEME_ROOT, 'site-1', 'current', 'layouts', 'layout.liquid'), File.join(THEME_ROOT, 'site-1', 'current', 'layouts', 'custom_layout.liquid') - sites(:first).sections.home.update_attribute :layout, 'custom_layout' - assert_site_layout_name :custom_layout, :layout - end - - specify "should find fallback for site with preferred layout" do - sites(:first).sections.home.update_attribute :layout, 'custom_layout' - assert_site_layout_name :layout - end - - protected - def assert_site_template_name(expected_template_name, template_type = nil, options = {}) - template_type ||= expected_template_name - site = options[:site] || sites(:first) - section = options[:section] || site.sections.home - assert_equal(expected_template_name.nil? ? nil : site.templates[expected_template_name], site.send(:set_preferred_template, section, template_type)) - end - def assert_site_layout_name(expected_template_name, template_type = nil, options = {}) - template_type ||= expected_template_name - site = options[:site] || sites(:first) - section = options[:section] || site.sections.home - assert_equal(expected_template_name.nil? ? nil : site.templates[expected_template_name], site.send(:set_layout_template, section, template_type)) - end end \ No newline at end of file test/unit/site_test.rb @@ -24,7 +24,7 @@ class ThemeTest < Test::Unit::TestCase ] def test_should_export_files - sites(:first).attachments.export 'foo', :to => THEME_ROOT + sites(:first).theme.export 'foo', :to => THEME_ROOT THEME_FILES.each do |path| assert File.exists?(File.join(THEME_ROOT, 'foo', path)), "#{path} does not exist" @@ -32,7 +32,7 @@ class ThemeTest < Test::Unit::TestCase end def test_should_export_files_as_zip - sites(:first).attachments.export_as_zip 'foo', :to => THEME_ROOT + sites(:first).theme.export_as_zip 'foo', :to => THEME_ROOT assert File.exists?(File.join(THEME_ROOT, 'foo.zip')) test/unit/theme_test.rb lib/mephisto/attachments/attachment_methods.rb lib/mephisto/attachments/resource_methods.rb lib/mephisto/attachments/template_methods.rb 902481b2b1c696f99c73cb0ba555207e0875c90f technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78 http://github.com/francois/mephisto/commit/87dc9608d75855ba9c87097940fd379a1f893d5a 87dc9608d75855ba9c87097940fd379a1f893d5a 2006-09-19T07:14:23-07:00 2006-09-19T07:14:23-07:00 allow way to find themes for a site git-svn-id: http://svn.techno-weenie.net/projects/mephisto/trunk@2217 567b1171-46fb-0310-a4c9-b4bef9110e78 179f9d54675387f2cc1cf1019a2ac5c19b74064c technoweenie technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78