octopress-ink 1.0.0.alpha.31 → 1.0.0.alpha.32

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

@@ -1,9 +1,12 @@
 module Octopress
-  module Assets
-    class Javascript < Asset
-      def tag
-        "<script src='#{Filters.expand_url(File.join(@dir, @file))}'></script>"
+  module Ink
+    module Assets
+      class Javascript < Asset
+        def tag
+          "<script src='#{Filters.expand_url(File.join(@dir, @file))}'></script>"
+        end
       end
     end
   end
 end
+

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

@@ -1,19 +1,24 @@
 module Octopress
-  module Assets
-    class Layout < Asset
+  module Ink
+    module Assets
+      class Layout < Asset
 
-      def register
-        name = "#{@plugin.namespace}:#{@file}"
-        name = name.split(".")[0..-2].join(".")
+        def register
+          file = user_path
+          dir = user_dir
+          if !exists?(file)
+            file = plugin_path 
+            dir = plugin_dir
+          end
 
-        file = user_path
-        dir = user_dir
-        if !exists?(file)
-          file = plugin_path 
-          dir = plugin_dir
+          Plugins.site.layouts[name] = Jekyll::Layout.new(Plugins.site, dir, @file)
         end
 
-        Plugins.site.layouts[name] = Jekyll::Layout.new(Plugins.site, dir, @file)
+        def name
+          name = "#{@plugin.slug}:#{@file}"
+          # remove extension
+          name = name.split(".")[0..-2].join(".")
+        end
       end
     end
   end

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

@@ -2,38 +2,40 @@
 # 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
+  module Ink
+    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
 
-      # 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

@@ -2,25 +2,27 @@
 # Use root assets for files like robots.text or favicon.ico
 
 module Octopress
-  module Assets
-    class RootAsset < Asset
+  module Ink
+    module Assets
+      class RootAsset < Asset
 
-      def initialize(plugin, type, file)
-        @root = plugin.assets_path
-        @plugin = plugin
-        @dir = ''
-        @type = type
-        @file = file
-        @exists = {}
-        file_check
-      end
+        def initialize(plugin, type, file)
+          @root = plugin.assets_path
+          @plugin = plugin
+          @dir = ''
+          @type = type
+          @file = file
+          @exists = {}
+          file_check
+        end
 
-      def copy
-        unless exists? local_plugin_path
-          Plugins.site.static_files << StaticFile.new(plugin_path, destination)
+        def copy
+          unless exists? local_plugin_path
+            Plugins.site.static_files << StaticFile.new(plugin_path, destination)
+          end
         end
-      end
 
+      end
     end
   end
 end

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

@@ -1,60 +1,62 @@
 module Octopress
-  module Assets
-    class Sass < Stylesheet
-      def initialize(plugin, type, file, media)
-        @plugin = plugin
-        @type = type
-        @file = file
-        @media = media || 'all'
-        @root = plugin.assets_path
-        @dir = File.join(plugin.namespace, type)
-        @exists = {}
-        file_check
-      end
+  module Ink
+    module Assets
+      class Sass < Stylesheet
+        def initialize(plugin, type, file, media)
+          @plugin = plugin
+          @type = type
+          @file = file
+          @media = media || 'all'
+          @root = plugin.assets_path
+          @dir = File.join(plugin.slug, type)
+          @exists = {}
+          file_check
+        end
 
-      def tag
-        "<link href='#{Filters.expand_url(File.join(@dir, @file))}' media='#{media}' rel='stylesheet' type='text/css'>"
-      end
+        def tag
+          "<link href='#{Filters.expand_url(File.join(@dir, @file))}' media='#{media}' rel='stylesheet' type='text/css'>"
+        end
 
-      # TODO: see if this is done TODO: choose user path before local path.
-      def user_load_path
-        File.join(Plugins.site.source, Plugins.custom_dir, @dir, File.dirname(@file)).sub /\/\.$/, ''
-      end
+        # TODO: see if this is done TODO: choose user path before local path.
+        def user_load_path
+          File.join(Plugins.site.source, Plugins.custom_dir, @dir, File.dirname(@file)).sub /\/\.$/, ''
+        end
 
-      def theme_load_path
-        File.expand_path(File.join(@root, @type))
-      end
+        def theme_load_path
+          File.expand_path(File.join(@root, @type))
+        end
 
-      def compile
-        unless @compiled
-          options = Plugins.sass_options
-          if @plugin.type == 'local_plugin'
-            @compiled = Plugins.compile_sass_file(path.to_s, options)
-          else
-            # If the plugin isn't a local plugin, add source paths to allow overrieds on @imports.
-            #
-            options[:load_paths] = [user_load_path, theme_load_path]
-            @compiled = Plugins.compile_sass(path.read, options)
+        def compile
+          unless @compiled
+            options = Plugins.sass_options
+            if @plugin.type == 'local_plugin'
+              @compiled = Plugins.compile_sass_file(path.to_s, options)
+            else
+              # If the plugin isn't a local plugin, add source paths to allow overrieds on @imports.
+              #
+              options[:load_paths] = [user_load_path, theme_load_path]
+              @compiled = Plugins.compile_sass(path.read, options)
+            end
           end
+          @compiled
         end
-        @compiled
-      end
 
-      def user_override_path
-        # Allow Sass overrides to use either syntax
-        if @file =~ /s[ac]ss$/
-          [File.join(user_dir, @file), File.join(user_dir, alt_syntax_file)]
-        else
-          File.join user_dir, @file
+        def user_override_path
+          # Allow Sass overrides to use either syntax
+          if @file =~ /s[ac]ss$/
+            [File.join(user_dir, @file), File.join(user_dir, alt_syntax_file)]
+          else
+            File.join user_dir, @file
+          end
         end
-      end
 
-      def destination
-        File.join(@dir, @file.sub(/s.ss/, 'css'))
-      end
+        def destination
+          File.join(@dir, @file.sub(/s.ss/, 'css'))
+        end
 
-      def copy
-        Plugins.site.static_files << StaticFileContent.new(compile, destination)
+        def copy
+          Plugins.site.static_files << StaticFileContent.new(compile, destination)
+        end
       end
     end
   end

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

@@ -1,31 +1,33 @@
 module Octopress
-  module Assets
-    class Stylesheet < Asset
-      def initialize(plugin, type, file, media)
-        @plugin = plugin
-        @file = file
-        @type = type
-        @media = media || 'all'
-        @root = plugin.assets_path
-        @dir = File.join(plugin.namespace, type)
-        @exists = {}
-        file_check
-      end
+  module Ink
+    module Assets
+      class Stylesheet < Asset
+        def initialize(plugin, type, file, media)
+          @plugin = plugin
+          @file = file
+          @type = type
+          @media = media || 'all'
+          @root = plugin.assets_path
+          @dir = File.join(plugin.slug, type)
+          @exists = {}
+          file_check
+        end
 
-      def media
-        m = @media
-        if @file =~ /@(.+?)\./
-          m = $1
+        def media
+          m = @media
+          if @file =~ /@(.+?)\./
+            m = $1
+          end
+          m
         end
-        m
-      end
 
-      def destination
-        File.join(@dir, @file.sub(/@(.+?)\./,'.'))
-      end
+        def destination
+          File.join(@dir, @file.sub(/@(.+?)\./,'.'))
+        end
 
-      def tag
-        "<link href='#{Filters.expand_url(File.join(@dir, @file))}' media='#{media}' rel='stylesheet' type='text/css'>"
+        def tag
+          "<link href='#{Filters.expand_url(File.join(@dir, @file))}' media='#{media}' rel='stylesheet' type='text/css'>"
+        end
       end
     end
   end

data/lib/octopress-ink/commands.rb

@@ -0,0 +1,23 @@
+module Octopress
+  module Ink
+    module Commands
+      require 'octopress-ink/commands/info'
+
+      class Ink < Octopress::Command
+
+        def self.init_with_program(p)
+          p.command(:ink) do |c|
+            c.syntax "octopress ink [options]"
+            c.description "Get about octopress ink plugins"
+
+            Info.process_command(c)
+
+            c.action do |args, options|
+            end
+          end
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,19 @@
+module Octopress
+  module Ink
+    module Commands
+      module CommandHelpers
+        def self.add_asset_options(c)
+          c.option "layouts", "--layouts", "List only layouts"
+          c.option "includes", "--includes", "List only includes"
+          c.option "pages", "--pages", "List only pages"
+          c.option "stylesheets", "--stylesheets", "List only stylesheets"
+          c.option "sass", "--sass", "List only Sass files"
+          c.option "javascripts", "--javascripts", "List only Javascripts"
+          c.option "images", "--images", "List only images"
+          c.option "fonts", "--fonts", "List only fonts"
+          c.option "files", "--files", "List only files"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+module Octopress
+  module Ink
+    module Commands
+      class Info
+        def self.process_command(p)
+          p.command(:info) do |c|
+            c.syntax "octopress ink info [plugin] [options]"
+            c.description "Get info about octopress ink plugins"
+            CommandHelpers.add_asset_options(c)
+
+            c.action do |args, options|
+              if args.empty?
+                Octopress::Ink.info
+              else
+                name = args.first
+                puts Octopress::Ink.plugin_info(name, options)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/octopress-ink/filters.rb

@@ -1,130 +1,133 @@
 module Octopress
-  module Filters
-    
+  module Ink
+    module Filters
+      
 
-    # Returns the site's config root or '/' if the config isn't set
-    #
-    def root
-      root_url = Plugins.site.config['root']
-      root_url.nil? ? '/' : File.join('/', root_url)
-    end
+      # Returns the site's config root or '/' if the config isn't set
+      #
+      def root
+        root_url = Plugins.site.config['root']
+        root_url.nil? ? '/' : File.join('/', root_url)
+      end
 
-    # Prepends input with a url fragment
-    #
-    # input - An absolute url, e.g. /images/awesome.gif
-    # url   - The fragment to prepend the input, e.g. /blog
-    #
-    # Returns the modified url, e.g /blog
-    #
-    def expand_url(input, url=nil)
-      url ||= root
-      if input =~ /^#{url}/
-        input
-      else
-        File.join(url, input)
+      # Prepends input with a url fragment
+      #
+      # input - An absolute url, e.g. /images/awesome.gif
+      # url   - The fragment to prepend the input, e.g. /blog
+      #
+      # Returns the modified url, e.g /blog
+      #
+      def expand_url(input, url=nil)
+        url ||= root
+        if input =~ /^#{url}/
+          input
+        else
+          File.join(url, input)
+        end
       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
+      # 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
-    # url   - The fragment to prepend absolute urls
-    #
-    # Returns input with modified urls
-    #
-    def expand_urls(input, url=nil)
-      url ||= root
-      input.gsub /(\s+(href|src)\s*=\s*["|']{1})(\/[^\"'>]*)/ do
-        $1 + expand_url($3, url)
+      # Prepend all absolute urls with a url fragment
+      #
+      # input - The content of a page or post
+      # url   - The fragment to prepend absolute urls
+      #
+      # Returns input with modified urls
+      #
+      def expand_urls(input, url=nil)
+        url ||= root
+        input.gsub /(\s+(href|src)\s*=\s*["|']{1})(\/[^\"'>]*)/ do
+          $1 + expand_url($3, url)
+        end
       end
-    end
 
-    # Prepend all urls with the full site url
-    #
-    # input - The content of a page or post
-    #
-    # Returns input with all urls expanded to include the full site url
-    # e.g. /images/awesome.gif => http://example.com/images/awesome.gif
-    #
-    def full_urls(input)
-      url = Plugins.site.config['url']
-      if url.nil?
-        raise IOError.new "Could not expand urls: Please add your published url to your _config.yml, eg url: http://example.com/"
-      else
-        expand_urls(input, url)
+      # Prepend all urls with the full site url
+      #
+      # input - The content of a page or post
+      #
+      # Returns input with all urls expanded to include the full site url
+      # e.g. /images/awesome.gif => http://example.com/images/awesome.gif
+      #
+      def full_urls(input)
+        url = Plugins.site.config['url']
+        if url.nil?
+          raise IOError.new "Could not expand urls: Please add your published url to your _config.yml, eg url: http://example.com/"
+        else
+          expand_urls(input, url)
+        end
       end
-    end
-    
-    # Prepend a url with the full site url
-    #
-    # input - a url
-    #
-    # Returns input with all urls expanded to include the full site url
-    # e.g. /images/awesome.gif => http://example.com/images/awesome.gif
-    #
-    def full_url(input)
-      url = Plugins.site.config['url']
-      if url.nil?
-        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
-        expand_url(input, url)
+      
+      # Prepend a url with the full site url
+      #
+      # input - a url
+      #
+      # Returns input with all urls expanded to include the full site url
+      # e.g. /images/awesome.gif => http://example.com/images/awesome.gif
+      #
+      def full_url(input)
+        url = Plugins.site.config['url']
+        if url.nil?
+          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
+          expand_url(input, url)
+        end
       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
+      # 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
-    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
+      # 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;')
-    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
-    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
+      end
 
-    # Formats a string for use as a css classname, removing illegal characters
-    def classify(input)
-      input.gsub(/ /,'-').gsub(/[^\w-]/,'').downcase
-    end
+      # Formats a string for use as a css classname, removing illegal characters
+      def classify(input)
+        input.gsub(/ /,'-').gsub(/[^\w-]/,'').downcase
+      end
 
-    # Remove empty lines
-    def compact_newlines(input)
-      input.gsub(/\n{2,}/, "\n").gsub(/^ +\n/,"")
-    end
+      # 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
+      # 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, :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
+      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
 end
+