jekyll-org 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81176c9af379cd4168e9d39591a2dad4c66e6566
-  data.tar.gz: 48ee5ee0fa261107f567547ade26eae997303c30
+  metadata.gz: 9ca8bf2b1561648245687da19cec5ea812b400d3
+  data.tar.gz: 97432c814b9e297e35489cd04ecb122a3242cf12
 SHA512:
-  metadata.gz: 4df1948974bddab87868a89de7e82c58eb47c041c7f81536324819028fecadedafe82659386675a9ee38b7be5ee32dfa5c9e5cbb4a94dda4dd4f770059d2c443
-  data.tar.gz: d58bd3f1c44d69da11a6bd3f469353a8f87b4123289a935fd81f3134037ab171b62539c4f0dc2e6325eb4f6313bdf6d1af316d36837992a61756c3063769aab3
+  metadata.gz: debccea10bbe9a9bf2ffaaddf7297e80746149c14f818b5db3a22f2499ada538dfb265993c98fae8676de59fe79e46091b4095613d6f8857717dd957224ecf5c
+  data.tar.gz: 54b22764c592b1a60a75dde326183907d6135877c89eb0f0613938b96a73232fd59445701c128f07a378469a387e081cc62d6f467e6921791b33a7ef09f5e2ea

data/.travis.yml

@@ -0,0 +1,30 @@
+sudo: false
+language: ruby
+cache: bundler
+rvm:
+- 2.3.1
+matrix:
+  include:
+    - # GitHub Pages
+      rvm: 2.3.1
+      env: JEKYLL_VERSION=3.3.0
+env:
+  matrix:
+    - JEKYLL_VERSION=3.3
+branches:
+  only:
+    - master
+install:
+- travis_retry script/bootstrap
+script: script/cibuild
+notifications:
+  irc:
+    on_success: change
+    on_failure: change
+    channels:
+    - irc.freenode.org#jekyll
+    template:
+    - '%{repository}#%{build_number} %{message} %{build_url}'
+  email:
+    on_success: never
+    on_failure: change

data/Gemfile

@@ -3,7 +3,9 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 gem 'org-ruby' , '>= 0.9.12'
-gem 'jekyll', '>= 3.0.0'
+gem 'jekyll', '>= 3.5.0'
+gem 'json', github: 'flori/json', branch: 'v1.8'
+
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/README.org

@@ -2,7 +2,8 @@
 
 ** Overview
 
-   This plugin adds [[http://orgmode.org/][Org mode]] support to [[http://jekyllrb.com][Jekyll]] and lets you write posts and pages in Org.
+This plugin adds [[http://orgmode.org/][Org mode]] support to [[http://jekyllrb.com][Jekyll]] and lets you write posts
+and pages in Org.
 
 ** Requirements
 
@@ -11,56 +12,70 @@
 
 ** Installation
 *** Short version
-For experienced Jekyll users, you need to do 2 things to get ~jekyll-org~ to work
-- Install the gem
+
+For experienced Jekyll users, you need to do 2 things to get
+~jekyll-org~ to work :
+
 - Include the gem in your ~_config.yml~
+- Include the gem in Gemfile
 
 *** Long version
-To  use ~jekyll-org~ with Jekyll, you need to have Ruby RubyGems and Jekyll installed. See  how to do that [[http://jekyllrb.com/docs/installation/][here]].
+
+To use ~jekyll-org~ with Jekyll, you need to have Ruby RubyGems and
+Jekyll installed.  See how to do that [[http://jekyllrb.com/docs/installation/][here]].
 
 Create a new Jekyll project ~my-site~ run:
+
 #+begin_src sh
 jekyll new my-site
 #+end_src
 
-Create a Gemfile in the root of the project, and add at least the following lines:
+Create a Gemfile in the root of the project, and add at least the
+following lines:
+
 #+begin_src ruby
 source 'https://rubygems.org'
 
 gem 'jekyll' , '>= 3.0.0'
-gem 'jekyll-org', '>= '1.0.0'
+gem 'jekyll-org', '>= 1.0.2'
 #+end_src
 
 Install the gems with bundler:
+
 #+begin_src sh
 bundle install
 #+end_src
 
-
 To use the new converter add the following line to your ~_config.yml~:
-#+begin_src ruby
-gems: [jekyll-org]
+
+#+begin_src yml
+pulugins: 
+  - jekyll-org
 #+end_src
+
 ** Usage
 
-   Create a new file with =.org= extension in =_posts=, and write the post with Org. That is all! Generate your Jekyll site as you usually do.
+Create a new file with =.org= extension in =_posts=, and write the post
+with Org. That is all! Generate your Jekyll site as you usually do.
 
 ** Front matter
 
-   Instead of YAML the front matter is configured in the usual Org way, with no lines:
+Instead of YAML the front matter is configured in the usual Org way,
+with no lines:
 
-   #+BEGIN_EXAMPLE
-   #+TITLE: Jekyll and Org together
-   #+LAYOUT: posts
-   #+TAGS: jekyll org-mode
+#+BEGIN_EXAMPLE
+#+TITLE: Jekyll and Org together
+#+LAYOUT: posts
+#+TAGS: jekyll org-mode
 
-   This is a blog post about Jekyll and Org mode.
-   #+END_EXAMPLE
+This is a blog post about Jekyll and Org mode.
+#+END_EXAMPLE
 
 ** Liquid templating
 
-By default the all content is exported to raw HTML with org-ruby, but you can add =#+liquid: whatevervalue==
-in the header.  Then you can use [[http://docs.shopify.com/themes/liquid-documentation/basics][Liquid]] tags.
+By default the all content is exported to raw HTML with org-ruby, but
+you can add =#+liquid: whatevervalue== in the header.  Then you can use
+[[http://docs.shopify.com/themes/liquid-documentation/basics][Liquid]] tags.
 
 For example, if your Org file contains
 
@@ -86,30 +101,30 @@ then you will get output like
 
 ** Source code highlighting
 
-   Add a source code block as you would in Org, for example Ruby:
+Add a source code block as you would in Org, for example Ruby:
 
-  #+BEGIN_EXAMPLE
-  #+BEGIN_SRC
-   require 'rubygems'
-   require 'org-ruby'
-   data = IO.read(filename)
-   puts Orgmode::Parser.new(data).to_html
-  #+END_SRC
-  #+END_EXAMPLE
+#+BEGIN_EXAMPLE
+#+BEGIN_SRC
+ require 'rubygems'
+ require 'org-ruby'
+ data = IO.read(filename)
+ puts Orgmode::Parser.new(data).to_html
+#+END_SRC
+#+END_EXAMPLE
 
-  Then the output will have code highlighting:
+Then the output will have code highlighting:
 
-  #+BEGIN_SRC ruby
-   require 'rubygems'
-   require 'org-ruby'
-   data = IO.read(filename)
-   puts Orgmode::Parser.new(data).to_html
-  #+END_SRC
+#+BEGIN_SRC ruby
+ require 'rubygems'
+ require 'org-ruby'
+ data = IO.read(filename)
+ puts Orgmode::Parser.new(data).to_html
+#+END_SRC
 
 ** Author
 
-   eggcaker <eggcaker@gmail.com>
+eggcaker <eggcaker@gmail.com>
 
 ** License
 
-   MIT
+MIT

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/jekyll-org.gemspec

@@ -2,23 +2,24 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: jekyll-org 1.0.1 ruby lib
+# stub: jekyll-org 1.0.2 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "jekyll-org"
-  s.version = "1.0.1"
+  s.name = "jekyll-org".freeze
+  s.version = "1.0.2"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["eggcaker"]
-  s.date = "2016-10-11"
-  s.description = "So you want org-mode support for Jekyll. Write your _posts in org-mode, then add 'gems: [jekyll-org]' to your _config.yml. Thats it!"
-  s.email = "eggcaker@gmail.com"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["eggcaker".freeze]
+  s.date = "2018-01-12"
+  s.description = "So you want org-mode support for Jekyll. Write your _posts in org-mode, then add 'gems: [jekyll-org]' to your _config.yml. Thats it!".freeze
+  s.email = "eggcaker@gmail.com".freeze
   s.extra_rdoc_files = [
     "LICENSE",
     "README.org"
   ]
   s.files = [
+    ".travis.yml",
     "Gemfile",
     "LICENSE",
     "README.org",
@@ -33,42 +34,45 @@ Gem::Specification.new do |s|
     "spec/helper.rb",
     "spec/test_jekyll-org.rb"
   ]
-  s.homepage = "http://eggcaker.github.io/jekyll-org"
-  s.licenses = ["MIT"]
-  s.rubygems_version = "2.5.1"
-  s.summary = "Jekyll converter for org-mode files"
+  s.homepage = "http://eggcaker.github.io/jekyll-org".freeze
+  s.licenses = ["MIT".freeze]
+  s.rubygems_version = "2.6.14".freeze
+  s.summary = "Jekyll converter for org-mode files".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<org-ruby>, [">= 0.9.12"])
-      s.add_runtime_dependency(%q<jekyll>, [">= 3.0.0"])
-      s.add_development_dependency(%q<shoulda>, [">= 3.5.0"])
-      s.add_development_dependency(%q<rspec>, [">= 3.5.0"])
-      s.add_development_dependency(%q<rdoc>, [">= 3.12"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0"])
-      s.add_development_dependency(%q<jeweler>, [">= 2.1.1"])
-      s.add_development_dependency(%q<simplecov>, [">= 0.12.0"])
+      s.add_runtime_dependency(%q<org-ruby>.freeze, [">= 0.9.12"])
+      s.add_runtime_dependency(%q<jekyll>.freeze, [">= 3.5.0"])
+      s.add_runtime_dependency(%q<json>.freeze, [">= 0"])
+      s.add_development_dependency(%q<shoulda>.freeze, [">= 3.5.0"])
+      s.add_development_dependency(%q<rspec>.freeze, [">= 3.5.0"])
+      s.add_development_dependency(%q<rdoc>.freeze, [">= 3.12"])
+      s.add_development_dependency(%q<bundler>.freeze, [">= 1.0"])
+      s.add_development_dependency(%q<jeweler>.freeze, [">= 2.1.1"])
+      s.add_development_dependency(%q<simplecov>.freeze, [">= 0.12.0"])
     else
-      s.add_dependency(%q<org-ruby>, [">= 0.9.12"])
-      s.add_dependency(%q<jekyll>, [">= 3.0.0"])
-      s.add_dependency(%q<shoulda>, [">= 3.5.0"])
-      s.add_dependency(%q<rspec>, [">= 3.5.0"])
-      s.add_dependency(%q<rdoc>, [">= 3.12"])
-      s.add_dependency(%q<bundler>, [">= 1.0"])
-      s.add_dependency(%q<jeweler>, [">= 2.1.1"])
-      s.add_dependency(%q<simplecov>, [">= 0.12.0"])
+      s.add_dependency(%q<org-ruby>.freeze, [">= 0.9.12"])
+      s.add_dependency(%q<jekyll>.freeze, [">= 3.5.0"])
+      s.add_dependency(%q<json>.freeze, [">= 0"])
+      s.add_dependency(%q<shoulda>.freeze, [">= 3.5.0"])
+      s.add_dependency(%q<rspec>.freeze, [">= 3.5.0"])
+      s.add_dependency(%q<rdoc>.freeze, [">= 3.12"])
+      s.add_dependency(%q<bundler>.freeze, [">= 1.0"])
+      s.add_dependency(%q<jeweler>.freeze, [">= 2.1.1"])
+      s.add_dependency(%q<simplecov>.freeze, [">= 0.12.0"])
     end
   else
-    s.add_dependency(%q<org-ruby>, [">= 0.9.12"])
-    s.add_dependency(%q<jekyll>, [">= 3.0.0"])
-    s.add_dependency(%q<shoulda>, [">= 3.5.0"])
-    s.add_dependency(%q<rspec>, [">= 3.5.0"])
-    s.add_dependency(%q<rdoc>, [">= 3.12"])
-    s.add_dependency(%q<bundler>, [">= 1.0"])
-    s.add_dependency(%q<jeweler>, [">= 2.1.1"])
-    s.add_dependency(%q<simplecov>, [">= 0.12.0"])
+    s.add_dependency(%q<org-ruby>.freeze, [">= 0.9.12"])
+    s.add_dependency(%q<jekyll>.freeze, [">= 3.5.0"])
+    s.add_dependency(%q<json>.freeze, [">= 0"])
+    s.add_dependency(%q<shoulda>.freeze, [">= 3.5.0"])
+    s.add_dependency(%q<rspec>.freeze, [">= 3.5.0"])
+    s.add_dependency(%q<rdoc>.freeze, [">= 3.12"])
+    s.add_dependency(%q<bundler>.freeze, [">= 1.0"])
+    s.add_dependency(%q<jeweler>.freeze, [">= 2.1.1"])
+    s.add_dependency(%q<simplecov>.freeze, [">= 0.12.0"])
   end
 end
 

data/lib/jekyll-org.rb

@@ -34,6 +34,9 @@ module Jekyll
   # This overrides having to use YAML in the posts.
   # Instead use settings from Org mode.
   class Document
+    DATELESS_FILENAME_MATCHER = %r!^(?:.+/)*(.*)(\.[^.]+)$!
+    DATE_FILENAME_MATCHER = %r!^(?:.+/)*(\d{4}-\d{2}-\d{2})-(.*)(\.[^.]+)$!
+
     alias :_orig_read :read
     def read(opts = {})
       unless relative_path.end_with?(".org")
@@ -58,24 +61,35 @@ module Jekyll
 
         self.data[buffer_setting] = value
       end
+      # set default slug
+      # copy and edit frmo jekyll:lib/jekyll/document.rb -- populate_title
+      if relative_path =~ DATE_FILENAME_MATCHER
+        date, slug, ext = Regexp.last_match.captures
+        modify_date(date)
+      elsif relative_path =~ DATELESS_FILENAME_MATCHER
+        slug, ext = Regexp.last_match.captures
+      end
+      self.data["title"] ||= Utils.titleize_slug(slug)
+      self.data["slug"]  ||= slug
+      self.data["ext"]   ||= ext
 
       # Disable Liquid tags from the output by default or enabled with liquid_enabled tag
-
       if liquid_enabled
         self.content = org_text.to_html
         self.content = self.content.gsub("‘","'")
         self.content = self.content.gsub("’", "'")
       else
-        self.content = <<ORG
-{% raw %}
-#{org_text.to_html}
-{% endraw %}
-ORG
+        self.content = [
+          '{% raw %}',
+          org_text.to_html,
+          '{% endraw %}'
+        ].join(" ")
+      end
+      begin
+        self.data
+        rescue => e
+          puts "Error converting file #{relative_path}: #{e.message} #{e.backtrace}"
       end
-
-      post_read
-    rescue => e
-      puts "Error converting file #{relative_path}: #{e.message} #{e.backtrace}"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-org
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - eggcaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2018-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: org-ruby
@@ -30,14 +30,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.5.0
+- !ruby/object:Gem::Dependency
+  name: json
+  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: 3.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +145,7 @@ extra_rdoc_files:
 - LICENSE
 - README.org
 files:
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.org
@@ -164,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Jekyll converter for org-mode files