octopress-ink 1.0.0.rc.45 → 1.0.0.rc.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3991200528afefe0ea49e4150bd019acccc67997
-  data.tar.gz: 3f62a023eabbf02b0745ee650be59ed0b60c3494
+  metadata.gz: c06bc8cc89eb550204b2b126b8bc9e0be46d7243
+  data.tar.gz: 8abd0edc93bc79e482782b7b8b086da351490b39
 SHA512:
-  metadata.gz: c9572974e45577364ed82fd4ac9a3d5110fd25adc4d214fd211711360c5889e6f30c4e7fa65ecd161aee686da7645e1ad6cd30be0e2bdf667ce7d53fc071ef99
-  data.tar.gz: fa8ed94d8a097d79d09b5f49545aa6372476c19a3c8d937d7afc644e413e266628bd3a80bce37fc8527c82fd64343868106051164a62041cbe54c8aa108045b9
+  metadata.gz: 9c9ab16dd4750d607c2cf91547997039454c0ef1dde942fa2c14789ef7befb9214914ce2cba3c46aae73db53c86904ba192dfc40409c09da20db016deb3f2451
+  data.tar.gz: 402ebad5ee47d2ae3203168a5b4d924bafc6a680149d29b556f6630085de85af0119056da935613e23c510fb60b0fc49bb96d0645b98c82247c71ea7e970bdd8

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 1.0.0 RC46 - 2015-02-18
+- Fix: Site reset triggers reset method on each plugin.
+
 ### 1.0.0 RC45 - 2015-02-18
 - Fix: Plugins weren't being initialized properly due to a race condition
 

data/lib/octopress-ink.rb

@@ -71,8 +71,8 @@ module Octopress
     # 
     # plugin - A subclass of Plugin
     #
-    def self.register_plugin(plugin)
-      Plugins.register_plugin(plugin)
+    def self.register_plugin(plugin, options={})
+      Plugins.register_plugin(plugin, options)
     end
 
     # Create a new plugin from a configuration hash

data/lib/octopress-ink/jekyll/hooks.rb

@@ -3,7 +3,9 @@ module Octopress
     class SiteHook < Hooks::Site
 
       def reset(site)
-        Plugins.reset
+        if Plugins.registered
+          Plugins.reset
+        end
       end
 
       def post_read(site)

data/lib/octopress-ink/plugin.rb

@@ -13,7 +13,7 @@ module Octopress
                     :layouts, :includes, :images, :fonts, :files, :pages, :templates, :docs
 
       def initialize(options)
-        options = Jekyll::Utils.symbolize_hash_keys(options || configuration)
+        @options = Jekyll::Utils.symbolize_hash_keys(options || configuration)
 
         DEFAULT_CONFIG.merge(options).each { |k,v| set_config(k,v) }
 
@@ -27,6 +27,11 @@ module Octopress
         @javascripts_dir   = 'javascripts'
         @stylesheets_dir   = 'stylesheets'
         @templates_dir     = 'templates'
+        @slug            ||= @name
+        @assets_path     ||= File.join(@path, 'assets')
+      end
+
+      def reset
         @lang_configs      = []
         @layouts           = []
         @includes          = []
@@ -40,11 +45,10 @@ module Octopress
         @files             = []
         @pages             = []
         @templates         = []
-        @slug            ||= @name
-        @assets_path     ||= File.join(@path, 'assets')
       end
 
       def register
+        reset
         unless @assets_path.nil?
           disable_assets
           add_assets

data/lib/octopress-ink/plugins.rb

@@ -2,6 +2,11 @@ module Octopress
   module Ink
     module Plugins
       extend self
+      attr_reader :registered
+
+      @registered = false
+      @plugins = []
+      @user_plugins = []
 
       def theme
         @theme
@@ -39,11 +44,9 @@ module Octopress
 
       def reset
         @static_files = []
-        @plugins = []
-        @user_plugins = []
+        @registered = false
         @css_tags = []
         @js_tags = []
-        @registered = false
       end
 
       def register

data/lib/octopress-ink/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.45
+  version: 1.0.0.rc.46
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-18 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll