static_cms 0.1.1 → 1.1.1

data/data/site_template/rakefile

@@ -3,15 +3,10 @@ require 'static_cms'
 ::SITE = StaticCms::Site.new
 task default: :generate
 desc "Generate all pages."
-task generate: SITE.pages.map(&:name)
+task generate: SITE.page_alist.keys
 
-::SITE.pages.each{|page|
-  task page.name do
+::SITE.page_alist.each{|name, page|
+  task name do
     page.generate
   end
 }
-
-desc "Update templates, sources, statics (and more)."
-task :update do
-  ::StaticCms::Command.update
-end

data/data/site_template/templates/blank.html.haml

@@ -2,5 +2,7 @@
 %html{lang: :en}
   = haml(File.read('templates/head.html.haml'))
   %body
-    This page is intentionally left blank.
-    %a{href: @site.www} Please go to the top page.
+    %p
+      This page is intentionally left blank.
+    %nav
+      = haml(File.read('templates/nav.html.haml'))

data/data/site_template/templates/default.html.haml

@@ -13,7 +13,4 @@
         = haml(article.data)
     %footer
       %nav
-        %ul
-          - @site.pages.select{|p| p.visible}.delete_if{|p| p.template == 'blank'}.sort_by{|p| p.name}.each do |p|
-            %li
-              %a{href: File.join(@site.www, p.name)}= p.title
+        = haml(File.read('templates/nav.html.haml'))

data/data/site_template/templates/moved.html.haml

@@ -2,5 +2,7 @@
 %html{lang: :en}
   = haml(File.read('templates/head.html.haml'))
   %body
-    Contents of this page have moved or removed.
-    %a{href: @site.www} Please go to the top page.
+    %p
+      Contents of this page have moved or removed.
+    %nav
+      = haml(File.read('templates/nav.html.haml'))

data/data/site_template/templates/nav.html.haml

@@ -0,0 +1,4 @@
+%ul
+  - @site.page_alist.sort.select{|_, p| p.visible}.delete_if{|_, p| p.template == 'blank'}.each do |name, page|
+    %li
+      %a{href: File.join(@site.www, name)}= page.title

data/lib/static_cms/version.rb

@@ -1,3 +1,3 @@
 module ::StaticCms
-  VERSION = '0.1.1'
+  VERSION = '1.1.1'
 end

data/lib/static_cms.rb

@@ -46,7 +46,7 @@ git commit -m 'Copied from site template.' > #{File::NULL}
       'charset' => 'utf-8',
     }
 
-    attr_accessor :pages
+    attr_accessor :page_alist
     attr_accessor *(CONFIG_DEFAULT.keys)
 
     def initialize
@@ -54,8 +54,12 @@ git commit -m 'Copied from site template.' > #{File::NULL}
       @www = config.delete('www')
       @www += '/' unless @www[-1] == '/'
       config.each{|k, v| instance_variable_set("@#{k}", v)}
-      @pages = YAML.load_file('pages.yaml')\
-        .to_a.map{|name, params| ::StaticCms::Page.new(self, name, params)}
+      @page_alist = Hash.new{|h, k| raise KeyError, k}
+      YAML.load_file('pages.yaml')\
+        .sort\
+        .each{|name, params|
+        @page_alist[name] = ::StaticCms::Page.new(self, name, params)
+      }
     end
   end
 
@@ -73,7 +77,7 @@ git commit -m 'Copied from site template.' > #{File::NULL}
       'base' => nil,
     }
 
-    attr_accessor :site, :name, :dir
+    attr_accessor :site, :name, :dir, :template_file
     attr_accessor *(PARAMS_DEFAULT.keys)
 
     def initialize(site, name, params = {})
@@ -81,7 +85,8 @@ git commit -m 'Copied from site template.' > #{File::NULL}
       @name = name
       @dir = File.join("root", @name)
       params = PARAMS_DEFAULT.merge(params)
-      @template = File.join('templates', params.delete('template')) + '.html.haml'
+      @template = params.delete('template')
+      @template_file = File.join('templates', @template) + '.html.haml'
       @articles = params.delete('articles').map{|name| ::StaticCms::Article.use(self, name)}
       @statics = params.delete('statics').map{|file| File.join('statics', file)}
       @sources = params.delete('sources').map{|file| File.join('sources', file)}
@@ -97,14 +102,14 @@ git commit -m 'Copied from site template.' > #{File::NULL}
       if @visible
         @statics.each{|file| cp_if_new(file)}
         @sources.each{|file| compile(file)}
-        template = @template
+        template_file = @template_file
       else
         @statics.each{|file| FileUtils.rm_rf(static_target(file))}
         @sources.each{|file| FileUtils.rm_rf(compile_target(file))}
-        template = 'templates/moved.html.haml'
+        template_file = 'templates/moved.html.haml'
       end
 
-      html = ::Haml::Engine.new(File.read(template)).render(self)
+      html = ::Haml::Engine.new(File.read(template_file)).render(self)
       target = File.join(@dir, 'index.html')
       open(target, 'w'){|io|
         io.write(html)
@@ -119,6 +124,11 @@ git commit -m 'Copied from site template.' > #{File::NULL}
       ::Haml::Engine.new(text).render(self)
     end
 
+    def nth_page_from_self(n)
+      index = (@site.page_alist.to_a.index{|name, page| name == @name} + n)%@site.page_alist.size
+      @site.page_alist.to_a[index][1]
+    end
+
     def link_to_article(name)
       article = ::StaticCms::Article.alist[name]
       page = article.pages.first
@@ -232,5 +242,10 @@ git commit -m 'Copied from site template.' > #{File::NULL}
     def init(dir = '.')
       ::StaticCms::Command.init(dir)
     end
+
+    desc "update", "Update templates, sources, statics (and more)."
+    def update
+      ::StaticCms::Command.update
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: static_cms
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-02 00:00:00.000000000 Z
+date: 2012-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &75260150 !ruby/object:Gem::Requirement
+  requirement: &69398750 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *75260150
+  version_requirements: *69398750
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &75258430 !ruby/object:Gem::Requirement
+  requirement: &69397340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *75258430
+  version_requirements: *69397340
 - !ruby/object:Gem::Dependency
   name: ruby_patch
-  requirement: &75273040 !ruby/object:Gem::Requirement
+  requirement: &69396770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *75273040
+  version_requirements: *69396770
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &75272260 !ruby/object:Gem::Requirement
+  requirement: &69396130 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '0.16'
   type: :runtime
   prerelease: false
-  version_requirements: *75272260
+  version_requirements: *69396130
 description: Simple static contents management system based on Haml and Sass.
 email: 
 executables: