nesta 0.9.11 → 0.12.0

data/Guardfile

@@ -0,0 +1,7 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard 'ctags-bundler' do
+  watch(%r{^(lib)/.*\.rb$})  { 'lib' }
+  watch('Gemfile.lock')
+end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2011 Graham Ashton
+Copyright (c) 2008-2020 Graham Ashton
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -31,12 +31,44 @@ You'll find basic configuration options for your site in
 before you go very far.
 
 That's it - you can launch a local web server in development mode using
-shotgun...
+mr-sparkle...
 
-    $ bundle exec shotgun config.ru
+    $ bundle exec mr-sparkle config.ru
 
-...then point your web browser at http://localhost:9393. Start editing
-the files in `content/pages` (see the [Writing content][content] docs
-for full instructions).
+...then point your web browser at http://localhost:8080. Start editing
+the files in `content/pages` (see the [docs on writing content][] for
+full instructions).
 
-[content]: http://nestacms.com/docs/creating-content
+[docs on writing content]: http://nestacms.com/docs/creating-content
+
+## Support
+
+There's plenty of information on <http://nestacms.com>. If you need some
+help with anything just jump on the [mailing list][] and ask.
+
+[mailing list]: http://nestacms.com/support
+
+If you like Nesta you can keep up with developments by following [@nestacms][]
+on Twitter, and on [the blog][].
+
+[@nestacms]: http://twitter.com/nestacms
+[the blog]: http://nestacms.com/blog
+
+## Contributing
+
+If you want to add a new feature, I recommend that you post a quick
+message to the [mailing list][] before you start coding. I'm likely to
+suggest that we implement it as a [plugin][] (to keep Nesta itself lean
+and simple), so you might save yourself some time if we chat about a
+good approach before you start.
+
+[plugin]: http://nestacms.com/docs/plugins
+
+If you think you've found a bug, please bring that up on the [mailing
+list][] too, rather than creating an issue on GitHub straight away.
+You'll probably get a faster response on the mailing list, as I'm the
+only person who'll see your new issue.
+
+-- Graham ([@grahamashton][] on Twitter).
+
+[@grahamashton]: http://twitter.com/grahamashton

data/RELEASING.md

@@ -0,0 +1,21 @@
+# Releasing Nesta
+
+When it comes time to release a new version of the Nesta gem, these are
+the steps:
+
+1. Bump the version number in `lib/nesta/version.rb`. This will cause
+   the version number in `Gemfile.lock` to be updated too, so regenerate
+   it now and check them in together.
+
+2. Update the `CHANGES` file with a summary of significant changes since
+   the previous release.
+
+3. Check the versions of Ruby used in `.travis.yml` are up to date. If new
+   Ruby versions need testing, update the config and re-run the Travis build.
+
+4. Generate a new site with the `nesta` command, install the demo content,
+   check that it runs okay locally.
+
+5. If everything seems fine, run `rake release`.
+
+6. Publish an announcement blog post and email the list.

data/Rakefile

@@ -3,10 +3,26 @@ require "bundler/setup"
 
 Bundler.require(:default, :test)
 
-require "spec/rake/spectask"
 Bundler::GemHelper.install_tasks
 
-desc "Run all specs in spec directory"
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_files = FileList["spec/*_spec.rb"]
+namespace :test do
+  task :set_load_path do
+    $LOAD_PATH.unshift File.expand_path('test')
+  end
+
+  def load_tests(directory)
+    Rake::FileList["test/#{directory}/*_test.rb"].each { |f| require_relative f }
+  end
+
+  task units: :set_load_path do
+    load_tests('unit')
+  end
+
+  task integrations: :set_load_path do
+    load_tests('integration')
+  end
+end
+
+task test: 'test:set_load_path' do
+  load_tests('**')
 end

data/bin/nesta

@@ -13,9 +13,12 @@ USAGE: #{File.basename($0)} [GLOBAL OPTIONS]  [COMMAND OPTIONS]
 GLOBAL OPTIONS
     --help, -h            Display this message.
     --version, -v         Display version number.
+    --bash-completion     Output command completion setup for Bash.
+    --zsh-completion      Output command completion setup for Zsh.
 
 COMMANDS
     new <path>            Create a new Nesta project.
+    edit <path>           Edit a document (path relative to content/pages).
     demo:content          Install example pages in ./content-demo.
     plugin:create <name>  Create a gem called nesta-plugin-name.
     theme:install <url>   Install a theme from a git repository.
@@ -37,18 +40,24 @@ EOF
 
     def self.parse_command_line
       opts = GetoptLong.new(
+        ['--bash-completion', GetoptLong::NO_ARGUMENT],
         ['--git', GetoptLong::NO_ARGUMENT],
         ['--help', '-h', GetoptLong::NO_ARGUMENT],
         ['--version', '-v', GetoptLong::NO_ARGUMENT],
-        ['--vlad', GetoptLong::NO_ARGUMENT]
+        ['--vlad', GetoptLong::NO_ARGUMENT],
+        ['--zsh-completion', GetoptLong::NO_ARGUMENT]
       )
       options = {}
       opts.each do |opt, arg|
-        case opt 
+        case opt
+        when '--bash-completion'
+          bash_completion
         when '--help'
           usage(exitcode=0)
         when '--version'
           version
+        when '--zsh-completion'
+          zsh_completion
         else
           options[opt.sub(/^--/, '')] = arg
         end
@@ -59,21 +68,30 @@ EOF
       usage
     end
 
+    def self.require_bundled_gems
+      if File.exist?('Gemfile')
+        require 'bundler'
+        Bundler.setup(:default)
+        Bundler.require(:default)
+      end
+    end
+
+    def self.class_for_command(command)
+      const_names = command.split(':').map { |word| word.capitalize }
+      const_names.inject(Nesta::Commands) do |namespace, const|
+        namespace.const_get(const)
+      end
+    end
+
     def self.main(options)
       command = ARGV.shift
       command.nil? && usage
-      case command
-        when 'new'
-          Nesta::Commands::New.new(ARGV[0], options).execute
-        when 'demo:content'
-          Nesta::Commands::Demo::Content.new.execute
-        when 'plugin:create'
-          Nesta::Commands::Plugin::Create.new(ARGV[0]).execute
-        when /^theme:(create|enable|install)$/
-          command_cls = Nesta::Commands::Theme.const_get($1.capitalize.to_sym)
-          command_cls.new(ARGV[0], options).execute
-        else
-          usage(exitcode=0)
+      begin
+        command_cls = class_for_command(command)
+      rescue NameError
+        usage
+      else
+        command_cls.new(ARGV[0], options).execute
       end
     rescue RuntimeError => e
       $stderr.puts "ERROR: #{e}"
@@ -82,7 +100,106 @@ EOF
       $stderr.puts "ERROR: #{e}"
       usage
     end
+
+    def self.bash_completion
+      puts <<-EOF
+# Bash completion configuration for the nesta command.
+#
+# Install it with these commands:
+#
+# $ nesta --bash-completion > ~/.nesta-completion.sh
+# $ echo '[ -f ~/.nesta-completion.sh ] && source ~/.nesta-completion.sh' \
+#       >> ~/.bash_profile
+# $ source ~/.nesta-completion.sh
+
+_nesta() {
+    local cur prev opts pages
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+    opts="new 'demo:content' edit 'plugin:create' 'theme:install' 'theme:enable' 'theme:create'"
+
+    case "${cur}" in
+        theme:*)
+            COMPREPLY=( $(compgen -W "enable install" -- ${cur##*:}) )
+            return 0
+            ;;
+    esac
+
+    case "${prev}" in
+        edit)
+            local pages_path="content/pages"
+            local pages="$(find $pages_path -type f | sed s,$pages_path/,,)"
+            COMPREPLY=( $(compgen -W "$pages" -- $cur) )
+            return 0
+            ;;
+        *)
+            ;;
+    esac
+
+    COMPREPLY=( $(compgen -W "$opts" -- $cur) )
+    return 0
+}
+complete -F _nesta nesta
+      EOF
+      exit 0
+    end
+
+    def self.zsh_completion
+      puts <<-EOF
+# Zsh completion configuration for the nesta command.
+#
+# Install it with these commands:
+#
+# $ nesta --zsh-completion > <somewhere/in/your/$fpath>/nesta-completion.sh
+#
+# Source form somewhere in your $fpath
+
+#compdef nesta
+
+
+_nesta_content() {
+  content=(`ls content/pages/**/*`)
+}
+
+
+local -a _1st_arguments
+_1st_arguments=(
+  'new:Create a new Nesta project'
+  'edit:Edit a document'
+  'demo\:content:Install example pages in ./content-demo'
+  'theme\:install:Install a theme from a git repository'
+  'theme\:enable:Make the theme active, updating config.yml'
+  'theme\:create:Makes a template for a new theme in ./themes'
+)
+
+local expl
+local -a content
+
+_arguments \
+  '(-h)'{-h,--help}'[Display usage]' \
+  '(-v)'{-v,--version}'[Display Nesta version]' \
+  '(--bash-completion)--bash-completion[Output command for Bash completion]' \
+  '(--zsh-completion)--zsh-completion[Output command for Zsh completion]' \
+  '*:: :->subcmds' && return 0
+
+if (( CURRENT == 1 )); then
+  _describe -t commands "nesta subcommand" _1st_arguments
+  return
+fi
+
+case "$words[1]" in
+  edit)
+    _nesta_content
+    _wanted content expl 'all content' compadd -a content ;;
+esac
+      EOF
+      exit 0
+    end
   end
 end
 
+Nesta::Cli.require_bundled_gems
+Nesta::Plugin.initialize_plugins
 Nesta::Cli.main(Nesta::Cli.parse_command_line)

data/config.ru

@@ -4,7 +4,10 @@ require 'bundler/setup'
 Bundler.require(:default)
 
 $LOAD_PATH.unshift(::File.expand_path('lib', ::File.dirname(__FILE__)))
+
 require 'nesta/env'
+Nesta::Env.root = ::File.expand_path('.', ::File.dirname(__FILE__))
+
 require 'nesta/app'
 
 run Nesta::App

data/lib/nesta.rb

@@ -1 +1,9 @@
-require "nesta/plugin"
+module Nesta
+  def self.deprecated(name, message)
+    if Nesta::App.environment != :test
+      $stderr.puts "DEPRECATION WARNING: #{name} is deprecated; #{message}"
+    end
+  end
+end
+
+require 'nesta/plugin'

data/lib/nesta/app.rb

@@ -1,114 +1,31 @@
 require 'sinatra/base'
 require 'haml'
-require 'sass'
+require 'sassc'
 
+require File.expand_path('../nesta', File.dirname(__FILE__))
 require File.expand_path('env', File.dirname(__FILE__))
-require File.expand_path('nesta', File.dirname(__FILE__))
-require File.expand_path('cache', File.dirname(__FILE__))
 require File.expand_path('config', File.dirname(__FILE__))
 require File.expand_path('models', File.dirname(__FILE__))
+require File.expand_path('helpers', File.dirname(__FILE__))
 require File.expand_path('navigation', File.dirname(__FILE__))
 require File.expand_path('overrides', File.dirname(__FILE__))
 require File.expand_path('path', File.dirname(__FILE__))
-require File.expand_path('plugin', File.dirname(__FILE__))
 
 Encoding.default_external = 'utf-8' if RUBY_VERSION =~ /^1.9/
 
 module Nesta
   class App < Sinatra::Base
-    register Sinatra::Cache
-
     set :root, Nesta::Env.root
     set :views, File.expand_path('../../views', File.dirname(__FILE__))
-    set :cache_enabled, Config.cache
-    set :haml, { :format => :html5 }
+    set :haml, { format: :html5 }
 
     helpers Overrides::Renderers
     helpers Navigation::Renderers
-
-    helpers do
-      def set_from_config(*variables)
-        variables.each do |var|
-          instance_variable_set("@#{var}", Nesta::Config.send(var))
-        end
-      end
-  
-      def set_from_page(*variables)
-        variables.each do |var|
-          instance_variable_set("@#{var}", @page.send(var))
-        end
-      end
-  
-      def no_widow(text)
-        text.split[0...-1].join(" ") + "&nbsp;#{text.split[-1]}"
-      end
-  
-      def set_common_variables
-        @menu_items = Nesta::Menu.for_path('/')
-        @site_title = Nesta::Config.title
-        set_from_config(:title, :subtitle, :google_analytics_code)
-        @heading = @title
-      end
-
-      def url_for(page)
-        File.join(base_url, page.path)
-      end
-  
-      def base_url
-        url = "http://#{request.host}"
-        request.port == 80 ? url : url + ":#{request.port}"
-      end
-  
-      def absolute_urls(text)
-        text.gsub!(/(<a href=['"])\//, '\1' + base_url + '/')
-        text
-      end
-  
-      def nesta_atom_id_for_page(page)
-        published = page.date.strftime('%Y-%m-%d')
-        "tag:#{request.host},#{published}:#{page.abspath}"
-      end
-  
-      def atom_id(page = nil)
-        if page
-          page.atom_id || nesta_atom_id_for_page(page)
-        else
-          "tag:#{request.host},2009:/"
-        end
-      end
-  
-      def format_date(date)
-        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
-          haml_tag :link, :href => "/css/#{name}.css", :rel => "stylesheet"
-        end
-      end
-
-      def latest_articles(count = 8)
-        Nesta::Page.find_articles[0..count - 1]
-      end
-
-      def article_summaries(articles)
-        haml(:summaries, :layout => false, :locals => { :pages => articles })
-      end
-
-      def articles_heading
-        @page.metadata('articles heading') || "Articles on #{@page.heading}"
-      end
-    end
+    helpers View::Helpers
 
     before do
-      if request.path =~ Regexp.new('./$')
-        redirect to(request.path.sub(Regexp.new('/$'), ''))
+      if request.path_info =~ Regexp.new('./$')
+        redirect to(request.path_info.sub(Regexp.new('/$'), ''))
       end
     end
 
@@ -126,7 +43,7 @@ module Nesta
     Overrides.load_theme_app
 
     get '/robots.txt' do
-      content_type 'text/plain', :charset => 'utf-8'
+      content_type 'text/plain', charset: 'utf-8'
       <<-EOF
 # robots.txt
 # See http://en.wikipedia.org/wiki/Robots_exclusion_standard
@@ -134,44 +51,41 @@ module Nesta
     end
 
     get '/css/:sheet.css' do
-      content_type 'text/css', :charset => 'utf-8'
-      cache stylesheet(params[:sheet].to_sym)
+      content_type 'text/css', charset: 'utf-8'
+      stylesheet(params[:sheet].to_sym)
     end
 
-    get %r{/attachments/([\w/.-]+)} do |file|
-      file = File.join(Nesta::Config.attachment_path, params[:captures].first)
-      if file =~ /\.\.\//
-        not_found
-      else 
-        send_file(file, :disposition => nil)
-      end
+    get '/attachments/*' do |path|
+      filename = File.join(Nesta::Config.attachment_path, path)
+      send_file(filename, disposition: nil)
     end
 
     get '/articles.xml' do
-      content_type :xml, :charset => 'utf-8'
+      content_type :xml, charset: 'utf-8'
       set_from_config(:title, :subtitle, :author)
       @articles = Page.find_articles.select { |a| a.date }[0..9]
-      cache haml(:atom, :format => :xhtml, :layout => false)
+      haml(:atom, format: :xhtml, layout: false)
     end
 
     get '/sitemap.xml' do
-      content_type :xml, :charset => 'utf-8'
-      @pages = Page.find_all
+      content_type :xml, charset: 'utf-8'
+      @pages = Page.find_all.reject do |page|
+        page.draft? or page.flagged_as?('skip-sitemap')
+      end
       @last = @pages.map { |page| page.last_modified }.inject do |latest, page|
         (page > latest) ? page : latest
       end
-      cache haml(:sitemap, :format => :xhtml, :layout => false)
+      haml(:sitemap, format: :xhtml, layout: false)
     end
 
     get '*' do
       set_common_variables
-      @heading = @title
       parts = params[:splat].map { |p| p.sub(/\/$/, '') }
       @page = Nesta::Page.find_by_path(File.join(parts))
       raise Sinatra::NotFound if @page.nil?
       @title = @page.title
       set_from_page(:description, :keywords)
-      cache haml(@page.template, :layout => @page.layout)
+      haml(@page.template, layout: @page.layout)
     end
   end
 end