octopress-genesis-theme 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d44474e2d922073c99ef5837f3d6a516ce9116fa
-  data.tar.gz: 9b74336892b62ea103047bb62f71e373b4099414
+  metadata.gz: 32d5f7e9176584bfaa80812d9fb84ad4bb6be3dc
+  data.tar.gz: cb5829a501b655dac1f4a24c4039b91111100192
 SHA512:
-  metadata.gz: 4c8e7718cf9bf8b7ee291af3a82e8b6fe76f981cef5fd1f19dfdf729d8a35d8b64230ce2c5ec553847d74796158d66ddcfcc85493567ecc126706b9c5d2c5ebe
-  data.tar.gz: b54e9dc8daca7c709576a228d7160c182cfa804a73e359b0c6897b6ba81c0fd3b16036ad9fb3ae072ddfab2978d5ebd8048edb6be123614e656b7bc8b24a03ed
+  metadata.gz: f519acee6b7401d5feaacbabe2dfe4c2a863b3362db2c7e9ca944d4b4a5de5ae14a3442807d3e9db9fd814f039c6979ca1a25ac717de8dd5ef41de7b18e91a52
+  data.tar.gz: da333c5ad070fb023d6be6472198bbcfd2198040e1571ca25ec8d84e38367db51587c7e013e0249472ac4407fa0e518e361c0e20e3b0ef30deeed75e407a6087

data/assets/config.yml

@@ -1,22 +1,40 @@
 # Settings for main header
 header:
   title: My Octopress Blog
-  subtitle: A clever subtitle (optional)
+  subtitle:
  
 # Links for main navigation
 nav:
   - { url: '/', title: 'Home' }
-  - { url: '/archive', title: 'Archive' }
-  - { url: '/feed', title: 'RSS' }
+  - { url: '/archive/', title: 'Archive' }
+  - { url: '/feed/', title: 'RSS' }
 
-# Settings for category index generator
+# Settings for category generator
 category:
-  prefix: Category
-  url:    category
+  title:  Category
+  dir:   'categories'
+  feeds: false
+    
+  # The base url for categories
+  # An empty string means categories will live at the root directory.
+
+  # To add per category feeds, use an array of category names you want feeds for.
+  # for example:
+  # feeds:
+  #   - news
+  #   - programming
 
 post_index:
-  excerpt_posts: true
+  excerpt_articles: true
   permalink_label: "Permalink"
   read_more_label: "Continue Reading →"
 
-center-headings: true
+feeds:
+  count: 10
+  main_feed: true
+  linkpost_feed: true
+  article_feed: true
+  excerpt_articles: false
+
+center_headings: true
+search: google

data/assets/includes/feed/entry.xml

@@ -0,0 +1,30 @@
+<title type="html">{{ post.title_text }}</title>
+    {% if post.linkpost %}
+    <link rel="alternate" type="text/html" href="{{ post.external-url }}"/>
+    <link rel="related" type="text/html" href="{{ post.url | full_url }}"/>
+    {% else %}
+    <link rel="alternate" type="text/html" href="{{ post.url | full_url }}"/>
+    {% endif %}
+    <id>{{ post.id }}</id>
+    <published>{{ post.date_xml }}</published>
+    <updated>{% return post.updated_date_xml || post.date_xml %}</updated>
+    <author>
+      <name>{% return post.author || site.author %}</name>
+      <uri>{% return post.author_site || site.url %}</uri>
+    </author>
+    <content type="html" xml:base="{{ site.url }}" xml:lang="en">
+<![CDATA[
+{% if theme.feeds.excerpt_articles and post.linkpost == false %}
+{{ post.excerpt | full_urls }}
+
+{% if post.excerpted %}
+<p><a href="{{ post.url | full_url }}">Continue reading &rarr;</a></p>
+{% endif %}
+{% else %}
+{{ post.content | full_urls }}
+{% if post.linkpost %}
+<p><a href="{{ post.url | full_url }}">&infin; Permalink</a></p>
+{% endif %}
+{% endif %}
+]]>
+    </content>

data/assets/includes/feed/head.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<feed xmlns="http://www.w3.org/2005/Atom">
+  <title>{{ return theme.header.title }}</title>
+  <link rel="alternate" type="text/html" href="{{ site.url }}/"/>
+  <link rel="self" type="application/atom+xml" href="{{ page.url | remove:'index.xml' | full_url }}"/>
+  <id>{{ site.url }}</id>
+  <updated>{% return include.last_post.date_updated_xml || include.last_post.date_xml %}</updated>
+  <generator uri="http://octopress.org/">Octopress</generator>
+  <rights>Copyright © {{ site.time | date: '%Y' }}, {{ site.author | strip_html }}</rights>

data/assets/includes/index-post.html

@@ -1,8 +1,8 @@
-{% assign post_content = (theme.post_index.excerpt_posts ? post.excerpt : post.content) %}
+{% assign post_content = (theme.post-index.excerpt-articles ? post.excerpt : post.content) %}
 {% assign excerpted = true if post_content != post.content %}
 {% assign classnames = post.class | join: " " | classify if post.class %}
 {% assign classnames += " excerpt" if excerpted %}
-{% assign permalink_label = (excerpted ? theme.post_index.read_more_label : theme.post_index.permalink_label) %}
+{% assign permalink_label = (excerpted ? theme.post-index.read_more_label : theme.post-index.permalink-label) %}
 
 <article class="entry {{ classnames }}" role="article">
   <header class="entry-header">

data/assets/includes/search/duckduckgo.html

@@ -0,0 +1,4 @@
+<form class='site-search' action="http://www.duckduckgo.com/" method="get">
+  <input type="hidden" name="sites" value="{{ site.url | strip_url_protocol }}">
+  <input class="search-input" type="text" name="q" results="0" placeholder="Search&hellip;" accesskey="/">
+</form>

data/assets/includes/search/google.html

@@ -0,0 +1,4 @@
+<form class='site-search' action="https://google.com/search" method="get">
+  <input type="hidden" name="q" value="site:{{ site.url | strip_url_protocol }}">
+  <input class="search-input" type="text" name="q" results="0" placeholder="Search&hellip;" accesskey="/">
+</form>

data/assets/includes/site-footer.html

@@ -9,4 +9,6 @@
     {% endfor %}
   </nav>
   {% endif %}
+  {% capture search_template %}theme:search/{{ theme.search }}.html{% endcapture %}
+  {% include search_template %}
 </footer>

data/assets/layouts/category-feed.html

@@ -0,0 +1,8 @@
+{% assign last_post = site.categories[page.category].last %}
+{% include theme:feed/head.xml last_post=last_post %}
+{% for post in site.categories[page.category] limit:theme.feeds.count %}
+<entry>
+{% include theme:feed/entry.xml %}
+</entry>
+{% endfor %}
+</feed>

data/assets/pages/feed-articles.xml

@@ -0,0 +1,14 @@
+---
+permalink: /feed/articles/
+title: Articles-only Feed
+feed: articles
+---
+{% if theme.feeds.article_feed %}
+{% include theme:feed/head.xml last_post=site.articles.last %}
+{% for post in site.articles limit:theme.feeds.count %}
+  <entry>
+    {% include theme:feed/entry.xml %}
+  </entry>
+{% endfor %}
+</feed>
+{% else %}{% abort %}{% endif %}

data/assets/pages/feed-links.xml

@@ -0,0 +1,14 @@
+---
+permalink: /feed/links/
+title: Linkpost Feed
+feed: linkposts
+---
+{% if theme.feeds.linkpost_feed %}
+{% include theme:feed/head.xml last_post=site.linkposts.last %}
+{% for post in site.linkposts limit:theme.feeds.count %}
+  <entry>
+    {% include theme:feed/entry.xml %}
+  </entry>
+{% endfor %}
+</feed>
+{% else %}{% abort %}{% endif %}

data/assets/pages/feed.xml

@@ -0,0 +1,12 @@
+---
+permalink: /feed/
+title: Main Feed
+feed: posts
+---
+{% include theme:feed/head.xml last_post = site.posts.last %}
+{% for post in site.posts limit:theme.feeds.count %}
+  <entry>
+    {% include theme:feed/entry.xml %}
+  </entry>
+{% endfor %}
+</feed>

data/demo/_plugins/theme/config.yml

@@ -1,19 +0,0 @@
-# Settings for main header
-header:
-  title: My Octopress Blog
- 
-# Links for main navigation
-nav:
-  - { url: '/', title: 'Posts' }
-  - { url: '/archive', title: 'Archive' }
-  - { url: '/feed', title: 'RSS' }
-
-# Settings for category index generator
-category:
-  prefix: Category
-  url:    category
-
-post_index:
-  excerpt_posts: true
-
-center-headings: true

data/demo/_posts/2014-08-03-dang-that-was-fast.md

@@ -3,11 +3,12 @@ layout: theme:post
 title: "Dang That Was Fast"
 date: 2014-08-03T23:18:12-05:00
 categories: 
-  - 'hi'
-  - 'guys'
+  - 'test'
+  - 'news'
 title-graphic: /images/panorama.jpg
 class: light-title
 subtitle: But was it? Was it really?
+external-url: http://timecube.com
 ---
 
 **The quick**, brown fox jumps over a lazy dog. DJs flock by when MTV ax quiz prog. Junk MTV quiz graced by fox whelps. Bawds jog, flick quartz, vex nymphs. Waltz, bad nymph, for quick jigs vex! Fox nymphs grab quick-jived waltz. Brick quiz whangs jumpy veldt fox. Bright vixens jump; dozy fowl quack.

data/lib/octopress-genesis.rb

@@ -4,6 +4,7 @@ require 'octopress-autoprefixer'
 require 'octopress-date-format'
 require 'octopress-comment-tag'
 require 'octopress-wrap-tag'
+require 'octopress-abort-tag'
 require 'octopress-assign-tag'
 require 'octopress-return-tag'
 require 'octopress-include-tag'

data/lib/octopress-genesis/category-generator.rb

@@ -41,14 +41,33 @@ module Jekyll
       self.data                = layout.data
       self.data['category']    = category
       # Set the title for this page.
-      prefix                   = 'Category'
-      self.data['title']       = "#{@config['prefix']}: #{category}"
+      self.data['title']       = "#{@config['title']}: #{category}"
       # Set the meta-description for this page.
-      self.data['description'] = "#{prefix}: #{category}"
+      self.data['description'] = "#{@config['title']}: #{category}"
     end
 
   end
 
+  # The CategoryFeed class creates an Atom feed for the specified category.
+  class CategoryFeed < CategoryIndex
+
+    # Initializes a new CategoryFeed.
+    #
+    #  +base+         is the String path to the <source>.
+    #  +category_dir+ is the String path between <source> and the category folder.
+    #  +category+     is the category currently being processed.
+    def initialize(site, base, category_dir, category)
+      super
+      @name = 'index.xml'
+      self.process(@name)
+      layout = @site.layouts['theme:category-feed']
+      self.content             = layout.content
+      self.data                = layout.data
+      self.data['category']    = category
+    end
+
+  end
+  
   # The Site class is a built-in Jekyll class with access to global site config information.
   class Site
 
@@ -66,29 +85,28 @@ module Jekyll
 
     end
 
+    # write 
+    def write_category_feed(category_dir, category)
+      # Create an Atom-feed for each index.
+      feed = CategoryFeed.new(self, self.source, File.join(category_dir,'feed'), category)
+      feed.render(self.layouts, site_payload)
+      feed.write(self.dest)
+      # Record the fact that this page has been added, otherwise Site::cleanup will remove it.
+      self.pages << feed
+    end
+
     # Loops through the list of category pages and processes each one.
     def write_category_indexes
       if self.layouts.key? 'theme:category-index'
         config = Octopress::Ink::Plugins.config['theme']['category']
-        url = config['url']
+        slug = config['dir']
+        feeds = config['feeds']
         self.categories.keys.each do |category|
-          self.write_category_index(File.join(url, category), category) if url
+          self.write_category_index(File.join(slug, category), category) if slug
+          self.write_category_feed(File.join(slug, category), category) if feeds && feeds.include?(category)
         end
-
-      # Throw an exception if the layout couldn't be found.
-      else
-        raise <<-ERR
-
-
-===============================================
- Error for category_generator.rb plugin
------------------------------------------------
- No 'category_index.html' in source/_layouts/
- Perhaps you haven't installed a theme yet.
-===============================================
-
-ERR
       end
+
     end
 
   end
@@ -138,8 +156,10 @@ ERR
     def category_link(category)
       dir = @context.registers[:site].config['category_dir']
       # TODO: URLize categories
-      url = File.join('/', Octopress::Ink::Plugins.config['theme']['category']['url'], sluggify(category))
-      "<a class='category' href='#{url}/'>#{category}</a>"
+      slug = File.join('/',
+                       Octopress::Ink::Plugins.config['theme']['category']['dir'],
+                       sluggify(category))
+      "<a class='category' href='#{slug}/'>#{category}</a>"
     end
 
     # returns a string which is ready for urlizing.

data/lib/octopress-genesis/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Genesis
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/octopress-genesis.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "octopress-date-format", "~> 2.0"
   spec.add_runtime_dependency "octopress-autoprefixer", "~> 1.0"
   spec.add_runtime_dependency "octopress-wrap-tag", "~> 1.0"
+  spec.add_runtime_dependency "octopress-abort-tag", "~> 1.0"
   spec.add_runtime_dependency "octopress-assign-tag", "~> 1.0"
   spec.add_runtime_dependency "octopress-filter-tag", "~> 1.0"
   spec.add_runtime_dependency "octopress-comment-tag", "~> 1.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-genesis-theme
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-31 00:00:00.000000000 Z
+date: 2014-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-ink
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: octopress-abort-tag
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: octopress-assign-tag
   requirement: !ruby/object:Gem::Requirement
@@ -234,22 +248,30 @@ files:
 - Rakefile
 - assets/config.yml
 - assets/includes/archive-post.html
+- assets/includes/feed/entry.xml
+- assets/includes/feed/head.xml
 - assets/includes/head.html
 - assets/includes/index-post.html
 - assets/includes/post-nav.html
 - assets/includes/primary-nav.html
+- assets/includes/search/duckduckgo.html
+- assets/includes/search/google.html
 - assets/includes/site-footer.html
 - assets/includes/site-header.html
 - assets/includes/social/page-header.html
 - assets/includes/social/post-footer.html
 - assets/includes/social/post-header.html
 - assets/layouts/base.html
+- assets/layouts/category-feed.html
 - assets/layouts/category-index.html
 - assets/layouts/default.html
 - assets/layouts/page.html
 - assets/layouts/paginated-posts.html
 - assets/layouts/post.html
 - assets/pages/archive.html
+- assets/pages/feed-articles.xml
+- assets/pages/feed-links.xml
+- assets/pages/feed.xml
 - assets/pages/index.html
 - assets/stylesheets/_colors.scss
 - assets/stylesheets/_entry.scss