nesta 0.9.13 → 0.10.0

data/spec/sitemap_spec.rb

@@ -4,97 +4,102 @@ require File.expand_path('model_factory', File.dirname(__FILE__))
 describe "sitemap XML" do
   include RequestSpecHelper
   include ModelFactory
-  
+
   before(:each) do
     stub_configuration
     @category = create_category do |path|
-      mock_file_stat(:stub!, path, "3 Jan 2009, 15:07")
+      mock_file_stat(:stub, path, "3 Jan 2009, 15:07")
     end
     @article = create_article do |path|
-      mock_file_stat(:stub!, path, "3 Jan 2009, 15:10")
+      mock_file_stat(:stub, path, "3 Jan 2009, 15:10")
+    end
+    skipped_page_definition = {
+      path: 'unlisted-page',
+      metadata: { 'flags' => 'skip-sitemap' }
+    }
+    @skipped = create_page(skipped_page_definition) do |path|
+      mock_file_stat(:stub, path, "3 Jan 2009, 15:07")
     end
     get "/sitemap.xml"
   end
-  
+
   after(:each) do
     Nesta::FileModel.purge_cache
     remove_temp_directory
   end
-  
+
   it "should render successfully" do
     last_response.should be_ok
   end
-  
+
   it "should have a urlset tag" do
     namespace = "http://www.sitemaps.org/schemas/sitemap/0.9"
-    body.should have_tag("/urlset[@xmlns=#{namespace}]")
+    assert_xpath "//urlset[@xmlns='#{namespace}']"
   end
-  
+
   it "should reference the home page" do
-    body.should have_tag("/urlset/url/loc", "http://example.org/")
+    assert_xpath "//urlset/url/loc", content: "http://example.org/"
   end
-  
+
   it "should configure home page to be checked frequently" do
-    body.should have_tag("/urlset/url") do |url|
-      url.should have_tag("loc", "http://example.org/")
-      url.should have_tag("changefreq", "daily")
-      url.should have_tag("priority", "1.0")
-    end
+    assert_xpath "//urlset/url/loc", content: "http://example.org/"
+    assert_xpath "//urlset/url/changefreq", content: "daily"
+    assert_xpath "//urlset/url/priority", content: "1.0"
   end
-  
+
   it "should set the homepage lastmod from latest article" do
-    body.should have_tag("/urlset/url") do |url|
-      url.should have_tag("loc", "http://example.org/")
-      url.should have_tag("lastmod", /^2009-01-03T15:10:00/)
-    end
+    assert_xpath "//urlset/url/loc", content: "http://example.org/"
+    assert_xpath "//urlset/url/lastmod", content: "2009-01-03T15:10:00"
+  end
+
+  def test_url(path)
+    "http://example.org/#{path}"
   end
-  
+
   it "should reference category pages" do
-    body.should have_tag(
-        "/urlset/url/loc", "http://example.org/#{@category.path}")
+    assert_xpath "//urlset/url/loc", content: test_url(@category.path)
   end
-  
+
   it "should reference article pages" do
-    body.should have_tag(
-        "/urlset/url/loc", "http://example.org/#{@article.path}")
+    assert_xpath "//urlset/url/loc", content: test_url(@article.path)
+  end
+
+  it "should not include pages that have the skip-sitemap flag set" do
+    assert_not_xpath "//urlset/url/loc", content: test_url(@skipped.path)
   end
 end
 
 describe "sitemap XML lastmod" do
   include ModelFactory
   include RequestSpecHelper
-  
+
   before(:each) do
     stub_configuration
   end
-  
+
   after(:each) do
     remove_temp_directory
     Nesta::FileModel.purge_cache
   end
-  
+
   it "should be set for file based page" do
     create_article do |path|
-      mock_file_stat(:stub!, path, "3 January 2009, 15:37:01")
+      mock_file_stat(:stub, path, "3 January 2009, 15:37:01")
     end
     get "/sitemap.xml"
-    body.should have_tag("url") do |url|
-      url.should have_tag("loc", /my-article$/)
-      url.should have_tag("lastmod", /^2009-01-03T15:37:01/)
-    end
+    assert_selector("url loc:contains('my-article')")
+    assert_selector("url lastmod:contains('2009-01-03T15:37:01')")
   end
-  
+
   it "should be set to latest page for home page" do
-    create_article(:path => "article-1") do |path|
-      mock_file_stat(:stub!, path, "4 January 2009")
+    create_article(path: "article-1") do |path|
+      mock_file_stat(:stub, path, "4 January 2009")
     end
-    create_article(:path => "article-2") do |path|
-      mock_file_stat(:stub!, path, "3 January 2009")
+    create_article(path: "article-2") do |path|
+      mock_file_stat(:stub, path, "3 January 2009")
     end
     get "/sitemap.xml"
-    body.should have_tag("url") do |url|
-      url.should have_tag("loc", "http://example.org/")
-      url.should have_tag("lastmod", /^2009-01-04/)
-    end
+    assert_selector("url loc:contains('http://example.org/')")
+    assert_selector("url lastmod:contains('2009-01-04')")
   end
 end

data/spec/spec_helper.rb

@@ -1,11 +1,9 @@
-require 'rubygems'
-require 'spec'
-require 'spec/interop/test'
+require 'rspec'
 require 'rack/test'
-require 'rspec_hpricot_matchers'
 require 'sinatra'
-
-Test::Unit::TestCase.send :include, Rack::Test::Methods
+require 'test/unit'
+require 'webrat'
+require 'webrat/core/matchers'
 
 module Nesta
   class App < Sinatra::Base
@@ -20,25 +18,25 @@ require File.expand_path('../lib/nesta/app', File.dirname(__FILE__))
 module ConfigSpecHelper
   def stub_yaml_config
     @config = {}
-    Nesta::Config.stub!(:yaml_exists?).and_return(true)
-    Nesta::Config.stub!(:yaml_conf).and_return(@config)
+    Nesta::Config.stub(:yaml_exists?).and_return(true)
+    Nesta::Config.stub(:yaml_conf).and_return(@config)
   end
 
   def stub_config_key(key, value, options = {})
     stub_yaml_config unless @config
-    if options[:rack_env]
+    if options[:for_environment]
       @config['test'] ||= {}
       @config['test'][key] = value
     else
       @config[key] = value
     end
   end
-  
+
   def stub_configuration(options = {})
     stub_config_key('title', 'My blog', options)
     stub_config_key('subtitle', 'about stuff', options)
     stub_config_key(
-        'content', temp_path('content'), options.merge(:rack_env => true))
+        'content', temp_path('content'), options.merge(rack_env: true))
   end
 end
 
@@ -50,27 +48,44 @@ module TempFileHelper
   end
 
   def remove_temp_directory
-    FileUtils.rm_r(TempFileHelper::TEMP_DIR, :force => true)
+    FileUtils.rm_r(TempFileHelper::TEMP_DIR, force: true)
   end
-  
+
   def temp_path(base)
     File.join(TempFileHelper::TEMP_DIR, base)
   end
 end
 
-Spec::Runner.configure do |config|
-  config.include(RspecHpricotMatchers)
-
+RSpec.configure do |config|
   config.include(ConfigSpecHelper)
   config.include(TempFileHelper)
+  config.include(Rack::Test::Methods)
 end
 
 module RequestSpecHelper
+  include Webrat::Matchers
+
   def app
     Nesta::App
   end
-  
+
   def body
     last_response.body
   end
+
+  def assert_xpath(*args)
+    body.should have_xpath(*args)
+  end
+
+  def assert_not_xpath(*args)
+    body.should_not have_xpath(*args)
+  end
+
+  def assert_selector(*args)
+    body.should have_selector(*args)
+  end
+
+  def assert_not_selector(*args)
+    body.should_not have_selector(*args)
+  end
 end

data/templates/Gemfile

@@ -1,8 +1,11 @@
 source 'http://rubygems.org'
 
 gem 'nesta', '<%= Nesta::VERSION %>'
-<% if @options['heroku'] %>gem 'heroku'<% end %>
 <% if @options['vlad'] %>gem 'vlad', '2.1.0'
 gem 'vlad-git', '2.2.0'<% end %>
 
-# gem (RUBY_VERSION =~ /^1.9/) ? 'ruby-debug19': 'ruby-debug'
+group :development do
+  gem 'mr-sparkle'
+end
+
+# gem 'debugger'

data/templates/config/config.yml

@@ -28,14 +28,6 @@ subtitle: "(change this text in config/config.yml)"
 #
 # disqus_short_name: mysite
 
-# cache
-#     Set it to true if you'd like Nesta to cache your pages in ./public.
-#     Useful if you're deploying Nesta with a proxy server such as Nginx,
-#     but not in the least bit helpful if your pages are dynamic, or you're
-#     deploying Nesta to Heroku.
-#
-cache: false
-
 # content
 #     The root directory where nesta will look for your article files.
 #     Should contain "pages" and "attachments" subdirectories that contain
@@ -54,14 +46,22 @@ content: content
 #
 # google_analytics_code: "UA-???????-?"
 
-# Overriding "cache" and "content" in production is recommended if you're
-# deploying Nesta to your own server (but see the deployment documentation
-# on the Nesta site). Setting google_analytics_code in production is
-# recommended regardless of how you're deploying (if you have a GA account!).
+# read_more
+#     When the summary of an article is displayed on the home page, or
+#     on a category page, there is a link underneath the summary that
+#     points to the rest of the post. Use this value to customize the
+#     default link text. You can still override this value on a per-page
+#     basis with the 'Read more' metadata key.
+#
+# read_more: "Continue reading"
+
+# Overriding "content" in production is recommended if you're deploying
+# Nesta to your own server (but see the deployment documentation on the
+# Nesta site). Setting google_analytics_code in production is recommended
+# regardless of how you're deploying (if you have a GA # account!).
 #
 # Don't forget to uncomment the "production:" line too...
 
 # production:
-#   cache: true    
 #   content: /var/apps/nesta/shared/content
 #   google_analytics_code: "UA-???????-?"

data/templates/config/deploy.rb

@@ -38,10 +38,10 @@ namespace :vlad do
   # using a different app server in the call to Vlad.load in Rakefile.
   #
   desc "Deploy the code and restart the server"
-  task :deploy => [:update, :start_app]
+  task deploy: [:update, :start_app]
 
   # If you use bundler to manage the installation of gems on your server
   # you can use this definition of the deploy task instead:
   #
-  # task :deploy => [:update, :bundle, :start_app]
+  # task deploy: [:update, :bundle, :start_app]
 end

data/templates/index.haml

@@ -1 +1,3 @@
+Link text: Home
+
 %section.articles= article_summaries(latest_articles)

data/templates/themes/app.rb

@@ -8,7 +8,7 @@ module Nesta
     #
     # Put your assets in themes/<%= @name %>/public/<%= @name %>.
     #
-    # use Rack::Static, :urls => ["/<%= @name %>"], :root => "themes/<%= @name %>/public"
+    # use Rack::Static, urls: ["/<%= @name %>"], root: "themes/<%= @name %>/public"
 
     helpers do
       # Add new helpers here.

data/templates/themes/views/layout.haml

@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+%html(lang="en")
+  %head
+    %meta(charset="utf-8")
+    %title
+  %body
+    = yield

data/templates/themes/views/master.sass

@@ -0,0 +1,3 @@
+// Master Sass stylesheet
+// http://sass-lang.com/
+

data/templates/themes/views/page.haml

@@ -0,0 +1 @@
+~ @page.to_html(self)

data/views/atom.haml

@@ -3,8 +3,8 @@
   %title(type='text')= @title
   %generator(uri='http://nestacms.com') Nesta
   %id= atom_id
-  %link(href="#{url('/articles.xml')}" rel='self')
-  %link(href="#{url('/')}" rel='alternate')
+  %link(href="#{path_to('/articles.xml', :uri => true)}" rel='self')
+  %link(href="#{path_to('/', :uri => true)}" rel='alternate')
   %subtitle(type='text')= @subtitle
   - if @articles[0]
     %updated= @articles[0].date(:xmlschema)
@@ -19,7 +19,7 @@
   - @articles.each do |article|
     %entry
       %title= article.heading
-      %link{ :href => url(article.path), :type => 'text/html', :rel => 'alternate' }
+      %link{ :href => path_to(article.path, :uri => true), :type => 'text/html', :rel => 'alternate' }
       %id= atom_id(article)
       %content(type='html')&= find_and_preserve(absolute_urls(article.body(self)))
       %published= article.date(:xmlschema)

data/views/comments.haml

@@ -1,4 +1,4 @@
-- if short_name = Nesta::Config.disqus_short_name
+- if @page.receives_comments? && short_name = Nesta::Config.disqus_short_name
   #disqus_thread
     - if Sinatra::Application.environment == :development
       :javascript

data/views/error.haml

@@ -1,5 +1,5 @@
 %nav.breadcrumb
-  %a(href="#{url('/')}") Home
+  %a(href="#{path_to('/')}") Home
 
 #content
   %section(role="main")

data/views/feed.haml

@@ -1,3 +1,3 @@
 - title ||= "Atom feed"
 .feed
-  %a(href="#{url('/articles.xml')}" title=title)= title
+  %a(href="#{path_to('/articles.xml')}" title=title)= title

data/views/layout.haml

@@ -2,20 +2,23 @@
 %html(lang="en")
   %head
     %meta(charset="utf-8")
+    %meta(content="width=device-width, initial-scale=1.0" name="viewport")
     - if @description
       %meta(name="description" content=@description)
     - if @keywords
       %meta(name="keywords" content=@keywords)
     %title= @title
+    %link(href='http://fonts.googleapis.com/css?family=Roboto+Slab:400,700' rel='stylesheet' type='text/css')
     <!--[if ! lte IE 6]><!-->
-    %link(href="#{url('/css/master.css')}" media="screen" rel="stylesheet")
+    %link(href="#{path_to('/css/master.css')}" media="screen" rel="stylesheet")
+    - local_stylesheet_link_tag('local')
     <!--<![endif]-->
     /[if lte IE 6]
       %link(rel="stylesheet" href="http://universal-ie6-css.googlecode.com/files/ie6.1.1.css" media="screen, projection")
     /[if lt IE 9]
       %script(src="//html5shim.googlecode.com/svn/trunk/html5.js")
-    - local_stylesheet_link_tag('local')
-    %link(href="#{url('/articles.xml')}" rel="alternate" type="application/atom+xml")
+    %script(src="//cdnjs.cloudflare.com/ajax/libs/respond.js/1.1.0/respond.min.js")
+    %link(href="#{path_to('/articles.xml')}" rel="alternate" type="application/atom+xml")
     = haml :analytics, :layout => false
   %body
     #container

data/views/master.sass

@@ -1,143 +1,138 @@
 @import "mixins.sass"
-@import "colors.sass"
-
-// Variables
-
-$content-width: 37em
-
-$border-style: 1px dashed $border-color
-
-// Reset
-
-*
-  margin: 0
-  padding: 0
-
-// Typography
-
-@mixin text-shadow
-  text-shadow: 0 2px 3px #ddd
+@import "normalize"
 
 body
-  font: ($base-font * 1.05) Georgia, serif
-  line-height: $vertical-rhythm
+  font: $size1 "Roboto Slab", serif
+  line-height: 1.6
   color: $base-color
 
+div#container
+  position: relative
+  margin: 0 1em
+
 header[role=banner]
   h1,
   h2
     margin: 0
-    line-height: 1.2em
     font-weight: normal
+
   h1
-    font-size: 327%
-    @include text-shadow
+    margin-top: 0.5em
+    font-size: $size2
+
   h2
     color: $meta-color
-    font-size: 1em
+    font-size: $size0
+
+footer.branding
+  padding-top: 2em
+
++respond-to(medium-screens)
+  div#container
+    margin: 0 auto
+    max-width: $measure
+
++respond-to(wide-screens)
+  div#container
+    max-width: $full-page-width
+
+  div#content
+    float: left
+    width: 37em
+
+  div#sidebar
+    float: right
+    width: $sidebar-width
+
+  footer.branding
+    clear: both
+
+h1, h2, h3, h4
+  margin: 1em 0 0.5em
 
-h1, h2, h3, h4, h5, h6
-  font-family: Georgia, serif
 h1
-  @include adjust-font-size($h1-scale, 0.6, 0.4)
-  font-weight: normal
+  font-size: $size4
 h2
-  @include adjust-font-size($h2-scale, 1.5, 0.5)
-  font-weight: normal
+  font-size: $size3
 h3
-  @include adjust-font-size($h3-scale, 1.5, 0.5)
-  font-weight: normal
+  font-size: $size2
 h4
-  @include adjust-font-size($h4-scale, 2, 0)
+  font-size: $size2
 
 ol,
 p,
 pre,
 ul
-  margin: 0
-  margin-bottom: $base-vertical-margin
+  margin: 0 0 $vertical-margin
 
 li
-  @include adjust-font-size(1, 0, 0)
+  margin: 0
 
 blockquote
-  margin: $base-vertical-margin 0
-  padding: 0 $base-vertical-margin
+  margin: $vertical-margin 0
+  padding: 0 $vertical-margin / 2
+  border-left: 5px solid $tint
   
   font-style: italic
   color: $base-color + #555
   
 pre
-  padding: ($vertical-rhythm / 2) 1em
+  display: block
+  width: auto
+
+  padding: 0.5em
+
+  font-size: $size0
+
   overflow: auto
+  white-space: pre
+
+  code
+    font-size: 1em
+
+code
+  font-size: $size0
 
 img
   border: none
 
 nav.breadcrumb
-  margin-top: $vertical-rhythm
+  margin-top: $vertical-margin
   color: $meta-color
-  padding: 0.5em 0
 
   font-size: 0.909em
 
-// Layout
+  ul
+    margin: 0
+    padding: 0
 
-article, aside, footer, header, nav, section
-  display: block
+  li
+    display: inline
+    list-style: none
 
-div#container
-  width: 54em
-  margin: 0 auto
-  padding: 1em 1em 0 1em
+    &::before
+      content: " > "
 
-  div#content
-    position: relative
-    width: $content-width
-    float: left
-    padding: 1px 0
+    &:last-child
+      display: block
+      margin-left: 1em
 
-  div#sidebar
-    width: 12em
-    margin-left: 40em
-    padding: 0 1em
-  
-  footer.branding
-    clear: both
-    color: $meta-color
-    @include adjust-font-size($base-scale)
-    p
-      width: $content-width
-      margin: 0
-      padding: 1em 0
+      +respond-to(medium-screens)
+        display: inline
+        margin: 0
 
-// The visuals
+    &:first-child
+      margin-left: 0
 
 a
-  border-bottom: 1px dotted $link-color
-  text-decoration: none
   color: $link-color
-  @include transition(color 0.25s 0 ease)
+  +transition(color 0.25s 0 ease)
   &:visited
     color: $visited-link-color
-    border-bottom-color: $visited-link-color
   &:hover
     color: $hover-link-color
-    border-bottom-color: $hover-link-color
   &:active
     color: $active-link-color
-    border-bottom-color: $active-link-color
-
-nav.breadcrumb    
-  ul
-    margin: 0
-  li
-    display: inline
-    list-style: none
-    &::after
-      content: " > "
-    &:last-child::after
-      content: ""
 
 nav.breadcrumb,
 nav.categories,
@@ -150,51 +145,19 @@ article p.meta
   a:hover
     color: $hover-link-color
 
-nav.categories,
-div.feed,
-article p.meta
-  a
-    border-bottom-color: $background-color
-
-article p.meta
-  a
-    @include transition(border-bottom-color 0.5s 0 ease)
-  a:hover
-    border-bottom-color: $hover-link-color
-
-article h1 a
-  border-bottom: none
-
-body
-  background: $background-color
-  
 article
   img
     max-width: 100%
-    margin-bottom: $base-vertical-margin
-
-  code,
-  pre
-    background-color: $tint
-  code
-    padding: 1px 3px
-  pre
-    border-left: $border-style
-    background-color: $tint
-    code
-      padding: 0
 
   footer
-    border-top: $border-style
     p.meta
-      @include adjust-font-size(0.909, 0.1, 1.9)
       font-style: italic
       color: $meta-color
 
 // Pages of content
 article[role="main"]
-  h1, h2
-    @include text-shadow
+  & > h1
+    font-weight: normal
 
   div#disqus_thread
     img
@@ -207,40 +170,87 @@ section.pages,
 section.articles
   & > ol
     margin-left: 0
+    padding-left: 0
     li
       position: relative
       list-style: none
+
     article
+      h1
+        margin-bottom: 0.2em
+
+        font-size: $size3
+        font-weight: normal
       ol li
         list-style: decimal
       ul li
         list-style: disc
 
-  header[role=main] h1
-    @include adjust-font-size($h1-scale, 1.5, 0.5)
   header h1
-    @include adjust-font-size($h2-scale, 1.5, 0.5)
+    font-size: $size3
 
   article
     h1
-      text-shadow: none
+      a
+        text-decoration: none
     p.read_more
-      @include adjust-font-size(1, 0, 0)
-      margin-top: -$base-vertical-margin
+      font-size: $size1
+      margin: -1em 0 0 0
     footer
       border-top: none
 
-nav.categories
+      font-size: $size0
+
+section.articles
+  border-top: 2px solid $tint
+
+  &:first-child
+    border-top: none
+
+  & > header h1
+    color: $meta-color
+    font-weight: normal
+
+div#sidebar
+  border-top: 2px solid $tint
+
   h1
-    @include adjust-font-size(1, 2, 0)
+    font-size: $size3
 
-  ul.menu
+  ol, ul
+    padding-left: 0
     list-style: none
-    ul
-      list-style: disc
-      margin: 0 0 0 1.25em
-    & > ul
-      @include adjust-font-size(0.909, 0, 0)
+
+    li
+      display: inline
+
+      &::after
+        content: ' / '
+      &:last-child
+        &::after
+          content: ''
+
+  +respond-to(medium-screens)
+    margin-top: 1.4em
+
+    p
+      font-size: $size0
+
+  +respond-to(wide-screens)
+    border-top: none
+
+    color: $meta-color
+
+    h1
+      font-size: $size2
+      font-weight: normal
+
+    ol, ul
+      li
+        display: block
+
+        &::after
+          content: ''
 
 div.feed
-  margin: $base-vertical-margin 0
+  margin: $vertical-margin 0