octopress-ink 1.0.0.rc.56 → 1.0.0.rc.57

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2cd9fc670733acf85a2404920d6007bef790fc6
-  data.tar.gz: f1b1aa10dc93141d6a1d33015c9d489795bf3e6f
+  metadata.gz: 51af822022c99cfea1c9f14ffa3b32188ab4235b
+  data.tar.gz: 1cc82f18bbd1ec90cc13979297801833cb0f6880
 SHA512:
-  metadata.gz: 1eed8707847bc8d7905fa504d057eafbf8e2da7e35e77500ec24610d3e22a1483a12cfb292407948b5f9bbff46448c1dd16c444f926a1ae47b52b2688525e5db
-  data.tar.gz: 89ecd6438d235a217b22372422a0e6e137986067ec0334f6b6415e6756557cdd211e8afe33ab8b146c73e39597479282bb1e2a4cc3ea0729a2f6916983a8cd6d
+  metadata.gz: 64972ef01166bfde776d24a5364a4c0a3e4556cf238bc089f4bfec540494e23fad6113fbffad977b18682f0f618a2e7be6b5f3ce3c10efa21fdd64266a0b26f0
+  data.tar.gz: 78dcbe0ed983b969d682f394106d8fab3fbdafe5eb9193bc97686317d840d28601ada861a704b2e515de14119f16a1d10252f58c34aeb1af4b5f98adab248d60

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.0.0 RC57 - 2015-03-27
+- Fix: Now asset pipeline is properly reset during jekyll watch.
+- Minor: Added caching to speed up category and tag liquid tags.
+
 ### 1.0.0 RC56 - 2015-03-22
 - Fix: Tag links and lists weren't being ouput
 - Fix: Tags and categories would throw errors if tags were used but plugin

data/assets/docs/working-with-plugins.markdown

@@ -10,10 +10,10 @@ If you were going to install the [octopress-codefence](https://github.com/octopr
 
 #### Using Bundler
 
-If you are using [Bundler](http://bundler.io), simply add it to your Gemfile in the `:octopress` group and run `bundle`. Octopress will automatically load the plugin when you build your site.
+If you are using [Bundler](http://bundler.io), simply add it to your Gemfile in the `:jekyll_plugins` group and run `bundle`. Octopress will automatically load the plugin when you build your site.
 
 ```ruby
-group :octopress do
+group :jekyll_plugins do
   gem 'octopress-codefence'
 end
 ```

data/lib/octopress-ink/plugin/bootstrap.rb

@@ -10,12 +10,17 @@ module Octopress
 
       class << self
         attr_reader :pages, :categories, :tags, :feeds
+        attr_accessor :tag_links, :category_links, :tag_list, :category_list
 
         def reset
-          @pages      = {}
-          @categories = {}
-          @tags       = {}
-          @feeds      = {}
+          @pages           = {}
+          @categories      = {}
+          @tags            = {}
+          @feeds           = {}
+          @tag_links       = {}
+          @tag_list        = {}
+          @category_links  = {}
+          @category_list   = {}
         end
 
         def page(lang, type, key)

data/lib/octopress-ink/plugin_asset_pipeline.rb

@@ -1,10 +1,21 @@
 module Octopress
   module Ink
     module PluginAssetPipeline
+      extend self
+
+      def reset
+        @sass_converter = nil
+        @combined_stylesheets = nil
+        @stylesheets = nil
+        @javascripts = nil
+        @uglify_settings = nil
+        @combined_js = ''
+        @combined_stylesheets = nil
+      end
 
       # Compile CSS to take advantage of Sass's compression settings
       #
-      def self.compile_css(content)
+      def compile_css(content)
         configs = sass_converter.sass_configs
         configs[:syntax] = :scss
         configs[:style] ||= :compressed if Ink.configuration['asset_pipeline']['compress_css']
@@ -12,13 +23,13 @@ module Octopress
         Sass.compile(content, configs)
       end
 
-      def self.compile_sass(sass)
+      def compile_sass(sass)
         Sass.compile(sass.render, sass_configs(sass))
       end
 
       # Gets default Sass configuration hash from Jekyll
       #
-      def self.sass_configs(sass)
+      def sass_configs(sass)
         configs = sass_converter.sass_configs
 
         configs[:syntax] = sass.ext.sub(/^\./,'').to_sym
@@ -32,20 +43,17 @@ module Octopress
       
       # Access Jekyll's built in Sass converter
       #
-      def self.sass_converter
-        if @sass_converter
-          @sass_converter
-        else
-          Octopress.site.converters.each do |c|
-            @sass_converter = c if c.kind_of?(Jekyll::Converters::Sass) 
+      def sass_converter
+        @sass_converter ||= begin
+          Octopress.site.converters.find do |c|
+            c.kind_of?(Jekyll::Converters::Sass) 
           end
-          @sass_converter
         end
       end
 
       # Return a link tag, for all plugins' stylesheets
       #
-      def self.combined_stylesheet_tag
+      def combined_stylesheet_tag
         tags = ''
         combine_stylesheets.keys.each do |media|
           tags.concat "<link href='#{Filters.expand_url(combined_stylesheet_path(media))}' media='#{media}' rel='stylesheet' type='text/css'>"
@@ -53,7 +61,7 @@ module Octopress
         tags
       end
 
-      def self.combined_javascript_tag
+      def combined_javascript_tag
         unless @combined_js == ''
           "<script src='#{Filters.expand_url(combined_javascript_path)}'></script>"
         end
@@ -66,10 +74,8 @@ module Octopress
       #
       #   output: { 'screen' => 'body { background... }' }
       #
-      def self.combine_stylesheets
-        if @combined_stylesheets
-          @combined_stylesheets
-        else
+      def combine_stylesheets
+        @combined_stylesheets ||= begin
           combined = {}
 
           stylesheets.clone.each do |media,files|
@@ -81,12 +87,11 @@ module Octopress
             end
           end
 
-          @combined_stylesheets = combined
+          combined
         end
       end
 
-      def self.write_combined_stylesheet
-        @combined_stylesheets = nil
+      def write_combined_stylesheet
         css = combine_stylesheets
         css.keys.each do |media|
           contents = compile_css(css[media])
@@ -94,11 +99,11 @@ module Octopress
         end
       end
 
-      def self.combined_stylesheet_path(media)
+      def combined_stylesheet_path(media)
         File.join('stylesheets', "#{media}-#{stylesheet_fingerprint(media)}.css")
       end
 
-      def self.stylesheet_fingerprint(media)
+      def stylesheet_fingerprint(media)
         @stylesheet_fingerprint ||= {}
         @stylesheet_fingerprint[media] ||=
           fingerprint(stylesheets[media].clone.map(&:path))
@@ -110,10 +115,8 @@ module Octopress
       #
       #   output: { 'screen' => [Octopress::Ink::Assets::Stylesheet, ..]
       #
-      def self.stylesheets
-        if @stylesheets
-          @stylesheets
-        else
+      def stylesheets
+       @stylesheets ||= begin
           files = {}
           Plugins.plugins.clone.each do |plugin| 
             plugin.stylesheets.each do |file|
@@ -121,27 +124,25 @@ module Octopress
               files[file.media] << file
             end
           end
-          @stylesheets = files
+          files
         end
       end
 
-      def self.javascripts
+      def javascripts
         @javascripts ||=
           Plugins.plugins.clone.map(&:javascripts).flatten
       end
 
-      def self.javascript_fingerprint
+      def javascript_fingerprint
         @javascript_fingerprint ||=
           fingerprint(javascripts.clone.map(&:path))
       end
 
-      def self.combined_javascript_path
+      def combined_javascript_path
         File.join('javascripts', "all-#{javascript_fingerprint}.js")
       end
 
-      def self.write_combined_javascript
-        @combined_js = ''
-
+      def write_combined_javascript
         if Ink.configuration['asset_pipeline']['combine_js']
           javascripts.each do |file|
 
@@ -170,15 +171,15 @@ module Octopress
         end
       end
 
-      def self.compress_js?(file)
+      def compress_js?(file)
         Ink.configuration['asset_pipeline']['compress_js'] && !file.path.end_with?('.min.js')
       end
 
-      def self.write_files(source, dest)
+      def write_files(source, dest)
         Plugins.static_files << StaticFileContent.new(source, dest)
       end
 
-      def self.fingerprint(paths)
+      def fingerprint(paths)
         return '' if ENV['JEKYLL_ENV'] == 'test'
         paths = [paths] unless paths.is_a? Array
         Digest::MD5.hexdigest(paths.clone.map! { |path| "#{File.mtime(path).to_i}" }.join)

data/lib/octopress-ink/plugins.rb

@@ -1,8 +1,8 @@
 module Octopress
   module Ink
     module Plugins
-      extend self
       attr_reader :registered
+      extend self
 
       @registered = false
       @plugins = []
@@ -43,16 +43,19 @@ module Octopress
       end
 
       def reset
-        @static_files = []
         @registered = false
-        @css_tags = []
-        @js_tags = []
-        Bootstrap.reset
       end
 
       def register
         unless @registered
           @registered = true
+          @static_files = []
+          @css_tags = []
+          @js_tags = []
+          Bootstrap.reset
+          PluginAssetPipeline.reset
+
+          puts 'registering'
           plugins.each(&:register) 
         end
       end

data/lib/octopress-ink/tags/category_tag.rb

@@ -15,9 +15,23 @@ module Octopress
 
           # Check to see if post loop is active, otherwise default to current page
           page = context['post'] || context['page']
+
+          tags = Bootstrap.send(@tag)[page['url']]
+
+          if tags.nil?
+            if tags = item_tags(page)
+              # Cache tags to speed up multiple references for the same post
+              Bootstrap.send(@tag)[page['url']] = tags
+            end
+          end
+
+          tags
+        end
+
+        def item_tags(page)
           items = page[item_name_plural]
 
-          return '' if items.nil? || items.empty?
+          return nil if items.nil? || items.empty?
 
           items = items.sort.map { |i| item_link(page, i) }.compact.map do |link|
             if item_list?
@@ -27,7 +41,7 @@ module Octopress
             link
           end
 
-          return '' if items.empty?
+          return nil if items.empty?
 
           if item_list?
             %Q{<ul class="#{item_name}-list">#{items.join}</ul>}

data/lib/octopress-ink/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.56
+  version: 1.0.0.rc.57
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll