octopress-ink 1.0.0.rc.11 → 1.0.0.rc.13

data/lib/octopress-ink/assets/asset.rb

@@ -68,6 +68,8 @@ module Octopress
         # Copy asset to user override directory
         #
         def copy(target_dir)
+          return unless exists? plugin_path
+
           if target_dir
             target_dir = File.join(target_dir, base)
           else
@@ -83,9 +85,9 @@ module Octopress
         # compiled site directory. 
         #
         def remove_jekyll_asset
-          Ink.site.static_files.clone.each do |sf|
+          Octopress.site.static_files.clone.each do |sf|
             if sf.kind_of?(Jekyll::StaticFile) && sf.path == path.to_s
-              Ink.site.static_files.delete(sf)
+              Octopress.site.static_files.delete(sf)
             end
           end
         end
@@ -110,19 +112,15 @@ module Octopress
           content = path.read
 
           if content =~ /\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)/m
-            payload = Ink.site.site_payload
+            payload = Octopress.site.site_payload
             content = $POSTMATCH
             payload['page'] = SafeYAML.load($1)
-            render_liquid(content, payload)
+            Liquid::Template.parse(content).render!(payload)
           else
             content
           end
         end
 
-        def render_liquid(content, payload={})
-          Liquid::Template.parse(content).render!(Ink.payload(payload), {})
-        end
-
         def plugin_dir
           File.join root, base
         end
@@ -132,11 +130,11 @@ module Octopress
         end
 
         def user_dir
-          File.join Ink.site.source, Plugins.custom_dir, dir
+          File.join Octopress.site.source, Plugins.custom_dir, dir
         end
 
         def local_plugin_path
-          File.join Ink.site.source, dir, file
+          File.join Octopress.site.source, dir, file
         end
 
         def user_override_path

data/lib/octopress-ink/assets/doc_page.rb

@@ -1,6 +1,3 @@
-# These are files which need to be in added to the root of the site directory
-# Use root assets for files like robots.text or favicon.ico
-
 module Octopress
   module Ink
     module Assets
@@ -25,8 +22,8 @@ module Octopress
         # Add doc page to Jekyll pages
         #
         def add
-          if Ink.config['docs_mode']
-            Ink.site.pages << page
+          if Octopress.config['docs_mode']
+            Octopress.site.pages << page
           end
         end
 
@@ -34,7 +31,7 @@ module Octopress
 
         def page
           return @page if @page
-          @page = Page.new(Ink.site, source_dir, page_dir, file, {'path'=>plugin.docs_base_path})
+          @page = Page.new(Octopress.site, source_dir, page_dir, file, {'path'=>plugin.docs_base_path})
           @page.data['layout'] = 'docs'
           @page.data['plugin'] = { 
             'name' => @plugin.name, 

data/lib/octopress-ink/assets/file.rb

@@ -18,7 +18,7 @@ module Octopress
         end
 
         def add
-          if !exists?(local_plugin_path) && !Ink.config['docs_mode']
+          if !exists?(local_plugin_path) && !Octopress.config['docs_mode']
             Plugins.static_files << StaticFile.new(File.join(source_dir, file), destination)
           end
         end
@@ -30,7 +30,7 @@ module Octopress
         end
 
         def user_dir
-          File.join Ink.site.source, Plugins.custom_dir, plugin.slug, base
+          File.join Octopress.site.source, Plugins.custom_dir, plugin.slug, base
         end
       end
     end

data/lib/octopress-ink/assets/layout.rb

@@ -16,7 +16,7 @@ module Octopress
             dir = plugin_dir
           end
 
-          Ink.site.layouts[name] = Jekyll::Layout.new(Ink.site, dir, file)
+          Octopress.site.layouts[name] = Jekyll::Layout.new(Octopress.site, dir, file)
         end
 
         def name

data/lib/octopress-ink/assets/page.rb

@@ -21,13 +21,26 @@ module Octopress
         # Add page to Jekyll pages if no other page has a conflicting destination
         #
         def add
-          if page.url && !Ink.config['docs_mode']
-            Ink.site.pages << page unless Helpers::Path.find_page(page)
+          if page.url && !Octopress.config['docs_mode']
+            Octopress.site.pages << page unless find_page(page)
           end
         end
 
+        def find_page(page)
+          site_dir = Octopress.site.config['destination']
+          dest = page.destination(site_dir)
+
+          Octopress.site.pages.clone.each do |p|
+            return p if p.destination(site_dir) == dest
+          end
+          return false
+        end
+
         def page
-          @page ||= Page.new(Ink.site, source_dir, page_dir, file, plugin.config)
+          unless @page 
+            @page = Page.new(Octopress.site, source_dir, page_dir, file, plugin.config)
+          end
+          @page
         end
 
         def info
@@ -50,7 +63,7 @@ module Octopress
         end
 
         def user_dir
-          File.join Ink.site.source, Plugins.custom_dir, plugin.slug, base
+          File.join Octopress.site.source, Plugins.custom_dir, plugin.slug, base
         end
 
       end

data/lib/octopress-ink/assets/sass.rb

@@ -51,7 +51,7 @@ module Octopress
         end
 
         def user_load_path
-          File.join(Ink.site.source, Plugins.custom_dir, dir, File.dirname(file)).sub /\/\.$/, ''
+          File.join(Octopress.site.source, Plugins.custom_dir, dir, File.dirname(file)).sub /\/\.$/, ''
         end
 
         def theme_load_path

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

@@ -16,7 +16,7 @@ module Octopress
           c.option "images", "--images", "#{action} only images"
           c.option "fonts", "--fonts", "#{action} only fonts"
           c.option "files", "--files", "#{action} only files"
-          c.option "config", "--config <CONFIG_FILE>[,CONFIG_FILE2,...]", Array, "Custom Jekyll configuration file"
+          c.option "config", "--config", "#{action} only configuration file."
         end
       end
     end

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

@@ -8,7 +8,7 @@ module Octopress
             c.description "Get a list of installed octopress ink plugins for this site."
             c.option "all", "--all", "List all plugins and their assets."
             CommandHelpers.add_asset_options(c, 'List')
-            c.option "docs", "--docs", "List only documentation pages."
+            c.option "docs", "--docs", "List documentation pages."
 
             c.action do |args, options|
               if args.empty?

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

@@ -190,10 +190,7 @@ website:       ""
           gemfile_content = <<-HERE
 source 'https://rubygems.org'
 
-group :octopress do
-  gem 'octopress'
-  gem '#{@settings[:name]}', path: '../'
-end
+gemspec path: '../'
           HERE
 
           write(gemfile_path, gemfile_content)

data/lib/octopress-ink/configuration.rb

@@ -2,6 +2,16 @@
 require 'yaml'
 
 module Octopress
+  # Override Octopress configuration to Merge with Ink's defaults
+  #
+  class << self
+    alias_method :orig_config, :config
+
+    def config(options={})
+      Jekyll::Utils.deep_merge_hashes(Ink::Configuration::DEFAULTS, orig_config(options))
+    end
+  end
+
   module Ink
     module Configuration
       DEFAULTS = {
@@ -13,34 +23,7 @@ module Octopress
         'uglifier' => {},
         'disable' => [],
         'date_format' => 'ordinal',
-
-        'linkpost' => {
-          'marker' => "→",
-          'marker_position' => 'after'
-        },
-
-        'post' => {
-          'marker' => false,
-          'marker_position' => 'before'
-        }
       }
-
-      def self.config
-        @config ||= Jekyll::Utils.deep_merge_hashes(DEFAULTS, octopress_config)
-      end
-
-      def self.octopress_config
-        if defined? Octopress.config
-          Octopress.config
-        else
-          file = '_octopress.yml'
-          if File.exist?(file)
-            SafeYAML.load_file(file) || {}
-          else
-            {}
-          end
-        end
-      end
     end
   end
 end

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

@@ -1,163 +1,37 @@
-module Jekyll
-  module Convertible
-    alias_method :do_layout_orig, :do_layout
-    alias_method :read_yaml_orig, :read_yaml 
+module Octopress
+  module Ink
+    class SiteHook < Hooks::Site
 
-    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
-
-      do_layout_orig(payload, layouts)
-    end
-
-    def read_yaml(base, name, opts = {})
-      read_yaml_orig(base, name, opts)
-
-      if type == :post
-        self.data.merge! add_post_vars(self.data)
+      def post_read(site)
+        Octopress.site = site
+        Ink::Plugins.register
+        Ink::Plugins.add_files
       end
 
+      def merge_payload(payload, site)
+        config = Ink::Plugins.config
 
-      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)
+        new_payload = {
+          'plugins'   => config['plugins'],
+          'theme'     => config['theme'],
+          'octopress' => {
+            'version' => Ink.version
+          }
+        }
 
-          self.data['date_xml']  = xmlschema
-          self.data['date_html'] = html
+        if Octopress.config['docs_mode']
+          new_payload['doc_pages'] = Ink::Plugins.doc_pages
         end
-      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
+        new_payload
       end
-    end
-
-    def add_post_vars(data)
-      linkpost = data['external-url']
-
-      if linkpost
-        config = Octopress::Ink.config['linkpost']
-      else
-        config = Octopress::Ink.config['post']
-      end
-
-      if extract_excerpt.to_s.strip != content.strip
-        excerpted = true
-      end
-
-      if Octopress::Ink.config['titlecase']
-        Octopress::Utils.titlecase!(data['title'])
-      end
-
-      {
-        'title_text' => title_text(config, data['title']),
-        'title_html' => title_html(config, data['title']),
-        'title_url'  => linkpost || self.url,
-        'linkpost'   => !linkpost.nil?,
-        'excerpted'  => excerpted
-      }
-    end
-
-    def date_html(text, xmlschema)
-      "<time class='entry-date' datetime='#{ xmlschema }' pubdate>#{ text }</time>"
-    end
-
-    def format_date(date)
-      format = Octopress::Ink.config['date_format']
-      date = datetime(date)
-      if format == 'ordinal'
-        ordinalize(date)
-      else
-        date.strftime(format)
-      end
-    end
 
-    # Returns an ordidinal date eg July 22 2007 -> July 22nd 2007
-    def ordinalize(date)
-      date = datetime(date)
-      d = "<span class='date-month'>#{date.strftime('%b')}</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
-
-    # Returns an ordinal number. 13 -> 13th, 21 -> 21st etc.
-    def ordinal_suffix(date)
-      number = date.strftime('%e').to_i
-      if (11..13).include?(number % 100)
-        "th"
-      else
-        case number % 10
-        when 1; "st"
-        when 2; "nd"
-        when 3; "rd"
-        else    "th"
+      def post_write(site)
+        Octopress::Ink::Plugins.static_files.each do |f| 
+          f.write(site.config['destination'])
         end
       end
     end
-
-    def datetime(input)
-      case input
-      when Time
-        input
-      when String
-        Time.parse(input) rescue Time.at(input.to_i)
-      when Numeric
-        Time.at(input)
-      else
-        raise "Invalid Date:", "'#{input}' is not a valid datetime."
-        exit(1)
-      end
-    end
-    
-
-    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']
-
-      if config['marker_position'] == 'before'
-        title = "#{marker}&nbsp;#{title}"
-      else
-        title = "#{title}&nbsp;#{marker}"
-      end
-
-      title
-    end
-
-    def title_text(config, title)
-      return title if !config['marker']
-      position = config['marker_position']
-
-      if config['marker_position'] == 'before'
-        "#{config['marker']} #{title}"
-      else
-        "#{title} #{config['marker']}"
-      end
-    end
-  end
-
-  class Site
-    alias_method :write_orig, :write
-    # Called after write
-     
-    def write
-      write_orig
-      Octopress::Ink::Plugins.static_files.each do |f| 
-        f.write(config['destination'])
-      end
-    end
   end
 end
+

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

@@ -1,6 +1,7 @@
 module Octopress
   module Ink
     class Page < Jekyll::Page
+      include Jekyll::Convertible
 
       # Purpose: Configs can override a page's permalink
       #
@@ -12,6 +13,11 @@ module Octopress
       def initialize(site, base, dir, name, config={})
         @config = config
         super(site, base, dir, name)
+        post_init if respond_to?(:post_init)
+      end
+
+      def hooks
+        self.site.page_hooks
       end
 
       def destination(dest)
@@ -24,6 +30,12 @@ module Octopress
         @dest
       end
 
+      def relative_asset_path
+        site_source = Pathname.new Octopress.site.source
+        page_source = Pathname.new @base
+        page_source.relative_path_from(site_source).to_s
+      end
+
       # Allow pages to read url from plugin configuration
       #
       def url