staticpress 0.6.2 → 0.7.0

data/NOTES.markdown

@@ -0,0 +1,23 @@
+* .new passes params to #initialize
+* #initialize manually calculates full path to template from params and populates @template_types
+* Base#template_types is looped over in Base#render_partial
+* Base#template_extension joins Base#template_types and prepends with . if not empty
+* #template_path uses Base#template_extension to create full path to source
+
+
+* http://chriseppstein.github.com/blog/2012/08/23/sass-3-2-is-released/
+
+
+* http://jekyllbootstrap.com/
+* http://vitobotta.com/how-to-migrate-from-wordpress-to-jekyll/
+* http://vitobotta.com/sinatra-contact-form-jekyll/
+
+* http://nanoc.stoneship.org/docs/
+
+* https://github.com/darthapo/gumdrop
+
+
+* https://npmjs.org/package/blake
+* https://npmjs.org/package/punch
+* https://npmjs.org/package/yassg
+* https://npmjs.org/package/wintersmith

data/Rakefile

@@ -1,11 +1,6 @@
 require 'bundler/gem_tasks'
-require 'rake/testtask'
 
-task :default => [ :tests ]
-
-Rake::TestTask.new(:tests) do |t|
-  t.pattern = 'tests/**/*_test.rb'
-end
+task :default => [ :notes ]
 
 desc 'Enumerate annotations. Optionally takes a pipe-separated list of tags to process'
 task :notes, :types do |t, args|

data/docs/content/docs/plugins/pagination.haml

@@ -0,0 +1,30 @@
+---
+menu:
+  position: 1.6.0
+  text: Pagination
+---
+
+%h1 Pagination
+
+%table{ :style => 'border-collapse: separate; border-spacing: 0.5rem 0;' }
+  %caption / is the default page and is the same as /page/3. Post 1 is the oldest, Post 9 is the newest.
+  %thead
+    %tr
+      - ['/page/3', '/page/2', '/'].each do |th|
+        %th= th
+  %tfoot
+    %tr
+      %td past...
+      %td 1 2 3
+      %td ...future
+  %tbody
+    :ruby
+      pages = [
+        [1, 4, 7],
+        [2, 5, 8],
+        [3, 6, 9]
+      ]
+    - pages.each do |tr|
+      %tr
+        - tr.each do |td|
+          %td Post #{td}

data/docs/content/docs/samples/page.markdown

@@ -0,0 +1,14 @@
+---
+title: Sample Staticpress Page
+---
+
+    ---
+    ---
+    title: Sample Page
+    menu:
+      text: Alternate text for menu
+      position: 0
+    published: false
+    ---
+
+    This page is written with markdown. Of course you could use any templating language you want.

data/docs/content/docs/samples/post.markdown

@@ -0,0 +1,18 @@
+---
+title: Sample Staticpress Post
+---
+
+    ---
+    ---
+    title: Sample Post
+    created_at: 2012-01-01 00:00:00 UTC
+    categories:
+    - one:
+      - nested
+    tags:
+    - one
+    - one
+    published: false
+    ---
+
+    This post is written with markdown. Of course you could use any templating language you want.

data/docs/content/docs/themes.markdown

@@ -5,3 +5,50 @@ menu:
 ---
 
 # Themes
+
+Themes determine the markup, look and behavior for a site. Markup is determined by Layouts and Views, while look and behavior is controlled via assets. Layouts provide general markup for the site title and global navigation. Views provide a template file for rendering generated content, such as a category page. Technically the `default` Layout and View are the only files required for a Theme, but providing a `post_paged` View is a good idea. Layouts and Views are looked up according to the preference table, however individual Posts and Pages can override their normal Layout by specifying `:layout` in frontmatter.
+
+When rendering Staticpress selects an appropriate `template_path`, depending on what is being rendered. When a Page or Post is rendering (for instance `/about`), the `template_path` is the actual file in `content/` in the site. The Layout is selected according to the table, unless it is overridden on a case-by-case basis.
+
+When Staticpress renders a generated page (for instance `/tags/programming`) the `template_path` is set to a View. The heuristic for selecting a View is the same as selecting a Layout. Again see the preference table.
+
+Files inside the assets directory will be rendered similarly to static Page files when the site is generated or served. These files are pre-processed with Tilt (like all other files) so you can use whatever format you like.
+
+
+## Layouts And Views Lookup
+
+<table>
+  <thead>
+    <tr><th>File Name</th><th>Description</th><th>Example URL</th></tr>
+  </thead>
+  <tbody>
+    <tr><td>page                                                   </td><td>a page (Layout only)                                                                   </td><td>/about</td></tr>
+    <tr><td>post                                                   </td><td>a single post (Layout only)                                                            </td><td>/2012/11/10/hello</td></tr>
+    <tr><td>category                                               </td><td>generated page for all categories                                                      </td><td>/categories</td></tr>
+    <tr><td>tag                                                    </td><td>generated page for all tags                                                            </td><td>/tags</td></tr>
+    <tr><td>post_paged                                             </td><td>use for paging through multiple posts                                                  </td><td>/page/3</td></tr>
+    <tr><td>category_paged, post_paged                             </td><td>use for paging through multiple posts in a specific category                           </td><td>/categories/programming/page/2</td></tr>
+    <tr><td>tag_paged, post_paged                                  </td><td>use for paging through multiple posts in a specific tag                                </td><td>/tags/ruby/page/1</td></tr>
+    <tr><td>post_index, post_paged                                 </td><td>use for paging through multiple posts when no page is specified                        </td><td>/</td></tr>
+    <tr><td>category_index, post_index, category_paged, post_paged </td><td>use for paging through multiple posts in a specific category when no page is specified </td><td>/categories/programming</td></tr>
+    <tr><td>tag_index, post_index, tag_paged, post_paged           </td><td>use for paging through multiple posts in a specific tag when no page is specified      </td><td>/tags/ruby</td></tr>
+    <tr><td>default                                                </td><td>used if more specific Layout or View is not available                                  </td><td></td></tr>
+  </tbody>
+</table>
+
+
+## Minimal Theme Layout
+
+    themes/<theme-name>/
+    ├── assets/
+    │   ├── fonts/
+    │   ├── images/
+    │   ├── scripts/
+    │   │   └── application.js
+    │   └── styles/
+    │       └── application.css
+    ├── layouts/
+    │   └── default.extension
+    └── views/
+        ├── default.extension
+        └── post_paged.extension

data/lib/skeleton/config.yml

@@ -13,6 +13,7 @@
 :posts_source_path: content/_posts
 :plugins:
   - menu
+  - pagination
 :subscribe_rss: /atom.xml
 :deployment_strategy: :custom
 :deployment_strategies:

data/lib/staticpress/cli.rb

@@ -80,18 +80,14 @@ in config.yml
       FileUtils.cp source, destination
     end
 
-    desc 'fork_theme [theme-name]', 'Copies [theme-name]\'s files into <path-to-blog>/themes/[theme-name]'
+    desc 'fork_theme [theme-name] [new-theme-name]', 'Copies [theme-name]\'s files into <path-to-blog>/themes/[theme-name]'
     long_desc <<-DESCRIPTION
 Copies [theme-name]'s files into <path-to-blog>/themes/[theme-name] for
-customizations. If [theme-name] is blank, copies the currently configured theme
+customizations. If [theme-name] is blank, copies the currently configured theme. Specify a new name to copy to by passing both [theme-name] and [new-theme-name]
     DESCRIPTION
-    def fork_theme(name = nil)
-      theme_name = name ? name : config.theme
-      source = Staticpress.root + 'themes' + theme_name
-      destination = Staticpress.blog_path + 'themes' + theme_name
-
-      FileUtils.mkdir_p destination
-      FileUtils.cp_r source.children, destination
+    def fork_theme(name = config.theme, new_name = name)
+      theme = Staticpress::Theme.new name
+      theme.copy_to new_name
     end
 
     desc 'list [method]', 'Send [method] to every content and output the result, or list all content if [method] is not present'

data/lib/staticpress/content/base.rb

@@ -35,18 +35,14 @@ module Staticpress::Content
 
       regex_frontmatter = /^-{3}${1}(?<frontmatter>.*)^-{3}${1}/m
       regex_text = /(?<text>.*)/m
-      regex = /#{regex_frontmatter}#{regex_text}/
+      regex = /(#{regex_frontmatter})?#{regex_text}/
 
       c = template_path_content
 
       @content = if Tilt.mappings.include?(template_path.extname[1..-1])
-        c.match(regex_frontmatter) ? c.match(regex) : c.match(regex_text)
+        c.match regex
       else
-        reply = { :text => c }
-        def reply.names
-          keys.map &:to_s
-        end
-        reply
+        { :text => c }
       end
     end
 
@@ -67,8 +63,7 @@ module Staticpress::Content
 
     def layout
       if meta.layout || config.markup_templates.include?(template_path.extname[1..-1])
-        layout_name = meta.layout || :default
-        Tilt.new theme.layout_for(layout_name).to_s
+        Tilt.new theme.layout_for(*preferred_layout_names).to_s
       end
     end
 
@@ -77,7 +72,10 @@ module Staticpress::Content
     end
 
     def meta
-      Staticpress::Metadata.new(content.names.include?('frontmatter') ? YAML.load(content[:frontmatter]) : {})
+      Staticpress::Metadata.new(content[:frontmatter] ? YAML.load(content[:frontmatter]) : {})
+    rescue Psych::SyntaxError => e
+      warn "Could not parse frontmatter for #{template_path}", content[:frontmatter]
+      raise e
     end
 
     def optional_param_defaults

data/lib/staticpress/content/category.rb

@@ -1,8 +1,7 @@
 module Staticpress::Content
   class Category < Base
     include CollectionContent
-    extend CollectionContent
-    extend ResourceContent
+    include ResourceContent
 
     attr_reader :name
 
@@ -23,8 +22,22 @@ module Staticpress::Content
       paginate(self.class.content_by_category[params[:name]].sort)[params[:number] - 1]
     end
 
-    def template_path
-      self.class.template_path
+    def preferred_layout_names
+      reply = []
+
+      if params[:name].nil?
+        reply << :category
+      else
+        if params[:number].nil?
+          reply << :category_index
+          reply << :post_index
+        end
+
+        reply << :category_paged
+        reply << :post_paged
+      end
+
+      reply
     end
 
     def self.all

data/lib/staticpress/content/collection_content.rb

@@ -1,13 +1,11 @@
 module Staticpress::Content
   module CollectionContent
-    include ResourceContent
-
     def template_types
       find_supported_extensions template_path
     end
 
     def template_path
-      theme.view_for(type) || theme.view_for(:default)
+      theme.view_for(*preferred_layout_names)
     end
   end
 end

data/lib/staticpress/content/index.rb

@@ -1,7 +1,7 @@
 module Staticpress::Content
   class Index < Base
     include CollectionContent
-    extend CollectionContent
+    include ResourceContent
 
     def optional_param_defaults
       { :number => pages_count }
@@ -15,8 +15,11 @@ module Staticpress::Content
       paginate(self.class.all_posts.sort)[params[:number] - 1]
     end
 
-    def template_path
-      self.class.template_path
+    def preferred_layout_names
+      reply = []
+      reply << :post_index if params[:number].nil?
+      reply << :post_paged
+      reply
     end
 
     def self.all

data/lib/staticpress/content/page.rb

@@ -34,6 +34,10 @@ module Staticpress::Content
       (Staticpress.blog_path + config.source_path + params[:slug]).file?
     end
 
+    def preferred_layout_names
+      [meta.layout, :page]
+    end
+
     def template_path
       Staticpress.blog_path + config.source_path + "#{full_slug}#{template_extension}"
     end

data/lib/staticpress/content/post.rb

@@ -1,7 +1,6 @@
 module Staticpress::Content
   class Post < Base
     include ResourceContent
-    extend ResourceContent
 
     def initialize(params)
       super
@@ -21,6 +20,10 @@ module Staticpress::Content
       Time.utc params[:year], params[:month], params[:day]
     end
 
+    def preferred_layout_names
+      [meta.layout, :post]
+    end
+
     def template_path
       name = [
         params[:year],

data/lib/staticpress/content/resource_content.rb

@@ -13,14 +13,8 @@ module Staticpress::Content
     end
 
     def gather_resources_from(paths)
-      paths.map do |child|
-        if child.directory?
-          spider_directory child do |resource|
-            find_by_path resource
-          end
-        else
-          find_by_path child
-        end
+      spider_map paths do |resource|
+        find_by_path resource
       end.flatten.compact
     end
 

data/lib/staticpress/content/tag.rb

@@ -1,8 +1,7 @@
 module Staticpress::Content
   class Tag < Base
     include CollectionContent
-    extend CollectionContent
-    extend ResourceContent
+    include ResourceContent
 
     attr_reader :name
 
@@ -23,8 +22,22 @@ module Staticpress::Content
       paginate(self.class.content_by_tag[params[:name]].sort)[params[:number] - 1]
     end
 
-    def template_path
-      self.class.template_path
+    def preferred_layout_names
+      reply = []
+
+      if params[:name].nil?
+        reply << :tag
+      else
+        if params[:number].nil?
+          reply << :tag_index
+          reply << :post_index
+        end
+
+        reply << :tag_paged
+        reply << :post_paged
+      end
+
+      reply
     end
 
     def self.all

data/lib/staticpress/content/theme.rb

@@ -20,7 +20,7 @@ module Staticpress::Content
     end
 
     def self.all
-      gather_resources_from((Staticpress::Theme.theme.root + 'assets').children)
+      gather_resources_from Staticpress::Theme.theme.assets
     end
 
     def self.published

data/lib/staticpress/helpers.rb

@@ -49,12 +49,12 @@ module Staticpress
       Staticpress::Settings.instance
     end
 
-    def spider_directory(dir, &block)
-      dir.children.map do |child|
-        if child.directory?
-          spider_directory child, &block
+    def spider_map(paths, &block)
+      paths.map do |path|
+        if path.directory?
+          spider_map path.children, &block
         else
-          block.call child
+          block.call path
         end
       end
     end

data/lib/staticpress/plugins/menu.rb

@@ -16,7 +16,7 @@ module Staticpress::Plugins
               sub = menu(remaining_depth, item.sub_items, menu_options) || ''
               a + sub
             end
-          end.join("\n")
+          end.join
         end
       end
     end

data/lib/staticpress/plugins/pagination.rb

@@ -0,0 +1,38 @@
+# https://github.com/amatsuda/kaminari
+
+module Staticpress::Plugins
+  module Pagination
+    def pagination_menu(current_number, menu_options = {})
+      tag :menu, { :type => :toolbar }.merge(menu_options) do
+        numbered_pages = Staticpress::Content::Index.published.map do |page|
+          number = page.params[:number]
+          pagination_item number, number, number == current_number
+        end.join
+
+        first_page = 1
+        last_page = Staticpress::Content::Index.published.count
+
+        oldest_page = pagination_item 'Oldest', first_page, current_number == first_page
+        older_page = pagination_item 'Older', current_number - 1, current_number <= first_page
+        newer_page = pagination_item 'Newer', current_number + 1, current_number >= last_page
+        newest_page = pagination_item 'Newest', last_page, current_number == last_page
+
+        oldest_page + older_page + numbered_pages + newer_page + newest_page
+      end
+    end
+
+    def pagination_item(text, number, is_current)
+      tag :li do
+        if is_current
+          tag :span, :class => 'current-page' do
+            text
+          end
+        else
+          tag :a, :href => "/page/#{number}" do
+            text
+          end
+        end
+      end
+    end
+  end
+end