wouter-views 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b356aaa50ae723d845020d7dadfc95464e03dddedeb5ef04a09992cf9c56e56
-  data.tar.gz: 88ceeb64f8f33e41abc7075ce59daaa15ab11ed401c541f6caa9242d0d0d8a61
+  metadata.gz: 52f7636ecdb3cdf1d29fe825b53464e3506b89527a1833a3529b62dc4af124b1
+  data.tar.gz: 8e3b2b075d7c0ff1a5d683fbc7b8589d530795a4aa85dae1d24f5f6028910c5f
 SHA512:
-  metadata.gz: d0f52189c54044d9cbcf9a887ca7a967faefd3a7a3b4102f2822a88788b8477cd1394c5a65d5f5c745cbb980109df18c88f53e062d29b63f8b193e261bde3eae
-  data.tar.gz: c870c1ac14931cbd385660ddce16c3dbe36c6264ab4cf246c1b7ae583791e8edd510b1a10631cf769a1541285e7dfacb203fed5321edb29029ccba13317ea320
+  metadata.gz: 8de81eb26f3cd36e08ad46375910ec5767e6f2b63b738178cae804587c4c8bfc388ab49b65bcbf0ab66f7c4c1bc728a6487ec5abbbd56d4f501c89387c3c766a
+  data.tar.gz: 5db7cb838e4f3e27b03262653ed1723795eb6ed6c722135cbacc89b9a91bcd38756319fac49ec70f2e73323c3d1e4e1aec12bfe3567ad2c222914d9c1f819bbd

data/lib/wouter/views.rb

@@ -6,48 +6,71 @@ class Wouter
   class Views
     class FileNotFound < StandardError; end
 
-    def self.file_finder(dir, template, engine, bind)
-      file_name = template.to_s + '.' + engine.to_s
-      full_path = dir + '/' + file_name
+    class <<self
+      def file_finder(dir, template, engine, layout, bind)
+        template_full_path = full_path(template, dir, engine)
+        template_data = if Tilt.template_for(template_full_path)
+                          Tilt.new(template_full_path).render(bind)
+                        else
+                          File.read(template_full_path)
+                        end
 
-      return Tilt.new(full_path).render(bind) if File.exists?(full_path)
-
-      full_path = dir + '/' + template.to_s
-
-      if Tilt.template_for(full_path)
-        Tilt.new(full_path).render(bind)
-      else
-        if File.exists?(full_path)
-          File.read(full_path)
+        if layout
+          layout_full_path = full_path(layout, dir, engine)
+          if Tilt.template_for(layout_full_path)
+            Tilt.new(layout_full_path).render(bind) { template_data }
+          else
+            File.read(layout_full_path) + template_data
+          end
         else
-          raise FileNotFound, "could not find file: #{full_path}"
+          template_data
         end
       end
+
+      def full_path(file, dir, engine)
+        file_name = file.to_s + '.' + engine.to_s
+        full_path = dir + '/' + file_name
+
+        return full_path if File.exists?(full_path)
+
+        full_path = dir + '/' + file.to_s
+
+        return full_path if File.exists?(full_path)
+
+        raise FileNotFound, "cannot find file: '#{file}' in '#{dir}'"
+      end
     end
+
   end
 end
 
 class Wouter
   class <<self
-    def render_template(template, bind = self, engine = nil, dir = nil)
+    def render_template(template, bind = self, engine = nil, dir = nil, layout = nil)
       dir = dir || config[:view_dir] || File.expand_path('./views')
       engine = engine || config[:view_engine] || :html
-      Wouter::Views.file_finder(dir, template, engine, bind)
+      layout = layout || config[:layout] || nil
+      Wouter::Views.file_finder(dir, template, engine, layout, bind)
     end
 
-    def render_view(template, engine: nil, dir: nil)
-      ViewWrap.new(template, engine, dir)
+    def render_view(template, engine: nil, dir: nil, layout: nil)
+      ViewWrap.new(template, engine, dir, layout)
     end
 
     def view_dir(dir = nil)
-      config[:view_dir] = dir unless dir.nil?
+      config[:view_dir] = dir if dir
       config[:view_dir]
     end
 
     def view_engine(engine = nil)
-      config[:view_engine] = engine unless engine.nil?
+      config[:view_engine] = engine if engine
       config[:view_engine]
     end
+
+    def view_layout(layout = nil)
+      config[:view_layout] = layout if layout
+      config[:view_layout]
+    end
   end
 
   class ViewEndpoint < Wouter::Endpoint
@@ -57,32 +80,35 @@ class Wouter
     end
 
     def respond
-      render_view(@view[:template], engine: @view[:engine], dir: @view[:dir])
+      render_view(@view[:template], engine: @view[:engine], dir: @view[:dir], layout: @view[:layout])
     end
   end
 
   class ViewWrap
-    def initialize(template, engine = nil, dir = nil)
+    def initialize(template, engine = nil, dir = nil, layout = nil)
       @template = template
       @engine = engine
       @dir = dir
+      @layout = layout
     end
 
     def call(env)
       env['wouter.view'] = {
         template: @template,
         engine: @engine,
-        dir: @dir
+        dir: @dir,
+        layout: @layout
       }
       ViewEndpoint.call(env)
     end
   end
 
   class Endpoint
-    def render_view(template, engine: nil, dir: nil)
+    def render_view(template, engine: nil, dir: nil, layout: nil)
       engine ||= config[:view_engine]
       dir ||= config[:view_dir]
-      Wouter.render_template(template, self, engine, dir)
+      layout ||= config[:view_layout]
+      Wouter.render_template(template, self, engine, dir, layout)
     end
   end
 end

data/wouter-views.gemspec

@@ -3,7 +3,7 @@
 Gem::Specification.new do |s|
   s.name        = 'wouter-views'
   s.platform    = Gem::Platform::RUBY
-  s.version     = '0.0.7'
+  s.version     = '0.0.8'
   s.summary     = 'View template support for Wouter web framework.'
   s.description = 'Adds view template support to the Wouter web framework.'
   s.authors     = ['Robert Peterson']
@@ -22,4 +22,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rack-test', '~> 1.1'
   s.add_development_dependency 'rake', '~> 12.3'
   s.add_development_dependency 'slim', '~> 4.0', '>= 4.0.1'
+  s.add_development_dependency 'sass', '~> 3.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wouter-views
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Robert Peterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-21 00:00:00.000000000 Z
+date: 2018-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: wouter
@@ -154,6 +154,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.1
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
 description: Adds view template support to the Wouter web framework.
 email: robertpeterson@gmail.com
 executables: []