octopress-ink 1.0.0.rc.1 → 1.0.0.rc.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7aaa5bcf89c2f4ee26fe475db4657f9abadf369
-  data.tar.gz: 500a1709b5f6561e18231ea43ac3a69c0c671f59
+  metadata.gz: 95b695c1790cd0bba8f1cc1fc0c0d53d30fdaaca
+  data.tar.gz: 24f76e2a0450a822bc59194e6e88b4fa363b3e4b
 SHA512:
-  metadata.gz: e71e8686034c36d30d288e8be98cdcee95eee9b762ac946a1dbb5679627216ddcf8626a3f6ff175fcb5df78dc120318c2e3dd02c6f0d285d7a8920e18cf92933
-  data.tar.gz: b4135e91764ec41e747e8b514ea22dfa92408045ee35c2c5bc5df8c12f4fbaaa93471707a499628f8443318fccd47670abaf0c76827a43c6828803352cfdbd02
+  metadata.gz: b9e478581c5b16475d982fdf4c219b75970b670fc3a4eb1975978006b2f672f1dc977b6131ef95bc33cecfbe65276ffd17bb98598a7a1983a281a24060fb9036
+  data.tar.gz: 08c3aa98a5078ae00aff10a85ed008515506379be8f409f14ae29022f1736d04ea80babc90f8a989170b95c08c977d7354d7d9b59a4a4ac75efbf9d2317740b1

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+# Changelog
+
+## Current released version
+### 1.0.0 RC2 - 2014-05-26
+
+- Fixed: Post and Page data is appended to at read time.
+
+## Past versions
+
+### 1.0.0 RC1 - 2014-05-25
+
+- Initial release candidate

data/lib/octopress-ink/commands/new.rb

@@ -98,8 +98,11 @@ module Octopress
           end
           create_empty_dirs dirs
 
-          # Add empty configuration file
-          FileUtils.touch File.join(@settings[:path], 'assets', 'config.yml')
+          # Add Jekyll configuration file
+          #
+          config = "exclude:\n  - Gemfile*\ngems:\n  - #{@settings[:name]}"
+          path = File.join(@settings[:path], 'assets', 'config.yml')
+          write(path, config)
         end
 
         # New plugin uses a simple configuration hash

data/lib/octopress-ink/jekyll/hooks.rb

@@ -1,27 +1,44 @@
 module Jekyll
   module Convertible
     alias_method :do_layout_orig, :do_layout
+    alias_method :read_yaml_orig, :read_yaml 
 
     def do_layout(payload, layouts)
       # The contentblock tags needs access to the converter to process it while rendering.
       payload = Octopress::Ink.payload(payload)
       payload['converter'] = self.converter
 
-      if page = payload['page']
-        if type == :post
-          payload['page'] = add_post_vars(page)
-        end
+      do_layout_orig(payload, layouts)
+    end
 
-        if page['date']
-          payload['page']['date_html'] = date_html(page['date'])
-        end
+    def read_yaml(base, name, opts = {})
+      read_yaml_orig(base, name, opts)
+
+      if type == :post
+        self.data.merge! add_post_vars(self.data)
       end
 
-      do_layout_orig(payload, layouts)
+      if self.data['date']
+        text      = format_date(self.data['date'])
+        xmlschema = datetime(self.data['date']).xmlschema
+        html      = date_html(text, xmlschema)
+
+        self.data['date_xml']  = xmlschema
+        self.data['date_html'] = html
+      end
+
+      if self.data['updated']
+        text      = format_date(self.data['updated'])
+        xmlschema = datetime(self.data['updated']).xmlschema
+        html      = date_html(text, xmlschema)
+
+        self.data['updated_date_xml']  = xmlschema
+        self.data['updated_date_html'] = html
+      end
     end
 
-    def add_post_vars(page)
-      linkpost = page['external-url']
+    def add_post_vars(data)
+      linkpost = data['external-url']
 
       if linkpost
         config = Octopress::Ink.config['linkpost']
@@ -30,19 +47,19 @@ module Jekyll
       end
 
       if Octopress::Ink.config['titlecase']
-        Octopress::Utils.titlecase!(page['title'])
+        Octopress::Utils.titlecase!(data['title'])
       end
 
-      page.merge({
-        'title_text' => title_text(config, page['title']),
-        'title_html' => title_html(config, page['title']),
-        'title_url'  => linkpost || page['url'],
+      {
+        'title_text' => title_text(config, data['title']),
+        'title_html' => title_html(config, data['title']),
+        'title_url'  => linkpost || self.url,
         'linkpost'   => !linkpost.nil?
-      })
+      }
     end
 
-    def date_html(date)
-      "<time class='entry-date' datetime='#{ datetime(date).xmlschema }' pubdate>#{ format_date(date) }</time>"
+    def date_html(text, xmlschema)
+      "<time class='entry-date' datetime='#{ xmlschema }' pubdate>#{ text }</time>"
     end
 
     def format_date(date)
@@ -95,17 +112,17 @@ module Jekyll
     
 
     def title_html(config, title)
+      title = Octopress::Ink::Filters.unorphan(title)
+
       return title if !config['marker']
 
       marker = "<span class='post-marker post-marker-#{config['marker_position']}'>#{config['marker']}</span>"
       position = config['marker_position']
 
-      title = Octopress::Ink::Filters.unorphan(title)
-
       if config['marker_position'] == 'before'
-        "#{marker} #{title}"
+        "#{marker}&nbsp;#{title}"
       else
-        "#{title} #{marker}"
+        "#{title}&nbsp;#{marker}"
       end
     end
 

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.0.0.rc.1"
+    VERSION = "1.0.0.rc.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.1
+  version: 1.0.0.rc.2
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll