octopress-ink 1.0.0.alpha.29 → 1.0.0.alpha.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b32b9130d0f7aa2c02fd31e843550e1f3fe76fe
-  data.tar.gz: 46be5b6827a83af4a481ab318f425a2cf406f477
+  metadata.gz: 271a68e3d38cef8481d93b84fb05cfc8583b6f03
+  data.tar.gz: ee98fbb5431c7abb1a18101712e7fb3988e083cf
 SHA512:
-  metadata.gz: 2a6ac361f9f02a354888431144e604cf36c6c1067066a2dd3526722ce0f228a3a77b96e894c6254c8ca32f99cd7d224e29fd60b863dc416a286fef466527ef4e
-  data.tar.gz: cd09c65826a81d14f74f9549511869ccfb23057211cc860e2c929e30538d2800729e5cf0706271f0c5522f9e1318f6e7e8fec9e4caf6784f607e0a5e3fcadc1b
+  metadata.gz: 2eb15b26133b814a97d397438596d1502dd6f32cbafb83bf3334177089e226b135f3328a49d81803c0c230187bb149e815ee06299d617b5104609bad5dd6774c
+  data.tar.gz: 441a8f7ad7927a86c2a1518cbed724344231ec006ca4bd4baf01de421bb41f3c6e84a053342c61934427d026d6deebec462552fb19ee93a451e009d84ced3351

data/lib/octopress-ink.rb

@@ -9,13 +9,12 @@ require 'octopress-ink/version'
 require 'octopress-ink/helpers/titlecase'
 
 module Octopress
-  CUSTOM_DIR = "_custom"
-
   autoload :Helpers,              'octopress-ink/helpers'
   autoload :Filters,              'octopress-ink/filters'
   autoload :Assets,               'octopress-ink/assets'
-  autoload :StaticFile,           'octopress-ink/assets/static_file'
-  autoload :StaticFileContent,    'octopress-ink/assets/static_file_content'
+  autoload :Page,                 'octopress-ink/jekyll/page'
+  autoload :StaticFile,           'octopress-ink/jekyll/static_file'
+  autoload :StaticFileContent,    'octopress-ink/jekyll/static_file_content'
   autoload :Plugins,              'octopress-ink/plugins'
   autoload :Plugin,               'octopress-ink/plugin'
   autoload :Tags,                 'octopress-ink/tags'
@@ -24,6 +23,15 @@ module Octopress
   def self.register_plugin(plugin, name, type='plugin')
     Plugins.register_plugin(plugin, name, type)
   end
+
+  def self.version
+    version = "Jekyll v#{Jekyll::VERSION}, "
+    if defined? Octopress::VERSION
+      version << "Octopress v#{Octopress::VERSION} "
+    end
+    version << "Octopress Ink v#{Octopress::Ink::VERSION}"
+  end
+
 end
 
 Liquid::Template.register_filter Octopress::Filters
@@ -32,12 +40,14 @@ Liquid::Template.register_tag('include', Octopress::Tags::IncludeTag)
 Liquid::Template.register_tag('assign', Octopress::Tags::AssignTag)
 Liquid::Template.register_tag('capture', Octopress::Tags::CaptureTag)
 Liquid::Template.register_tag('return', Octopress::Tags::ReturnTag)
+Liquid::Template.register_tag('filter', Octopress::Tags::FilterTag)
 Liquid::Template.register_tag('render', Octopress::Tags::RenderTag)
 Liquid::Template.register_tag('octopress_js', Octopress::Tags::JavascriptTag)
 Liquid::Template.register_tag('octopress_css', Octopress::Tags::StylesheetTag)
 Liquid::Template.register_tag('content_for', Octopress::Tags::ContentForTag)
 Liquid::Template.register_tag('yield', Octopress::Tags::YieldTag)
 Liquid::Template.register_tag('wrap', Octopress::Tags::WrapTag)
+Liquid::Template.register_tag('abort', Octopress::Tags::AbortTag)
 Liquid::Template.register_tag('_', Octopress::Tags::LineCommentTag)
 
 Octopress.register_plugin(Octopress::StylesheetsPlugin, 'user stylesheets', 'local_plugin')

data/lib/octopress-ink/assets.rb

@@ -3,6 +3,7 @@ module Octopress
     autoload :Asset,                'octopress-ink/assets/asset'
     autoload :Config,               'octopress-ink/assets/config'
     autoload :RootAsset,            'octopress-ink/assets/root'
+    autoload :PageAsset,            'octopress-ink/assets/page'
     autoload :Javascript,           'octopress-ink/assets/javascript'
     autoload :Stylesheet,           'octopress-ink/assets/stylesheet'
     autoload :Sass,                 'octopress-ink/assets/sass'

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

@@ -0,0 +1,40 @@
+# 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 Assets
+    class PageAsset < Asset
+
+      def initialize(plugin, type, file)
+        @root = plugin.assets_path
+        @plugin = plugin
+        @type = type
+        @dir  = File.dirname(file)
+        @file = File.basename(file)
+        @exists = {}
+        file_check
+      end
+
+      def page_dir
+        @dir == '.' ? '' : @dir
+      end
+
+      def plugin_path
+        File.join(plugin_dir, @dir, @file)
+      end
+
+      def page
+        @page ||= Page.new(Plugins.site, plugin_dir, page_dir, @file, @plugin.config)
+      end
+
+      # Add page to Jekyll pages if no other page has a conflicting destination
+      #
+      def copy
+        return unless page.url
+        Plugins.site.pages << @page unless Helpers::Path.find_page(@page)
+      end
+
+    end
+  end
+end
+

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

@@ -1,7 +1,6 @@
 # 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 Assets
     class RootAsset < Asset
@@ -11,8 +10,8 @@ module Octopress
         @plugin = plugin
         @dir = ''
         @type = type
-        @exists = {}
         @file = file
+        @exists = {}
         file_check
       end
 

data/lib/octopress-ink/filters.rb

@@ -25,6 +25,11 @@ module Octopress
       end
     end
 
+    # Prevent orphans in text by inserting a non-breaking space between the two last words of a string.
+    def unorphan(input)
+      input.sub(/\s+(\S+)\s*$/, ' \1')
+    end
+
     # Prepend all absolute urls with a url fragment
     #
     # input - The content of a page or post
@@ -49,9 +54,9 @@ module Octopress
     def full_urls(input)
       url = Plugins.site.config['url']
       if url.nil?
-        expand_urls(input)
+        raise IOError.new "Could not expand urls: Please add your published url to your _config.yml, eg url: http://example.com/"
       else
-        File.join url, expand_urls(input)
+        expand_urls(input, url)
       end
     end
     
@@ -65,9 +70,9 @@ module Octopress
     def full_url(input)
       url = Plugins.site.config['url']
       if url.nil?
-        expand_url(input)
+        raise IOError.new "Could not expand url in #{input}: Please add your site's published url to your _config.yml, eg url: http://example.com/"
       else
-        File.join url, expand_url(input)
+        expand_url(input, url)
       end
     end
 
@@ -94,6 +99,11 @@ module Octopress
       input =~ /<!--\s*more\s*-->/i ? true : false
     end
 
+    # Escapes HTML content for XML
+    def cdata_escape(input)
+      input.gsub(/<!\[CDATA\[/, '&lt;![CDATA[').gsub(/\]\]>/, ']]&gt;')
+    end
+
     # Returns a title cased string based on John Gruber's title case http://daringfireball.net/2008/08/title_case_update
     def titlecase(input)
       input.titlecase
@@ -104,12 +114,17 @@ module Octopress
       input.gsub(/ /,'-').gsub(/[^\w-]/,'').downcase
     end
 
-    # Replaces newlines with space characters
-    def join_space(input)
-      input.gsub(/^\s+/,'').gsub(/\s+/, ' ')
+    # Remove empty lines
+    def compact_newlines(input)
+      input.gsub(/\n{2,}/, "\n").gsub(/^ +\n/,"")
+    end
+
+    # Join newlines 
+    def join_lines(input, separator='')
+      compact_newlines(input).strip.gsub(/\s*\n\s*/, separator)
     end
 
-    module_function :root, :expand_url, :expand_urls, :full_url, :full_urls, :excerpt, :titlecase, :classify
-    public :expand_url, :expand_urls, :full_url, :full_urls, :excerpt, :titlecase, :classify
+    module_function :root, :expand_url, :expand_urls, :full_url, :full_urls, :excerpt, :cdata_escape, :titlecase, :classify, :join_lines, :compact_newlines, :unorphan
+    public :expand_url, :expand_urls, :full_url, :full_urls, :excerpt, :cdata_escape, :titlecase, :classify, :join_lines, :compact_newlines, :unorphan
   end
 end

data/lib/octopress-ink/generators/plugin_assets.rb

@@ -1,7 +1,7 @@
 module Octopress
   class PluginAssets < Jekyll::Generator
     def generate(site)
-      Plugins.config(site)
+      Plugins.site = site
       Plugins.register_layouts
       Plugins.add_static_files
       site = Plugins.site

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

@@ -36,7 +36,30 @@ module Octopress
           File.join root, file
         end
       end
-      
+
+      def self.site_dir
+        File.expand_path(Plugins.site.config['destination'])
+      end
+
+      def self.page_destination(page)
+        page.destination(site_dir)
+      end
+
+      def self.find_page(page)
+        find_page_by_dest find_page_by_dest(page)
+      end
+
+      def self.find_page_by_dest(dest)
+        Plugins.site.pages.clone.each do |p|
+          return p if page_destination(p) == dest
+        end
+      end
+
+      def self.remove_page(dest)
+        Plugins.site.pages.reject! do |p|
+          page_destination(p) == dest
+        end
+      end
     end
   end
 end

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

@@ -2,7 +2,7 @@ module Octopress
   module Helpers
     module Var
       TERNARY = /(.*?)\(\s*(.+?)\s+\?\s+(.+?)\s+:\s+(.+?)\s*\)(.+)?/
-      HAS_FILTERS = /(.+?)(\s+\|\s+.+)/
+      HAS_FILTERS = /(.*?)(\s+\|\s+.+)/
 
       def self.set_var(var, operator, value, context)
         case operator

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

@@ -4,13 +4,12 @@ module Jekyll
 
     def do_layout(payload, layouts)
       # The contentblock tags needs access to the converter to process it while rendering.
-      config = Octopress::Plugins.config(payload['site'])
+      config = Octopress::Plugins.config
       payload['plugins']   = config['plugins']
       payload['theme']     = config['theme']
       payload['converter'] = self.converter
-      self.site.config['octopress'] = {}
-      self.site.config['octopress']['theme'] = config['theme']
-      self.site.config['octopress']['plugins'] = config['plugins']
+      payload['octopress'] = {}
+      payload['octopress']['version'] = Octopress.version
       do_layout_orig(payload, layouts)
     end
   end

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

@@ -0,0 +1,31 @@
+module Octopress
+  class Page < Jekyll::Page
+
+    # Override the destination for a page
+    #
+    # url - Path relative to destination directory.
+    #       examples: 
+    #         - '/' for the _site/index.html page
+    #         - '/archive/' for the _site/archive/index.html page
+    #
+    def initialize(site, base, dir, name, config)
+      @plugin_config = config
+      super(site, base, dir, name)
+    end
+
+
+    # Allow pages to read url from plugin configuration
+    #
+    def url
+      @url ||= if path_config = self.data['url_config']
+        begin
+          config = @plugin_config
+          path_config.split('.').each { |key| config = config[key] }
+          config
+        rescue; end
+      else
+        super
+      end
+    end
+  end
+end

data/lib/octopress-ink/plugin.rb

@@ -7,11 +7,13 @@ module Octopress
     def initialize(name, type)
       @layouts_dir       = 'layouts'
       @files_dir         = 'files'
+      @pages_dir         = 'pages'
       @fonts_dir         = 'fonts'
       @images_dir        = 'images'
       @includes_dir      = 'includes'
       @javascripts_dir   = 'javascripts'
       @stylesheets_dir   = 'stylesheets'
+      @plugins_dir       = 'plugins'
       @config_file       = 'config.yml'
       @name              = name
       @type              = type
@@ -20,22 +22,22 @@ module Octopress
       @stylesheets       = []
       @javascripts       = []
       @images            = []
-      @root_files        = []
       @sass              = []
       @fonts             = []
       @files             = []
+      @pages             = []
       add_assets
       add_layouts
+      add_pages
       add_includes
       add_config
+      require_plugins
     end
 
-    def add_assets
-      
-    end
+    def add_assets; end
 
     def add_config
-      @configs = Assets::Config.new(self, @config_file)
+      @config_file = Assets::Config.new(self, @config_file)
     end
 
     def namespace
@@ -58,6 +60,32 @@ module Octopress
       @javascripts << Assets::Javascript.new(self, @javascripts_dir, file)
     end
 
+    def add_pages
+      if @assets_path
+        base = File.join(@assets_path, @pages_dir)
+        entries = []
+        if Dir.exists?(base)
+          Dir.chdir(base) { entries = Dir['**/*.*'] }
+          entries.each do |file|
+            @files << Assets::PageAsset.new(self, @pages_dir, file)
+          end
+        end
+      end
+    end
+
+    def require_plugins
+      if @assets_path
+        base = File.join(@assets_path, @plugins_dir)
+        entries = []
+        if Dir.exists?(base)
+          Dir.chdir(base) { entries = Dir['**/*.rb'] }
+          entries.each do |file|
+            require File.join base, file
+          end
+        end
+      end
+    end
+
     def add_layouts
       if @assets_path
         base = File.join(@assets_path, @layouts_dir)
@@ -155,9 +183,8 @@ module Octopress
       @includes.file file
     end
 
-    def configs
-      @config ||= @configs.read
-      @config
+    def config
+      @config ||= @config_file.read
     end
   end
 end

data/lib/octopress-ink/plugins.rb

@@ -25,23 +25,26 @@ module Octopress
       [@theme].concat(@plugins).concat(@local_plugins).compact
     end
 
+    def self.site=(site)
+      @site = site
+    end
+
     def self.site
       @site
     end
 
-    def self.config(site=nil)
-      @site ||= site
+    def self.config
       if @config
         @config
       else
         @config            = {}
         @config['plugins'] = {}
-        @config['theme']   = @theme.nil? ? {} : @theme.configs
+        @config['theme']   = @theme.nil? ? {} : @theme.config
 
 
         plugins.each do |p| 
           unless p == @theme
-            @config['plugins'][p.name] = p.configs
+            @config['plugins'][p.name] = p.config
           end
         end
 
@@ -74,12 +77,7 @@ module Octopress
     end
 
     def self.custom_dir
-      config = @site.config
-      if config['octopress'] and config['octopress']['custom']
-        config['octopress']['custom']
-      else
-        CUSTOM_DIR
-      end
+      @site.config['plugins']
     end
 
     def self.fingerprint(paths)

data/lib/octopress-ink/tags.rb

@@ -3,6 +3,7 @@ module Octopress
     autoload :IncludeTag,           'octopress-ink/tags/include'
     autoload :AssignTag,            'octopress-ink/tags/assign'
     autoload :ReturnTag,            'octopress-ink/tags/return'
+    autoload :FilterTag,            'octopress-ink/tags/filter'
     autoload :RenderTag,            'octopress-ink/tags/render'
     autoload :CaptureTag,           'octopress-ink/tags/capture'
     autoload :JavascriptTag,        'octopress-ink/tags/javascript'
@@ -10,6 +11,7 @@ module Octopress
     autoload :ContentForTag,        'octopress-ink/tags/content_for'
     autoload :YieldTag,             'octopress-ink/tags/yield'
     autoload :WrapTag,              'octopress-ink/tags/wrap'
+    autoload :AbortTag,             'octopress-ink/tags/abort'
     autoload :LineCommentTag,       'octopress-ink/tags/line_comment'
   end
 end