dominate 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93f5b699571918d5a7f4a599d84f7d324ff88ef1
-  data.tar.gz: a3bdcd9fd5ac1dd6145888d03958ebd4334166f0
+  metadata.gz: 8a7bcd918c55a4b1bc2182aa3af2d1c99815e86f
+  data.tar.gz: 70a234db125eef1641b0eead1332eb009a3f1e79
 SHA512:
-  metadata.gz: 543d051c51e00fd274bc4cc4c331737aa22dc26889963e63763fde5ac7c9ba3609d2e8bb02ead32275b187c5954d8732ede7ad2d3b42de469f1d00cde6d23a7a
-  data.tar.gz: c7809e76967b223dc8f1d0fb78ae2ec2b2178e3cce14ca6962606ece132feafaa4a732f4624cfa9e5a23e81b4eff77592505d29c07086378ed3000fc77df852b
+  metadata.gz: 2272c1f3a61ede1f6c123370a339d21b1f515d3f5472978690e295da235378ae43c3d407500b3fa572ba8a644de641efc43099be93eea3799ed6183518744738
+  data.tar.gz: 09003081a2758df05c5c268379a5fd23194b403089165cebf98c3f4164957235ecf8f4886f3f7f75b7308a66936a0d08777ad5d7b9f4454dd663fa7c4833b327

data/lib/dominate/dom.rb

@@ -5,7 +5,6 @@ module Dominate
     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, config = {}
       @raw_html = raw_html
@@ -22,7 +21,7 @@ module Dominate
       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}"
+        HTML.load "#{view_path}/#{partial}"
       end
 
       set_doc updated_html if updated_html
@@ -31,14 +30,14 @@ module Dominate
         if match = e.to_html.strip.match(PARTIAL_REGEX)
           partial = match[1]
           e.swap Nokogiri::HTML.fragment(
-            load_view "#{view_path}/#{partial}"
+            HTML.load "#{view_path}/#{partial}"
           )
         end
       end
     end
 
     def load_layout
-      html       = load_view config.layout
+      html       = HTML.load config.layout
       inner_html = doc.inner_html
       set_doc html.gsub YIELD_REGEX, inner_html
     end
@@ -76,23 +75,7 @@ module Dominate
     end
 
     def view_path
-      Dominate.config.view_path
-    end
-
-    def load_view path
-      html = false
-
-      VIEW_TYPES.each do |type|
-        file = "#{path}.#{type}"
-
-        if File.file? file
-          template = Tilt.new file
-          html = template.render
-          break
-        end
-      end
-
-      html
+      config.view_path
     end
   end
 end

data/lib/dominate/html.rb

@@ -0,0 +1,29 @@
+module Dominate
+  module HTML
+    extend self
+
+    VIEW_TYPES = %w(html slim haml erb md markdown mkd mab)
+
+    def file file, instance = false, config = {}
+      c    = (Dominate.config.to_h.merge config).to_deep_ostruct
+      html = load "#{c.view_path}/#{file}"
+      Dom.new html, instance, config
+    end
+
+    def load path
+      html = false
+
+      VIEW_TYPES.each do |type|
+        file = "#{path}.#{type}"
+
+        if File.file? file
+          template = Tilt.new file
+          html = template.render
+          break
+        end
+      end
+
+      html
+    end
+  end
+end

data/lib/dominate/version.rb

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

data/lib/dominate.rb

@@ -2,6 +2,7 @@ require "nokogiri"
 require "tilt"
 require "dominate/version"
 require "dominate/inflectors"
+require "dominate/html"
 require "dominate/scope"
 require "dominate/dom"
 
@@ -10,10 +11,6 @@ module Dominate
 
   attr_accessor :config, :reset_config
 
-  def HTML html, instance = false, data = {}
-    Dom.new html, instance, data
-  end
-
   def setup
     yield config
   end
@@ -26,4 +23,8 @@ module Dominate
   def reset_config!
     @config = OpenStruct.new
   end
+
+  def HTML html, instance = false, options = {}
+    Dom.new html, instance, options
+  end
 end

data/test/dominate_test.rb

@@ -88,4 +88,9 @@ scope 'dominate' do
     assert a.dom.html['app layout']
     assert a.dom.html.scan(/body/).length == 2
   end
+
+  test 'file' do
+    dom = Dominate::HTML.file 'index'
+    assert dom.html['data-scope']
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dominate
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-01 00:00:00.000000000 Z
+date: 2014-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -137,6 +137,7 @@ files:
 - dominate.gemspec
 - lib/dominate.rb
 - lib/dominate/dom.rb
+- lib/dominate/html.rb
 - lib/dominate/inflectors.rb
 - lib/dominate/scope.rb
 - lib/dominate/version.rb