nanoc-conref-fs 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3a726e64721a3b46fba7d2c2127e5a32443e32e
-  data.tar.gz: 4029668164382b87e6e6214a43a6799ab6bbe9b1
+  metadata.gz: 4d7ad8948dbfd2807188dace405629e8556be38b
+  data.tar.gz: a2e748402407b1c74347d32c4f3cda89fff7d1cd
 SHA512:
-  metadata.gz: 721c545407580610d9e5837274e4255b948e2258b9282ed01e84c2d7a7e59ad8f130d38a1def79cb1f789cdf3eac58f9c1cd3f4f4082790a1729268da35ff5b5
-  data.tar.gz: 2d02ae7a354ed8660f4a78b43bfc7fa0cb16966fada9c662ab829fe4c557150c1c79d0554ee3c28477d63e8723b710144c89e849b27b10f0167082d221bb838b
+  metadata.gz: 331081baa3f15c26b040858f4a24ed03d9d01d6a73448b6da85c19d0908c852f2380eb07c0995cc2cd9d25e0ce454629cad01dae4842167108f049c8a14bcdd8
+  data.tar.gz: ef19358bbe4722d0181b6d999a8878aad3960208856978555ab22976ad79b2ebb75783bbf4a1d347c06d6d93984c7574b3e7e953956ea9d920f6509304fdbacd

data/lib/nanoc-conref-fs/conref-fs.rb

@@ -1,20 +1,37 @@
 require_relative 'conrefifier'
 
+# Unsure why attr_accessor does not work here
+module VariableMixin
+  def self.variables
+    @variables
+  end
+
+  def self.variables=(variables)
+    @variables = variables
+  end
+end
+
 class ConrefFS < Nanoc::DataSource
   include Nanoc::DataSources::Filesystem
+  include VariableMixin
 
   identifier :conref_fs
 
   # Before iterating over the file objects, this method loads the data folder
   # and applies to to an ivar for later usage.
   def load_objects(dir_name, kind, klass)
-    if klass == Nanoc::Int::Item && @vars.nil?
+    if klass == Nanoc::Int::Item && @variables.nil?
       data = Datafiles.process(@site_config)
-      @vars = { 'site' => { 'config' => @site_config.to_h, 'data' => data } }
+      @variables = { 'site' => { 'config' => @site_config.to_h, 'data' => data } }
+      VariableMixin.variables = @variables
     end
     super
   end
 
+  def self.fetch_variables
+    @variables
+  end
+
   # This function calls the parent super, then adds additional metadata to the item.
   def parse(content_filename, meta_filename, _kind)
     meta, content = super
@@ -22,7 +39,7 @@ class ConrefFS < Nanoc::DataSource
     unless page_vars[:data_association].nil?
       association = page_vars[:data_association]
       reference = association.split('.')
-      toc = @vars['site']['data']
+      toc = @variables['site']['data']
       while key = reference.shift
         toc = toc[key]
       end
@@ -62,7 +79,7 @@ class ConrefFS < Nanoc::DataSource
   def read(filename)
     begin
       page_vars = Conrefifier.file_variables(@site_config[:page_variables], filename)
-      page_vars = { :page => page_vars }.merge(@vars)
+      page_vars = { :page => page_vars }.merge(@variables)
 
       data = File.read(filename)
       return data unless filename.start_with?('content')

data/nanoc-conref-fs.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'nanoc-conref-fs'
-  spec.version       = '0.1.1'
+  spec.version       = '0.2.0'
   spec.authors       = ['Garen Torikian']
   spec.email         = ['gjtorikian@gmail.com']
   spec.summary       = 'A Nanoc filesystem to permit using conrefs/reusables in your content.'

data/test/conref_fs_test.rb

@@ -113,4 +113,15 @@ class DatafilesTest < MiniTest::Test
       assert_equal output_file, test_file
     end
   end
+
+  def test_it_fetches_variables
+    with_site(name: FIXTURES_DIR) do |site|
+
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
+      site.compile
+      output_file = read_output_file('datafiles', 'retrieve')
+      test_file = read_test_file('datafiles', 'retrieve')
+      assert_equal output_file, test_file
+    end
+  end
 end

data/test/fixtures/Rules

@@ -5,9 +5,14 @@ compile '/**/*.html' do
 end
 
 compile '/**/*.md' do
-  layout '/default.*'
+  if item[:filename] =~ /retrieve/
+    layout '/retrieve.*'
+  else
+    layout '/default.*'
+  end
 end
 
+
 route '/**/*.md' do
   item.identifier.without_ext + '/index.html'
 end

data/test/fixtures/content/datafiles/retrieve.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>
+  Fetching data
+  </title>
+</head>
+
+<body>
+
+  GitHub Enterprise
+
+Fetchy
+
+</body>
+</html>

data/test/fixtures/content/datafiles/retrieve.md

@@ -0,0 +1,5 @@
+---
+title: Fetching data
+---
+
+Fetchy

data/test/fixtures/layouts/retrieve.html

@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>
+  <%= @item[:title] %>
+  </title>
+</head>
+
+<body>
+
+  <%= VariableMixin.variables['site']['data']['variables']['product']['product_name']['2.0'] %>
+  <%= yield %>
+
+</body>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nanoc-conref-fs
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Garen Torikian
@@ -104,6 +104,8 @@ files:
 - test/fixtures/Rules
 - test/fixtures/content/datafiles/deep.html
 - test/fixtures/content/datafiles/deep.md
+- test/fixtures/content/datafiles/retrieve.html
+- test/fixtures/content/datafiles/retrieve.md
 - test/fixtures/content/frontmatter/audience.html
 - test/fixtures/content/frontmatter/audience.md
 - test/fixtures/content/frontmatter/different.html
@@ -126,6 +128,7 @@ files:
 - test/fixtures/data/variables/empty.yml
 - test/fixtures/data/variables/product.yml
 - test/fixtures/layouts/default.html
+- test/fixtures/layouts/retrieve.html
 - test/fixtures/nanoc.yaml
 - test/test_helper.rb
 homepage: https://github.com/gjtorikian/nanoc-conref-fs
@@ -158,6 +161,8 @@ test_files:
 - test/fixtures/Rules
 - test/fixtures/content/datafiles/deep.html
 - test/fixtures/content/datafiles/deep.md
+- test/fixtures/content/datafiles/retrieve.html
+- test/fixtures/content/datafiles/retrieve.md
 - test/fixtures/content/frontmatter/audience.html
 - test/fixtures/content/frontmatter/audience.md
 - test/fixtures/content/frontmatter/different.html
@@ -180,5 +185,6 @@ test_files:
 - test/fixtures/data/variables/empty.yml
 - test/fixtures/data/variables/product.yml
 - test/fixtures/layouts/default.html
+- test/fixtures/layouts/retrieve.html
 - test/fixtures/nanoc.yaml
 - test/test_helper.rb