dominate 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 263ca392c4f1caf806ddcb5ef3231d93d8b6d45b
-  data.tar.gz: e09f028bc7c04648cf48faa44b3d11e4ed5aa6c1
+  metadata.gz: 5600920b37b6799b8b026fa536b4a292461b3d27
+  data.tar.gz: 2de8938a45752ecee763249dba4f219f8ce8002b
 SHA512:
-  metadata.gz: b500d7d3cb695aad53c74140291ff10903a2b93724d310b9210bbb9559fd12a1c5ec1df17a18032f714699daa633af977132a8c9cec734b3250b123a36c45d68
-  data.tar.gz: 7fa4f9ff2792542e2e572256f696162d57d662929317aceea1b68177a3be38fce922d4fc00f0a88426736d145c170c85d4a5a4c6fde0be24c05c7ba0d3681eba
+  metadata.gz: b1fad8e73677983c7e365e32ebae730ab5bd07380a1d778abd6cf8c56380eb2cac832757ca1f5de3975a0be68235898f708e14dda1103682a34ee89b035ff5bb
+  data.tar.gz: 4afc8ea69b29be8dca0eb010c7a8e333ed59680dbd8b6a237a28e608fd88c859948c68778903dba27a618d319da3c94cf5b98d5f9150e3333491747d7480df1c

data/lib/dominate/dom.rb

@@ -43,10 +43,10 @@ module Dominate
     end
 
     def scope name, &block
-      reset_html
-      @scope = Scope.new instance, doc.search("[data-scope='#{name}']")
+      root_doc = doc.search("[data-scope='#{name}']")
+      @scope   = Scope.new instance, config, root_doc
 
-      @scope.root_doc.instance_eval(&block) if block
+      Instance.new(instance, config).instance_exec(root_doc, &block) if block
 
       self
     end
@@ -66,7 +66,7 @@ module Dominate
 
     def apply_instance
       reset_html
-      Scope.new(instance, doc).apply_instance
+      Scope.new(instance, config, doc).apply_instance
     end
 
     private

data/lib/dominate/html.rb

@@ -11,8 +11,7 @@ module Dominate
       dom  = Dom.new html, instance, config
 
       if File.file? path + '.dom'
-        proc = Proc.new { dom }
-        dom = instance.instance_eval File.read(path + '.dom')
+        dom = Instance.new(instance, c).instance_eval File.read(path + '.dom')
       end
 
       dom

data/lib/dominate/instance.rb

@@ -0,0 +1,13 @@
+module Dominate
+  class Instance < Struct.new(:instance, :config)
+    def method_missing method, *args, &block
+      if config.respond_to? method
+        config.send method
+      elsif instance.respond_to? method
+        instance.send method
+      else
+        super
+      end
+    end
+  end
+end

data/lib/dominate/scope.rb

@@ -1,5 +1,5 @@
 module Dominate
-  class Scope < Struct.new :instance, :root_doc
+  class Scope < Struct.new :instance, :config, :root_doc
 
     def apply data, &block
       root_doc.each do |doc|
@@ -100,11 +100,11 @@ module Dominate
     def value_for value, data, elem
       if value.is_a? Proc
         if value.parameters.length == 0
-          instance.instance_exec(&value).to_s
+          Instance.new(instance, config).instance_exec(&value).to_s
         elsif value.parameters.length == 1
-          instance.instance_exec(data, &value).to_s
+          Instance.new(instance, config).instance_exec(data, &value).to_s
         elsif value.parameters.length == 2
-          instance.instance_exec(data, elem, &value).to_s
+          Instance.new(instance, config).instance_exec(data, elem, &value).to_s
         end
       else
         value.to_s

data/lib/dominate/version.rb

@@ -1,3 +1,3 @@
 module Dominate
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/dominate.rb

@@ -3,6 +3,7 @@ require "nokogiri-styles"
 require "tilt"
 require "dominate/version"
 require "dominate/inflectors"
+require "dominate/instance"
 require "dominate/html"
 require "dominate/scope"
 require "dominate/dom"

data/test/dominate_test.rb

@@ -95,14 +95,14 @@ scope 'dominate' do
   end
 
   test 'flat' do
-    dom = Dominate::HTML.file 'flat'
+    dom = Dominate::HTML.file 'flat', false, name: '.dom'
     dom.scope(:flat).apply ['moo', 'cow']
     assert dom.html['Moo']
     assert dom.html['Cow']
   end
 
   test 'styles' do
-    dom = Dominate::HTML.file 'flat'
+    dom = Dominate::HTML.file 'flat', false, name: '.dom'
 
     dom.scope(:flat).apply ['moo', 'cow'] do |node|
       styles          = node.styles

data/test/dummy/flat.dom

@@ -1,5 +1,5 @@
 dom.scope(:from_file) do |node|
   node.each do |n|
-    n.add_child '<div>added via .dom file</div>'
+    n.add_child "<div>added via #{name} file</div>"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dominate
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - cj
@@ -153,6 +153,7 @@ files:
 - lib/dominate/dom.rb
 - lib/dominate/html.rb
 - lib/dominate/inflectors.rb
+- lib/dominate/instance.rb
 - lib/dominate/scope.rb
 - lib/dominate/version.rb
 - test/dominate_test.rb