octopress-ink 1.0.0.alpha.41 → 1.0.0.alpha.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cafd4614b86a0c2ee67bd091d9603518488deb2
-  data.tar.gz: 89ed549eaa1b6fd06225f005229ac923ac6cc73e
+  metadata.gz: 9ea8a006600a51e0bfc3c4816f20da55e849d52a
+  data.tar.gz: 5a4e760a5f58d4225bced80fd31d57f80c904683
 SHA512:
-  metadata.gz: c89bec5e91f8579d7a0daf2f218cc920dc4f0f0c3ce416207c00635c3b94bb833d0f39ec7ae65c2a79189c5609a72028cbdfc8b4b8da658fdcf7736be3d0c1cb
-  data.tar.gz: 917bcefdc14014139f9eb56125f38bf64b94d5c18cf8524c46aae20d10898858b3572c1954ff2770ae59ea5789164a92ecf27415c9624bc37978f5746c1676dd
+  metadata.gz: 188cec7106b750e62cd193bb5c54fea9965c3733b5854ab02a30562ea00ae3cb1867eccaf78ba9814f4f8156ef4e7d1c273adbb21b130cefa3152a77c1b9aadc
+  data.tar.gz: 84967eb34ce31062e3699c6f9a4009cbbc8146db0da74d9be6d1372773a0fe7b371017eddbe7b0f19e4b060e10358c764da078b1ddf11d4552f75496719d431e

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

@@ -41,8 +41,9 @@ module Octopress
           @page.data['plugin'] = { 
             'name' => @plugin.name, 
             'slug' => @plugin.slug,
-            'docs_base_path' => plugin.docs_base_path
+            'docs_base_path' => plugin.docs_base_path,
           }
+          @page.data['dir'] = File.dirname(plugin_path)
           @page.data['doc_pages'] = @plugin.doc_pages
           @page
         end

data/lib/octopress-ink/helpers/path.rb

@@ -23,10 +23,15 @@ module Octopress
         def self.expand(file, context)
           root = context.registers[:site].source
 
-          # If local file, e.g. ./somefile
-          if file =~ /^\.\/(.+)/
-            local_dir = File.dirname context.registers[:page]['path']
-            File.join root, local_dir, $1
+          # If relative path, e.g. ./somefile, ../somefile
+          if file =~ /^\.+\//
+            page = context['page']
+            if local_dir = page['dir']
+              File.expand_path(File.join(local_dir, file))
+            else
+              local_dir = File.dirname page['path']
+              File.expand_path(File.join(root, local_dir, file))
+            end
 
           # If absolute or relative to a user directory, e.g. /Users/Bob/somefile or ~/somefile
           elsif file =~ /^[\/~]/

data/lib/octopress-ink/plugin.rb

@@ -274,7 +274,11 @@ module Octopress
       end
 
       def add_docs
-        @docs = add_new_assets(@docs_dir, Assets::DocPageAsset)
+        find_assets(@docs_dir).each do |asset|
+          unless asset =~ /^_/
+            @docs << Assets::DocPageAsset.new(self, @docs_dir, asset)
+          end
+        end
       end
 
       def add_files

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

@@ -53,7 +53,7 @@ module Octopress
           path = markup.match(SYNTAX)[1]
           @path = Helpers::Path.expand(path, context)
           begin
-            Pathname.new(@path).read
+            File.open(@path).read
           rescue
             raise IOError.new "Render failed: {% #{@tag_name} #{@og_markup}%}. The file '#{path}' could not be found at #{@path}."
           end

data/lib/octopress-ink/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octopress-ink
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.41
+  version: 1.0.0.alpha.42
 platform: ruby
 authors:
 - Brandon Mathis