nesta 0.10.0 → 0.11.0

data/lib/nesta/commands/command.rb

@@ -0,0 +1,58 @@
+module Nesta
+  module Commands
+    class UsageError < RuntimeError; end
+
+    module Command
+      def run_process(*args)
+        system(*args)
+        if ! $?.success?
+          message = if $?.exitstatus == 127
+                      "#{args[0]} not found"
+                    else
+                      "'#{args.join(' ')}' failed with status #{$?.exitstatus}"
+                    end
+          $stderr.puts "Error: #{message}"
+          exit 1
+        end
+      end
+
+      def fail(message)
+        $stderr.puts "Error: #{message}"
+        exit 1
+      end
+
+      def template_root
+        File.expand_path('../../../templates', File.dirname(__FILE__))
+      end
+
+      def copy_template(src, dest)
+        FileUtils.mkdir_p(File.dirname(dest))
+        template = ERB.new(File.read(File.join(template_root, src)), nil, "-")
+        File.open(dest, 'w') { |file| file.puts template.result(binding) }
+      end
+
+      def copy_templates(templates)
+        templates.each { |src, dest| copy_template(src, dest) }
+      end
+
+      def update_config_yaml(pattern, replacement)
+        configured = false
+        File.open(Nesta::Config.yaml_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
+end

data/lib/nesta/commands/demo.rb

@@ -0,0 +1 @@
+require File.expand_path('demo/content', File.dirname(__FILE__))

data/lib/nesta/commands/demo/content.rb

@@ -0,0 +1,38 @@
+require File.expand_path('../command', File.dirname(__FILE__))
+
+module Nesta
+  module Commands
+    module Demo
+      class Content
+        include Command
+
+        def initialize(*args)
+          @dir = 'content-demo'
+        end
+
+        def clone_or_update_repository
+          repository = 'git://github.com/gma/nesta-demo-content.git'
+          path = Nesta::Path.local(@dir)
+          if File.exist?(path)
+            FileUtils.cd(path) { run_process('git', 'pull', 'origin', 'master') }
+          else
+            run_process('git', 'clone', repository, path)
+          end
+        end
+
+        def configure_git_to_ignore_repo
+          excludes = Nesta::Path.local('.git/info/exclude')
+          if File.exist?(excludes) && File.read(excludes).scan(@dir).empty?
+            File.open(excludes, 'a') { |file| file.puts @dir }
+          end
+        end
+
+        def execute
+          clone_or_update_repository
+          configure_git_to_ignore_repo
+          update_config_yaml(/^\s*#?\s*content:.*/, "content: #{@dir}")
+        end
+      end
+    end
+  end
+end

data/lib/nesta/commands/edit.rb

@@ -0,0 +1,21 @@
+require File.expand_path('command', File.dirname(__FILE__))
+
+module Nesta
+  module Commands
+    class Edit
+      include Command
+
+      def initialize(*args)
+        @filename = Nesta::Config.page_path(args.shift)
+      end
+
+      def execute
+        editor = ENV.fetch('EDITOR')
+      rescue IndexError
+        $stderr.puts "No editor: set EDITOR environment variable"
+      else
+        run_process(editor, @filename)
+      end
+    end
+  end
+end

data/lib/nesta/commands/new.rb

@@ -0,0 +1,57 @@
+require File.expand_path('command', File.dirname(__FILE__))
+
+module Nesta
+  module Commands
+    class New
+      include Command
+
+      def initialize(*args)
+        path = args.shift
+        options = args.shift || {}
+        path.nil? && (raise UsageError.new('path not specified'))
+        if File.exist?(path)
+          raise RuntimeError.new("#{path} already exists") 
+        end
+        @path = path
+        @options = options
+      end
+
+      def make_directories
+        %w[content/attachments content/pages].each do |dir|
+          FileUtils.mkdir_p(File.join(@path, dir))
+        end
+      end
+
+      def have_rake_tasks?
+        @options['vlad']
+      end
+
+      def create_repository
+        FileUtils.cd(@path) do
+          File.open('.gitignore', 'w') do |file|
+            file.puts %w[._* .*.swp .bundle .DS_Store .sass-cache].join("\n")
+          end
+          run_process('git', 'init')
+          run_process('git', 'add', '.')
+          run_process('git', 'commit', '-m', 'Initial commit')
+        end
+      end
+
+      def execute
+        make_directories
+        templates = {
+          'config.ru' => "#{@path}/config.ru",
+          'config/config.yml' => "#{@path}/config/config.yml",
+          'index.haml' => "#{@path}/content/pages/index.haml",
+          'Gemfile' => "#{@path}/Gemfile"
+        }
+        templates['Rakefile'] = "#{@path}/Rakefile" if have_rake_tasks?
+        if @options['vlad']
+          templates['config/deploy.rb'] = "#{@path}/config/deploy.rb"
+        end
+        copy_templates(templates)
+        create_repository if @options['git']
+      end
+    end
+  end
+end

data/lib/nesta/commands/plugin.rb

@@ -0,0 +1 @@
+require File.expand_path('plugin/create', File.dirname(__FILE__))

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

@@ -0,0 +1,82 @@
+require File.expand_path('../command', File.dirname(__FILE__))
+
+module Nesta
+  module Commands
+    module Plugin
+      class Create
+        include Command
+
+        def initialize(*args)
+          name = args.shift
+          name.nil? && (raise UsageError.new('name not specified'))
+          @name = name
+          @gem_name = "nesta-plugin-#{name}"
+          if File.exist?(@gem_name)
+            raise RuntimeError.new("#{@gem_name} already exists")
+          end
+        end
+
+        def lib_path(*parts)
+          File.join(@gem_name, 'lib', *parts)
+        end
+
+        def module_name
+          module_names.join('::')
+        end
+
+        def nested_module_definition_with_version
+          indent_level = 2
+          indent_with = '  '
+
+          lines = module_names.map { |name| "module #{name}\n" }
+          indent_levels = 0.upto(module_names.size - 1).to_a
+
+          lines << "VERSION = '0.1.0'\n"
+          indent_levels << module_names.size
+
+          (module_names.size - 1).downto(0).each do |indent_level|
+            lines << "end\n"
+            indent_levels << indent_level
+          end
+
+          ''.tap do |code|
+            lines.each_with_index do |line, i|
+              code << '  ' * (indent_levels[i] + 2) + line
+            end
+          end
+        end
+
+        def make_directories
+          FileUtils.mkdir_p(File.join(@gem_name, 'lib', @gem_name))
+        end
+
+        def gem_path(path)
+          File.join(@gem_name, path)
+        end
+
+        def execute
+          make_directories
+          copy_templates(
+            'plugins/README.md' => gem_path('README.md'),
+            'plugins/gitignore' => gem_path('.gitignore'),
+            'plugins/plugin.gemspec' => gem_path("#{@gem_name}.gemspec"),
+            'plugins/Gemfile' => gem_path('Gemfile'),
+            'plugins/lib/required.rb' => gem_path("lib/#{@gem_name}.rb"),
+            'plugins/lib/version.rb' => gem_path("lib/#{@gem_name}/version.rb"),
+            'plugins/lib/init.rb' => gem_path("lib/#{@gem_name}/init.rb"),
+            'plugins/Rakefile' => gem_path('Rakefile')
+          )
+          Dir.chdir(@gem_name) do
+            run_process('git', 'init')
+            run_process('git', 'add', '.')
+          end
+        end
+
+        private
+          def module_names
+            @name.split('-').map { |name| name.capitalize }
+          end
+      end
+    end
+  end
+end

data/lib/nesta/commands/theme.rb

@@ -0,0 +1,3 @@
+require File.expand_path('theme/create', File.dirname(__FILE__))
+require File.expand_path('theme/enable', File.dirname(__FILE__))
+require File.expand_path('theme/install', File.dirname(__FILE__))

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

@@ -0,0 +1,36 @@
+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)
+        end
+
+        def make_directories
+          FileUtils.mkdir_p(File.join(@theme_path, 'public', @name))
+          FileUtils.mkdir_p(File.join(@theme_path, 'views'))
+        end
+
+        def execute
+          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"
+          )
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,22 @@
+require File.expand_path('../command', File.dirname(__FILE__))
+
+module Nesta
+  module Commands
+    module Theme
+      class Enable
+        include Command
+
+        def initialize(*args)
+          name = args.shift
+          options = args.shift || {}
+          name.nil? && (raise UsageError.new('name not specified'))
+          @name = name
+        end
+
+        def execute
+          update_config_yaml(/^\s*#?\s*theme:.*/, "theme: #{@name}")
+        end
+      end
+    end
+  end
+end

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

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

data/lib/nesta/config.rb

@@ -90,18 +90,13 @@ module Nesta
     end
     private_class_method :yaml_exists?
 
-    def self.can_use_yaml?
-      ENV.keys.grep(/^NESTA/).empty? && yaml_exists?
-    end
-    private_class_method :can_use_yaml?
-
     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 can_use_yaml?
+      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

data/lib/nesta/models.rb

@@ -1,10 +1,10 @@
 require 'time'
 
-Tilt.register Tilt::MarukuTemplate, 'mdown'
-Tilt.register Tilt::KramdownTemplate, 'mdown'
-Tilt.register Tilt::BlueClothTemplate, 'mdown'
-Tilt.register Tilt::RDiscountTemplate, 'mdown'
-Tilt.register Tilt::RedcarpetTemplate, 'mdown'
+Tilt.register Tilt::MarukuTemplate, 'mdown', 'md'
+Tilt.register Tilt::KramdownTemplate, 'mdown', 'md'
+Tilt.register Tilt::BlueClothTemplate, 'mdown', 'md'
+Tilt.register Tilt::RDiscountTemplate, 'mdown', 'md'
+Tilt.register Tilt::RedcarpetTemplate, 'mdown', 'md'
 
 module Nesta
   class HeadingNotSet < RuntimeError; end
@@ -12,7 +12,7 @@ module Nesta
   class MetadataParseError < RuntimeError; end
 
   class FileModel
-    FORMATS = [:mdown, :haml, :textile]
+    FORMATS = [:mdown, :md, :haml, :textile]
     @@page_cache = {}
     @@filename_cache = {}
 
@@ -113,7 +113,7 @@ module Nesta
       (metadata('template') || 'page').to_sym
     end
 
-    def to_html(scope = nil)
+    def to_html(scope = Object.new)
       convert_to_html(@format, scope, markup)
     end
 
@@ -128,7 +128,7 @@ module Nesta
     def keywords
       metadata('keywords')
     end
-    
+
     def metadata(key)
       @metadata[key]
     end
@@ -220,7 +220,7 @@ module Nesta
 
     def heading
       regex = case @format
-        when :mdown
+        when :mdown, :md
           /^#\s*(.*?)(\s*#+|$)/
         when :haml
           /^\s*%h1\s+(.*)/
@@ -236,7 +236,7 @@ module Nesta
     rescue HeadingNotSet
       raise LinkTextNotSet, "Need to link to '#{abspath}' but can't get link text"
     end
-  
+
     def title
       metadata('title') || link_text
     rescue LinkTextNotSet
@@ -265,13 +265,13 @@ module Nesta
     def summary
       if summary_text = metadata("summary")
         summary_text.gsub!('\n', "\n")
-        convert_to_html(@format, nil, summary_text)
+        convert_to_html(@format, Object.new, summary_text)
       end
     end
 
     def body_markup
       case @format
-        when :mdown
+        when :mdown, :md
           markup.sub(/^#[^#].*$\r?\n(\r?\n)?/, '')
         when :haml
           markup.sub(/^\s*%h1\s+.*$\r?\n(\r?\n)?/, '')
@@ -280,23 +280,20 @@ module Nesta
       end
     end
 
-    def body(scope = nil)
+    def body(scope = Object.new)
       convert_to_html(@format, scope, body_markup)
     end
 
     def categories
       paths = category_strings.map { |specifier| specifier.sub(/:-?\d+$/, '') }
-      pages = valid_paths(paths).map { |p| Page.find_by_path(p) }
-      pages.sort do |x, y|
-        x.link_text.downcase <=> y.link_text.downcase
-      end
+      valid_paths(paths).map { |p| Page.find_by_path(p) }
     end
 
     def priority(category)
       category_string = category_strings.detect do |string|
         string =~ /^#{category}([,:\s]|$)/
       end
-      category_string && category_string.split(':', 2)[-1].to_i 
+      category_string && category_string.split(':', 2)[-1].to_i
     end
 
     def parent
@@ -309,6 +306,7 @@ module Nesta
           return parent unless parent.nil?
           parent_path = File.dirname(parent_path)
         end
+        return categories.first unless categories.empty?
         Page.load('index')
       end
     end
@@ -384,15 +382,15 @@ module Nesta
       rescue EOFError
       else
         page = Page.load(path.strip)
+        current_depth = path.scan(INDENT).size
         if page
-          current_depth = path.scan(INDENT).size
           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)