octopress-ink 1.0.0.rc.43 → 1.0.0.rc.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4ff4f3e6f31bb816c785ceb78da1906663bf26f
-  data.tar.gz: d0eac622e35eb83b52f41f6ff9c9ca714d9963a3
+  metadata.gz: 6f406acf8134296326633da8071b2b065bde2448
+  data.tar.gz: 27eb1c1ff48eeb84c929e584b71aa65f86d6ab73
 SHA512:
-  metadata.gz: 2fab5093f285ee61ab229f733229336e74262e834c58b04081bc8ec077606d62ea1c48eefb77e717157e23f157ae6e0e6b41c55373184bfca0d42acbfc2792e8
-  data.tar.gz: b869018fc35c78fa3b512df368e7845f814d45aef92c71c47fb2e448bf0e4dd240722b81286eb7f70db88bea29792b0c9d5e94d3c98ecc9acf735ffdfb75c81e
+  metadata.gz: 655308cfcd46f93a85e04e8f1a53ec6cd5577118b52a206ed032cdaaa79b99eb4b1ae29159022a8f62ecb8de8d9fb447f4226ae29f7f0232f65338c3edf08107
+  data.tar.gz: c84f0c5dcc53def4bb5cd6f2d1b03615bd810792259bc6fc51bf3b525ff18235a51ba29b1e8c2df0f5b70b70995aa19b49b147ca3f990fab46b4ad3eb59e8907

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.0.0 RC44 - 2015-02-18
+- Fix: Plugins reset for each build, fixing builds with Jekyll's watch enabled.
+- New: Added plugin templates for dynamically generating pages.
+
 ### 1.0.0 RC43 - 2015-02-16
 - Fix: Multilingual configurations are deep merged with primary language config to allow for less unnecessary duplication.
 

data/lib/octopress-ink.rb

@@ -20,6 +20,7 @@ module Octopress
     autoload :Assets,               'octopress-ink/assets'
     autoload :Convertible,          'octopress-ink/jekyll/convertible'
     autoload :Page,                 'octopress-ink/jekyll/page'
+    autoload :TemplatePage,         'octopress-ink/jekyll/template_page'
     autoload :Layout,               'octopress-ink/jekyll/layout'
     autoload :StaticFile,           'octopress-ink/jekyll/static_file'
     autoload :StaticFileContent,    'octopress-ink/jekyll/static_file_content'

data/lib/octopress-ink/assets.rb

@@ -6,6 +6,7 @@ module Octopress
       autoload :LangConfig,           'octopress-ink/assets/lang_config'
       autoload :FileAsset,            'octopress-ink/assets/file'
       autoload :PageAsset,            'octopress-ink/assets/page'
+      autoload :Template,             'octopress-ink/assets/template'
       autoload :Javascript,           'octopress-ink/assets/javascript'
       autoload :Coffeescript,         'octopress-ink/assets/coffeescript'
       autoload :Stylesheet,           'octopress-ink/assets/stylesheet'

data/lib/octopress-ink/assets/template.rb

@@ -0,0 +1,45 @@
+module Octopress
+  module Ink
+    module Assets
+      class Template < Asset
+        attr_accessor :pages
+
+        def add; end
+
+        def info
+          message = filename.ljust(35)
+          if disabled?
+            message += "-disabled-"
+          elsif path.to_s != plugin_path
+            shortpath = File.join(Plugins.custom_dir.sub(Dir.pwd,''), dir).sub('/','')
+            message += "from: #{shortpath}/#{filename}"
+          end
+          message = "  #{message}\n"
+          self.pages.each do |page|
+            message << "   - #{page.path.sub('index.html', '')}\n"
+          end
+          message
+        end
+
+        def new_page(permalink, data={})
+          @pages ||= []
+          return if disabled?
+
+          dir = File.dirname(permalink)
+          name = File.basename(permalink)
+
+          page = Ink::TemplatePage.new(Octopress.site, File.dirname(self.path), '.', File.basename(self.path))
+
+          page.data.merge!(data)
+
+          page.dir = dir
+          page.name = name
+          page.process(name)
+
+          page
+        end
+
+      end
+    end
+  end
+end

data/lib/octopress-ink/commands/new.rb

@@ -151,7 +151,7 @@ _site
         end
 
         def self.add_assets
-          dirs = %w{docs images fonts pages files layouts includes stylesheets javascripts}.map do |asset|
+          dirs = %w{docs images fonts pages templates files layouts includes stylesheets javascripts}.map do |asset|
             File.join(@settings[:path], 'assets', asset)
           end
           create_empty_dirs dirs

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

@@ -2,6 +2,10 @@ module Octopress
   module Ink
     class SiteHook < Hooks::Site
 
+      def reset(site)
+        Plugins.reset
+      end
+
       def post_read(site)
         Octopress.site = site
         Ink::Plugins.register

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

@@ -0,0 +1,14 @@
+module Octopress
+  module Ink
+    class TemplatePage < Jekyll::Page
+      attr_accessor :dir, :name
+      include Ink::Convertible
+      
+      def relative_asset_path
+        site_source = Pathname.new Octopress.site.source
+        page_source = Pathname.new @base
+        page_source.relative_path_from(site_source).to_s
+      end
+    end
+  end
+end

data/lib/octopress-ink/plugin.rb

@@ -9,8 +9,8 @@ module Octopress
       }
 
       attr_reader   :name, :type, :path, :assets_path, :local, :website, :description, :gem, :version, :source_url, :website,
-                    :layouts_dir, :stylesheets_dir, :javascripts_dir, :files_dir, :includes_dir, :images_dir,
-                    :layouts, :includes, :images, :fonts, :files, :pages, :docs
+                    :layouts_dir, :stylesheets_dir, :javascripts_dir, :files_dir, :includes_dir, :images_dir, :templates_dir,
+                    :layouts, :includes, :images, :fonts, :files, :pages, :templates, :docs
 
       def initialize(options)
         options = Jekyll::Utils.symbolize_hash_keys(options || configuration)
@@ -26,6 +26,7 @@ module Octopress
         @includes_dir      = 'includes'
         @javascripts_dir   = 'javascripts'
         @stylesheets_dir   = 'stylesheets'
+        @templates_dir     = 'templates'
         @lang_configs      = []
         @layouts           = []
         @includes          = []
@@ -38,6 +39,7 @@ module Octopress
         @fonts             = []
         @files             = []
         @pages             = []
+        @templates         = []
         @slug            ||= @name
         @assets_path     ||= File.join(@path, 'assets')
       end
@@ -59,6 +61,7 @@ module Octopress
             add_fonts
             add_files
             add_pages
+            add_templates
             add_stylesheets
           end
         end
@@ -89,8 +92,14 @@ module Octopress
           next if name == 'config-file'
           assets.each {|file| file.add unless file.disabled? }
         end
+
+        add_template_pages
       end
 
+      # Plugin authors override with template page adding
+      #
+      def add_template_pages; end
+
       # Copy asset files to plugin override path
       #
       def copy_asset_files(path, options)
@@ -237,6 +246,7 @@ module Octopress
       def can_disable
         [
           'pages',
+          'templates',
           'sass',
           'css',
           'stylesheets',
@@ -253,6 +263,7 @@ module Octopress
         {
           'layouts'      => @layouts,
           'includes'     => @includes,
+          'templates'    => @templates,
           'pages'        => @pages,
           'sass'         => @sass,
           'css'          => @css,
@@ -432,6 +443,21 @@ module Octopress
         @pages = add_new_assets(@pages_dir, Assets::PageAsset)
       end
 
+      def add_templates
+        @templates = add_new_assets(@templates_dir, Assets::Template)
+      end
+
+      def add_template_page(template, permalink, data={})
+        template = @templates.find { |t| t.filename == template }
+
+        unless template.nil? || template.disabled?
+          page = template.new_page(permalink, data)
+          template.pages << page
+          Octopress.site.pages << page
+          page
+        end
+      end
+
       def add_docs
         Octopress::Docs.add_plugin_docs(self)
       end

data/lib/octopress-ink/plugins.rb

@@ -3,13 +3,6 @@ module Octopress
     module Plugins
       extend self
 
-      @static_files = []
-      @plugins = []
-      @user_plugins = []
-      @css_tags = []
-      @js_tags = []
-      @registered = false
-
       def theme
         @theme
       end
@@ -44,6 +37,15 @@ module Octopress
         [@theme].concat(@plugins).concat(@user_plugins).compact
       end
 
+      def reset
+        @static_files = []
+        @plugins = []
+        @user_plugins = []
+        @css_tags = []
+        @js_tags = []
+        @registered = false
+      end
+
       def register
         unless @registered
           @registered = true

data/lib/octopress-ink/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.43
+  version: 1.0.0.rc.44
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-16 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -192,6 +192,7 @@ files:
 - lib/octopress-ink/assets/page.rb
 - lib/octopress-ink/assets/sass.rb
 - lib/octopress-ink/assets/stylesheet.rb
+- lib/octopress-ink/assets/template.rb
 - lib/octopress-ink/cache.rb
 - lib/octopress-ink/commands.rb
 - lib/octopress-ink/commands/copy.rb
@@ -206,6 +207,7 @@ files:
 - lib/octopress-ink/jekyll/page.rb
 - lib/octopress-ink/jekyll/static_file.rb
 - lib/octopress-ink/jekyll/static_file_content.rb
+- lib/octopress-ink/jekyll/template_page.rb
 - lib/octopress-ink/plugin.rb
 - lib/octopress-ink/plugin_asset_pipeline.rb
 - lib/octopress-ink/plugins.rb