nesta 0.9.13 → 0.10.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 904b608182032947bdcad754a909a9b49e1f4be7
+  data.tar.gz: 3759e6ccd241eac679f762209f4987746511596c
+SHA512:
+  metadata.gz: f36f814b284024e1d99bf37abf6cf37444db418d2c67cb980cbf8a80cb654ab36f5c1851e8a38d14e5de6cc7eeb70f3ed3c5201dab618071f0f0546522e5e217
+  data.tar.gz: e25c5f1dead47715cff47cb2458e7f9df44a0a87f682733fa475bd016ad1b5a7d9af9856564c8c2061394759eeed5ea92966e163fac8a83ec32f8093645136e7

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - 2.1.1

data/CHANGES

@@ -1,4 +1,128 @@
-= 0.9.12 / (3 March 2012)
+= 0.10.0 / (25 April 2014)
+
+ * Upgraded the default theme to a responsive design, using Google's
+   Roboto Slab web font. (Graham Ashton)
+
+ * Reduced the amount of I/O required to load a page with some judicious
+   in memory caching of filenames. Expect a speed boost! (Graham Ashton)
+
+ * Added 'Link text' metadata. When working out how to link to your
+   pages from the automatically generated menus and breadcrumbs, Nesta
+   uses the page's heading. It still does, but if you want to use
+   different words when linking to the page in breadcrumbs or in the
+   menu you can by defining the "Link text" metadata. (Micah Chalmer)
+
+   NOTE: Some existing sites may have pages that don't define a heading.
+   Those sites will not work with Nesta 0.10.0 until they've been
+   upgraded; either add an h1 level heading at the top of your pages
+   (preferred) or define the 'Link text' metadata. If you don't want
+   h1 headings to appear at the top of your web pages, hide them with
+   CSS (this is the best approach for accessibility), or define the
+   "Link text" metadata.
+
+ * The text used in the 'Read more' link is now configurable in config.yml.
+   The config key is called `read_more`. (Pete Gadomski)
+
+   See the config.yml template (on GitHub) for more details.
+   https://github.com/gma/nesta/blob/master/templates/config/config.yml
+
+ * Added the skip-sitemap flag, to prevent a page from being listed in
+   the XML sitemap. Add 'Flags: skip-sitemap' to the top of your page to
+   enable it. Draft pages have also been removed from the sitemap.
+   (Suggested by Joshua Mervine, implemented by Graham Ashton)
+
+ * Added support for user-defined config settings in config.yml.
+   If you've ever wanted to add config settings to config.yml and then
+   access them from within your app.rb file or templates, this is for
+   you.
+
+   There's a new `Nesta::Config.fetch` method for reading these
+   settings. It can also read settings from the environment, looking for
+   variables whose names are prefixed with "NESTA_". For example, the
+   value in the `NESTA_MY_SETTING` variable can be returned by
+   calling `Nesta::Config.fetch(:my_setting)`.
+
+   If the setting you're trying to read isn't defined a NotDefined
+   exception (a subclass of KeyError) will be raised. Similarly to
+   Ruby's Hash#fetch method, you can avoid the exception by specifying a
+   second argument (such as nil) that will be returned if the setting
+   isn't defined.
+
+   (Sean Redmond, Graham Ashton)
+
+ * The built-in file caching (where Nesta could write generated HTML for
+   rendered pages to disk) has been removed. If you'd like to cache
+   pages to disk, use the sinatra-cache gem.
+
+   See http://nestacms.com/docs/deployment/page-caching for more
+   details, and instructions for installing and testing sintra-cache.
+
+   (Graham Ashton)
+
+ * The nesta script's theme:create command now copies default templates
+   into a new theme. (Jake Rayson)
+
+ * Added the --zsh-completion option to the nesta command, which outputs
+   code that will configure command line completion in Zsh for the nesta
+   command. (Wynn Netherland)
+
+ * Page titles no longer include the heading from the parent page.
+   Behaviour was a little inconsistent, and it's arguably not a great
+   feature in the first place. Since the Title metadata appeared you can
+   ovverride the page title to something more useful if you need to too.
+   (Graham Ashton)
+
+ * When commenting via Disqus is configured, comments appeared on every
+   page in earlier versions of Nesta. From now on only pages with a date
+   set (i.e. articles) will display the comment form by default. If
+   you've copied the comments.haml template into your ./views folder (or
+   into a theme) you'll need to modify it slightly. See the `if`
+   statement in the latest version.
+
+   If you'd actually like comments to appear on every page of your site,
+   redefine the Page#receives_comments? method in your app.rb file, so
+   that it returns `true`.
+
+   (Graham Ashton)
+
+ * Breadcrumbs include Microdata for use by search engines. See:
+   http://support.google.com/webmasters/bin/answer.py?hl=en&answer=185417
+   (Sean Schofield)
+
+ * The menu and breadcrumb helper methods can now generate HTML that
+   identifies the current page. When viewing a page that appears in the
+   menu, its menu item will have the class "current". To change the name
+   of the class, override the Nesta::Navigation::current_menu_item_class
+   method.
+
+   The current page doesn't have a class applied by default. If you want
+   to add a class to style it, override the ::current_breadcrumb_class
+   method (also in the Nesta::Navigation module), returning a string.
+
+   (Pete Gadomski)
+
+ * Version 0.9.13 used Sinatra's `url` helper method to generate links
+   to pages on the site. When these pages were cached by proxy servers
+   the hostname in the URL could be set incorrectly, as it would be
+   determined from the HTTP headers (see issue #103 for more details).
+
+   The solution was to link to pages on the current site using an
+   absolute path, rather than a full URL. The `path_to` helper was added,
+   and used in place of Sinatra's `url` helper method.
+
+   (Micah Chalmer)
+
+ * Updated the test suite from RSpec 1.3 to RSpec 2.
+   (Wynn Netherland, Graham Ashton)
+
+ * Support for Ruby 1.8 has been dropped. Ruby 1.9.3 or above is
+   recommended.
+
+ * There were also plenty of small bug fixes that didn't make it into
+   this list. See GitHub for the full list of commits.
+   https://github.com/gma/nesta/compare/v0.9.13...v0.10.0
+
+= 0.9.13 / (3 March 2012)
 
  * The nesta script has a new command; edit. You can pass it the path
    to a file within your content/pages folder and it will open the file
@@ -28,6 +152,11 @@
  * The Page class has a new method; body_markup. It can be overridden by
    a plugin, and is used by the foldable plugin. (Micah Chalmer)
 
+ * The `current_item?` helper has been created in `Nesta::Navigation`.
+   You can override it to implement your own logic for determining
+   whether or not a menu item rendered by the menu helpers are
+   considered to be "current". (Chad Ostrowski)
+
  * The FileModel class has a new method; parse_metadata. It can be
    overriden by plugins that implement an alternate metadata syntax.
    Used by the yaml-metadata plugin.

data/Gemfile

@@ -3,11 +3,4 @@ source 'http://rubygems.org'
 # Specify your gem's dependencies in nesta.gemspec
 gemspec
 
-group :development do
-  gem 'guard-ctags-bundler'
-  gem 'guard-livereload'
-  gem 'rb-readline'
-  gem 'ZenTest'
-end
-
-# gem (RUBY_VERSION =~ /^1.9/) ? 'ruby-debug19': 'ruby-debug'
+gem 'debugger'

data/Gemfile.lock

@@ -1,73 +1,90 @@
 PATH
   remote: .
   specs:
-    nesta (0.9.13)
+    nesta (0.10.0)
       RedCloth (~> 4.2)
-      haml (~> 3.1)
-      rack (~> 1.1)
-      rdiscount (~> 1.6)
-      sass (~> 3.1)
-      shotgun (>= 0.8)
-      sinatra (~> 1.3)
+      haml (>= 3.1)
+      rack (>= 1.3)
+      rdiscount (~> 2.1)
+      sass (>= 3.1)
+      sinatra (~> 1.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
     RedCloth (4.2.9)
-    ZenTest (4.6.2)
-    addressable (2.2.7)
-    em-websocket (0.3.6)
-      addressable (>= 2.1.1)
-      eventmachine (>= 0.12.9)
-    eventmachine (0.12.10)
-    ffi (1.0.11)
-    guard (1.0.0)
-      ffi (>= 0.5.0)
-      thor (~> 0.14.6)
-    guard-ctags-bundler (0.0.5)
-      guard (>= 0.4.0)
-    guard-livereload (0.4.2)
-      em-websocket (>= 0.2.0)
-      guard (>= 0.10.0)
-      multi_json (~> 1.0)
-    haml (3.1.4)
-    hoe (2.15.0)
-      rake (~> 0.8)
-    hpricot (0.8.4)
-    multi_json (1.1.0)
-    rack (1.4.1)
-    rack-protection (1.2.0)
+    columnize (0.8.9)
+    debugger (1.6.6)
+      columnize (>= 0.3.1)
+      debugger-linecache (~> 1.2.0)
+      debugger-ruby_core_source (~> 1.3.2)
+    debugger-linecache (1.2.0)
+    debugger-ruby_core_source (1.3.2)
+    diff-lcs (1.2.5)
+    ffi (1.9.3)
+    haml (4.0.5)
+      tilt
+    hoe (3.12.0)
+      rake (>= 0.8, < 11.0)
+    kgio (2.9.2)
+    listen (1.3.1)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
+    mini_portile (0.5.3)
+    mr-sparkle (0.3.0)
+      listen (~> 1.0)
+      rb-fsevent (>= 0.9)
+      rb-inotify (>= 0.8)
+      unicorn (>= 4.5)
+    nokogiri (1.6.1)
+      mini_portile (~> 0.5.0)
+    rack (1.5.2)
+    rack-protection (1.5.3)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rake (0.9.2.2)
-    rb-readline (0.4.2)
-    rdiscount (1.6.8)
-    rspec (1.3.0)
-    rspec_hpricot_matchers (1.0)
-    sass (3.1.15)
-    shotgun (0.9)
-      rack (>= 1.0)
-    sinatra (1.3.2)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
-      tilt (~> 1.3, >= 1.3.3)
+    raindrops (0.13.0)
+    rake (10.3.1)
+    rb-fsevent (0.9.4)
+    rb-inotify (0.9.3)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.2)
+      ffi (>= 0.5.0)
+    rdiscount (2.1.7.1)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    sass (3.3.5)
+    sinatra (1.4.5)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
     test-unit (1.2.3)
       hoe (>= 1.5.1)
-    thor (0.14.6)
-    tilt (1.3.3)
+    tilt (1.4.1)
+    unicorn (4.8.2)
+      kgio (~> 2.6)
+      rack
+      raindrops (~> 0.7)
+    webrat (0.7.3)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  ZenTest
-  guard-ctags-bundler
-  guard-livereload
-  hpricot (= 0.8.4)
+  debugger
+  mr-sparkle (>= 0.0.2)
   nesta!
   rack-test (= 0.6.1)
-  rb-readline
-  rspec (= 1.3.0)
-  rspec_hpricot_matchers (= 1.0)
+  rspec (~> 2.14.0)
   test-unit (= 1.2.3)
+  webrat (~> 0.7.3)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2011 Graham Ashton
+Copyright (c) 2008-2014 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/Rakefile

@@ -3,12 +3,9 @@ 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"]
-end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec

data/bin/nesta

@@ -14,6 +14,7 @@ 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.
@@ -43,17 +44,20 @@ EOF
         ['--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
@@ -104,7 +108,7 @@ EOF
 # Install it with these commands:
 #
 # $ nesta --bash-completion > ~/.nesta-completion.sh
-# $ echo '[ -f ~/.nesta-completion.sh ] && source ~/.nesta-completion.sh' \ 
+# $ echo '[ -f ~/.nesta-completion.sh ] && source ~/.nesta-completion.sh' \
 #       >> ~/.bash_profile
 # $ source ~/.nesta-completion.sh
 
@@ -141,6 +145,58 @@ 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