octopress-feeds 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0db3234960909184d71e4d5eb1d63e5059c1625
-  data.tar.gz: 1a62792d466da0391b97962eeb681796e982b8da
+  metadata.gz: a967ab2b1b0362bd7c24d6c73d258e2211f9bf02
+  data.tar.gz: da93c88384ce140e93a74ab822f13e65b97a4f7a
 SHA512:
-  metadata.gz: e17f533d1c37a0ad2d33b4d9e841999f453bc083f9deec84e2d7d237bdf439cf77430757eb4685784df1ae9f42f29607c3666beb7da1d36c1c6f1c480552fe42
-  data.tar.gz: 7acce84984e6b277a5e23be6d244acbc37718576306f22ef58e4359cd9d1f1e5af403e194853189700c7e66f79632940d91826a23b96080834fb919fd8d45478
+  metadata.gz: d37e03cb7566d270d5efbaa940163b32e3d9844d318f3cad2c528dc875485da0153d71ff72712c716e44b52c08d644ebef70596943cd8d316e7c8aee4171a3ab
+  data.tar.gz: 990f1bb81175708a759f3a7a053dd287d2ac6ea384e50fcbc0c499eb9877a3d02fee8ae910021fb21db73b8fe13181bfe491b6b568bf0e2e1cf504bc104de99c

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+# Changelog
+
+### 1.1.0 (2015-01-06)
+
+- Updated dependencies
+- Fix: Works with new octopress-date-format
+- Fix: Works with octopress-linkblog (optionally)
+
+### 1.0.0 (2014-06-09)
+
+- Initial release

data/README.md

@@ -4,34 +4,35 @@ Add nice RSS feeds to Octopress and Jekyll sites. Supports a standard feed, an a
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Using Bundler:
 
-    gem 'octopress-feed'
+Add this gem to your site's Gemfile in the `:jekyll_plugins` group:
 
-And then execute:
+    group :jekyll_plugins do
+      gem 'octopress-feeds'
+    end
 
-    $ bundle
+Then install the gem with Bundler
 
-Or install it yourself as:
+    $ bundle
 
-    $ gem install octopress-feed
+Or install manually:
 
-### Add gem to Jekyll
+    $ gem install octopress-feeds
 
-Add the gem to Jekyll's configuration file:
+Then add the gem to your Jekyll configuration.
 
-```yaml
-gems:
-  - octopress-feed
-```
+    gems:
+      -octopress-feeds
 
 ## Usage
 
-Be sure your Jekyll configuration has a `url`, a `title`, and an `author`.
+Be sure your Jekyll configuration has a `url`, a `name` and an `author`. If you want your feed to have linkblogging features, be sure
+to install [Octopress Linkblog](https://github.com/octopress/linkblog).
 
 ```yaml
 url: http://yoursite.com/
-title: My Awesome Site
+name: My Awesome Site
 author: Guy McDude
 ```
 
@@ -103,7 +104,7 @@ This will create a configuration file populated with the defaults for this plugi
 
 ## Contributing
 
-1. Fork it ( https://github.com/octopress/feed/fork )
+1. Fork it ( https://github.com/octopress/feeds/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/assets/includes/entry.xml

@@ -1,4 +1,4 @@
-<title type="html">{{ post.title_text }}</title>
+<title type="html">{% return post.title_text || post.title %}</title>
     {% if post.linkpost and plugins.feeds.external_links %}
     <link rel="alternate" type="text/html" href="{{ post.external-url }}"/>
     <link rel="related" type="text/html" href="{{ post.url | full_url }}"/>
@@ -7,7 +7,7 @@
     {% endif %}
     <id>{{ post.id }}</id>
     <published>{{ post.date_xml }}</published>
-    <updated>{% return post.updated_date_xml || post.date_xml %}</updated>
+    <updated>{% return post.date_updated_xml || post.date_xml %}</updated>
     <author>
       <name>{% return post.author || site.author %}</name>
       <uri>{% return post.author_site || site.url %}</uri>

data/assets/includes/head.xml

@@ -3,7 +3,7 @@
   <title>{% return site.name || site.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>{{ url }}</id>
+  <id>{{ site.url }}</id>
   <updated>{% feed_updated_date %}</updated>
   <generator uri="http://octopress.org/">Octopress</generator>
   <rights>Copyright © {{ site.time | date: '%Y' }}, {{ site.author | strip_html }}</rights>

data/assets/pages/article-feed.xml

@@ -3,7 +3,7 @@ permalink: /feed/articles/
 title: Articles-only Feed
 feed: articles
 ---
-{% if plugins.feeds.articles_feed %}
+{% if site.articles && plugins.feeds.articles_feed %}
 {% include feeds:head.xml %}
 {% for post in site.articles limit:plugins.feeds.count %}
   <entry>

data/assets/pages/link-feed.xml

@@ -3,7 +3,7 @@ permalink: /feed/links/
 title: Linkpost Feed
 feed: linkposts
 ---
-{% if plugins.feeds.linkposts_feed %}
+{% if site.linkposts && plugins.feeds.linkposts_feed %}
 {% include feeds:head.xml %}
 {% for post in site.linkposts limit:plugins.feeds.count %}
   <entry>

data/lib/octopress-feeds/version.rb

@@ -1,7 +1,5 @@
 module Octopress
-  module Ink
-    module Feeds
-      VERSION = "1.0.0"
-    end
+  module Feeds
+    VERSION = "1.1.0"
   end
 end

data/lib/octopress-feeds.rb

@@ -1,55 +1,52 @@
 require 'octopress-feeds/version'
 require 'octopress-ink'
+require 'octopress-include-tag'
+require 'octopress-abort-tag'
+require 'octopress-return-tag'
+require 'octopress-date-format'
 
-Octopress::Ink.add_plugin({
-  name:          "Octopress Feeds",
-  slug:          "feeds",
-  assets_path:   File.expand_path(File.join(File.dirname(__FILE__), "../assets")),
-  type:          "plugin",
-  version:       Octopress::Ink::Feeds::VERSION,
-  description:   "A nice RSS feed for Octopress and Jekyll sites.",
-  website:       "https://github.com/octopress/feeds"
-})
+begin
+  require 'octopress-linkblog'
+rescue LoadError; end
 
 module Octopress
-  module Ink
-    module Tags
-      class FeedTag < Liquid::Tag
-        def render(context)
-          tags = []
-
-          Ink.plugin('feeds').pages.dup.map do |p|
-            if p.filename == 'main-feed.xml' && !p.disabled?
-              tag(p.page)
-            end
+  module Feeds
+    class FeedTag < Liquid::Tag
+      def render(context)
+        tags = []
+
+        Ink.plugin('feeds').pages.dup.map do |p|
+          if p.filename == 'main-feed.xml' && !p.disabled?
+            tag(p.page)
           end
         end
+      end
 
-        def tag(page)
-          url = page.url.sub(/index\.xml/, '')
-          "<link href='#{url}' rel='alternate' title='#{page.data['title']}: #{Ink.site.config['name']}' type='application/atom+xml'>"
-        end
+      def tag(page)
+        url = page.url.sub(/index\.xml/, '')
+        "<link href='#{url}' rel='alternate' title='#{page.data['title']}: #{Octopress.site.config['name']}' type='application/atom+xml'>"
       end
+    end
 
-      class FeedUpdatedTag < Liquid::Tag
-        def render(context)
-          feed = context.environments.first['page']['feed'] || 'posts'
-
-          case feed
-          when 'articles'
-            post = Ink.articles.last
-          when 'linkposts'
-            post = Ink.linkposts.last
-          else
-            post = Ink.site.posts.last
-          end
-          
-          if post.data['updated']
-            post.data['updated_date_xml']
-          else
-            post.data['date_xml']
-          end
+    class FeedUpdatedTag < Liquid::Tag
+      def render(context)
+        feed = context.environments.first['page']['feed'] || 'posts'
+        site = context.environments.first['site']
+
+        case feed
+        when 'articles'
+          posts = site['articles']
+        when 'linkposts'
+          posts = site['linkposts']
+        else
+          posts = site['posts']
         end
+
+        post = posts.sort_by{ |p|
+          p.data['date_updated'] || p.data['date']
+        }.last
+
+        post.data['date_updated_xml'] || post.data['date_xml']
       end
     end
   end
@@ -57,6 +54,17 @@ end
 
 
 
-Liquid::Template.register_tag('feed_tag', Octopress::Ink::Tags::FeedTag)
-Liquid::Template.register_tag('feed_updated_date', Octopress::Ink::Tags::FeedUpdatedTag)
+Liquid::Template.register_tag('feed_tag', Octopress::Feeds::FeedTag)
+Liquid::Template.register_tag('feed_updated_date', Octopress::Feeds::FeedUpdatedTag)
+
+Octopress::Ink.add_plugin({
+  name:          "Octopress Feeds",
+  slug:          "feeds",
+  gem:           "octopress-feeds",
+  path:          File.expand_path(File.join(File.dirname(__FILE__), "../")),
+  type:          "plugin",
+  version:       Octopress::Feeds::VERSION,
+  description:   "RSS feeds supporting link-blogging for Octopress and Jekyll sites.",
+  website:       "https://github.com/octopress/feeds"
+})
 

metadata

@@ -1,15 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: octopress-feeds
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2015-01-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: octopress-ink
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0.rc
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0.rc
+- !ruby/object:Gem::Dependency
+  name: octopress-abort-tag
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: octopress-return-tag
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: octopress-date-format
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -53,19 +109,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: octopress-ink
+  name: clash
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.8
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0.rc.8
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: octopress-linkblog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A nice RSS feeds for Octopress and Jekyll sites.
 email:
 - brandon@imathis.com
@@ -73,12 +157,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
-- Gemfile
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
-- Rakefile
 - assets/config.yml
 - assets/includes/entry.xml
 - assets/includes/head.xml
@@ -87,24 +168,6 @@ files:
 - assets/pages/main-feed.xml
 - lib/octopress-feeds.rb
 - lib/octopress-feeds/version.rb
-- octopress-feeds.gemspec
-- test/Gemfile
-- test/_config.yml
-- test/_expected/2014/05/26/awesome-link.html
-- test/_expected/2014/05/26/some-great-post-idea.html
-- test/_expected/feed/articles/index.xml
-- test/_expected/feed/index.xml
-- test/_expected/feed/links/index.xml
-- test/_includes/head.html
-- test/_layouts/post.html
-- test/_octopress.yml
-- test/_plugins/feeds/config.yml
-- test/_posts/2014-05-26-some-great-post-idea.markdown
-- test/_posts/2014-05-27-awesome-link.markdown
-- test/_templates/page
-- test/_templates/post
-- test/test.rb
-- test/test_suite.rb
 homepage: https://github.com/octopress/feeds
 licenses:
 - MIT
@@ -129,21 +192,4 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A nice RSS feeds for Octopress and Jekyll sites.
-test_files:
-- test/Gemfile
-- test/_config.yml
-- test/_expected/2014/05/26/awesome-link.html
-- test/_expected/2014/05/26/some-great-post-idea.html
-- test/_expected/feed/articles/index.xml
-- test/_expected/feed/index.xml
-- test/_expected/feed/links/index.xml
-- test/_includes/head.html
-- test/_layouts/post.html
-- test/_octopress.yml
-- test/_plugins/feeds/config.yml
-- test/_posts/2014-05-26-some-great-post-idea.markdown
-- test/_posts/2014-05-27-awesome-link.markdown
-- test/_templates/page
-- test/_templates/post
-- test/test.rb
-- test/test_suite.rb
+test_files: []

data/.gitignore

@@ -1,23 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-_site

data/.travis.yml

@@ -1,5 +0,0 @@
-language: ruby
-rvm:
-  - 2.0.0
-  - 1.9.3
-script: cd test && bundle exec ruby test.rb

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in octopress_feed.gemspec
-gemspec

data/Rakefile

@@ -1,2 +0,0 @@
-require "bundler/gem_tasks"
-

data/octopress-feeds.gemspec

@@ -1,26 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'octopress-feeds/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "octopress-feeds"
-  spec.version       = Octopress::Ink::Feeds::VERSION
-  spec.authors       = ["Brandon Mathis"]
-  spec.email         = ["brandon@imathis.com"]
-  spec.summary       = %q{A nice RSS feeds for Octopress and Jekyll sites.}
-  spec.description   = %q{A nice RSS feeds for Octopress and Jekyll sites.}
-  spec.homepage      = "https://github.com/octopress/feeds"
-  spec.license       = "MIT"
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "octopress"
-  
-  spec.add_runtime_dependency "octopress-ink", ">= 1.0.0.rc.8"
-end

data/test/Gemfile

@@ -1,8 +0,0 @@
-source 'https://rubygems.org'
-
-group :octopress do
-  gem 'octopress'
-  gem 'pry-debugger'
-  gem 'octopress-ink', path: '../../ink'
-  gem 'octopress-feeds', path: '../'
-end

data/test/_config.yml

@@ -1,9 +0,0 @@
-exclude:
-  - Gemfile*
-  - test*.rb
-gems:
-  - octopress-feeds
-url: http://octopress.org/
-author: Bob McDiggity
-title: Some awesome Jekyll site
-timezone: America/Chicago

data/test/_expected/2014/05/26/awesome-link.html

@@ -1,3 +0,0 @@
-<head><link href='http://octopress.org/feed/' rel='alternate' title='Main Feed: Some awesome Jekyll site' type='application/atom+xml'></head>
-<p>This contains all knowledge.</p>
-

data/test/_expected/2014/05/26/some-great-post-idea.html

@@ -1,3 +0,0 @@
-<head><link href='http://octopress.org/feed/' rel='alternate' title='Main Feed: Some awesome Jekyll site' type='application/atom+xml'></head>
-<p>totally sweet stuff.</p>
-

data/test/_expected/feed/articles/index.xml

@@ -1,36 +0,0 @@
-
-<?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom">
-  <title>Some awesome Jekyll site</title>
-  <link rel="alternate" type="text/html" href="http://octopress.org//"/>
-  <link rel="self" type="application/atom+xml" href="http://octopress.org/feed/articles/"/>
-  <id></id>
-  <updated>2014-05-26T22:29:13-05:00</updated>
-  <generator uri="http://octopress.org/">Octopress</generator>
-  <rights>Copyright © 2014, Bob McDiggity</rights>
-
-  <entry>
-    <title type="html">Some Great Post Idea</title>
-    
-    <link rel="alternate" type="text/html" href="http://octopress.org/2014/05/26/some-great-post-idea.html"/>
-    
-    <id>/2014/05/26/some-great-post-idea</id>
-    <published>2014-05-26T22:29:13-05:00</published>
-    <updated>2014-05-26T22:29:13-05:00</updated>
-    <author>
-      <name>Bob McDiggity</name>
-      <uri>http://octopress.org/</uri>
-    </author>
-    <content type="html" xml:base="http://octopress.org/" xml:lang="en">
-<![CDATA[
-
-<p>totally sweet stuff.</p>
-
-
-
-]]>
-    </content>
-  </entry>
-
-</feed>
-

data/test/_expected/feed/index.xml

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom">
-  <title>Some awesome Jekyll site</title>
-  <link rel="alternate" type="text/html" href="http://octopress.org//"/>
-  <link rel="self" type="application/atom+xml" href="http://octopress.org/feed/"/>
-  <id></id>
-  <updated>2014-06-01T22:45:41-05:00</updated>
-  <generator uri="http://octopress.org/">Octopress</generator>
-  <rights>Copyright © 2014, Bob McDiggity</rights>
-
-  <entry>
-    <title type="html">Awesome Link →</title>
-    
-    <link rel="alternate" type="text/html" href="http://timecube.com"/>
-    <link rel="related" type="text/html" href="http://octopress.org/2014/05/26/awesome-link.html"/>
-    
-    <id>/2014/05/26/awesome-link</id>
-    <published>2014-05-26T22:45:41-05:00</published>
-    <updated>2014-06-01T22:45:41-05:00</updated>
-    <author>
-      <name>Bob McDiggity</name>
-      <uri>http://octopress.org/</uri>
-    </author>
-    <content type="html" xml:base="http://octopress.org/" xml:lang="en">
-<![CDATA[
-
-<p>This contains all knowledge.</p>
-
-
-<p><a href="http://octopress.org/2014/05/26/awesome-link.html">&infin; Permalink</a></p>
-
-
-]]>
-    </content>
-  </entry>
-
-  <entry>
-    <title type="html">Some Great Post Idea</title>
-    
-    <link rel="alternate" type="text/html" href="http://octopress.org/2014/05/26/some-great-post-idea.html"/>
-    
-    <id>/2014/05/26/some-great-post-idea</id>
-    <published>2014-05-26T22:29:13-05:00</published>
-    <updated>2014-05-26T22:29:13-05:00</updated>
-    <author>
-      <name>Bob McDiggity</name>
-      <uri>http://octopress.org/</uri>
-    </author>
-    <content type="html" xml:base="http://octopress.org/" xml:lang="en">
-<![CDATA[
-
-<p>totally sweet stuff.</p>
-
-
-
-]]>
-    </content>
-  </entry>
-
-</feed>

data/test/_expected/feed/links/index.xml

@@ -1,39 +0,0 @@
-
-<?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom">
-  <title>Some awesome Jekyll site</title>
-  <link rel="alternate" type="text/html" href="http://octopress.org//"/>
-  <link rel="self" type="application/atom+xml" href="http://octopress.org/feed/links/"/>
-  <id></id>
-  <updated>2014-06-01T22:45:41-05:00</updated>
-  <generator uri="http://octopress.org/">Octopress</generator>
-  <rights>Copyright © 2014, Bob McDiggity</rights>
-
-  <entry>
-    <title type="html">Awesome Link →</title>
-    
-    <link rel="alternate" type="text/html" href="http://timecube.com"/>
-    <link rel="related" type="text/html" href="http://octopress.org/2014/05/26/awesome-link.html"/>
-    
-    <id>/2014/05/26/awesome-link</id>
-    <published>2014-05-26T22:45:41-05:00</published>
-    <updated>2014-06-01T22:45:41-05:00</updated>
-    <author>
-      <name>Bob McDiggity</name>
-      <uri>http://octopress.org/</uri>
-    </author>
-    <content type="html" xml:base="http://octopress.org/" xml:lang="en">
-<![CDATA[
-
-<p>This contains all knowledge.</p>
-
-
-<p><a href="http://octopress.org/2014/05/26/awesome-link.html">&infin; Permalink</a></p>
-
-
-]]>
-    </content>
-  </entry>
-
-</feed>
-

data/test/_includes/head.html

@@ -1 +0,0 @@
-<head>{% feed_tag %}</head>

data/test/_layouts/post.html

@@ -1,2 +0,0 @@
-{% include 'head.html' | full_urls %}
-{{ content }}

data/test/_octopress.yml

@@ -1,11 +0,0 @@
-# Default extension for new posts and pages
-post_ext: markdown
-page_ext: html
-
-# Default templates for posts and pages
-# Found in _templates/
-post_layout: post
-page_layout: page
-
-# Format titles with titlecase?
-titlecase: true

data/test/_plugins/feeds/config.yml

@@ -1,3 +0,0 @@
-articles_feed: true
-linkposts_feed: true
-

data/test/_posts/2014-05-26-some-great-post-idea.markdown

@@ -1,6 +0,0 @@
----
-layout: post
-title: "Some Great Post Idea"
-date: 2014-05-26T22:29:13-05:00
----
-totally sweet stuff.

data/test/_posts/2014-05-27-awesome-link.markdown

@@ -1,9 +0,0 @@
----
-layout: post
-title: "Awesome Link"
-date: 2014-05-26T22:45:41-05:00
-external-url: http://timecube.com
-updated: 2014-06-01T22:45:41-05:00
----
-
-This contains all knowledge.

data/test/_templates/page

@@ -1,4 +0,0 @@
----
-layout: {{ layout }}
-title: {{ title }}
----

data/test/_templates/post

@@ -1,5 +0,0 @@
----
-layout: {{ layout }}
-title: {{ title }}
-date: {{ date }}
----

data/test/test.rb

@@ -1,8 +0,0 @@
-require './test_suite'
-ENV['JEKYLL_ENV'] = 'test'
-
-@failures = []
-build
-test_dirs('Site build', '_site', '_expected')
-
-print_results

data/test/test_suite.rb

@@ -1,182 +0,0 @@
-require 'colorator'
-require 'find'
-
-# This is a makeshift integration test-suite.
-# It is unapologetically pragmatic.
-
-
-# Build Jekyll
-#
-def build(options={})
-  config = ['_config.yml'] << options[:config]
-
-  if options[:config]
-    options[:config].each do |name, file|
-      case name
-      when :jekyll
-        config << "_configs/#{file}"
-      when :octopress
-        FileUtils.cp "_configs/#{file}", "_octopress.yml"
-      else
-        FileUtils.cp "_configs/#{file}", "_plugins/#{name}/config.yml"
-      end
-    end
-  end
-
-  cmd = "rm -rf site && bundle exec jekyll build --config #{config.join(',')}"
-
-  `#{cmd}`
-
-  if options[:config]
-    options[:config].each do |name, file|
-      case name
-      when :jekyll
-        next
-      when :octopress
-        `rm _octopress.yml`
-      else
-        `rm _plugins/#{name}/config.yml`
-      end
-    end
-  end
-end
-
-
-# Find all files in a given directory
-#
-def dir_files(dir)
-  Find.find(dir).to_a.reject!{|f| File.directory?(f) }
-end
-
-# Recursively diff two directories
-#
-# This will walk through dir1 and diff matching paths in dir2
-#
-def test_dirs(desc, dir1, dir2)
-
-  test_missing_files(desc, dir1, dir2)
-
-  dir_files(dir1).each do |file|
-    file2 = file.sub(dir1, dir2)
-    if File.exist?(file2)
-      if diff = diff_file(file, file2)
-        @failures << {
-          desc: "#{desc}\nDiff of file: #{file.sub(dir1+'/', '')}\n",
-          result: format_diff(diff)
-        }
-        pout 'F'.red
-      else
-        pout '.'.green
-      end
-    end
-  end
-end
-
-def format_diff(diff)
-  "#{diff.gsub(/\A.+?\n/,'').gsub(/^[^><].+/,'---').gsub(/^>.+/){|m| 
-    m.green
-  }.gsub(/^(<.+?)$/){ |m| 
-    m.red
-  }}"
-end
-
-# List differences between files in two directories
-#
-def test_missing_files(desc, dir1, dir2)
-  files1 = dir_files(dir1).map {|f| f.sub(dir1,'') }
-  files2 = dir_files(dir2).map {|f| f.sub(dir2,'') }
-
-  missing = []
-
-  (files2 - files1).each do |file|
-    missing << File.join(dir1, file)
-  end
-
-  (files1 - files2).each do |file|
-    missing << File.join(dir2, file)
-  end
-
-  if !missing.empty?
-    @failures << {
-      desc: "#{desc}\nMissing files:\n",
-      result: " - " + missing.join("\n - ")
-    }
-
-    pout 'F'.red
-  else
-    pout '.'.green
-  end
-end
-
-# Diff two files
-#
-def diff_file(file1, file2)
-  diff = `diff #{file1} #{file2}`
-  if diff.size > 0
-    diff
-  else
-    false
-  end
-end
-
-# Test command output
-#
-# Input: options hash, format:
-#   {
-#     desc:   description of task
-#     cmd:    system command to be run, (String or Array)
-#     expect: expected output from command
-#   } 
-#
-def test_cmd(options)
-  if cmd = options[:cmd]
-    cmd = [cmd] unless cmd.is_a? Array
-
-    # In debug mode command output is printed
-    #
-    if options[:debug]
-      system cmd.join('; ')
-    else
-      output = `#{cmd.join('; ')}`.gsub(/#{Dir.pwd}\/*/,'').strip
-
-      # Remove character color codes
-      output = output.gsub("\e",'').gsub(/\[\d+m/,'').gsub("\[0m",'')
-    end
-    if options[:expect] && options[:expect].strip == output
-      pout '.'.green
-    elsif options[:expect]
-      pout 'F'.red
-      @failures << {
-        desc: options[:desc]+"\n",
-        result: <<-HERE
-expected: #{(options[:expect] || '').strip.green}
-result: #{(output || '').strip.red}
-HERE
-      }
-    end
-  end
-end
-
-
-# Print a single character without a newline
-#
-def pout(str)
-  print str
-  $stdout.flush
-end
-
-# Ouptut nicely formatted failure messages
-#
-def print_results
-  if !@failures.empty?
-    @failures.each do |test|
-      pout "\nFailed: #{test[:desc]}"
-      puts test[:result]
-      # print a newline for easier reading
-      puts ""
-    end
-    abort
-  else
-    puts "All passed!".green
-  end
-end