stasis 0.1.15 → 0.1.16

data/lib/stasis/plugins/layout.rb

@@ -16,11 +16,30 @@ class Stasis
       return unless @stasis.path
       @stasis.action._layout = nil
       matches = _match_key?(@layouts, @stasis.path)
-      # Find matching layout with same extension.
-      matches.each do |(within, layout, non_specific)|
-        if _within?(within) && File.extname(layout) == File.extname(@stasis.path)
-          @stasis.action._layout = layout
+      # Non-HTML extensions.
+      non_html = %w(sass scss less builder coffee yajl)
+      # Find matching layout.
+      [ :same, :similar ].each do |type|
+        matches.each do |(within, layout, non_specific)|
+          layout_ext = File.extname(layout)[1..-1]
+          path_ext = File.extname(@stasis.path)[1..-1]
+
+          match =
+            case type
+            # Same extension?
+            when :same then
+              layout_ext == path_ext
+            # Similar extension?
+            when :similar then
+              non_html.include?(layout_ext) == non_html.include?(path_ext)
+            end
+
+          # Set layout
+          if _within?(within) && match
+            @stasis.action._layout = layout
+          end
         end
+        break if @stasis.action._layout
       end
       # If layout not found, try again without extension requirement for specific layout
       # definitions only.

data/stasis.gemspec

@@ -6,7 +6,7 @@ $:.unshift lib unless $:.include?(lib)
 
 Gem::Specification.new do |s|
   s.name        = "stasis"
-  s.version     = '0.1.15'
+  s.version     = '0.1.16'
   s.platform    = Gem::Platform::RUBY
   s.authors     = [ 'Winton Welsh' ]
   s.email       = [ 'mail@wintoni.us' ]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stasis
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 1
-  - 15
-  version: 0.1.15
+  - 16
+  version: 0.1.16
 platform: ruby
 authors: 
 - Winton Welsh