octopress-ink 1.0.0.rc.5 → 1.0.0.rc.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 929a480cd5c29286e1e9d27ac281ce9f78352205
-  data.tar.gz: d946b8c7b9154c3b1c8c264ff0fadda79bcfaaf7
+  metadata.gz: 727c703ec69287f70483794f60e961fdfe54969b
+  data.tar.gz: 66e14204dcc1b8784e14d4a776817d3602f5ea3d
 SHA512:
-  metadata.gz: 412911ec07bbcd3deb32b4927d02e099e5720d3e87a2b540fa19e1fb35fb8790232d1dcee09c8c8c3b9d0fa38a38dff7b643a81abe91ada2dc53b2459bc22e16
-  data.tar.gz: 266037047141b44054ce6cb560920ce4283b41d553bc56fb8f1678ead45efa140f5becf4264f6e85be5a44eef7af4af75db91a715b0d13c1d10e1dee01c01c63
+  metadata.gz: fd1a5f496fc17d8f448ac105e99102401aaaff9b7b970a4af86aac1a17a6cd4089d3934fb79174cc8b4f7b184501803448499968a6efc9cbe53a2f54399b796d
+  data.tar.gz: dd9aad5f81d50b136982d990e46874563fa1e97d94ed34466ae6a839352d120ce64e82675485fcc519f9a347c805bf1ed8a7f0571cb0e6b4af57c409845de360

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+### 1.0.0 RC6 - 2014-06-07
+
+- Fixed: New gems gemspec scaffold does not include Ink's pre-release version numbers.
+- Fixed: Better formatting for ordinal dates.
+- Other minor bug fixes
+
 ## Current released version
 
 ### 1.0.0 RC5 - 2014-06-06

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

@@ -112,9 +112,10 @@ module Octopress
         # e.g. "spec" as in spec.name = "gem name"
         #
         def self.dependencies
-          minor_version = VERSION.scan(/\d\.\d/)[0]
+          minor_version = VERSION.scan(/\d+\.\d/)[0]
+          current_patch_version = VERSION.sub(/\.(alpha|rc).*/i, '')
           d  = "#{@settings[:spec_var]}.add_development_dependency \"octopress\"\n\n"
-          d += "#{@settings[:spec_var]}.add_runtime_dependency \"octopress-ink\", \"~> #{minor_version}\", \">= #{VERSION}\"\n"
+          d += "#{@settings[:spec_var]}.add_runtime_dependency \"octopress-ink\", \"~> #{minor_version}\", \">= #{current_patch_version}\"\n"
         end
 
         # Add Octopress Ink plugin to core module file

data/lib/octopress-ink/filters.rb

@@ -76,29 +76,6 @@ module Octopress
         end
       end
 
-      # Truncate a string at the <!--more--> marker
-      # input - The content of a post or page
-      #
-      # Returns only the content preceeding the marker
-      #
-      def excerpt(input)
-        if input.index(/<!--\s*more\s*-->/i)
-          input.split(/<!--\s*more\s*-->/i)[0]
-        else
-          input
-        end
-      end
-
-      # Checks for excerpt markers (helpful for template conditionals)
-      #
-      # input - The content of a page or post
-      #
-      # Returns true/false if the excerpt marker is found
-      #
-      def has_excerpt(input)
-        input =~ /<!--\s*more\s*-->/i ? true : false
-      end
-
       # Escapes HTML content for XML
       def cdata_escape(input)
         input.gsub(/<!\[CDATA\[/, '&lt;![CDATA[').gsub(/\]\]>/, ']]&gt;')
@@ -126,8 +103,8 @@ module Octopress
         compact_newlines(input).strip.gsub(/\s*\n\s*/, separator)
       end
 
-      module_function :root, :expand_url, :expand_urls, :full_url, :full_urls, :excerpt, :cdata_escape, :titlecase, :classify, :sluggify, :join_lines, :compact_newlines, :unorphan
-      public :expand_url, :expand_urls, :full_url, :full_urls, :excerpt, :cdata_escape, :titlecase, :classify, :sluggify, :join_lines, :compact_newlines, :unorphan
+      module_function :root, :expand_url, :expand_urls, :full_url, :full_urls, :cdata_escape, :titlecase, :classify, :sluggify, :join_lines, :compact_newlines, :unorphan
+      public :expand_url, :expand_urls, :full_url, :full_urls, :cdata_escape, :titlecase, :classify, :sluggify, :join_lines, :compact_newlines, :unorphan
     end
   end
 end

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

@@ -18,13 +18,17 @@ module Jekyll
         self.data.merge! add_post_vars(self.data)
       end
 
-      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
+      if type == :page || type == :post
+        if self.data['date'] || self.respond_to?(:date)
+          the_date = self.data['date'] || self.date
+          text      = format_date(the_date)
+          xmlschema = datetime(the_date).xmlschema
+          html      = date_html(text, xmlschema)
+
+          self.data['date_xml']  = xmlschema
+          self.data['date_html'] = html
+        end
       end
 
       if self.data['updated']
@@ -76,7 +80,7 @@ module Jekyll
     def ordinalize(date)
       date = datetime(date)
       d = "<span class='date-month'>#{date.strftime('%b')}</span> "
-      d = "<span class='date-day'>#{date.strftime('%e')}</span> "
+      d += "<span class='date-day'>#{date.strftime('%-d')}</span>"
       d += "<span class='date-suffix'>#{ordinal_suffix(date)}</span>, "
       d += "<span class='date-year'>#{date.strftime('%Y')}</span>"
     end
@@ -120,10 +124,12 @@ module Jekyll
       position = config['marker_position']
 
       if config['marker_position'] == 'before'
-        "#{marker}&nbsp;#{title}"
+        title = "#{marker}&nbsp;#{title}"
       else
-        "#{title}&nbsp;#{marker}"
+        title = "#{title}&nbsp;#{marker}"
       end
+
+      title
     end
 
     def title_text(config, title)

data/lib/octopress-ink/version.rb

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

data/lib/octopress-ink.rb

@@ -85,8 +85,10 @@ module Octopress
       if Octopress::Ink.config['docs_mode']
         payload['doc_pages'] = Octopress::Ink::Plugins.doc_pages
       end
+      
+      payload['site'] ||= {}
 
-      payload['site']['linkposts'] = site.posts.collect do |p|
+      payload['site']['linkposts'] = site.posts.select do |p|
         p.data['linkpost']
       end
 

data/test/expected/2014/02/02/test-post-2.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <title>Another Test Post</title>
+    <meta name="viewport" content="width=device-width">
+  </head>
+  <body class=" ">
+    <div class='local-override'><p>some random post
+<a href="/food">relative link</a></p>
+</div>
+
+  </body>
+</html>

data/test/expected/index.html

@@ -7,27 +7,64 @@
     <meta name="viewport" content="width=device-width">
   </head>
   <body class=" ">
-    <div class='local-override'><p>Test plugin assets and overrides:</p>
-
-<ul>
-<li>stylesheets</li>
-<li>javascripts</li>
-<li>files</li>
-<li>images</li>
-<li>fonts</li>
-<li>sass plugin</li>
-</ul>
-
-<p>Test configurations</p>
-
-<ul>
-<li>sass compression</li>
-<li>sass line numbers</li>
-<li>combine_css</li>
-<li>combine_js</li>
-</ul>
-
-<p>one <span class='separator'></b> two <span class='separator'></b> three <span class='separator'></b> four five</p>
+    <div class='local-override'>
+one <span class='separator'></b> two <span class='separator'></b> three <span class='separator'></b> four five
+
+
+  title: Another Test Post
+title text: Another Test Post
+title html: Another Test&nbsp;Post
+title url: /2014/02/02/test-post-2.html
+linkpost: false
+
+date: 2014-02-02 00:00:00 -0600
+date_xml: 2014-02-02T00:00:00-06:00
+date_html: <time class='entry-date' datetime='2014-02-02T00:00:00-06:00' pubdate><span class='date-month'>Feb</span> <span class='date-day'>2</span><span class='date-suffix'>nd</span>, <span class='date-year'>2014</span></time>
+
+content: <p>some random post
+<a href="/food">relative link</a></p>
+
+  title: Test Post
+title text: Test Post →
+title html: Test&nbsp;Post&nbsp;<span class='post-marker post-marker-after'>→</span>
+title url: http://timecube.com
+linkpost: true
+
+date: 2014-02-01 00:00:00 -0600
+date_xml: 2014-02-01T00:00:00-06:00
+date_html: <time class='entry-date' datetime='2014-02-01T00:00:00-06:00' pubdate><span class='date-month'>Feb</span> <span class='date-day'>1</span><span class='date-suffix'>st</span>, <span class='date-year'>2014</span></time>
+
+content: <p>Test post <strong>strong</strong> <em>emphasized</em> <a href="http://example.com">some link</a></p>
+
+
+
+  title: Another Test Post
+title text: Another Test Post
+title html: Another Test&nbsp;Post
+title url: /2014/02/02/test-post-2.html
+linkpost: false
+
+date: 2014-02-02 00:00:00 -0600
+date_xml: 2014-02-02T00:00:00-06:00
+date_html: <time class='entry-date' datetime='2014-02-02T00:00:00-06:00' pubdate><span class='date-month'>Feb</span> <span class='date-day'>2</span><span class='date-suffix'>nd</span>, <span class='date-year'>2014</span></time>
+
+content: <p>some random post
+<a href="/food">relative link</a></p>
+
+
+
+  title: Test Post
+title text: Test Post →
+title html: Test&nbsp;Post&nbsp;<span class='post-marker post-marker-after'>→</span>
+title url: http://timecube.com
+linkpost: true
+
+date: 2014-02-01 00:00:00 -0600
+date_xml: 2014-02-01T00:00:00-06:00
+date_html: <time class='entry-date' datetime='2014-02-01T00:00:00-06:00' pubdate><span class='date-month'>Feb</span> <span class='date-day'>1</span><span class='date-suffix'>st</span>, <span class='date-year'>2014</span></time>
+
+content: <p>Test post <strong>strong</strong> <em>emphasized</em> <a href="http://example.com">some link</a></p>
+
 </div>
 
   </body>

data/test/source/_includes/post_data.html

@@ -0,0 +1,11 @@
+title: {{ post.title }}
+title text: {{ post.title_text }}
+title html: {{ post.title_html }}
+title url: {{ post.title_url }}
+linkpost: {{ post.linkpost }}
+
+date: {{ post.date }}
+date_xml: {{ post.date_xml }}
+date_html: {{ post.date_html }}
+
+content: {{ post.content }}

data/test/source/_posts/2014-02-02-test-post-2.md

@@ -0,0 +1,7 @@
+---
+title: Another Test Post
+layout: theme:test
+---
+
+some random post
+<a href="/food">relative link</a>

data/test/source/index.html

@@ -0,0 +1,27 @@
+---
+layout: theme:test
+title: Your New Jekyll Site
+index: true
+---
+
+{% assign separator = ' <span class='separator'></b> ' %}
+{% capture foo | join_lines:separator %}
+one
+ two
+ three
+
+four five
+
+{% endcapture %}{{ foo }}
+
+{% for post in site.posts %}
+  {% include post_data.html %}
+{% endfor %}
+
+{% for post in site.articles %}
+  {% include post_data.html %}
+{% endfor %}
+
+{% for post in site.linkposts %}
+  {% include post_data.html %}
+{% endfor %}

data/test/test-plugin-expected/test-plugin.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "octopress"
   
-  spec.add_runtime_dependency "octopress-ink", "~> 1.0", ">= 1.0.0.rc.4"
+  spec.add_runtime_dependency "octopress-ink", "~> 1.0", ">= 1.0.0"
 end

data/test/test-theme-expected/test-theme.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "octopress"
   
-  spec.add_runtime_dependency "octopress-ink", "~> 1.0", ">= 1.0.0.rc.4"
+  spec.add_runtime_dependency "octopress-ink", "~> 1.0", ">= 1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.5
+  version: 1.0.0.rc.6
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-06 00:00:00.000000000 Z
+date: 2014-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -236,6 +236,7 @@ files:
 - test/copy_test/_copy/stylesheets/theme-test.css
 - test/copy_test/_copy/stylesheets/theme-test2.css
 - test/expected/2014/02/01/test-post.html
+- test/expected/2014/02/02/test-post-2.html
 - test/expected/favicon.ico
 - test/expected/favicon.png
 - test/expected/four/index.xml
@@ -306,6 +307,7 @@ files:
 - test/plugins/test-theme/stylesheets/theme-test2.css
 - test/source/.gitignore
 - test/source/_includes/foo.html
+- test/source/_includes/post_data.html
 - test/source/_layouts/head.html
 - test/source/_layouts/local.html
 - test/source/_plugins/awesome-sauce/config.yml
@@ -316,8 +318,9 @@ files:
 - test/source/_plugins/theme/stylesheets/_colors.sass
 - test/source/_plugins/theme/stylesheets/theme-test.css
 - test/source/_posts/2014-02-01-test-post.md
+- test/source/_posts/2014-02-02-test-post-2.md
 - test/source/favicon.png
-- test/source/index.md
+- test/source/index.html
 - test/source/test_config/plugin_config.html
 - test/source/test_config/theme_config.html
 - test/source/test_layouts/local.html
@@ -443,6 +446,7 @@ test_files:
 - test/copy_test/_copy/stylesheets/theme-test.css
 - test/copy_test/_copy/stylesheets/theme-test2.css
 - test/expected/2014/02/01/test-post.html
+- test/expected/2014/02/02/test-post-2.html
 - test/expected/favicon.ico
 - test/expected/favicon.png
 - test/expected/four/index.xml
@@ -513,6 +517,7 @@ test_files:
 - test/plugins/test-theme/stylesheets/theme-test2.css
 - test/source/.gitignore
 - test/source/_includes/foo.html
+- test/source/_includes/post_data.html
 - test/source/_layouts/head.html
 - test/source/_layouts/local.html
 - test/source/_plugins/awesome-sauce/config.yml
@@ -523,8 +528,9 @@ test_files:
 - test/source/_plugins/theme/stylesheets/_colors.sass
 - test/source/_plugins/theme/stylesheets/theme-test.css
 - test/source/_posts/2014-02-01-test-post.md
+- test/source/_posts/2014-02-02-test-post-2.md
 - test/source/favicon.png
-- test/source/index.md
+- test/source/index.html
 - test/source/test_config/plugin_config.html
 - test/source/test_config/theme_config.html
 - test/source/test_layouts/local.html

data/test/source/index.md

@@ -1,30 +0,0 @@
----
-layout: theme:test
-title: Your New Jekyll Site
----
-
-Test plugin assets and overrides:
-
-- stylesheets
-- javascripts
-- files
-- images
-- fonts
-- sass plugin
-
-Test configurations
-
-- sass compression
-- sass line numbers
-- combine_css
-- combine_js
-
-{% assign separator = ' <span class='separator'></b> ' %}
-{% capture foo | join_lines:separator %}
-one
- two
- three
-
-four five
-
-{% endcapture %}{{ foo }}