octopress-ink 1.0.0.alpha.36 → 1.0.0.alpha.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba0cc24dea9dd480491670843df791c946c80b03
-  data.tar.gz: 1ee711e4557cbb1b1fd2189f3a6865a099bd02b1
+  metadata.gz: 1226eebcf70464a6a5f11e81f3ccb35d12c388c7
+  data.tar.gz: 63696eb04d509a4c58f151efc79367d18f43285e
 SHA512:
-  metadata.gz: 47b839782bcf26f6582d72a49ba29ef59c510f0a625aa633e71ec802246b8f3ac8f954cd3b7b035e88b3cec5aa5e5234dfb0dc703eceabbe719af184455de6c0
-  data.tar.gz: a69ece94caf2e6eb8deabc429256e36f0bd7f4c13bfe00d086f2d154e829751e45928b96e65c0f578f80bdbfae896f6d2ba9b068f7bbecbb8162e14ee7bc30ec
+  metadata.gz: a5f58e9e24ae5e56927fc74d5a5fb3201445647d84c680a615a673ac423477983977f83f5b66f696822e0905222dbef20899417a7ba106a0f8ae9beffff97071
+  data.tar.gz: 9bc459fc294e66fad9c5d9ed07d779c3e84c24c08b9566085938bf6b6a3e434fb63213096562c8e8d87b7fd366a03297eeff838e225c94dac7463fe2112ac2c0

data/.gitignore

@@ -18,3 +18,4 @@ tmp
 .DS_Store
 .sass-cache
 test/site
+.code-highlighter-cache

data/lib/octopress-ink.rb

@@ -27,8 +27,8 @@ module Octopress
       require 'octopress-ink/commands'
     end
 
-    def self.register_plugin(plugin, name, type='plugin', local=nil)
-      Plugins.register_plugin(plugin, name, type, local)
+    def self.register_plugin(plugin)
+      Plugins.register_plugin(plugin)
     end
 
     def self.version
@@ -62,7 +62,7 @@ module Octopress
         return false
       end
     end
-    
+
     # Prints a list of plugins and details
     #
     # options - a Hash of options from the Info command
@@ -156,6 +156,6 @@ Liquid::Template.register_tag('_', Octopress::Ink::Tags::LineCommentTag)
 require 'octopress-ink/plugins/ink'
 require 'octopress-ink/plugins/asset_pipeline'
 
-Octopress::Ink.register_plugin(Ink, 'ink', 'plugin')
-Octopress::Ink.register_plugin(Octopress::Ink::AssetPipelinePlugin, 'asset-pipeline', 'plugin', true)
+Octopress::Ink.register_plugin(Ink)
+Octopress::Ink.register_plugin(Octopress::Ink::AssetPipelinePlugin)
 

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

@@ -38,8 +38,11 @@ module Octopress
           return @page if @page
           @page = Page.new(Plugins.site, source_dir, page_dir, file, {'path'=>plugin.docs_base_path})
           @page.data['layout'] = 'docs'
-          @page.data['plugin'] = @plugin.slug
-          @page.data['docs_pages'] = @plugin.doc_pages
+          @page.data['plugin'] = { 
+            'name' => @plugin.name, 
+            'slug' => @plugin.slug
+          }
+          @page.data['doc_pages'] = @plugin.doc_pages
           @page
         end
 

data/lib/octopress-ink/filters.rb

@@ -1,7 +1,6 @@
 module Octopress
   module Ink
     module Filters
-      
 
       # Returns the site's config root or '/' if the config isn't set
       #
@@ -115,6 +114,8 @@ module Octopress
         input.gsub(/ /,'-').gsub(/[^\w-]/,'').downcase
       end
 
+      alias_method :sluggify, :classify
+
       # Remove empty lines
       def compact_newlines(input)
         input.gsub(/\n{2,}/, "\n").gsub(/^ +\n/,"")
@@ -125,8 +126,8 @@ module Octopress
         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, :sluggify, :join_lines, :compact_newlines, :unorphan
+      public :expand_url, :expand_urls, :full_url, :full_urls, :excerpt, :cdata_escape, :titlecase, :classify, :sluggify, :join_lines, :compact_newlines, :unorphan
     end
   end
 end

data/lib/octopress-ink/plugin.rb

@@ -3,12 +3,18 @@ require 'find'
 module Octopress
   module Ink
     class Plugin
-      attr_reader   :name, :type, :assets_path,
+
+      DEFAULT_CONFIG = {
+        type: 'plugin'
+      }
+
+      attr_reader   :name, :type, :assets_path, :local, :website, :description, :version,
                     :layouts_dir, :css_dir, :javascripts_dir, :files_dir, :includes_dir, :images_dir,
-                    :layouts, :includes, :images, :fonts, :files, :pages, :docs,
-                    :website, :description, :version, :config
+                    :layouts, :includes, :images, :fonts, :files, :pages, :docs
+
+      def initialize
+        DEFAULT_CONFIG.merge(configuration).each { |k,v| set_config(k,v) }
 
-      def initialize(slug, type)
         @layouts_dir       = 'layouts'
         @files_dir         = 'files'
         @pages_dir         = 'pages'
@@ -30,17 +36,22 @@ module Octopress
         @fonts             = []
         @files             = []
         @pages             = []
-        @type              = type
-        @slug              = slug
-        @name            ||= slug
-        @version         ||= false
-        @description     ||= false
-        @website         ||= false
+        @slug            ||= @name
+      end
+
+      def configuration; {}; end
+
+      def set_config(name,value)
+        instance_variable_set("@#{name}", value)
+        instance_eval(<<-EOS, __FILE__, __LINE__ + 1)
+          def #{name}
+            @#{name}
+          end
+        EOS
       end
 
       def register
         unless @assets_path.nil?
-          add_config
           disable_assets
           add_assets
           add_layouts
@@ -60,14 +71,14 @@ module Octopress
         css.clone.concat sass
       end
 
-      def add_config
-        @config = Assets::Config.new(self, @config_file).read
+      def config
+        @config ||= Assets::Config.new(self, @config_file).read
       end
 
       def disable_assets
         disabled = []
-        @config['disable'] ||= {}
-        @config['disable'].each do |key,val| 
+        config['disable'] ||= {}
+        config['disable'].each do |key,val| 
           next unless can_disable.include? key
           if !!val == val
             disabled << key if val
@@ -77,15 +88,15 @@ module Octopress
             disabled << File.join(key, val)
           end
         end
-        @config['disable'] = disabled
+        config['disable'] = disabled
       end
 
       def disabled?(dir, file)
-        @config['disable'].include?(dir) || @config['disable'].include?(File.join(dir, file))
+        config['disable'].include?(dir) || config['disable'].include?(File.join(dir, file))
       end
 
       def slug
-        @type == 'theme' ? @type : @slug
+        Filters.sluggify @type == 'theme' ? @type : @slug
       end
 
       def docs_base_path
@@ -103,11 +114,11 @@ module Octopress
             page_data = d.page.data
             title   = page_data['link_title'] || page_data['title']
             title ||= File.basename(d.file, '.*')
-            path = File.join(docs_base_path, d.file)
+            url = File.join(docs_base_path, d.file)
 
             {
               'title' => title,
-              'path' => path
+              'url' => url
             }
           end
         end

data/lib/octopress-ink/plugins.rb

@@ -44,7 +44,7 @@ module Octopress
 
       def self.add_files
         add_assets(%w{images pages files fonts docs})
-        plugin('asset-pipeline').register_assets
+        plugin('octopress-asset-pipeline').register_assets
         add_stylesheets
         add_javascripts
       end
@@ -59,14 +59,14 @@ module Octopress
         @site
       end
 
-      def self.register_plugin(plugin, name, type='plugin', local=nil)
-        new_plugin = plugin.new(name, type)
+      def self.register_plugin(plugin)
+        new_plugin = plugin.new
 
-        case type
+        case new_plugin.type
         when 'theme'
           @theme = new_plugin
         else
-          if local
+          if new_plugin.local
             @user_plugins << new_plugin
           else
             @plugins << new_plugin

data/lib/octopress-ink/plugins/asset_pipeline.rb

@@ -4,10 +4,16 @@
 module Octopress
   module Ink
     class AssetPipelinePlugin < Plugin
+      def configuration
+        {
+          name:        "Octopress Asset Pipeline",
+          description: "Add your CSS and JS to the asset pipeline.",
+          local:       true
+        }
+      end
 
-      def initialize(slug, type)
-        @name = "Octopress Assset Pipeline"
-        super
+      def config
+        @config ||= Ink.config
       end
 
       def register_assets
@@ -17,11 +23,11 @@ module Octopress
 
         remove_jekyll_assets @sass if @sass
 
-        if Ink.config['concat_js']
+        if config['concat_js']
           remove_jekyll_assets @javascripts if @javascripts
         end
 
-        if Ink.config['concat_css']
+        if config['concat_css']
           remove_jekyll_assets @css if @css
         end
       end
@@ -29,9 +35,9 @@ module Octopress
       def disabled?(dir, file)
         case dir
         when stylesheets_dir
-          Ink.config['disable'].include?('site_stylesheets')
+          config['disable'].include?('site_stylesheets')
         when javascripts_dir
-          Ink.config['disable'].include?('site_javascripts')
+          config['disable'].include?('site_javascripts')
         end
       end
 
@@ -61,11 +67,11 @@ module Octopress
       end
 
       def javascripts_dir
-        Ink.config['javascripts_dir']
+        config['javascripts_dir']
       end
 
       def stylesheets_dir
-        Ink.config['stylesheets_dir']
+        config['stylesheets_dir']
       end
 
       def local_stylesheets
@@ -79,7 +85,6 @@ module Octopress
       end
 
       def local_files(type, dir)
-        config = Ink.config
         source = Plugins.site.source
         
         # If they manually specify files

data/lib/octopress-ink/plugins/ink.rb

@@ -1,11 +1,13 @@
 class Ink < Octopress::Ink::Plugin
-
-  def initialize(name, type)
-    @assets_path = File.expand_path(File.join(File.dirname(__FILE__), '../../../assets'))
-    @version = Octopress::Ink::VERSION
-    @description = "Octopress Ink is a plugin framework for Jekyll"
-    @website = "http://octopress.org/ink"
-    super
+  def configuration
+    {
+      name:        "Octopress Ink",
+      slug:        "ink",
+      assets_path: File.expand_path(File.join(File.dirname(__FILE__), '../../../assets')),
+      version:     Octopress::Ink::VERSION,
+      description: "Octopress Ink is a plugin framework for Jekyll",
+      website:     "http://octopress.org/ink"
+    }
   end
 
   def docs_base_path

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.0.0.alpha.36"
+    VERSION = "1.0.0.alpha.37"
   end
 end

data/octopress-ink.gemspec

@@ -21,9 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "jekyll", "~> 1.4.3"
   spec.add_runtime_dependency "sass", "~> 3.3.0"
 
-  spec.add_development_dependency "octopress", "~> 1.0.0.alpha.8"
+  spec.add_development_dependency "octopress", "~> 3.0.0.alpha8"
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry-debugger"
 end
-

data/test/plugins/awesome-sauce/plugin.rb

@@ -1,8 +1,13 @@
+require 'octopress-ink'
+
 class TestPlugin < Octopress::Ink::Plugin
-  def initialize(name, type)
-    @assets_path = File.expand_path(File.join(File.dirname(__FILE__)))
-    @description = "Test some plugins y'all"
-    super
+  def configuration
+    {
+      name:        'Awesome Sauce',
+      slug:        'awesome-sauce',
+      assets_path: File.expand_path(File.dirname(__FILE__)),
+      description: "Test some plugins y'all"
+    }
   end
 
   def add_assets
@@ -12,5 +17,5 @@ class TestPlugin < Octopress::Ink::Plugin
   end
 end
 
-Octopress::Ink.register_plugin(TestPlugin, 'awesome-sauce')
+Octopress::Ink.register_plugin(TestPlugin)
 

data/test/plugins/test-theme/plugin.rb

@@ -1,12 +1,15 @@
 require 'octopress-ink'
 
 class TestTheme < Octopress::Ink::Plugin
-  def initialize(name, type)
-    @assets_path = File.expand_path(File.join(File.dirname(__FILE__)))
-    @description = "Test theme y'all"
-    @name = "Classic Theme"
-    super
+  def configuration
+    {
+      type:        "theme",
+      description: "Test theme y'all",
+      name:        "Classic Theme",
+      assets_path:  File.expand_path(File.dirname(__FILE__))
+    }
   end
+  
   def add_assets
     add_css_files ['theme-test.css', 'theme-test2.css']
     add_css 'theme-media-test@print.css'
@@ -15,4 +18,4 @@ class TestTheme < Octopress::Ink::Plugin
   end
 end
 
-Octopress::Ink.register_plugin(TestTheme, 'classic', 'theme')
+Octopress::Ink.register_plugin(TestTheme)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.36
+  version: 1.0.0.alpha.37
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-09 00:00:00.000000000 Z
+date: 2014-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha.8
+        version: 3.0.0.alpha8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha.8
+        version: 3.0.0.alpha8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement