octopress-date-format 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd900553e1ca7e0d2f47025f40446fcd62a014bd
-  data.tar.gz: 778e974f85cc5d562e5623ef47797e3bad0b60fb
+  metadata.gz: 7a22b97f31315075505298367d931ac711bf1a07
+  data.tar.gz: f441b78ea1c9356ab066809229bf48bf1a14f392
 SHA512:
-  metadata.gz: cccc18d8d06d191c87eb400f1da5d1192a5344087f97b84c7766c80095361aa1ea8a6925cf2fc0945c778f59f1ab79c67c82c9f0cf5759597415bc9f84069916
-  data.tar.gz: 6c36777108228c6721b7ce6a191033fb8dafe8098d63c6a655a990dfed1d3093217e59755022ded23737b9a88116ca4158843bc6f8ded12fd96022310138bf19
+  metadata.gz: 26752820cf9f7623e3da7a690be9586ab21a9d14a50032f26033abee39a521f8af477d37cb512d2377980096eeb36f23a15bed7df3d5a34b3b52e4693de6f4ec
+  data.tar.gz: 7766f7abc45ea443b205fe4566b0d97bb41e67c5c5856c06404c23654307d44674fb694b9d17dd52858f01f0449c711779d64e7c9e4256d2823730b6305d1e7c

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 2.0.2 - 2014-10-09
+
+- Also reads from Jekyll's configuration for broader compatibility.
+
 ### 2.0.1 - 2014-08-18
 
 - Added support for old `updated` YAML front-matter var.

data/lib/octopress-date-format.rb

@@ -16,6 +16,12 @@ module Octopress
       end
     end
 
+    class SiteHook < Hooks::Site
+      def pre_read(site)
+        PageDate::Configuration.jekyll_config = site.config
+      end
+    end
+
     def self.hack_date(page)
       if page.data['date'] || page.respond_to?(:date)
         date = datetime(page.data['date'] || page.date)

data/lib/octopress-date-format/configuration.rb

@@ -12,15 +12,32 @@ module Octopress
 
   module PageDate
     module Configuration
+      @jekyll_config = {}
+
       DEFAULTS = {
         'date_format' => 'ordinal',
-        'time_format' => '%-I:%M %P',
-        'display_time' => false
+        'time_format' => '%-I:%M %P'
       }
+
+      def self.jekyll_config=(config)
+        @jekyll_config = config
+      end
+
+      # For broader compatibility, also read config from Jekyll
+      def self.jekyll_date_config
+        @jekyll_config.select { |key,_| DEFAULTS.include? key }
+      end
     end
 
     def self.config
-      @config ||= Jekyll::Utils.deep_merge_hashes(PageDate::Configuration::DEFAULTS, Octopress.config)
+      @config ||= begin
+        default = PageDate::Configuration::DEFAULTS
+        jekyll = PageDate::Configuration::jekyll_date_config
+        octopress = Octopress.config
+
+        config = Jekyll::Utils.deep_merge_hashes(default, jekyll)
+        Jekyll::Utils.deep_merge_hashes(config, octopress)
+      end
     end
   end
 end

data/lib/octopress-date-format/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   class DateFormat
-    VERSION = "2.0.1"
+    VERSION = "2.0.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-date-format
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-hooks
@@ -52,6 +52,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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: 'Adds nicely formated dates to Jekyll posts and pages. (formerly: ''jekyll-date-format'')'
 email:
 - brandon@imathis.com
@@ -59,30 +87,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - lib/octopress-date-format.rb
 - lib/octopress-date-format/configuration.rb
 - lib/octopress-date-format/version.rb
-- octopress-date-format.gemspec
-- test/.clash.yml
-- test/.gitignore
-- test/Gemfile
-- test/_config.yml
-- test/_expected/2014/07/03/test.html
-- test/_expected/2014/07/03/welcome-to-jekyll.html
-- test/_expected/index.html
-- test/_expected/page.html
-- test/_includes/test_date.html
-- test/_posts/2013-08-16-welcome-to-jekyll.html
-- test/_posts/2013-08-17-test.html
-- test/index.html
-- test/page.html
 homepage: https://github.com/octopress/date-format
 licenses:
 - MIT
@@ -103,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: 'Adds nicely formated dates to Jekyll posts and pages. (formerly: ''jekyll-date-format'')'

data/.gitignore

@@ -1,19 +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
-.DS_Store
-_site

data/.travis.yml

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

data/Gemfile

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

data/Rakefile

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

data/octopress-date-format.gemspec

@@ -1,23 +0,0 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'octopress-date-format/version'
-
-Gem::Specification.new do |gem|
-  gem.name          = "octopress-date-format"
-  gem.version       = Octopress::DateFormat::VERSION
-  gem.authors       = ["Brandon Mathis"]
-  gem.email         = ["brandon@imathis.com"]
-  gem.description   = %q{Adds nicely formated dates to Jekyll posts and pages. (formerly: 'jekyll-date-format')}
-  gem.summary       = %q{Adds nicely formated dates to Jekyll posts and pages. (formerly: 'jekyll-date-format')}
-  gem.homepage      = "https://github.com/octopress/date-format"
-  gem.license       = "MIT"
-
-  gem.add_runtime_dependency 'octopress-hooks', '~> 2.0'
-  gem.add_runtime_dependency 'jekyll', '~> 2.0'
-
-  gem.add_development_dependency 'clash', '~> 1.0'
-
-  gem.files         = `git ls-files`.split($/)
-  gem.require_paths = ["lib"]
-end

data/test/.clash.yml

@@ -1,2 +0,0 @@
-build: true
-compare: _expected _site

data/test/.gitignore

@@ -1 +0,0 @@
-_site

data/test/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org'
-
-gemspec :path => '/gemspec/path', :path => '../'

data/test/_config.yml

@@ -1,7 +0,0 @@
-name: Your New Jekyll Site
-markdown: redcarpet
-timezone: UTC
-gems:
-  - octopress-date-format
-exclude:
-  - Gemfile*

data/test/_expected/2014/07/03/test.html

@@ -1,21 +0,0 @@
-
-  
-
-## Date
-- Date: 2014-07-03 14:08:00 +0000
-- Formatted Date: Jul 3rd, 2014
-- Formatted Time: 2:08 pm
-- Date XML: 2014-07-03T14:08:00+00:00
-- Date HTML: <time class='entry-date' datetime='2014-07-03T14:08:00+00:00'><span class='date'><span class='date-month'>Jul</span> <span class='date-day'>3</span><span class='date-suffix'>rd</span>, <span class='date-year'>2014</span></span></time>
-- Date Time HTML: <time class='entry-date' datetime='2014-07-03T14:08:00+00:00'><span class='date'><span class='date-month'>Jul</span> <span class='date-day'>3</span><span class='date-suffix'>rd</span>, <span class='date-year'>2014</span></span> <span class='time'>2:08 pm</span></time>
-
-
-## Updated
-- Date: 2014-07-04 16:03:05 +0000
-- Formatted Date: Jul 4th, 2014
-- Formatted Time: 4:03 pm
-- XML: 2014-07-04T16:03:05+00:00
-- HTML: <time class='updated' datetime='2014-07-04T16:03:05+00:00'><span class='date'><span class='date-month'>Jul</span> <span class='date-day'>4</span><span class='date-suffix'>th</span>, <span class='date-year'>2014</span></span></time>
-- Date Time HTML: <time class='updated' datetime='2014-07-04T16:03:05+00:00'><span class='date'><span class='date-month'>Jul</span> <span class='date-day'>4</span><span class='date-suffix'>th</span>, <span class='date-year'>2014</span></span> <span class='time'>4:03 pm</span></time>
-
-

data/test/_expected/2014/07/03/welcome-to-jekyll.html

@@ -1,21 +0,0 @@
-
-  
-
-## Date
-- Date: 2014-07-03 14:08:00 +0000
-- Formatted Date: Jul 3rd, 2014
-- Formatted Time: 2:08 pm
-- Date XML: 2014-07-03T14:08:00+00:00
-- Date HTML: <time class='entry-date' datetime='2014-07-03T14:08:00+00:00'><span class='date'><span class='date-month'>Jul</span> <span class='date-day'>3</span><span class='date-suffix'>rd</span>, <span class='date-year'>2014</span></span></time>
-- Date Time HTML: <time class='entry-date' datetime='2014-07-03T14:08:00+00:00'><span class='date'><span class='date-month'>Jul</span> <span class='date-day'>3</span><span class='date-suffix'>rd</span>, <span class='date-year'>2014</span></span> <span class='time'>2:08 pm</span></time>
-
-
-## Updated
-- Date: 2014-07-03 15:03:15 +0000
-- Formatted Date: Jul 3rd, 2014
-- Formatted Time: 3:03 pm
-- XML: 2014-07-03T15:03:15+00:00
-- HTML: <time class='updated' datetime='2014-07-03T15:03:15+00:00'><span class='date'><span class='date-month'>Jul</span> <span class='date-day'>3</span><span class='date-suffix'>rd</span>, <span class='date-year'>2014</span></span></time>
-- Date Time HTML: <time class='updated' datetime='2014-07-03T15:03:15+00:00'><span class='date'><span class='date-month'>Jul</span> <span class='date-day'>3</span><span class='date-suffix'>rd</span>, <span class='date-year'>2014</span></span> <span class='time'>3:03 pm</span></time>
-
-

data/test/_expected/index.html

@@ -1,45 +0,0 @@
-
-
-  
-
-## Date
-- Date: 2014-07-03 14:08:00 +0000
-- Formatted Date: Jul 3rd, 2014
-- Formatted Time: 2:08 pm
-- Date XML: 2014-07-03T14:08:00+00:00
-- Date HTML: <time class='entry-date' datetime='2014-07-03T14:08:00+00:00'><span class='date'><span class='date-month'>Jul</span> <span class='date-day'>3</span><span class='date-suffix'>rd</span>, <span class='date-year'>2014</span></span></time>
-- Date Time HTML: <time class='entry-date' datetime='2014-07-03T14:08:00+00:00'><span class='date'><span class='date-month'>Jul</span> <span class='date-day'>3</span><span class='date-suffix'>rd</span>, <span class='date-year'>2014</span></span> <span class='time'>2:08 pm</span></time>
-
-
-## Updated
-- Date: 2014-07-03 15:03:15 +0000
-- Formatted Date: Jul 3rd, 2014
-- Formatted Time: 3:03 pm
-- XML: 2014-07-03T15:03:15+00:00
-- HTML: <time class='updated' datetime='2014-07-03T15:03:15+00:00'><span class='date'><span class='date-month'>Jul</span> <span class='date-day'>3</span><span class='date-suffix'>rd</span>, <span class='date-year'>2014</span></span></time>
-- Date Time HTML: <time class='updated' datetime='2014-07-03T15:03:15+00:00'><span class='date'><span class='date-month'>Jul</span> <span class='date-day'>3</span><span class='date-suffix'>rd</span>, <span class='date-year'>2014</span></span> <span class='time'>3:03 pm</span></time>
-
-
-
-
-  
-
-## Date
-- Date: 2014-07-03 14:08:00 +0000
-- Formatted Date: Jul 3rd, 2014
-- Formatted Time: 2:08 pm
-- Date XML: 2014-07-03T14:08:00+00:00
-- Date HTML: <time class='entry-date' datetime='2014-07-03T14:08:00+00:00'><span class='date'><span class='date-month'>Jul</span> <span class='date-day'>3</span><span class='date-suffix'>rd</span>, <span class='date-year'>2014</span></span></time>
-- Date Time HTML: <time class='entry-date' datetime='2014-07-03T14:08:00+00:00'><span class='date'><span class='date-month'>Jul</span> <span class='date-day'>3</span><span class='date-suffix'>rd</span>, <span class='date-year'>2014</span></span> <span class='time'>2:08 pm</span></time>
-
-
-## Updated
-- Date: 2014-07-04 16:03:05 +0000
-- Formatted Date: Jul 4th, 2014
-- Formatted Time: 4:03 pm
-- XML: 2014-07-04T16:03:05+00:00
-- HTML: <time class='updated' datetime='2014-07-04T16:03:05+00:00'><span class='date'><span class='date-month'>Jul</span> <span class='date-day'>4</span><span class='date-suffix'>th</span>, <span class='date-year'>2014</span></span></time>
-- Date Time HTML: <time class='updated' datetime='2014-07-04T16:03:05+00:00'><span class='date'><span class='date-month'>Jul</span> <span class='date-day'>4</span><span class='date-suffix'>th</span>, <span class='date-year'>2014</span></span> <span class='time'>4:03 pm</span></time>
-
-
-

data/test/_expected/page.html

@@ -1,13 +0,0 @@
-
-  
-
-## Date
-- Date: 2013-08-16 14:08:15 +0000
-- Formatted Date: Aug 16th, 2013
-- Formatted Time: 2:08 pm
-- Date XML: 2013-08-16T14:08:15+00:00
-- Date HTML: <time class='entry-date' datetime='2013-08-16T14:08:15+00:00'><span class='date'><span class='date-month'>Aug</span> <span class='date-day'>16</span><span class='date-suffix'>th</span>, <span class='date-year'>2013</span></span></time>
-- Date Time HTML: <time class='entry-date' datetime='2013-08-16T14:08:15+00:00'><span class='date'><span class='date-month'>Aug</span> <span class='date-day'>16</span><span class='date-suffix'>th</span>, <span class='date-year'>2013</span></span> <span class='time'>2:08 pm</span></time>
-
-
-

data/test/_includes/test_date.html

@@ -1,22 +0,0 @@
-{% if post %}
-  {% assign entry = post %}
-{% else %}
-  {% assign entry = page %}
-{% endif %}
-## Date
-- Date: {{ entry.date }}
-- Formatted Date: {{ entry.date_text }}
-- Formatted Time: {{ entry.time_text }}
-- Date XML: {{ entry.date_xml }}
-- Date HTML: {{ entry.date_html }}
-- Date Time HTML: {{ entry.date_time_html }}
-
-{% if entry.date_updated %}
-## Updated
-- Date: {{ entry.date_updated }}
-- Formatted Date: {{ entry.date_updated_text }}
-- Formatted Time: {{ entry.time_updated_text }}
-- XML: {{ entry.date_updated_xml }}
-- HTML: {{ entry.date_updated_html }}
-- Date Time HTML: {{ entry.date_time_updated_html }}
-{% endif %}

data/test/_posts/2013-08-16-welcome-to-jekyll.html

@@ -1,7 +0,0 @@
----
-title:  "Welcome to Jekyll!"
-date:   2014-07-03 14:08:00
-date_updated: 2014-07-03 15:03:15
----
-
-{% include test_date.html %}

data/test/_posts/2013-08-17-test.html

@@ -1,7 +0,0 @@
----
-title:  "Test"
-date:   2014-07-03 14:08:00
-updated: 2014-07-04 16:03:05
----
-
-{% include test_date.html %}

data/test/index.html

@@ -1,6 +0,0 @@
----
----
-
-{% for post in site.posts %}
-{% include test_date.html %}
-{% endfor %}

data/test/page.html

@@ -1,6 +0,0 @@
----
-title: Your New Jekyll Site
-date:   2013-08-16 14:08:15
----
-
-{% include test_date.html %}