nesta 0.9.13 → 0.10.0

data/views/page_meta.haml

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

data/views/sitemap.haml

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

data/views/summaries.haml

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

metadata

@@ -1,230 +1,191 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: nesta
-version: !ruby/object:Gem::Version 
-  hash: 33
-  prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 13
-  version: 0.9.13
+version: !ruby/object:Gem::Version
+  version: 0.10.0
 platform: ruby
-authors: 
+authors:
 - Graham Ashton
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-03 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
-        version: "3.1"
-  version_requirements: *id001
+date: 2014-04-25 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
-        version: "3.1"
-  version_requirements: *id002
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
   name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 6
-        version: "1.6"
-  version_requirements: *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
   name: rdiscount
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 4
-        - 2
-        version: "4.2"
-  version_requirements: *id004
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
   name: RedCloth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
-  version_requirements: *id005
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+- !ruby/object:Gem::Dependency
   name: sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
   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
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+- !ruby/object:Gem::Dependency
   name: rack
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
-        version: "0.8"
-  version_requirements: *id007
-  name: shotgun
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 8
-        - 4
-        version: 0.8.4
-  version_requirements: *id008
-  name: hpricot
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: mr-sparkle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 6
-        - 1
-        version: 0.6.1
-  version_requirements: *id009
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.2
+- !ruby/object:Gem::Dependency
   name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.1
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
-  version_requirements: *id010
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.1
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.14.0
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  version_requirements: *id011
-  name: rspec_hpricot_matchers
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.14.0
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.3
   type: :development
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 2
-        - 3
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 1.2.3
-  version_requirements: *id012
-  name: test-unit
+- !ruby/object:Gem::Dependency
+  name: webrat
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.3
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.3
 description: |
   Nesta is a lightweight Content Management System, written in Ruby using
   the Sinatra web framework. Nesta has the simplicity of a static site
   generator, but (being a fully fledged Rack application) allows you to
   serve dynamic content on demand.
-  
+
   Content is stored on disk in plain text files (there is no database).
   Edit your content in a text editor and keep it under version control
   (most people use git, but any version control system will do fine).
-  
+
   Implementing your site's design is easy, but Nesta also has a small
   selection of themes to choose from.
-
-email: 
+email:
 - graham@effectif.com
-executables: 
+executables:
 - nesta
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .travis.yml
+files:
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGES
 - Gemfile
 - Gemfile.lock
@@ -237,7 +198,6 @@ files:
 - config/deploy.rb.sample
 - lib/nesta.rb
 - lib/nesta/app.rb
-- lib/nesta/cache.rb
 - lib/nesta/commands.rb
 - lib/nesta/config.rb
 - lib/nesta/env.rb
@@ -250,6 +210,7 @@ files:
 - lib/nesta/version.rb
 - nesta.gemspec
 - scripts/import-from-mephisto
+- smoke-test.sh
 - spec/atom_spec.rb
 - spec/commands_spec.rb
 - spec/config_spec.rb
@@ -266,7 +227,6 @@ files:
 - spec/path_spec.rb
 - spec/plugin_spec.rb
 - spec/sitemap_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - templates/Gemfile
 - templates/Rakefile
@@ -276,6 +236,9 @@ files:
 - templates/index.haml
 - templates/themes/README.md
 - templates/themes/app.rb
+- templates/themes/views/layout.haml
+- templates/themes/views/master.sass
+- templates/themes/views/page.haml
 - views/analytics.haml
 - views/atom.haml
 - views/categories.haml
@@ -288,6 +251,7 @@ files:
 - views/layout.haml
 - views/master.sass
 - views/mixins.sass
+- views/normalize.scss
 - views/not_found.haml
 - views/page.haml
 - views/page_meta.haml
@@ -296,38 +260,28 @@ files:
 - views/summaries.haml
 homepage: http://nestacms.com
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: nesta
-rubygems_version: 1.8.17
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby CMS, written in Sinatra
-test_files: 
+test_files:
 - spec/atom_spec.rb
 - spec/commands_spec.rb
 - spec/config_spec.rb
@@ -344,5 +298,4 @@ test_files:
 - spec/path_spec.rb
 - spec/plugin_spec.rb
 - spec/sitemap_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb