octopress-ink 1.0.0.alpha.33 → 1.0.0.alpha.34

data/lib/octopress-ink/plugins.rb

@@ -1,9 +1,10 @@
+require 'octopress'
+
 module Octopress
   module Ink
     module Plugins
-
       @plugins = []
-      @local_plugins = []
+      @user_plugins = []
       @site = nil
 
       def self.theme
@@ -31,17 +32,50 @@ module Octopress
       end
 
       def self.plugins
-        [@theme].concat(@plugins).concat(@local_plugins).compact
+        [@theme].concat(@plugins).concat(@user_plugins).compact
       end
 
-      def self.site=(site)
-        @site = site
+      def self.register(site)
+        unless @site
+          @site = site
+          plugins.each do |p| 
+            p.register
+          end
+        end
+      end
+
+      def self.add_files
+        add_assets(%w{images pages files fonts docs})
+        plugin('asset-pipeline').register_assets
+        add_stylesheets
+        add_javascripts
+      end
+
+      def self.add_assets(assets)
+        plugins.each do |p| 
+          p.add_asset_files(assets)
+        end
       end
 
       def self.site
         @site
       end
 
+      def self.register_plugin(plugin, name, type='plugin', local=nil)
+        new_plugin = plugin.new(name, type)
+
+        case type
+        when 'theme'
+          @theme = new_plugin
+        else
+          if local
+            @user_plugins << new_plugin
+          else
+            @plugins << new_plugin
+          end
+        end
+      end
+
       def self.config
         if @config
           @config
@@ -50,7 +84,6 @@ module Octopress
           @config['plugins'] = {}
           @config['theme']   = @theme.nil? ? {} : @theme.config
 
-
           plugins.each do |p| 
             unless p == @theme
               @config['plugins'][p.name] = p.config
@@ -66,35 +99,8 @@ module Octopress
         p.include(file)
       end
 
-      def self.register_plugin(plugin, name, type='plugin')
-        new_plugin = plugin.new(name, type)
-
-        case type
-        when 'theme'
-          @theme = new_plugin
-        when 'local_plugin'
-          @local_plugins << new_plugin
-        else
-          @plugins << new_plugin
-        end
-      end
-
-      def self.register_layouts
-        plugins.each do |p|
-          p.layouts.clone.each { |layout| layout.register }
-        end
-      end
-
-      def self.layouts
-        names = []
-        plugins.each do |p|
-          p.layouts.each { |layout| names << layout.name }
-        end
-        names
-      end
-
       def self.custom_dir
-        @site.config['plugins']
+        site.config['plugins']
       end
 
       def self.fingerprint(paths)
@@ -107,8 +113,13 @@ module Octopress
       end
 
       def self.combined_javascript_path
-        print = @javascript_fingerprint || ''
-        File.join('javascripts', "#{print}.js")
+        print = ''
+
+        if @js_fingerprint
+          print = "-" + @js_fingerprint
+        end
+
+        File.join('javascripts', "all#{print}.js")
       end
 
       def self.write_files(source, dest)
@@ -123,29 +134,24 @@ module Octopress
         ::Sass.compile(contents, options)
       end
 
-      def self.sass_config(item, default)
-        config = @site.config
-        if config['octopress'] && config['octopress']['sass'] && config['octopress']['sass'][item]
-          config['octopress']['sass'][item]
-        else
-          default
-        end
-      end
-      
       def self.sass_options
-        options = {
-          style:        sass_config('output_style', 'compressed').to_sym,
-          trace:        sass_config('trace', false),
-          line_numbers: sass_config('line_numbers', false)
+        config = @site.config
+        
+        defaults = {
+          'style'        => :compressed,
+          'trace'        => false,
+          'line_numbers' => false
         }
+
+        options = defaults.deep_merge(config['sass'] || {}).symbolize_keys
+        options = options.each{ |k,v| options[k] = v.to_sym if v.is_a? String }
+        options
       end
 
       def self.write_combined_stylesheet
         css = combine_stylesheets
         css.keys.each do |media|
-          options = sass_options
-          options[:line_numbers] = false
-          contents = compile_sass(css[media][:contents], options)
+          contents = compile_sass(css[media][:contents], sass_options)
           write_files(contents, combined_stylesheet_path(media)) 
         end
       end
@@ -165,7 +171,7 @@ module Octopress
             else
               plugin_header = "/* Plugin: #{plugin.name} */\n"
             end
-            stylesheets = plugin.stylesheets.clone.concat plugin.sass
+            stylesheets = plugin.stylesheets
             stylesheets.each do |file|
               css[file.media] ||= {}
               css[file.media][:contents] ||= ''
@@ -196,7 +202,7 @@ module Octopress
           js = ''
           plugins.each do |plugin| 
             paths = plugin.javascript_paths
-            @javascript_fingerprint = fingerprint(paths)
+            @js_fingerprint = fingerprint(paths)
             paths.each do |file|
               js.concat Pathname.new(file).read
             end
@@ -221,7 +227,7 @@ module Octopress
       end
 
       def self.stylesheet_tags
-        if concat_css
+        if Ink.config['concat_css']
           combined_stylesheet_tag
         else
           css = []
@@ -233,26 +239,8 @@ module Octopress
         end
       end
 
-      def self.concat_css
-        config = @site.config
-        if config['octopress'] && !config['octopress']['concat_css'].nil?
-          config['octopress']['concat_css'] != false
-        else
-          true
-        end
-      end
-
-      def self.concat_js
-        config = @site.config
-        if config['octopress'] && !config['octopress']['concat_js'].nil?
-          config['octopress']['concat_js'] != false
-        else
-          true
-        end
-      end
-
       def self.javascript_tags
-        if concat_js
+        if Ink.config['concat_js']
           combined_javascript_tag
         else
           js = []
@@ -263,56 +251,29 @@ module Octopress
         end
       end
 
-      def self.copy_javascripts
-        plugins.each do |plugin| 
-          copy plugin.javascripts
-        end
-      end
-
-      def self.copy_stylesheets
-        stylesheets = plugins.clone.map { 
-          |p| p.stylesheets.clone.concat(p.sass) 
-        }.flatten
-        copy stylesheets
-      end
-
-      def self.add_static_files
+      # Copy/Generate Stylesheets
+      #
+      def self.add_stylesheets
        
-        plugin('user stylesheets').add_files
-   
-        # Copy/Generate Stylesheets
-        #
-        if concat_css
+        if Ink.config['concat_css']
           write_combined_stylesheet
         else
-          copy_stylesheets
+          add_assets(%w{css sass})
         end
+      end
+
+      # Copy/Generate Javascripts
+      #
+      def self.add_javascripts
 
-        # Copy/Generate Javascripts
-        #
-        if concat_js
+        if Ink.config['concat_js']
           write_combined_javascript
         else
-          copy_javascripts
+          add_assets(['javascripts'])
         end
 
-        # Copy other assets
-        #
-        copy_static_files
       end
 
-      def self.copy_static_files
-        plugins.each do |plugin| 
-          copy plugin.files
-          copy plugin.pages
-          copy plugin.images
-          copy plugin.fonts
-        end
-      end
-
-      def self.copy(files)
-        files.each { |f| f.copy }
-      end
     end
   end
 end

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

@@ -0,0 +1,93 @@
+# The CSS assets for this plugin are populated at runtime by the add_static_files method of
+# the Plugins module.
+#
+module Octopress
+  module Ink
+    class AssetPipelinePlugin < Plugin
+
+      def register_assets
+
+        local_stylesheets.each {|f| add_stylesheet(f) }
+        local_javascripts.each {|f| add_javascript(f) }
+
+        remove_jekyll_assets @sass if @sass
+
+        if Ink.config['concat_js']
+          remove_jekyll_assets @javascripts if @javascripts
+        end
+
+        if Ink.config['concat_css']
+          remove_jekyll_assets @css if @css
+        end
+      end
+
+      def disabled?(dir, file)
+        case dir
+        when stylesheets_dir
+          Ink.config['disable'].include?('site_stylesheets')
+        when javascripts_dir
+          Ink.config['disable'].include?('site_javascripts')
+        end
+      end
+
+      def add_javascript(file)
+        @javascripts << Assets::LocalJavascript.new(self, javascripts_dir, file)
+      end
+
+      def add_stylesheet(file)
+        # accept ['file', 'media_type']
+        #
+        if file.is_a? Array
+          if file.first =~ /\.css/
+            @css << Assets::LocalStylesheet.new(self, stylesheets_dir, file.first, file.last)
+          else
+            @sass << Assets::LocalSass.new(self, stylesheets_dir, file.first, file.last)
+          end
+          
+        # accept 'file'
+        #
+        else
+          if file =~ /\.css/
+            @css << Assets::LocalStylesheet.new(self, stylesheets_dir, file)
+          else
+            @sass << Assets::LocalSass.new(self, stylesheets_dir, file)
+          end
+        end
+      end
+
+      def javascripts_dir
+        Ink.config['javascripts_dir']
+      end
+
+      def stylesheets_dir
+        Ink.config['stylesheets_dir']
+      end
+
+      def local_stylesheets
+        local_files('stylesheets', stylesheets_dir).reject do |f|
+          File.basename(f) =~ /^_.*?s[ac]ss/
+        end
+      end
+
+      def local_javascripts
+        local_files('javascripts', javascripts_dir)
+      end
+
+      def local_files(type, dir)
+        config = Ink.config
+        source = Plugins.site.source
+        
+        # If they manually specify files
+        #
+        if config[type].is_a?(Array) && !config[type].empty?
+          config[type]
+        else
+          dir = File.join(source, dir)
+          files = glob_assets(dir)
+          files.map { |f| f.split(dir).last }
+        end
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,15 @@
+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
+  end
+
+  def docs_base_path
+    'docs/ink'
+  end
+end
+

data/lib/octopress-ink/version.rb

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

data/octopress-ink.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency "jekyll", "~> 1.4.3"
   spec.add_runtime_dependency "sass", "~> 3.2.0"
+  spec.add_runtime_dependency "octopress", ">= 3.0.0.alpha8"
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/test/Gemfile

@@ -1,7 +1,5 @@
 source 'https://rubygems.org'
 
-gem "octopress", "~> 3.0.0.alpha5"
-
 group :octopress do
   gem "octopress-ink", path: "../"
 end

data/test/_concat_false.yml

@@ -0,0 +1,2 @@
+concat_css: false
+concat_js: false

data/test/_sass_compact.yml

@@ -1,5 +1,4 @@
 # Sass configurations 
-octopress:
-  sass: 
-    output_style: compact
+sass: 
+  style: compact
 

data/test/_sass_expanded.yml

@@ -1,5 +1,4 @@
 # Sass configurations 
-octopress:
-  sass: 
-    output_style: expanded
+sass: 
+  style: expanded