octopress-ink 1.0.0.rc.53 → 1.0.0.rc.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 163f983b14a1c6e9b939559a04ed6aa430772c4b
-  data.tar.gz: f53f891a51e09e1a227a8b8fffe9d3400e224e48
+  metadata.gz: 9a64f959380cab490e1186054068076ac6a3ccb8
+  data.tar.gz: 50a373e6606fb46a3d0b11f8f5eee1ea627de796
 SHA512:
-  metadata.gz: 5fa9bbb9f3935eadfe775955c8b4e944b1e4ca2f52987fe01f98eef35dd55b1c078ad76a21c54c8b85d7caefa12232096d63615c0832cd9cfa96e31ee07be58c
-  data.tar.gz: 747c5c4a4033d530cd580d487558bae67fc6bb7af9b9703e419882377c59933ac48f12c0c3dbea7b9bd3ddfc19b5a3471aefd924246bc860383152ca548cc8ee
+  metadata.gz: 13ff921e7a6b2a227821ca560161cfac96b3f5271753b2e4add1ab0002906391ac84c234d0ab39ad3fffb57568282f890cc2a286c1080311383fa6eaae83677b
+  data.tar.gz: c7e5548d378e171ad95697fd0de29f04f6be1128251d0a9bd694198c8bf468406cc4166b250cd1b879bbc2bd75d93cc488477ab9abc36152c674663db44a2a5c

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-### 1.0.0 RC52 - 2015-03-05
+### 1.0.0 RC54 - 2015-03-10
+- Added `new_page` method to page assets to mirror template functionality.
+- Generated pages can now reference the asset instance that generated them.
+
+### 1.0.0 RC53 - 2015-03-05
 - Fix: Removed reference to debugger
 
 ### 1.0.0 RC52 - 2015-03-05

data/lib/octopress-ink/assets.rb

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

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

@@ -58,9 +58,7 @@ module Octopress
         end
 
         def path
-          if @found_file
-            @found_file
-          else
+          @path ||= begin
             files = []
             files << user_path
             files << plugin_path
@@ -69,7 +67,8 @@ module Octopress
             if files.empty?
               raise IOError.new "Could not find #{File.basename(file)} at #{file}"
             end
-            @found_file = files[0]
+
+            files[0]
           end
         end
 

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

@@ -0,0 +1,20 @@
+module Octopress
+  module Ink
+    module Assets
+      class LocalTemplate < Template
+        def initialize(plugin, base, layout)
+          @layout = layout
+          super(plugin, base, layout.name)
+        end
+
+        def path
+          plugin_path
+        end
+
+        def plugin_path
+          File.join(base, file)
+        end
+      end
+    end
+  end
+end

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

@@ -39,6 +39,14 @@ module Octopress
           Jekyll::Utils.deep_merge_hashes(page.data, data)
         end
 
+        def new_page(data={})
+          page = Ink::Page.new(Octopress.site, File.dirname(self.path), '.', File.basename(self.path))
+          page.data.merge!(data)
+          page.plugin = plugin
+          page.asset = self
+          page
+        end
+
         def find_page(page)
           site_dir = Octopress.site.dest
           dest = page.destination(site_dir)
@@ -61,6 +69,7 @@ module Octopress
 
             page.data.merge!(@data)
             page.plugin = plugin
+            page.asset = self
 
             page
           end

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

@@ -33,6 +33,7 @@ module Octopress
           page = Ink::Page.new(Octopress.site, File.dirname(self.path), '.', File.basename(self.path))
           page.data.merge!(data)
           page.plugin = plugin
+          page.asset = self
           self.pages << page
 
           if existing_page = page_exists?(page)

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

@@ -2,7 +2,7 @@ module Octopress
   module Ink
     class Page < Jekyll::Page
       include Ink::Convertible
-      attr_accessor :dir, :name, :plugin
+      attr_accessor :dir, :name, :plugin, :asset
 
       def relative_asset_path
         site_source = Pathname.new Octopress.site.source

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

@@ -70,15 +70,15 @@ module Octopress
 
       # Find templates
       def register_templates
-        @post_index       = templates.find { |p| p.filename == 'post_index.html' }
-        @post_archive     = templates.find { |p| p.filename == 'post_archive.html' }
-        @main_feed        = templates.find { |p| p.filename == 'main_feed.xml' }
-        @articles_feed    = templates.find { |p| p.filename == 'articles_feed.xml' }
-        @links_feed       = templates.find { |p| p.filename == 'links_feed.xml' }
-        @category_index   = templates.find { |t| t.filename == 'category_index.html' }
-        @tag_index        = templates.find { |t| t.filename == 'tag_index.html' }
-        @category_feed    = templates.find { |t| t.filename == 'category_feed.xml' }
-        @tag_feed         = templates.find { |t| t.filename == 'tag_feed.xml' }
+        @post_index       = find_template('post_index.html')
+        @post_archive     = find_template('post_archive.html')
+        @main_feed        = find_template('main_feed.xml')
+        @articles_feed    = find_template('articles_feed.xml')
+        @links_feed       = find_template('links_feed.xml')
+        @category_index   = find_template('category_index.html')
+        @tag_index        = find_template('tag_index.html')
+        @category_feed    = find_template('category_feed.xml')
+        @tag_feed         = find_template('tag_feed.xml')
       end
 
       # Merge optional configurations with plugin configuration

data/lib/octopress-ink/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.53
+  version: 1.0.0.rc.54
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -217,6 +217,7 @@ files:
 - lib/octopress-ink/assets/javascript.rb
 - lib/octopress-ink/assets/lang_config.rb
 - lib/octopress-ink/assets/layout.rb
+- lib/octopress-ink/assets/local_template.rb
 - lib/octopress-ink/assets/page.rb
 - lib/octopress-ink/assets/sass.rb
 - lib/octopress-ink/assets/stylesheet.rb