roda-component 0.1.65 → 0.1.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0c512ecac4ecf7a3b0274e5c52becace09c1e69
-  data.tar.gz: d7171c6866fffed0dea124e208765b83cd3dd4e8
+  metadata.gz: 23c5468778c982bcaa2ccfce82c5172a4e74e1f8
+  data.tar.gz: 82aa7a44b790a0861f9ab6a71181219465ee5693
 SHA512:
-  metadata.gz: e3929aae6ee8227aa3bcdf06048cf179fccbd1a0c8c77e2babbd7ac7f5ae9d90f2c60a76ba73696b7a8db4835032780a809c72672072d66107a3720276c031e3
-  data.tar.gz: 70889b0ca0c6bf642535d3af62a77e3f359ce40f8c7d96ad858eb4a6fc95f86d436063772a380224f76ea27f506a186e75a33d1bf6eebf5996e433cef44521fd
+  metadata.gz: 6e824c8d84f59329bc3223f3aaa939ea6d53d9d33b5afbc2f2986a9ac8b6e3af41d195a16fb7e4c28beab7986097bef992cdbf4dd156a48530801692680f4347
+  data.tar.gz: 5d19cb6664d78019e88c471d6ebb2cc68e86d762464908dcb0ab97d603572b15e70807b02242625853b1a148af7a1faca9a227dff3d3e23b9ac0d9728a61b72d

data/lib/roda/component.rb

@@ -31,16 +31,18 @@ unless RUBY_ENGINE == 'opal'
   module Nokogiri
     module XML
       class NodeSet
-        # alias_method :original_to_xhtml, :to_xhtml
-        # def to_xhtml *args
-        #   original_to_xhtml(*args).gsub("
", "\r")
-        # end
+        # fix: this is really shity
+        alias_method :original_to_html, :to_html
+        def to_html *args
+          original_to_html(*args).gsub(/%7B(|;)/, "{").gsub(/%7D(|;)/, "}")
+        end
       end
       class Node
-        # alias_method :original_to_xhtml, :to_xhtml
-        # def to_xhtml *args
-        #   original_to_xhtml(*args).gsub("
", "\r")
-        # end
+        # fix: this is really shity
+        alias_method :original_to_html, :to_html
+        def to_html *args
+          original_to_html(*args).gsub(/%7B(|;)/, "{").gsub(/%7D(|;)/, "}")
+        end
 
         private
 
@@ -271,7 +273,7 @@ class Roda
             cache[:html] = yield
           end
 
-          cache[:html] = cache[:html].gsub("\r\n", "\n")
+          cache[:html] = cache[:html]
           cache[:dom]  = DOM.new(cache[:html])
         end
       end
@@ -341,7 +343,7 @@ class Roda
       def tmpl name, dom = false, remove = true
         if dom
           cache[:tmpl][name] = { dom: remove ? dom.remove : dom }
-          cache[:tmpl][name][:html] = cache[:tmpl][name][:dom].to_xhtml
+          cache[:tmpl][name][:html] = cache[:tmpl][name][:dom].to_html
           cache[:tmpl][name]
         elsif t = cache[:tmpl][name]
           DOM.new t[:html]
@@ -389,7 +391,7 @@ class Roda
     def dom
       if server?
         # TODO: duplicate cache[:dom] so we don't need to parse all the html again
-        @_dom ||= DOM.new(cache[:dom].dom.to_xhtml)
+        @_dom ||= DOM.new(cache[:dom].dom.to_html)
       else
         @_dom ||= DOM.new(Element)
       end

data/lib/roda/component/events.rb

@@ -123,7 +123,7 @@ class Roda
             response = Component::Instance.new(component(comp), scope).instance_exec options, &block
 
             if response.is_a? Roda::Component::DOM
-              content = response.to_xhtml
+              content = response.to_html
             else
               content = response
             end

data/lib/roda/component/form.rb

@@ -224,7 +224,7 @@ class Roda
               if client?
                 field_error_dom = DOM.new(`#{tmpl.dom}[0].outerHTML`)
               else
-                field_error_dom = DOM.new(tmpl.dom.to_xhtml)
+                field_error_dom = DOM.new(tmpl.dom.to_html)
               end
             else
               field_error_dom = DOM.new('<span class="field-error"><span>')

data/lib/roda/component/version.rb

@@ -1,5 +1,5 @@
 class Roda
   class Component
-    VERSION = "0.1.65"
+    VERSION = "0.1.66"
   end
 end

data/lib/roda/plugins/component.rb

@@ -64,7 +64,7 @@ class Roda
         end
 
         def loaded_component_js
-          request.env['loaded_component_js'] ||= []
+          request ? (request.env['loaded_component_js'] ||= []) : (@_loaded_component_js ||= [])
         end
 
         def load_component name, options = {}
@@ -183,7 +183,7 @@ class Roda
             load_component_js comp, action, options
 
             if js && comp_response.is_a?(Roda::Component::DOM)
-              comp_response = comp_response.to_xhtml
+              comp_response = comp_response.to_html
             end
 
             if comp_response.is_a?(String) && js

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roda-component
 version: !ruby/object:Gem::Version
-  version: 0.1.65
+  version: 0.1.66
 platform: ruby
 authors:
 - cj