majek 0.1.2 → 0.1.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjgwM2QwZTU3OGQyNjFhNmYwMzgxOWY1NDc0YzZkOWEyNjQyYjllMw==
+  data.tar.gz: !binary |-
+    OWEzZDI3NmVhM2NkZGNkMWZjMmYxYmQ3YzdmYzgyNmRiZGY5ODk4OA==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ODBlZmJjNWE2NGE2ODg2NzBlNDQ2MGZhZDdkZmQ1YzMwM2EyNzlhYmQyOTE0
+    MDgyMGVjNTY4YzIzNmQ3YjhlNjM5NDgyMzEzODU2MDFjNDI1NmYyOTlmZGRl
+    ZGNmZGIzODk0OWM4YThkZDlhNzY2NDJkMjZiNzg2Mjk4N2IyYzA=
+  data.tar.gz: !binary |-
+    MWY0N2E5ODhjNTc1MTgxMjA0MmE2YTJmNTZmMGVhNjVhYzc1NjVhYTc5ODE5
+    YmI0OTBhM2RlMTdmODkxYThlOGExMTJhMDE0ZjVlMDhkYzFkZjU3Zjk3NzBh
+    ZjAxZDY1MDg5YjdkNmMyOWRmMzcyNWU1ZmQ3OWI5NmQwYWU1YzU=

data/.travis.yml

@@ -0,0 +1,14 @@
+language: ruby
+
+rvm:
+  - 1.8.7
+  - 1.9.3
+  - 2.0.0
+
+install: bundle install
+
+script: bundle exec rake build
+
+branches:
+  only:
+    - master

data/CHANGELOG.md

@@ -0,0 +1,27 @@
+v0.1.3 (Mar 11 2013)
+--------------------
+
+* Only set post layout and post title in YAML front matter.
+* Use post title *New Post* if none can be found.
+* Read Markdown from standard input if file is absent.
+* Add Travis config (no tests yet).
+* Add this CHANGELOG file.
+* Update to md_inc v0.2.9.
+* Update README.
+
+v0.1.2 (Feb 14 2013)
+--------------------
+
+* Big README update.
+
+v0.1.1 (Feb 13 2013)
+--------------------
+
+* Add gemspec; source it in Gemfile.
+* Add Rakefile.
+* Add .gitignore.
+
+v0.1.0 (Feb 13 2013)
+--------------------
+
+* First tagged version.

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org/'
 
 gemspec

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    majek (0.1.2)
-      md_inc
+    majek (0.1.3)
+      md_inc (>= 0.2.9)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    md_inc (0.2.7)
+    md_inc (0.2.9)
     rake (10.0.3)
 
 PLATFORMS

data/README.md

@@ -1,15 +1,15 @@
 Majek
 =====
 
-Majek is a preprocessor for Jekyll/Octopress blog posts that helps you to
-concentrate on writing. It allows you to include other files from your Markdown
-(thanks to [md_inc]) and produce posts in Jekyll format.
+Majek is a preprocessor for Jekyll blog posts that helps you to concentrate on
+writing. It allows you to include other files from your Markdown (thanks to
+[md_inc]) and produce posts in Jekyll format.
 
 Majek is especially helpful when you're writing Markdown with a tool like
 [iA Writer] that is more about prose and less about code. Instead of including
 bulky code snippets directly in your Markdown file, you simply insert short
-commands like `.inc 'foo.txt'` or `.codeblock 'bar.rb'`, which will then be
-expanded by Majek.
+commands like `.inc 'foo.txt'` or `.highlight 'bar.rb', 'ruby'`, which will then
+be expanded by Majek.
 
 
 Installation
@@ -30,20 +30,37 @@ Alternatively, you can install the gem from source:
 Usage
 -----
 
-    usage: majek <markdown file>
+    usage: majek [<markdown file>]
 
-Simply pass Majek a Markdown file and it will do the following:
+Simply pass Majek a Markdown file and it will do the following (if the file is
+absent, Majek reads from the standard input):
 
 - read the contents of the Markdown file
 - process the text with md_inc which provides commands to include other text
-  files (`.inc`) and code (`.code_inc`) and more
-- process the text using custom md_inc commands for Octopress, see below
-- add a Jekyll header with title, date, categories, etc. (will be configurable
-  in the future)
+  files, code snippets, and much more (see Commands)
+- add Jekyll's YAML front matter with post layout and post title (will be
+  configurable in the future)
 - output the final text to screen
 
-In addition to the default commands of md_inc, Majek provides the following
-Octopress-specific commands:
+
+Commands
+--------
+
+Majek provides all commands that come with md_inc as well as some additional
+commands for Jekyll and Octopress:
+
+### md_inc
+
+- `.inc path`
+- `.code_inc path [,language]`
+
+Read the documentation of [md_inc] to learn more.
+
+### Jekyll
+
+- `.highlight path, language`
+
+### Octopress
 
 - `.blockquote path [,attributes...]`
 - `.codeblock path [,attributes...]`
@@ -55,8 +72,6 @@ Octopress-specific commands:
 - `.render_partial [attributes...]`
 - `.video [attributes...]`
 
-Make sure to also read the documentation of [md_inc] to learn more.
-
 
 Examples
 --------
@@ -78,9 +93,6 @@ $ majek one_month_of_coderwall_protips.md
 ---
 layout: post
 title: "One Month of Coderwall Protips"
-date: 2013-02-14 11:01:09 +0100
-comments: true
-categories:
 ---
 
 On 1 January 2013, I signed up on [Coderwall](https://coderwall.com/) -- a place

data/lib/majek.rb

@@ -1,5 +1,7 @@
 require 'md_inc'
-
+require 'md_inc/jekyll_commands'
 require 'md_inc/octopress_commands'
+
 require 'majek/application'
+require 'majek/jekyll_page'
 require 'majek/version'

data/lib/majek/application.rb

@@ -3,24 +3,28 @@ module Majek
     MATCH_TITLE = %r{^# (.+)$}
 
     def initialize(argv)
-      @filename = argv.first
-      @base_dir = File.dirname(File.expand_path(@filename))
+      if argv.empty?
+        @markdown = STDIN.read
+        @base_dir = nil
+      else
+        filename = argv.first
+        @markdown = File.read(filename)
+        @base_dir = File.dirname(File.expand_path(filename))
+      end
     end
 
     def run
-      markdown = File.read(@filename)
-      title = markdown.match(MATCH_TITLE)[1]
-      jekyll_body = markdown.gsub(MATCH_TITLE, '')
-      jekyll_header = %Q(---
-layout: post
-title: "#{title}"
-date: #{Time.now}
-comments: true
-categories:
----)
-      MdInc::Commands::root(@base_dir)
+      match = @markdown.match(MATCH_TITLE)
+      title = match ? match[1] : 'New Post'
+      content = @markdown.sub(MATCH_TITLE, '').sub(/\n*/, '')
+
       tp = MdInc::TextProcessor.new
-      puts tp.process(jekyll_header + jekyll_body)
+      tp.root(@base_dir) unless @base_dir.nil?
+      content = tp.process(content)
+
+      # TODO make variables configurable
+      page = JekyllPage.new content, :layout => 'post', :title => "\"#{title}\""
+      puts page.render
     end
   end
 end

data/lib/majek/jekyll_page.rb

@@ -0,0 +1,20 @@
+module Majek
+  class JekyllPage
+    def initialize(content, vars=nil)
+      @content = content
+      @vars = vars || Hash.new
+    end
+
+    def content
+      @content
+    end
+
+    def front_matter
+      ['---', @vars.map { |k, v| "#{k}: #{v}" }, '---'].join("\n")
+    end
+
+    def render
+      [front_matter, '',  content].join("\n")
+    end
+  end
+end

data/lib/majek/version.rb

@@ -1,3 +1,3 @@
 module Majek
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/md_inc/jekyll_commands.rb

@@ -0,0 +1,35 @@
+# Add Jekyll commands to MdInc.
+module MdInc
+  module Commands
+    class << self
+      def jekyll_tag(name, attrs=[], lines=[])
+        output = []
+        output << "{% #{([name] + attrs).join(" ")} %}"
+        unless lines.empty?
+          output += lines
+          output << "{% end#{name} %}"
+        end
+        output
+      end
+
+      # Public: Jekyll command to include code that should be highlighted from
+      # a file.
+      #
+      # path     - Path to the file to be included.
+      # language - Language identifier
+      #
+      # Examples
+      #
+      #   .highlight 'snippets/stub-spec.rb', 'ruby'
+      #   # =>
+      #   # {% highlight ruby %}
+      #   # contents of snippets/stub-spec.rb
+      #   # {% endhighlight %}
+      #
+      # Returns the Jekyll tag as a String Array.
+      def highlight(path, language)
+        jekyll_tag(:highlight, [language], inc(path))
+      end
+    end
+  end
+end

data/lib/md_inc/octopress_commands.rb

@@ -2,16 +2,6 @@
 module MdInc
   module Commands
     class << self
-      def octo_tag(name, attrs=[], lines=[])
-        output = []
-        output << "{% #{([name] + attrs).join(" ")} %}"
-        unless lines.empty?
-          output += lines
-          output << "{% end#{name} %}"
-        end
-        output
-      end
-
       # Public: Octopress command to include other files.
       #
       # path  - Path to the file to be included.
@@ -19,15 +9,15 @@ module MdInc
       #
       # Examples
       #
-      #   .codeblock 'snippets/stub-spec.rb', 'ruby'
+      #   .codeblock 'snippets/stub-spec.rb', 'lang:ruby'
       #   # =>
-      #   # {% codeblock ruby %}
+      #   # {% codeblock lang:ruby %}
       #   # contents of snippets/stub-spec.rb
       #   # {% endcodeblock %}
       #
       # Returns the Octopress tag as a String Array.
       %w(blockquote codeblock pullquote).each do |meth|
-        define_method(meth) { |path, *attrs| octo_tag(meth, attrs, inc(path)) }
+        define_method(meth) { |path, *attrs| jekyll_tag(meth, attrs, inc(path)) }
       end
 
       # Public: Octopress command that doesn't include anything; only added for
@@ -45,7 +35,7 @@ module MdInc
       #
       # Returns the Octopress tag as a String Array.
       %w(gist img include_code jsfiddle render_partial video).each do |meth|
-        define_method(meth) { |*attrs| octo_tag(meth, attrs) }
+        define_method(meth) { |*attrs| jekyll_tag(meth, attrs) }
       end
     end
   end

data/majek.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/majek/version', __FILE__)
 Gem::Specification.new do |s|
   s.authors       = ['Mathias Lafeldt']
   s.email         = ['mathias.lafeldt@gmail.com']
-  s.description   = %q{A preprocessor for Jekyll/Octopress blog posts that helps you to concentrate on writing}
+  s.description   = %q{A preprocessor for Jekyll blog posts that helps you to concentrate on writing}
   s.summary       = s.description
   s.homepage      = 'http://mlafeldt.github.com/majek'
   s.license       = 'MIT'
@@ -16,6 +16,6 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.version       = Majek::VERSION
 
-  s.add_dependency 'md_inc'
+  s.add_dependency 'md_inc', '>= 0.2.9'
   s.add_development_dependency 'rake'
 end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: majek
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.1.3
 platform: ruby
 authors:
 - Mathias Lafeldt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: md_inc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.9
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,13 +34,12 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: A preprocessor for Jekyll/Octopress blog posts that helps you to concentrate
-  on writing
+description: A preprocessor for Jekyll blog posts that helps you to concentrate on
+  writing
 email:
 - mathias.lafeldt@gmail.com
 executables:
@@ -53,6 +48,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -61,39 +58,33 @@ files:
 - bin/majek
 - lib/majek.rb
 - lib/majek/application.rb
+- lib/majek/jekyll_page.rb
 - lib/majek/version.rb
+- lib/md_inc/jekyll_commands.rb
 - lib/md_inc/octopress_commands.rb
 - majek.gemspec
 homepage: http://mlafeldt.github.com/majek
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 204157305799219663
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 204157305799219663
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
-summary: A preprocessor for Jekyll/Octopress blog posts that helps you to concentrate
-  on writing
+specification_version: 4
+summary: A preprocessor for Jekyll blog posts that helps you to concentrate on writing
 test_files: []