octopress-ink 1.0.0.rc.22 → 1.0.0.rc.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 647bcbdbcf354195f3990d5a63ad12b63b52b9cd
-  data.tar.gz: 86d6463658166fc12f5ef709144d0b247911a5d2
+  metadata.gz: 4d9c983309c30c9bdbb11e3aad0c741c3e5e208b
+  data.tar.gz: 6a32fe0f8b9f79e99c87837cf86dedcccab8966a
 SHA512:
-  metadata.gz: 7280f35abb690a97429b47c58a4b62fad146b2cd8a2de8a8903003cf7fcf424c433e6f26f0f9f05ee64f692ade152d6be887f28b22d891105d80152923baba09
-  data.tar.gz: d12f8f562636a17c2ee61c52bbd74b870a2d2f0c43595bedc941a67aee624a8c0c2161f47f89c070705bbcb7a71de03cc7eccc26be2503dac18d76dcedec23ba
+  metadata.gz: c18ebf8a676ed40773ff4f45f0a54499e6786ea1e42bd394b9809f9ebc3b495e7ddecfba660273326c437b3964b09bbc177634b9c66ecae22fa75ba0ad654850
+  data.tar.gz: 003132b76e43c9530ce99c785692675e6d0d50c33faa02da55a3959ae682cdfb225e926d262cd5edfe793f1b968f872b85653c069c0db74299d0e952633901bf

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.0.0 RC23 - 2015-01-02
+
+- Reworked integration with Octopress Docs
+
 ### 1.0.0 RC22 - 2015-01-01
 
 - Moved Asset pipeline configuration under `asset_pipline` key in _config.yml 

data/lib/octopress-ink.rb

@@ -5,7 +5,6 @@ require 'digest/md5'
 require 'octopress'
 require 'octopress-hooks'
 require 'octopress-filters'
-require 'octopress-docs'
 
 require 'octopress-ink/version'
 require 'octopress-ink/configuration'
@@ -30,6 +29,8 @@ module Octopress
       require 'octopress-ink/commands'
     end
 
+    @load_plugin_assets = true
+
     def self.version
       version = "Jekyll v#{Jekyll::VERSION}, "
       if defined? Octopress::VERSION
@@ -51,6 +52,14 @@ module Octopress
       ink_payload
     end
 
+    def self.enabled?
+      @load_plugin_assets
+    end
+
+    def self.load_plugin_assets=(setting)
+      @load_plguin_assets = setting
+    end
+
     # Register a new plugin
     # 
     # plugin - A subclass of Plugin
@@ -217,5 +226,4 @@ Octopress::Docs.add({
   slug:        "ink",
   path:        File.expand_path(File.join(File.dirname(__FILE__), "../")),
   source_url:  "https://github.com/octopress/ink",
-  base_url:    "docs/ink"
 })

data/lib/octopress-ink/plugin.rb

@@ -10,7 +10,7 @@ module Octopress
 
       attr_reader   :name, :type, :path, :assets_path, :local, :website, :description, :version, :source_url, :website,
                     :layouts_dir, :stylesheets_dir, :javascripts_dir, :files_dir, :includes_dir, :images_dir,
-                    :layouts, :includes, :images, :fonts, :files, :pages, :docs, :docs_url
+                    :layouts, :includes, :images, :fonts, :files, :pages, :docs
 
       def initialize(options)
         options = Jekyll::Utils.symbolize_hash_keys(options || configuration)
@@ -39,7 +39,6 @@ module Octopress
         @pages             = []
         @slug            ||= @name
         @assets_path     ||= File.join(@path, 'assets')
-        @docs_url        ||= docs_url
       end
 
       def register
@@ -49,9 +48,11 @@ module Octopress
           add_assets
           add_images
 
-          if ENV['OCTOPRESS_DOCS']
+          if Octopress::Docs.enabled?
             add_docs
-          else
+          end
+
+          if Octopress::Ink.enabled?
             add_includes
             add_layouts
             add_javascripts
@@ -69,18 +70,6 @@ module Octopress
         Filters.sluggify @type == 'theme' ? 'theme' : @slug
       end
 
-      # Path where doc pages will be hosted
-      #
-      # - returns: String, eg: docs/plugins/plugin-slug
-      #
-      def docs_url
-        if @type == 'theme'
-          File.join('docs', 'theme')
-        else
-          File.join('docs', 'plugins', slug)
-        end
-      end
-
       # List info about plugin's assets
       #
       # returs: String filled with asset info

data/lib/octopress-ink/version.rb

@@ -1,5 +1,5 @@
 module Octopress
   module Ink
-    VERSION = "1.0.0.rc.22"
+    VERSION = "1.0.0.rc.23"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.22
+  version: 1.0.0.rc.23
 platform: ruby
 authors:
 - Brandon Mathis
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0.rc
-- !ruby/object:Gem::Dependency
-  name: octopress-docs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement