nesta 0.9.11 → 0.9.13

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2

data/CHANGES

@@ -1,3 +1,58 @@
+= 0.9.12 / (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
+   in your default editor (as set by the EDITOR environment variable).
+
+ * The nesta script has a new option; --bash-completion. Run nesta with
+   this option and it will print some Bash that will configure command
+   line completion for the nesta command.
+
+   You can type `nesta edit <TAB>` and Bash will complete the names of
+   the files in your content/pages directory. :-)
+
+   Installation instructions at the top of the Bash script.
+
+ * Nesta can now be mounted cleanly at a path, rather than at a site's
+   root, and assets and links will be served correctly.
+   (Max Sadrieh, Graham Ashton)
+
+ * The default config.ru file that is generated when you create a new
+   project now enables Etag HTTP headers. (Max Sadrieh)
+
+ * Two helper methods have been removed; url_for and base_url. Use
+   Sinatra's url helper instead. They would have been deprecated rather
+   than removed, but if you try and load Nesta's helpers in a Rails app
+   url_for breaks Rails's rendering. (Max Sadrieh, Graham Ashton)
+
+ * 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 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.
+
+ * Erb templates in your ./views folder, or in a theme's folder, will
+   now be found when you call Sinatra's erb helper method.
+
+ * config.yml can now contain Erb (and therefore inline Ruby), which
+   will be interpreted when loaded. (Glenn Gillen)
+
+ * Extended the `nesta` command to support new commands that could (for
+   example) be added by a plugin. The class to be instantiated within
+   the Nesta::Commands module is determined from the command line
+   argument (e.g. `nesta plugin:create` will instantiate the class
+   called Nesta::Commands::Plugin::Create).
+
+ * Bug fix: Don't crash if a page's metadata only contains the key, with
+   no corresponding value. You could argue this wasn't a bug, but the
+   error message was difficult to trace. See #77.
+
+ * Bug fix: Summaries on Haml pages were not marked up as paragraphs.
+   See #75.
+
+= 0.9.12 / (Released then pulled, due to rubygems [still] being a total mess)
+
 = 0.9.11 / (22 September 2011)
 
  * Use Tilt to render the Markdown, Textile and Haml in content/pages.

data/Gemfile

@@ -3,4 +3,11 @@ 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'

data/Gemfile.lock

@@ -1,46 +1,73 @@
 PATH
   remote: .
   specs:
-    nesta (0.9.11)
+    nesta (0.9.13)
       RedCloth (~> 4.2)
       haml (~> 3.1)
+      rack (~> 1.1)
       rdiscount (~> 1.6)
       sass (~> 3.1)
       shotgun (>= 0.8)
-      sinatra (= 1.2.6)
+      sinatra (~> 1.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    RedCloth (4.2.8)
-    haml (3.1.3)
-    hoe (2.12.2)
+    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)
-    rack (1.3.2)
+    multi_json (1.1.0)
+    rack (1.4.1)
+    rack-protection (1.2.0)
+      rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rake (0.9.2)
+    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.7)
+    sass (3.1.15)
     shotgun (0.9)
       rack (>= 1.0)
-    sinatra (1.2.6)
-      rack (~> 1.1)
-      tilt (< 2.0, >= 1.2.2)
+    sinatra (1.3.2)
+      rack (~> 1.3, >= 1.3.6)
+      rack-protection (~> 1.2)
+      tilt (~> 1.3, >= 1.3.3)
     test-unit (1.2.3)
       hoe (>= 1.5.1)
+    thor (0.14.6)
     tilt (1.3.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  ZenTest
+  guard-ctags-bundler
+  guard-livereload
   hpricot (= 0.8.4)
   nesta!
   rack-test (= 0.6.1)
+  rb-readline
   rspec (= 1.3.0)
   rspec_hpricot_matchers (= 1.0)
   test-unit (= 1.2.3)

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/Rakefile

@@ -10,3 +10,5 @@ desc "Run all specs in spec directory"
 Spec::Rake::SpecTask.new(:spec) do |t|
   t.spec_files = FileList["spec/*_spec.rb"]
 end
+
+task :default => :spec

data/bin/nesta

@@ -13,9 +13,11 @@ USAGE: #{File.basename($0)} [GLOBAL OPTIONS] <command> [COMMAND OPTIONS]
 GLOBAL OPTIONS
     --help, -h            Display this message.
     --version, -v         Display version number.
+    --bash-completion     Output command completion setup for Bash.
 
 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,6 +39,7 @@ 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],
@@ -45,6 +48,8 @@ EOF
       options = {}
       opts.each do |opt, arg|
         case opt 
+        when '--bash-completion'
+          bash_completion
         when '--help'
           usage(exitcode=0)
         when '--version'
@@ -59,21 +64,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 +96,54 @@ 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
   end
 end
 
+Nesta::Cli.require_bundled_gems
+Nesta::Plugin.initialize_plugins
 Nesta::Cli.main(Nesta::Cli.parse_command_line)

data/lib/nesta.rb

@@ -1 +1,9 @@
+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

@@ -2,15 +2,15 @@ require 'sinatra/base'
 require 'haml'
 require 'sass'
 
+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/
 
@@ -25,90 +25,11 @@ module Nesta
 
     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(" ") + " #{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
 
@@ -165,7 +86,6 @@ module Nesta
 
     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?

data/lib/nesta/cache.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-# require 'sinatra/base'
 
 module Sinatra 
     
@@ -27,7 +26,7 @@ module Sinatra
       #  TODO:: implement the opts={} hash functionality. What other options are needed?
       # 
       def cache(content, opts={})
-        return content unless options.cache_enabled
+        return content unless settings.cache_enabled
         
         unless content.nil?
           content = "#{content}\n#{page_cached_timestamp}\n"
@@ -51,7 +50,7 @@ module Sinatra
       #
       #  TODO:: implement the options={} hash functionality. What options are really needed ? 
       def cache_expire(path = nil, opts={})
-        return unless options.cache_enabled
+        return unless settings.cache_enabled
         
         path = (path.nil?) ? cache_page_path(request.path_info) : cache_page_path(path)
         if File.exist?(path)
@@ -72,7 +71,7 @@ module Sinatra
       #      => <!--  page cached: 2009-02-24 12:00:00 -->
       #
       def page_cached_timestamp
-        "<!-- page cached: #{Time.now.strftime("%Y-%d-%m %H:%M:%S")} -->\n" if options.cache_enabled
+        "<!-- page cached: #{Time.now.strftime("%Y-%d-%m %H:%M:%S")} -->\n" if settings.cache_enabled
       end
       
       
@@ -84,36 +83,36 @@ module Sinatra
         # 
         def cache_file_name(path,opts={})
           name = (path.empty? || path == "/") ? "index" : Rack::Utils.unescape(path.sub(/^(\/)/,'').chomp('/'))
-          name << options.cache_page_extension unless (name.split('/').last || name).include? '.'
+          name << settings.cache_page_extension unless (name.split('/').last || name).include? '.'
           return name
         end
         
         # Sets the full path to the cached page/file
-        # Dependent upon Sinatra.options .public and .cache_dir variables being present and set.
+        # Dependent upon Sinatra.settings .public and .cache_dir variables being present and set.
         # 
         def cache_page_path(path,opts={})
           # test if given a full path rather than relative path, otherwise join the public path to cache_dir 
           # and ensure it is a full path
-          cache_dir = (options.cache_dir == File.expand_path(options.cache_dir)) ? 
-              options.cache_dir : File.expand_path("#{options.public}/#{options.cache_dir}")
+          cache_dir = (settings.cache_dir == File.expand_path(settings.cache_dir)) ? 
+              settings.cache_dir : File.expand_path("#{settings.public}/#{settings.cache_dir}")
           cache_dir = cache_dir[0..-2] if cache_dir[-1,1] == '/'
           "#{cache_dir}/#{cache_file_name(path,opts)}"
         end
         
         #  TODO:: this implementation really stinks, how do I incorporate Sinatra's logger??
         def log(msg,scope=:debug)
-          if options.cache_logging
-            "Log: msg=[#{msg}]" if scope == options.cache_logging_level
+          if settings.cache_logging
+            "Log: msg=[#{msg}]" if scope == settings.cache_logging_level
           else
             # just ignore the stuff...
-            # puts "just ignoring msg=[#{msg}] since cache_logging => [#{options.cache_logging.to_s}]"
+            # puts "just ignoring msg=[#{msg}] since cache_logging => [#{settings.cache_logging.to_s}]"
           end
         end
         
     end #/module Helpers
     
     
-    # Sets the default options:
+    # Sets the default settings:
     # 
     #  * +:cache_enabled+ => toggle for the cache functionality. Default is: +true+
     #  * +:cache_page_extension+ => sets the default extension for cached files. Default is: +.html+
@@ -136,4 +135,4 @@ module Sinatra
   
   register(Sinatra::Cache)
   
-end #/module Sinatra
+end #/module Sinatra