octopress-asset-pipeline 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fb1495d68766f134895a4514df1881e8132540f
-  data.tar.gz: 987fcf763524fddab67048970d9130a0e6db4ff3
+  metadata.gz: 60bc0ddd9493e3bda8bddd969d03ee41fa923af1
+  data.tar.gz: e602239f9f1cae6b17a20a8c4474b4cb7ed6fa1a
 SHA512:
-  metadata.gz: e84e14427e76c8f18849650e639af612d98a828871411e807dca21e67e7aa9fdb0f2dbfa577915a980778865ec7a587db83017500996adc03f13ca9d6f61f784
-  data.tar.gz: 13325ce37ebf786e541ad460aa580598d4f548ec6f2333ad2dedac898f5cd185e31d12f199d745f17e85ff793f596d1798a8cbda3e823f521319b9a56c3af526
+  metadata.gz: 81b371370acabfbe5d5c62d681d70f16a12b3038c441a032907ddcdcd8c7233cf64a9f4fea95756a84bfbe72ca50efcc074cda5a87355f20d071805b6ae51b8c
+  data.tar.gz: 5e29a2f9e986c3be0200204aa0695cd3049ba43665cd5f0a1bdbd5e10011fbbe1698a8768f5a0ec0cb644bed7a75ad0f93d4db226de2a41bee286c38787579c0

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.1.1 - 2015-01-02
+
+- Added support for reading documentation through Octopress docs
+
 ### 1.1.0 - 2015-01-01
 
 - Now reads configuration from _config.yml under `asset_pipeline`.

data/lib/octopress-asset-pipeline/assets/coffeescript.rb

@@ -1,18 +1,16 @@
 module Octopress
-  module Ink
-    module LocalAssets
-      class Coffeescript < LocalAssets::Javascript
-        def compile
-          ::CoffeeScript.compile(file.content)
-        end
+  module AssetPipeline
+    class Coffeescript < Javascript
+      def compile
+        ::CoffeeScript.compile(file.content)
+      end
 
-        def path
-          Pathname.new File.join(Octopress.site.source, file.path)
-        end
+      def path
+        Pathname.new File.join(Octopress.site.source, file.path)
+      end
 
-        def destination
-          File.join(base, filename.sub(/\.coffee/,'.js'))
-        end
+      def destination
+        File.join(base, filename.sub(/\.coffee/,'.js'))
       end
     end
   end

data/lib/octopress-asset-pipeline/assets/css.rb

@@ -1,18 +1,16 @@
 module Octopress
-  module Ink
-    module LocalAssets
-      class Css < LocalAssets::Asset
-        def media
-          path.to_s.scan(/@(.+?)\./).flatten[0] || 'all'
-        end
+  module AssetPipeline
+    class Css < Asset
+      def media
+        path.to_s.scan(/@(.+?)\./).flatten[0] || 'all'
+      end
 
-        def destination
-          File.join(base, filename.sub(/@(.+?)\./,'.'))
-        end
+      def destination
+        File.join(base, filename.sub(/@(.+?)\./,'.'))
+      end
 
-        def tag
-          "<link href='#{Filters.expand_url(destination)}' media='#{media}' rel='stylesheet' type='text/css'>"
-        end
+      def tag
+        "<link href='#{Filters.expand_url(destination)}' media='#{media}' rel='stylesheet' type='text/css'>"
       end
     end
   end

data/lib/octopress-asset-pipeline/assets/javascript.rb

@@ -1,10 +1,8 @@
 module Octopress
-  module Ink
-    module LocalAssets
-      class Javascript < LocalAssets::Asset
-        def tag
-          "<script src='#{Filters.expand_url(destination)}'></script>"
-        end
+  module AssetPipeline
+    class Javascript < Asset
+      def tag
+        "<script src='#{Filters.expand_url(destination)}'></script>"
       end
     end
   end

data/lib/octopress-asset-pipeline/assets/local.rb

@@ -1,38 +1,36 @@
 module Octopress
-  module Ink
-    module LocalAssets
-      class Asset < Ink::Assets::Asset
-        def initialize(plugin, file)
-          @plugin = plugin
-          @file = file
-        end
-
-        def info
-          message = filename.ljust(35)
-          message += "from: #{base}"
-          "  - #{message}"
-        end
+  module AssetPipeline
+    class Asset < Ink::Assets::Asset
+      def initialize(plugin, file)
+        @plugin = plugin
+        @file = file
+      end
 
-        def filename
-          File.basename(path)
-        end
+      def info
+        message = filename.ljust(35)
+        message += "from: #{base}"
+        "  - #{message}"
+      end
 
-        def base
-          file.relative_path.sub(filename,'').sub(/^\/(.+)\/$/,'\1')
-        end
+      def filename
+        File.basename(path)
+      end
 
-        def destination
-          File.join(base, filename)
-        end
+      def base
+        file.relative_path.sub(filename,'').sub(/^\/(.+)\/$/,'\1')
+      end
 
-        def path
-          Pathname.new file.path
-        end
+      def destination
+        File.join(base, filename)
+      end
 
-        # Copy is unncessary with local assets
-        #
-        def copy(target_dir); end
+      def path
+        Pathname.new file.path
       end
+
+      # Copy is unncessary with local assets
+      #
+      def copy(target_dir); end
     end
   end
 end

data/lib/octopress-asset-pipeline/assets/sass.rb

@@ -1,30 +1,28 @@
 module Octopress
-  module Ink
-    module LocalAssets
-      class Sass < LocalAssets::Css
-        def ext
-          file.ext
-        end
+  module AssetPipeline
+    class Sass < Css
+      def ext
+        file.ext
+      end
 
-        def path
-          Pathname.new File.join(Octopress.site.source, file.path)
-        end
+      def path
+        Pathname.new File.join(Octopress.site.source, file.path)
+      end
 
-        def destination
-          super.sub(/\.s[ca]ss$/, '.css')
-        end
+      def destination
+        super.sub(/\.s[ca]ss$/, '.css')
+      end
 
-        def add
-          Plugins.static_files << StaticFileContent.new(compile, destination)
-        end
+      def add
+        Ink::Plugins.static_files << Ink::StaticFileContent.new(compile, destination)
+      end
 
-        def data
-          file.data
-        end
+      def data
+        file.data
+      end
 
-        def compile
-          PluginAssetPipeline.compile_sass(self)
-        end
+      def compile
+        Ink::PluginAssetPipeline.compile_sass(self)
       end
     end
   end

data/lib/octopress-asset-pipeline/version.rb

@@ -1,7 +1,5 @@
 module Octopress
-  module Ink
-    module LocalAssetPipeline
-      VERSION = "1.1.0"
-    end
+  module AssetPipeline
+    VERSION = "1.1.1"
   end
 end

data/lib/octopress-asset-pipeline.rb

@@ -9,136 +9,141 @@ require 'octopress-asset-pipeline/assets/javascript'
 require 'octopress-asset-pipeline/assets/coffeescript'
 
 module Octopress
-  module Ink
-    module AssetPipeline
-      class Plugin < Ink::Plugin
-        def configuration
-          {
-            name:          "Octopress Asset Pipeline",
-            slug:          "octopress-asset-pipeline",
-            path:          File.expand_path(File.join(File.dirname(__FILE__), "../")),
-            type:          "plugin",
-            version:       Octopress::Ink::LocalAssetPipeline::VERSION,
-            description:   "Combine and compress CSS and Sass, Javascript and Coffeescript to a single fingerprinted file.",
-            source_url:    "https://github.com/octopress/asset-pipeline",
-            local: true
-          }
-        end
-
-        def register
-          # Tell Jekyll to read static files and pages
-          # This is necessary when Jekyll isn't being asked to build a site,
-          # like when a user runs the list command to list assets
-          #
-          if Octopress.site.pages.empty? && Octopress.site.posts.empty?
-            Octopress.site.read_directories 
-          end
+  module AssetPipeline
+    class Plugin < Ink::Plugin
+      def configuration
+        {
+          name:          "Octopress Asset Pipeline",
+          path:          File.expand_path(File.join(File.dirname(__FILE__), "../")),
+          type:          "plugin",
+          version:       Octopress::AssetPipeline::VERSION,
+          description:   "Combine and compress CSS and Sass, Javascript and Coffeescript to a single fingerprinted file.",
+          source_url:    "https://github.com/octopress/asset-pipeline",
+          local: true
+        }
+      end
 
-          add_stylesheets
-          add_javascripts
+      def register
+        # Tell Jekyll to read static files and pages
+        # This is necessary when Jekyll isn't being asked to build a site,
+        # like when a user runs the list command to list assets
+        #
+        if ENV['OCTOPRESS_DOCS']
+          add_docs
+        else
+          add_files
         end
+      end
 
-        def config
-          @config ||= begin
-            Ink.configuration['asset_pipeline'].merge({'disable' => {}})
-          end
+      def add_files
+        if Octopress.site.pages.empty? && Octopress.site.posts.empty?
+          Octopress.site.read_directories 
         end
 
-        # Return stylesheets to be combined in the asset pipeline
-        def stylesheets
-          sort(@css.clone.concat(@sass), config['order_css'] || [])
-        end
+        add_stylesheets
+        add_javascripts
+      end
 
-        def javascripts
-          sort(@js.clone.concat(@coffee), config['order_js'] || [])
+      def config
+        @config ||= begin
+          Ink.configuration['asset_pipeline'].merge({'disable' => {}})
         end
+      end
 
-        private
+      # Return stylesheets to be combined in the asset pipeline
+      def stylesheets
+        sort(@css.clone.concat(@sass), config['order_css'] || [])
+      end
 
-        def combine_js
-          config['combine_js']
-        end
+      def javascripts
+        sort(@js.clone.concat(@coffee), config['order_js'] || [])
+      end
 
-        def combine_css
-          config['combine_css']
-        end
+      private
 
-        def add_stylesheets
-          add_css
-          add_sass
+      def combine_js
+        config['combine_js']
+      end
 
-          if !combine_css
-            # Add tags for {% css_asset_tag %}
-            stylesheets.each { |f| Plugins.add_css_tag(f.tag) }
-            @css.clear
-          end
+      def combine_css
+        config['combine_css']
+      end
+
+      def add_stylesheets
+        add_css
+        add_sass
 
+        if !combine_css
+          # Add tags for {% css_asset_tag %}
+          stylesheets.each { |f| Ink::Plugins.add_css_tag(f.tag) }
+          @css.clear
         end
 
-        def add_javascripts
-          add_js
-          add_coffee
+      end
 
-          if !combine_js
-            # Add tags for {% js_asset_tag %}
-            javascripts.each { |f| Plugins.add_js_tag(f.tag) }
-            @js.clear
-            @coffee.clear
-          end
+      def add_javascripts
+        add_js
+        add_coffee
+
+        if !combine_js
+          # Add tags for {% js_asset_tag %}
+          javascripts.each { |f| Ink::Plugins.add_js_tag(f.tag) }
+          @js.clear
+          @coffee.clear
         end
+      end
 
-        def sort(files, config)
-          sorted = []
-          config.each do |item|
-            files.each do |file|
-              sorted << files.delete(file) if file.path.to_s.include? item
-            end
+      def sort(files, config)
+        sorted = []
+        config.each do |item|
+          files.each do |file|
+            sorted << files.delete(file) if file.path.to_s.include? item
           end
-
-          sorted.concat files
         end
 
-        # Finds all Sass files registered by Jekyll
-        #
-        def add_sass
-          Octopress.site.pages.each do |f| 
-            if f.ext =~ /\.s[ca]ss/ 
-              @sass << LocalAssets::Sass.new(self, f)
-              Octopress.site.pages.delete(f)
-            end
+        sorted.concat files
+      end
+
+      # Finds all Sass files registered by Jekyll
+      #
+      def add_sass
+        Octopress.site.pages.each do |f| 
+          if f.ext =~ /\.s[ca]ss/ 
+            @sass << Sass.new(self, f)
+            Octopress.site.pages.delete(f)
           end
         end
+      end
 
-        # Finds all CSS files registered by Jekyll
-        #
-        def add_css
-          Octopress.site.static_files.each do |f| 
-            if f.path =~ /\.css$/ 
-              @css << LocalAssets::Css.new(self, f)
-              Octopress.site.static_files.delete(f) if combine_css
-            end
+      # Finds all CSS files registered by Jekyll
+      #
+      def add_css
+        Octopress.site.static_files.each do |f| 
+          if f.path =~ /\.css$/ 
+            @css << Css.new(self, f)
+            Octopress.site.static_files.delete(f) if combine_css
           end
         end
+      end
 
-        # Finds all Coffeescript files registered by Jekyll
-        #
-        def add_coffee
-          Octopress.site.pages.each do |f| 
-            if f.ext =~ /\.coffee$/ 
-              @coffee << LocalAssets::Coffeescript.new(self, f)
-              Octopress.site.pages.delete(f) if combine_js
-            end
+      # Finds all Coffeescript files registered by Jekyll
+      #
+      def add_coffee
+        Octopress.site.pages.each do |f| 
+          if f.ext =~ /\.coffee$/ 
+            @coffee << Coffeescript.new(self, f)
+            Octopress.site.pages.delete(f) if combine_js
           end
         end
+      end
 
-        # Finds all Javascript files registered by Jekyll
-        #
-        def add_js
-          Octopress.site.static_files.each do |f| 
-            if f.path =~ /\.js$/ 
-              @js << LocalAssets::Javascript.new(self, f)
-              Octopress.site.static_files.delete(f) if combine_js
-            end
+      # Finds all Javascript files registered by Jekyll
+      #
+      def add_js
+        Octopress.site.static_files.each do |f| 
+          if f.path =~ /\.js$/ 
+            @js << Javascript.new(self, f)
+            Octopress.site.static_files.delete(f) if combine_js
           end
         end
       end
@@ -146,4 +151,4 @@ module Octopress
   end
 end
 
-Octopress::Ink.register_plugin(Octopress::Ink::AssetPipeline::Plugin)
+Octopress::Ink.register_plugin(Octopress::AssetPipeline::Plugin)

data/octopress-asset-pipeline.gemspec

@@ -5,7 +5,7 @@ require 'octopress-asset-pipeline/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "octopress-asset-pipeline"
-  spec.version       = Octopress::Ink::LocalAssetPipeline::VERSION
+  spec.version       = Octopress::AssetPipeline::VERSION
   spec.authors       = ["Brandon Mathis"]
   spec.email         = ["brandon@imathis.com"]
   spec.summary       = %q{Combine and compress CSS and Sass, Javascript and Coffeescript to a single fingerprinted file.}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress-asset-pipeline
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Brandon Mathis