octopress-date-format 2.0.2 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a22b97f31315075505298367d931ac711bf1a07
-  data.tar.gz: f441b78ea1c9356ab066809229bf48bf1a14f392
+  metadata.gz: 1c8eb3200076ffb34ddff36208941349740217f2
+  data.tar.gz: 157b3d14982e791756faf5dc7c95a03fbc64e7fc
 SHA512:
-  metadata.gz: 26752820cf9f7623e3da7a690be9586ab21a9d14a50032f26033abee39a521f8af477d37cb512d2377980096eeb36f23a15bed7df3d5a34b3b52e4693de6f4ec
-  data.tar.gz: 7766f7abc45ea443b205fe4566b0d97bb41e67c5c5856c06404c23654307d44674fb694b9d17dd52858f01f0449c711779d64e7c9e4256d2823730b6305d1e7c
+  metadata.gz: 454cc19b7a1287eae597e658d00e008736de7c4f11f015fb8e524c7ecb39c22841c0f27895b8df705910af8ee78eddee5302bd8bbdc7d58492d2b3e4ce6cd4de
+  data.tar.gz: f3a1cfa6e2530188068916218de682917e12d5e9086983a43794a51857c0ebc0a1fb4ed2da05ba30c4f647f2e4f8d2b4769ba0105964aa96c6d7694c060f2358

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 3.0.0 - 2014-10-09
+
+- Now only reads from Jekyll's configuration.
+
 ### 2.0.2 - 2014-10-09
 
 - Also reads from Jekyll's configuration for broader compatibility.

data/README.md

@@ -68,8 +68,8 @@ Of course you can use Liquid conditionals when outputting an updated date.
 
 ## Configuration
 
-You may change the formatting of the dates and times in the
-`_octopress.yml` configuration file. Here are the defaults:
+You may change the formatting of the dates and times in
+Jekyll's configuration file. Here are the defaults:
 
 ```
 date_format: 'ordinal'     # July 3rd, 2014

data/lib/octopress-date-format.rb

@@ -1,9 +1,21 @@
 require 'octopress-hooks'
-require 'octopress-date-format/configuration'
 require 'octopress-date-format/version'
 
 module Octopress
   module PageDate
+    DEFAULTS = {
+      'date_format' => 'ordinal',
+      'time_format' => '%-I:%M %P'
+    }
+
+    def self.config
+      @config
+    end
+
+    def self.config=(config)
+      @config = DEFAULTS.merge(config)
+    end
+
     class PageHook < Hooks::Page
       def post_init(page)
         PageDate.hack_date(page)
@@ -18,7 +30,7 @@ module Octopress
 
     class SiteHook < Hooks::Site
       def pre_read(site)
-        PageDate::Configuration.jekyll_config = site.config
+        PageDate.config = site.config
       end
     end
 

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-date-format
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octopress-hooks
@@ -91,7 +91,6 @@ files:
 - LICENSE.txt
 - README.md
 - lib/octopress-date-format.rb
-- lib/octopress-date-format/configuration.rb
 - lib/octopress-date-format/version.rb
 homepage: https://github.com/octopress/date-format
 licenses:

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

@@ -1,44 +0,0 @@
-module Octopress
-  unless defined? Octopress.config
-    def self.config
-      file = '_octopress.yml'
-      if File.exist?(file)
-        SafeYAML.load_file(file) || {}
-      else
-        {}
-      end
-    end
-  end
-
-  module PageDate
-    module Configuration
-      @jekyll_config = {}
-
-      DEFAULTS = {
-        'date_format' => 'ordinal',
-        '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 ||= 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
-