dominate 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 027d7683d6936a5b2288d2385c123c521b50e762
-  data.tar.gz: 2a714a9548917eee30ab5a64cbc1a16acb0180fa
+  metadata.gz: 93f5b699571918d5a7f4a599d84f7d324ff88ef1
+  data.tar.gz: a3bdcd9fd5ac1dd6145888d03958ebd4334166f0
 SHA512:
-  metadata.gz: 0bdd687486a08e26a29815b5a7c519c30a1b75874b6ab8306eebbb2009ae2b2505f805e3f3448a3255061845613f9fe48d74377ab532e0c1ba6a62f3dfe979c9
-  data.tar.gz: 10c1329d9c4a36da9c375d16cf6aa9b264210a6ec41ebab4f96446529936d10fb3983d66836f7f0e66dbb66756874d3cac08dcbe98187aae7c22f3c8a34c623a
+  metadata.gz: 543d051c51e00fd274bc4cc4c331737aa22dc26889963e63763fde5ac7c9ba3609d2e8bb02ead32275b187c5954d8732ede7ad2d3b42de469f1d00cde6d23a7a
+  data.tar.gz: c7809e76967b223dc8f1d0fb78ae2ec2b2178e3cce14ca6962606ece132feafaa4a732f4624cfa9e5a23e81b4eff77592505d29c07086378ed3000fc77df852b

data/lib/dominate.rb

@@ -8,10 +8,10 @@ require "dominate/dom"
 module Dominate
   extend self
 
-  attr_accessor :config, :reset_config, :load_all
+  attr_accessor :config, :reset_config
 
-  def HTML html, data = {}
-    Dom.new html, data
+  def HTML html, instance = false, data = {}
+    Dom.new html, instance, data
   end
 
   def setup

data/lib/dominate/dom.rb

@@ -1,33 +1,31 @@
 module Dominate
   class Dom
-    attr_accessor :raw_html, :instance, :doc
+    attr_accessor :raw_html, :instance, :options, :config, :doc
 
-    PARTIAL_REGEX = /<!--(?:\s*|)@partial(?:\s*|)([a-zA-Z0-9\-_]*)(?:\s*|)-->/
-    PARTIAL_REGEX_WITHIN =/<!--(?:\s*|)@partial(?:\s*|)([a-zA-Z0-9\-_]*)(?:\s*|)-->(.*?)<!--(?:\s*|)\/partial(?:\s*|)([a-zA-Z0-9\-_]*)(?:\s*|)-->/m
-    VIEW_TYPES    = %w(html slim haml erb md markdown mkd mab)
+    YIELD_REGEX          = /<!--(?:\s*|)@yield(?:\s*|)-->/
+    PARTIAL_REGEX        = /<!--(?:\s*|)@partial(?:\s*|)([a-zA-Z0-9\-_]*)(?:\s*|)-->/
+    PARTIAL_REGEX_WITHIN = /<!--(?:\s*|)@partial(?:\s*|)([a-zA-Z0-9\-_]*)(?:\s*|)-->(.*?)<!--(?:\s*|)\/partial(?:\s*|)([a-zA-Z0-9\-_]*)(?:\s*|)-->/m
+    VIEW_TYPES           = %w(html slim haml erb md markdown mkd mab)
 
-    def initialize raw_html, instance = false
+    def initialize raw_html, instance = false, config = {}
       @raw_html = raw_html
       @instance = instance
+      @config   = (Dominate.config.to_h.merge config).to_deep_ostruct
 
-      if raw_html.match(/<html.*>/)
-        @doc = Nokogiri::HTML::Document.parse raw_html
-      else
-        # need to wrap it in a div to make sure it has a root
-        @doc = Nokogiri::HTML.fragment "<div>#{raw_html}</div>"
-      end
-
-      load_partials if Dominate.config.view_path
+      set_doc raw_html
+      load_html if Dominate.config.view_path
     end
 
-    def load_partials
+    def load_html
+      load_layout if config.layout
+
       updated_html = doc.inner_html.gsub(PARTIAL_REGEX_WITHIN) do |m|
         match   = m.strip.match(PARTIAL_REGEX)
         partial = match[1]
         load_view "#{view_path}/#{partial}"
       end
 
-      doc.inner_html = updated_html if updated_html
+      set_doc updated_html if updated_html
 
       doc.traverse do |e|
         if match = e.to_html.strip.match(PARTIAL_REGEX)
@@ -39,6 +37,12 @@ module Dominate
       end
     end
 
+    def load_layout
+      html       = load_view config.layout
+      inner_html = doc.inner_html
+      set_doc html.gsub YIELD_REGEX, inner_html
+    end
+
     def scope name
       reset_html
       Scope.new instance, doc.search("[data-scope='#{name}']")
@@ -58,6 +62,15 @@ module Dominate
 
     private
 
+    def set_doc html
+      if html.match(/<html.*>/)
+        @doc = Nokogiri::HTML::Document.parse html
+      else
+        # need to wrap it in a div to make sure it has a root
+        @doc = Nokogiri::HTML.fragment html
+      end
+    end
+
     def reset_html
       @html = false
     end

data/lib/dominate/scope.rb

@@ -101,6 +101,5 @@ module Dominate
         value.to_s
       end
     end
-
   end
 end

data/lib/dominate/version.rb

@@ -1,3 +1,3 @@
 module Dominate
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

data/test/dominate_test.rb

@@ -6,6 +6,7 @@ setup do
   Dominate.reset_config!
   Dominate.setup do |c|
     c.view_path = './test/dummy'
+    c.layout    = "#{c.view_path}/app"
   end
 
   inline_html = File.read './test/dummy/index.html'
@@ -80,4 +81,11 @@ scope 'dominate' do
     assert a.dom.html['Test Company']
     assert a.dom.html['This should not show'] == nil
   end
+
+  test 'layout' do |a|
+    assert a.dom.html['<head>'] == nil
+    assert a.dom.html['body']
+    assert a.dom.html['app layout']
+    assert a.dom.html.scan(/body/).length == 2
+  end
 end

data/test/dummy/app.slim

@@ -1,3 +1,4 @@
 html
   body
-    /! @content
+    | app layout
+    /! @yield

data/test/dummy/index.html

@@ -1,26 +1,32 @@
-<!-- @partial header -->
-  <span>This should not show</span>
-<!-- /partial header -->
+<html>
+  <head>
+  </head>
+<body>
+  <!-- @partial header -->
+    <span>This should not show</span>
+  <!-- /partial header -->
 
-<div>
-  <h1 data-scope='admin_only'>Admin</h1>
-  <span>current_user:
-    <span data-instance="current_user.first_name">John</span>
-    <span data-instance="current_user.last_name">Doe</span>
-  </span>
-</div>
-<ul data-scope="list">
-  <li>
-    <a href="#" data-prop="todo">test</a>
-  </li>
-  <li>
-    <a href="#" data-prop="todo">testing</a>
-  </li>
-  <li>
-    <ul data-scope="list-nested">
-      <li data-prop="todo"></li>
-    </ul>
-  </li>
-</ul>
+  <div>
+    <h1 data-scope='admin_only'>Admin</h1>
+    <span>current_user:
+      <span data-instance="current_user.first_name">John</span>
+      <span data-instance="current_user.last_name">Doe</span>
+    </span>
+  </div>
+  <ul data-scope="list">
+    <li>
+      <a href="#" data-prop="todo">test</a>
+    </li>
+    <li>
+      <a href="#" data-prop="todo">testing</a>
+    </li>
+    <li>
+      <ul data-scope="list-nested">
+        <li data-prop="todo"></li>
+      </ul>
+    </li>
+  </ul>
 
-<!-- @partial footer -->
+  <!-- @partial footer -->
+</body>
+</html>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dominate
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - cj