nesta 0.9.11 → 0.9.13

data/spec/page_spec.rb

@@ -27,7 +27,7 @@ describe "page that can display menus", :shared => true do
     it "should link to top level menu items" do
       do_get
       body.should have_tag(
-        "ul.menu a[@href=#{@category.abspath}]", Regexp.new(@category.heading))
+        "ul.menu a[@href$=#{@category.abspath}]", Regexp.new(@category.heading))
     end
   end
   
@@ -151,7 +151,7 @@ describe "The home page" do
     
     it "should display link to article in h2 tag" do
       body.should have_tag(
-          "h1 a[@href=#{@article.abspath}]", /^\s*#{@article.heading}$/)
+          "h1 a[@href$=#{@article.abspath}]", /^\s*#{@article.heading}$/)
     end
     
     it "should display article summary if available" do
@@ -159,7 +159,7 @@ describe "The home page" do
     end
     
     it "should display read more link" do
-      body.should have_tag("a[@href=#{@article.abspath}]", @read_more)
+      body.should have_tag("a[@href$=#{@article.abspath}]", @read_more)
     end
   end
 end
@@ -377,7 +377,7 @@ describe "A page" do
       it "should display links to articles" do
         do_get
         body.should have_tag(
-            "h1 a[@href='#{@article.abspath}']", /^\s*#{@article.heading}$/)
+            "h1 a[@href$='#{@article.abspath}']", /^\s*#{@article.heading}$/)
         body.should_not have_tag("h3", @article2.heading)
       end
 

data/spec/sitemap_spec.rb

@@ -31,12 +31,12 @@ describe "sitemap XML" do
   end
   
   it "should reference the home page" do
-    body.should have_tag("/urlset/url/loc", "http://example.org")
+    body.should have_tag("/urlset/url/loc", "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("loc", "http://example.org/")
       url.should have_tag("changefreq", "daily")
       url.should have_tag("priority", "1.0")
     end
@@ -44,7 +44,7 @@ describe "sitemap XML" do
   
   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("loc", "http://example.org/")
       url.should have_tag("lastmod", /^2009-01-03T15:10:00/)
     end
   end
@@ -93,7 +93,7 @@ describe "sitemap XML lastmod" do
     end
     get "/sitemap.xml"
     body.should have_tag("url") do |url|
-      url.should have_tag("loc", "http://example.org")
+      url.should have_tag("loc", "http://example.org/")
       url.should have_tag("lastmod", /^2009-01-04/)
     end
   end

data/templates/config.ru

@@ -3,6 +3,9 @@ require 'bundler/setup'
 
 Bundler.require(:default)
 
+use Rack::ConditionalGet
+use Rack::ETag
+
 require 'nesta/env'
 Nesta::Env.root = ::File.expand_path('.', ::File.dirname(__FILE__))
 

data/templates/themes/README.md

@@ -4,4 +4,4 @@
 <%= @name %> is a theme for Nesta, a [Ruby CMS](nesta), designed by
 <insert your name here>.
 
-[nesta]: http://effectif.com/nesta
+[nesta]: http://nestacms.com

data/views/atom.haml

@@ -1,10 +1,10 @@
 !!! XML
 %feed(xmlns='http://www.w3.org/2005/Atom')
   %title(type='text')= @title
-  %generator(uri='http://effectif.com/nesta') Nesta
+  %generator(uri='http://nestacms.com') Nesta
   %id= atom_id
-  %link(href="#{base_url}/articles.xml" rel='self')
-  %link(href=base_url rel='alternate')
+  %link(href="#{url('/articles.xml')}" rel='self')
+  %link(href="#{url('/')}" 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_for(article), :type => 'text/html', :rel => 'alternate' }
+      %link{ :href => url(article.path), :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/error.haml

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

data/views/feed.haml

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

data/views/layout.haml

@@ -8,14 +8,14 @@
       %meta(name="keywords" content=@keywords)
     %title= @title
     <!--[if ! lte IE 6]><!-->
-    %link(href="/css/master.css" media="screen" rel="stylesheet")
+    %link(href="#{url('/css/master.css')}" media="screen" rel="stylesheet")
     <!--<![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="/articles.xml" rel="alternate" type="application/atom+xml")
+    %link(href="#{url('/articles.xml')}" rel="alternate" type="application/atom+xml")
     = haml :analytics, :layout => false
   %body
     #container

data/views/page_meta.haml

@@ -10,7 +10,7 @@
         - page.categories.each do |category|
           - if category != page.categories[-1]
             = succeed ',' do
-              %a(href="#{category.abspath}")= category.heading
+              %a(href="#{url(category.abspath)}")= category.heading
           - else
-            %a(href="#{category.abspath}")= category.heading
+            %a(href="#{url(category.abspath)}")= category.heading
 

data/views/sitemap.haml

@@ -1,11 +1,11 @@
 !!! XML
 %urlset(xmlns="http://www.sitemaps.org/schemas/sitemap/0.9")
   %url
-    %loc= base_url
+    %loc= url('/')
     %changefreq daily
     %priority 1.0
     %lastmod= @last.xmlschema
   - @pages.each do |page|
     %url
-      %loc= url_for(page)
+      %loc= url(page.path)
       %lastmod= page.last_modified.xmlschema

data/views/summaries.haml

@@ -5,11 +5,11 @@
         %article
           %header
             %h1
-              %a(href="#{page.abspath}")= page.heading
+              %a(href="#{url(page.abspath)}")= page.heading
           - if page.summary.nil? || page.summary.empty?
             ~ page.body(self)
           - else
             ~ page.summary
             %p.read_more
-              %a(href="#{page.abspath}")= page.read_more
+              %a(href="#{url(page.abspath)}")= page.read_more
           = haml :page_meta, :layout => false, :locals => { :page => page }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nesta
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 33
   prerelease: 
   segments: 
   - 0
   - 9
-  - 11
-  version: 0.9.11
+  - 13
+  version: 0.9.13
 platform: ruby
 authors: 
 - Graham Ashton
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-22 00:00:00 +01:00
-default_executable: 
+date: 2012-03-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,9 +31,9 @@ dependencies:
         version: "3.1"
   version_requirements: *id001
   name: haml
-  prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,9 +46,9 @@ dependencies:
         version: "3.1"
   version_requirements: *id002
   name: sass
-  prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -61,9 +61,9 @@ dependencies:
         version: "1.6"
   version_requirements: *id003
   name: rdiscount
-  prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -76,26 +76,40 @@ dependencies:
         version: "4.2"
   version_requirements: *id004
   name: RedCloth
-  prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 9
         segments: 
         - 1
-        - 2
-        - 6
-        version: 1.2.6
+        - 3
+        version: "1.3"
   version_requirements: *id005
   name: sinatra
-  prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 1
+        - 1
+        version: "1.1"
+  version_requirements: *id006
+  name: rack
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -105,12 +119,12 @@ dependencies:
         - 0
         - 8
         version: "0.8"
-  version_requirements: *id006
+  version_requirements: *id007
   name: shotgun
-  prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -121,12 +135,12 @@ dependencies:
         - 8
         - 4
         version: 0.8.4
-  version_requirements: *id007
+  version_requirements: *id008
   name: hpricot
-  prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -137,12 +151,12 @@ dependencies:
         - 6
         - 1
         version: 0.6.1
-  version_requirements: *id008
+  version_requirements: *id009
   name: rack-test
-  prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -153,12 +167,12 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  version_requirements: *id009
+  version_requirements: *id010
   name: rspec
-  prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -168,12 +182,12 @@ dependencies:
         - 1
         - 0
         version: "1.0"
-  version_requirements: *id010
+  version_requirements: *id011
   name: rspec_hpricot_matchers
-  prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -184,9 +198,8 @@ dependencies:
         - 2
         - 3
         version: 1.2.3
-  version_requirements: *id011
+  version_requirements: *id012
   name: test-unit
-  prerelease: false
   type: :development
 description: |
   Nesta is a lightweight Content Management System, written in Ruby using
@@ -211,9 +224,11 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - CHANGES
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
@@ -226,9 +241,9 @@ files:
 - lib/nesta/commands.rb
 - lib/nesta/config.rb
 - lib/nesta/env.rb
+- lib/nesta/helpers.rb
 - lib/nesta/models.rb
 - lib/nesta/navigation.rb
-- lib/nesta/nesta.rb
 - lib/nesta/overrides.rb
 - lib/nesta/path.rb
 - lib/nesta/plugin.rb
@@ -279,7 +294,6 @@ files:
 - views/sidebar.haml
 - views/sitemap.haml
 - views/summaries.haml
-has_rdoc: true
 homepage: http://nestacms.com
 licenses: []
 
@@ -309,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: nesta
-rubygems_version: 1.6.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Ruby CMS, written in Sinatra

data/lib/nesta/nesta.rb

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