nesta 0.12.0 → 0.14.0

data/lib/nesta/commands/template.rb

@@ -0,0 +1,20 @@
+module Nesta
+  module Commands
+    class Template
+      def initialize(filename)
+        @filename = filename
+      end
+
+      def template_path
+        dir = File.expand_path('../../../templates', File.dirname(__FILE__))
+        File.join(dir, @filename)
+      end
+
+      def copy_to(dest, context)
+        FileUtils.mkdir_p(File.dirname(dest))
+        template = ERB.new(File.read(template_path), trim_mode: "-")
+        File.open(dest, 'w') { |file| file.puts template.result(context) }
+      end
+    end
+  end
+end

data/lib/nesta/commands/theme/create.rb

@@ -1,18 +1,16 @@
-require File.expand_path('../command', File.dirname(__FILE__))
-
 module Nesta
   module Commands
     module Theme
       class Create
-        include Command
-
         def initialize(*args)
           name = args.shift
           options = args.shift || {}
           name.nil? && (raise UsageError.new('name not specified'))
           @name = name
           @theme_path = Nesta::Path.themes(@name)
-          fail("#{@theme_path} already exists") if File.exist?(@theme_path)
+          if File.exist?(@theme_path)
+            Nesta.fail_with("#{@theme_path} already exists")
+          end
         end
 
         def make_directories
@@ -20,15 +18,17 @@ module Nesta
           FileUtils.mkdir_p(File.join(@theme_path, 'views'))
         end
 
-        def execute
+        def execute(process)
           make_directories
-          copy_templates(
+          {
             'themes/README.md' => "#{@theme_path}/README.md",
             'themes/app.rb' => "#{@theme_path}/app.rb",
             'themes/views/layout.haml' => "#{@theme_path}/views/layout.haml",
             'themes/views/page.haml' => "#{@theme_path}/views/page.haml",
             'themes/views/master.sass' => "#{@theme_path}/views/master.sass"
-          )
+          }.each do |src, dest|
+            Nesta::Commands::Template.new(src).copy_to(dest, binding)
+          end
         end
       end
     end

data/lib/nesta/commands/theme/enable.rb

@@ -1,11 +1,9 @@
-require File.expand_path('../command', File.dirname(__FILE__))
+require File.expand_path('../../config_file', File.dirname(__FILE__))
 
 module Nesta
   module Commands
     module Theme
       class Enable
-        include Command
-
         def initialize(*args)
           name = args.shift
           options = args.shift || {}
@@ -13,8 +11,8 @@ module Nesta
           @name = name
         end
 
-        def execute
-          update_config_yaml(/^\s*#?\s*theme:.*/, "theme: #{@name}")
+        def execute(process)
+          Nesta::ConfigFile.new.set_value('theme', @name)
         end
       end
     end

data/lib/nesta/commands/theme/install.rb

@@ -1,11 +1,7 @@
-require File.expand_path('../command', File.dirname(__FILE__))
-
 module Nesta
   module Commands
     module Theme
       class Install
-        include Command
-
         def initialize(*args)
           @url = args.shift
           @url.nil? && (raise UsageError.new('URL not specified'))
@@ -16,14 +12,14 @@ module Nesta
           File.basename(@url, '.git').sub(/nesta-theme-/, '')
         end
 
-        def execute
-          run_process('git', 'clone', @url, "themes/#{theme_name}")
-          FileUtils.rm_r(File.join("themes/#{theme_name}", '.git'))
-          enable
+        def execute(process)
+          process.run('git', 'clone', @url, "themes/#{theme_name}")
+          FileUtils.rm_rf(File.join("themes/#{theme_name}", '.git'))
+          enable(process)
         end
 
-        def enable
-          Enable.new(theme_name).execute
+        def enable(process)
+          Enable.new(theme_name).execute(process)
         end
       end
     end

data/lib/nesta/commands.rb

@@ -4,10 +4,19 @@ require 'fileutils'
 require File.expand_path('env', File.dirname(__FILE__))
 require File.expand_path('app', File.dirname(__FILE__))
 require File.expand_path('path', File.dirname(__FILE__))
+require File.expand_path('system_command', File.dirname(__FILE__))
 require File.expand_path('version', File.dirname(__FILE__))
 
+require File.expand_path('commands/build', File.dirname(__FILE__))
 require File.expand_path('commands/demo', File.dirname(__FILE__))
 require File.expand_path('commands/edit', File.dirname(__FILE__))
 require File.expand_path('commands/new', File.dirname(__FILE__))
 require File.expand_path('commands/plugin', File.dirname(__FILE__))
+require File.expand_path('commands/template', File.dirname(__FILE__))
 require File.expand_path('commands/theme', File.dirname(__FILE__))
+
+module Nesta
+  module Commands
+    class UsageError < RuntimeError; end
+  end
+end

data/lib/nesta/config.rb

@@ -1,115 +1,89 @@
+require 'singleton'
 require 'yaml'
 
+require_relative './config_file'
+
 module Nesta
   class Config
+    include Singleton
+
     class NotDefined < KeyError; end
 
-    @settings = %w[
-      cache
+    SETTINGS = %w[
+      author
+      build
       content
       disqus_short_name
+      domain
       google_analytics_code
       read_more
       subtitle
       theme
       title
     ]
-    @author_settings = %w[name uri email]
-    @yaml = nil
-    
+
     class << self
-      attr_accessor :settings, :author_settings, :yaml_conf
+      extend Forwardable
+      def_delegators *[:instance, :fetch].concat(SETTINGS.map(&:to_sym))
     end
 
-    def self.fetch(key, *default)
-      from_environment(key.to_s)
+    attr_accessor :config
+
+    def fetch(setting, *default)
+      setting = setting.to_s
+      self.config ||= read_config_file(setting)
+      env_config = config.fetch(Nesta::App.environment.to_s, {})
+      env_config.fetch(
+        setting,
+        config.fetch(setting) { raise NotDefined.new(setting) }
+      )
     rescue NotDefined
-      begin
-        from_yaml(key.to_s)
-      rescue NotDefined
-        default.empty? && raise || (return default.first)
-      end
+      default.empty? && raise || (return default.first)
     end
 
-    def self.method_missing(method, *args)
-      if settings.include?(method.to_s)
-        fetch(method, nil)
+    def method_missing(method, *args)
+      if SETTINGS.include?(method.to_s)
+        fetch(method.to_s, nil)
       else
         super
       end
     end
-    
-    def self.author
-      environment_config = {}
-      %w[name uri email].each do |setting|
-        variable = "NESTA_AUTHOR__#{setting.upcase}"
-        ENV[variable] && environment_config[setting] = ENV[variable]
-      end
-      environment_config.empty? ? from_yaml('author') : environment_config
-    rescue NotDefined
-      nil
-    end
 
-    def self.cache
-      Nesta.deprecated('Nesta::Config.cache',
-                       'see http://nestacms.com/docs/deployment/page-caching')
-    end
-    
-    def self.content_path(basename = nil)
-      get_path(content, basename)
-    end
-    
-    def self.page_path(basename = nil)
-      get_path(File.join(content_path, "pages"), basename)
+    def respond_to_missing?(method, include_private = false)
+      SETTINGS.include?(method.to_s) || super
     end
-    
-    def self.attachment_path(basename = nil)
-      get_path(File.join(content_path, "attachments"), basename)
-    end
-    
-    def self.yaml_path
-      File.expand_path('config/config.yml', Nesta::App.root)
+
+    def build
+      fetch('build', {})
     end
 
-    def self.read_more
+    def read_more
       fetch('read_more', 'Continue reading')
     end
 
-    def self.from_environment(setting)
-      value = ENV.fetch("NESTA_#{setting.upcase}")
-    rescue KeyError
+    private
+
+    def read_config_file(setting)
+      YAML::load(ERB.new(IO.read(Nesta::ConfigFile.path)).result)
+    rescue Errno::ENOENT
       raise NotDefined.new(setting)
-    else
-      overrides = { "true" => true, "false" => false }
-      overrides.has_key?(value) ? overrides[value] : value
-    end
-    private_class_method :from_environment
-    
-    def self.yaml_exists?
-      File.exist?(yaml_path)
     end
-    private_class_method :yaml_exists?
 
-    def self.from_hash(hash, setting)
-      hash.fetch(setting) { raise NotDefined.new(setting) }
-    end
-    private_class_method :from_hash
-
-    def self.from_yaml(setting)
-      raise NotDefined.new(setting) unless yaml_exists?
-      self.yaml_conf ||= YAML::load(ERB.new(IO.read(yaml_path)).result)
-      env_config = self.yaml_conf.fetch(Nesta::App.environment.to_s, {})
-      begin
-        from_hash(env_config, setting)
-      rescue NotDefined
-        from_hash(self.yaml_conf, setting)
-      end
-    end
-    private_class_method :from_yaml
-    
     def self.get_path(dirname, basename)
       basename.nil? ? dirname : File.join(dirname, basename)
     end
     private_class_method :get_path
+
+    def self.content_path(basename = nil)
+      get_path(content, basename)
+    end
+
+    def self.page_path(basename = nil)
+      get_path(File.join(content_path, "pages"), basename)
+    end
+
+    def self.attachment_path(basename = nil)
+      get_path(File.join(content_path, "attachments"), basename)
+    end
   end
 end

data/lib/nesta/config_file.rb

@@ -0,0 +1,29 @@
+module Nesta
+  class ConfigFile
+    def self.path
+      File.expand_path('config/config.yml', Nesta::App.root)
+    end
+
+    def set_value(key, value)
+      pattern = /^\s*#?\s*#{key}:.*/
+      replacement = "#{key}: #{value}"
+
+      configured = false
+      File.open(self.class.path, 'r+') do |file|
+        output = ''
+        file.each_line do |line|
+          if configured
+            output << line
+          else
+            output << line.sub(pattern, replacement)
+            configured = true if line =~ pattern
+          end
+        end
+        output << "#{replacement}\n" unless configured
+        file.pos = 0
+        file.print(output)
+        file.truncate(file.pos)
+      end
+    end
+  end
+end

data/lib/nesta/helpers.rb

@@ -60,11 +60,6 @@ module Nesta
         date.strftime("%d %B %Y")
       end
 
-      def local_stylesheet?
-        Nesta.deprecated('local_stylesheet?', 'use local_stylesheet_link_tag')
-        File.exist?(File.expand_path('views/local.sass', Nesta::App.root))
-      end
-
       def local_stylesheet_link_tag(name)
         pattern = File.expand_path("views/#{name}.s{a,c}ss", Nesta::App.root)
         if Dir.glob(pattern).size > 0

data/lib/nesta/models.rb

@@ -380,45 +380,44 @@ module Nesta
       end
     end
 
-    private
-      def self.append_menu_item(menu, file, depth)
-        path = file.readline
-      rescue EOFError
-      else
-        page = Page.load(path.strip)
-        current_depth = path.scan(INDENT).size
-        if page
-          if current_depth > depth
-            sub_menu_for_depth(menu, depth) << [page]
-          else
-            sub_menu_for_depth(menu, current_depth) << page
-          end
+    private_class_method def self.append_menu_item(menu, file, depth)
+      path = file.readline
+    rescue EOFError
+    else
+      page = Page.load(path.strip)
+      current_depth = path.scan(INDENT).size
+      if page
+        if current_depth > depth
+          sub_menu_for_depth(menu, depth) << [page]
+        else
+          sub_menu_for_depth(menu, current_depth) << page
         end
-        append_menu_item(menu, file, current_depth)
       end
+      append_menu_item(menu, file, current_depth)
+    end
 
-      def self.sub_menu_for_depth(menu, depth)
-        sub_menu = menu
-        depth.times { sub_menu = sub_menu[-1] }
-        sub_menu
-      end
+    private_class_method def self.sub_menu_for_depth(menu, depth)
+      sub_menu = menu
+      depth.times { sub_menu = sub_menu[-1] }
+      sub_menu
+    end
 
-      def self.find_menu_item_by_path(menu, path)
-        item = menu.detect do |item|
-          item.respond_to?(:path) && (item.path == path)
-        end
-        if item
-          subsequent = menu[menu.index(item) + 1]
-          item = [item]
-          item << subsequent if subsequent.respond_to?(:each)
-        else
-          sub_menus = menu.select { |menu_item| menu_item.respond_to?(:each) }
-          sub_menus.each do |sub_menu|
-            item = find_menu_item_by_path(sub_menu, path)
-            break if item
-          end
+    private_class_method def self.find_menu_item_by_path(menu, path)
+      item = menu.detect do |item|
+        item.respond_to?(:path) && (item.path == path)
+      end
+      if item
+        subsequent = menu[menu.index(item) + 1]
+        item = [item]
+        item << subsequent if subsequent.respond_to?(:each)
+      else
+        sub_menus = menu.select { |menu_item| menu_item.respond_to?(:each) }
+        sub_menus.each do |sub_menu|
+          item = find_menu_item_by_path(sub_menu, path)
+          break if item
         end
-        item
       end
+      item
+    end
   end
 end

data/lib/nesta/navigation.rb

@@ -64,11 +64,6 @@ module Nesta
         raise
       end
 
-      def breadcrumb_label(page)
-        Nesta.deprecated('breadcrumb_label', 'use link_text')
-        link_text(page)
-      end
-
       def current_item?(item)
         request.path_info == item.abspath
       end

data/lib/nesta/overrides.rb

@@ -1,30 +1,47 @@
 module Nesta
   module Overrides
     module Renderers
-      def haml(template, options = {}, locals = {})
-        defaults, engine = Overrides.render_options(template, :haml)
-        super(template, defaults.merge(options), locals)
-      end
-
-      def erb(template, options = {}, locals = {})
-        defaults, engine = Overrides.render_options(template, :erb)
-        super(template, defaults.merge(options), locals)
+      def find_template(views, name, engine, &block)
+        user_paths = [
+          Nesta::Overrides.local_view_path,
+          Nesta::Overrides.theme_view_path,
+          views
+        ].flatten.compact
+        user_paths.each do |path|
+          super(path, name, engine, &block)
+        end
       end
 
       def scss(template, options = {}, locals = {})
-        defaults, engine = Overrides.render_options(template, :scss)
-        super(template, defaults.merge(options), locals)
+        find_template(Nesta::App.settings.views, template, Tilt::ScssTemplate) do |file|
+          return Tilt.new(file).render if File.exist?(file)
+        end
+        raise IOError, "SCSS template not found: #{template}"
       end
 
       def sass(template, options = {}, locals = {})
-        defaults, engine = Overrides.render_options(template, :sass)
-        super(template, defaults.merge(options), locals)
+        find_template(Nesta::App.settings.views, template, Tilt::SassTemplate) do |file|
+          return Tilt.new(file).render if File.exist?(file)
+        end
+        raise IOError, "Sass template not found: #{template}"
       end
 
       def stylesheet(template, options = {}, locals = {})
-        defaults, engine = Overrides.render_options(template, :sass, :scss)
-        renderer = Sinatra::Templates.instance_method(engine)
-        renderer.bind(self).call(template, defaults.merge(options), locals)
+        scss(template, options, locals)
+      rescue IOError
+        sass(template, options, locals)
+      end
+    end
+
+    def self.local_view_path
+      Nesta::Path.local("views")
+    end
+  
+    def self.theme_view_path
+      if Nesta::Config.theme.nil?
+        nil
+      else
+        Nesta::Path.themes(Nesta::Config.theme, "views")
       end
     end
 
@@ -39,33 +56,5 @@ module Nesta
         require app_file if File.exist?(app_file)
       end
     end
-
-    private
-      def self.template_exists?(engine, views, template)
-        views && File.exist?(File.join(views, "#{template}.#{engine}"))
-      end
-
-      def self.render_options(template, *engines)
-        [local_view_path, theme_view_path].each do |path|
-          engines.each do |engine|
-            if template_exists?(engine, path, template)
-              return { views: path }, engine
-            end
-          end
-        end
-        [{}, :sass]
-      end
-
-      def self.local_view_path
-        Nesta::Path.local("views")
-      end
-    
-      def self.theme_view_path
-        if Nesta::Config.theme.nil?
-          nil
-        else
-          Nesta::Path.themes(Nesta::Config.theme, "views")
-        end
-      end
   end
 end

data/lib/nesta/plugin.rb

@@ -15,21 +15,5 @@ module Nesta
     def self.initialize_plugins
       self.loaded.each { |name| require "#{name}/init" }
     end
-
-    def self.load_local_plugins
-      # This approach is deprecated; plugins should now be distributed
-      # as gems. See http://nestacms.com/docs/plugins/writing-plugins
-      plugins = Dir.glob(File.expand_path('../plugins/*', File.dirname(__FILE__)))
-      plugins.each { |path| require_local_plugin(path) }
-    end
-
-    def self.require_local_plugin(path)
-      Nesta.deprecated(
-          'loading plugins from ./plugins', "convert #{path} to a gem")
-      require File.join(path, 'lib', File.basename(path))
-    rescue LoadError => e
-      $stderr.write("Couldn't load plugins/#{File.basename(path)}: #{e}\n")
-    end
-    private_class_method :require_local_plugin
   end
 end

data/lib/nesta/static/assets.rb

@@ -0,0 +1,50 @@
+require 'rake'
+
+module Nesta
+  module Static
+    class Assets
+      def initialize(build_dir, logger = nil)
+        @build_dir = build_dir
+        @logger = logger
+      end
+
+      def copy_attachments
+        dest_basename = File.basename(Nesta::Config.attachment_path)
+        dest_dir = File.join(@build_dir, dest_basename)
+        copy_file_tree(Nesta::Config.attachment_path, dest_dir)
+      end
+
+      def copy_public_folder
+        copy_file_tree(Nesta::App.settings.public_folder, @build_dir)
+      end
+
+      private
+
+      def log(message)
+        @logger.call(message) if @logger
+      end
+
+      def copy_file_tree(source_dir, dest_dir)
+        files_in_tree(source_dir).each do |file|
+          target = File.join(dest_dir, file.sub(/^#{source_dir}\//, ''))
+          task = Rake::FileTask.define_task(target => file) do
+            target_dir = File.dirname(target)
+            FileUtils.mkdir_p(target_dir) unless Dir.exist?(target_dir)
+            FileUtils.cp(file, target_dir)
+            log("Copied #{file} to #{target}")
+          end
+          task.invoke
+        end
+      end
+
+      def files_in_tree(directory)
+        Rake::FileList["#{directory}/**/*"].tap do |assets|
+          assets.exclude('~*')
+          assets.exclude do |f|
+            File.directory?(f)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/nesta/static/html_file.rb

@@ -0,0 +1,26 @@
+module Nesta
+  module Static
+    class HtmlFile
+      def initialize(build_dir, page)
+        @build_dir = build_dir
+        @content_path = page.filename
+      end
+
+      def page_shares_path_with_directory?(dir, base_without_ext)
+        Dir.exist?(File.join(dir, base_without_ext))
+      end
+
+      def filename
+        dir, base = File.split(@content_path)
+        base_without_ext = File.basename(base, File.extname(base))
+        subdir = dir.sub(/^#{Nesta::Config.page_path}/, '')
+        path = File.join(@build_dir, subdir, base_without_ext)
+        if page_shares_path_with_directory?(dir, base_without_ext)
+          File.join(path, 'index.html')
+        else
+          path + '.html'
+        end
+      end
+    end
+  end
+end