jekyll-ramler 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b51a16a272803f10915253d041eadd53213f8d4
-  data.tar.gz: eb6626d0d68f77c7faa78041428214d419a2e664
+  metadata.gz: 2f230b6212247528fc03df0000009d3eb25c154e
+  data.tar.gz: bb207769c3478528d86c2ff22258955d39ad2f09
 SHA512:
-  metadata.gz: d9c0d5900dc16eadbfe0119fca2a96b125835506d031fec593bcd8b1679be9b49f9f5dbd4771526d0571c7bd3a41febe782c43c04b32a5e4509cf96debd13048
-  data.tar.gz: b445707349317d6923584813ff834a430ea55d48c17106bc489515a9dad8063aadec4970a33eb8679299d30fa589bcd255e489d217f6023087c932a9a24660f9
+  metadata.gz: 06140a5983654fc240b33d25e156585b5df0173ebf974ff2fec7f2e0cbed295768d2853cc49fe09da233ebd1dc4fa1d93340fc87edee4f6afbe4c9ea9de083eb
+  data.tar.gz: c26f71403202e493480dfe3f0256072c742805721aa930183ee5ac712997a456a3569fe989d6a4969194cc66cf72b2d538f44e48a6499d571f5df69607f13efc

data/jekyll-ramler.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'jekyll-ramler'
-  s.version     = '0.0.2'
+  s.version     = '0.0.3'
   s.date        = '2015-02-09'
   s.authors     = ['GovDelivery']
   s.email       = 'support@govdelivery.com'

data/lib/raml-generate.rb

@@ -24,7 +24,7 @@ module Jekyll
       @dir = File.join(web_root, @dir)
       @name = 'index.html'
       
-      layout = get_layout(dir) if layout.nil?
+      layout = get_layout("#{web_root}#{dir}") if layout.nil?
       layout << '.html' if not layout.end_with?('.html')
 
       self.process(@name)
@@ -46,13 +46,13 @@ module Jekyll
       end
 
       def get_layout(dir, site=@site)
-        default = site.config.fetch('defaults', {}).detect do |default| 
-          default['scope']['path'] == dir.split('/').first
-        end
+        defaults = site.config.fetch('defaults', []).sort_by { |x| -(x.fetch('scope', {}).fetch('path', '').length) }
+
+        default = defaults.detect { |x| dir.include?(x['scope']['path'])}
 
         default = {"values" => {}} if default.nil?
 
-        default['values'].fetch('layout', 'default')
+        layout = default['values'].fetch('layout', 'default')
       end
 
   end

data/spec/config_spec.rb

@@ -19,6 +19,7 @@ describe 'ReferencePageGenerator', fakefs:true do
 
     FileUtils.mkdir_p('_layouts')
     File.open('_layouts/default.html', 'w') { |f| f << "{{ content }}" }
+    File.open('_layouts/resource.html', 'w') { |f| f << "<h1>Resource</h1> <p>{{ content }}</p>" }
 
     File.open('api.json', 'w') do |f|
       f << JSON.pretty_generate(load_simple_raml)
@@ -141,5 +142,18 @@ describe 'ReferencePageGenerator', fakefs:true do
       expect(File.file?('_site/productA/productA_api.json')).to be true
       expect(File.file?('_site/productA/productA_api.raml')).to be true
     end
+
+    it 'can use layouts configured for nested contexts' do
+      @site.config['defaults'] = [{
+        'scope' => {'path' => 'productA/resource'},
+        'values' => {'layout' => 'resource'}
+      }]
+      @site.config['ramler_api_paths'].delete('service.json')
+
+      @rpg.generate(@site)
+      @site.process
+      output = File.read('_site/productA/resource/test_resource/index.html')
+      expect(output).to include "<h1>Resource</h1>"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-ramler
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - GovDelivery