www_app 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbfdf7458b157b502e9cf03a522b7d3d41883a6e
-  data.tar.gz: dff3da5abcc509526f77e5b511306c5f113e4a9a
+  metadata.gz: 6deb97c603788b103774f666d964e7fdc72ce709
+  data.tar.gz: 2020b45f8daffc2db74fbc1706cc403d8c0292d7
 SHA512:
-  metadata.gz: 938a2941e13c3912b4a9b6603d47fc77f0ac0e4b7c8813f66f27ad07392db2e00e66187e23bb6c02c6e9644ad4ec6ea244651b053800ec68e8ae520e7a18c4bf
-  data.tar.gz: 1580b1995dca04033a640ceee1131b328d086b525e3bdd1f681f57d45b9e992c2be756a7b9a7de466b7b8a8681049b124229b76d5557d279b18fffaf52913145
+  metadata.gz: 1644de2510fdd6caaf1a883b905667c6ea229184d9e0bb2ee585041acafb53073a4ecb46bc7c81a25b7432f8ce89b1e4a5b5f7ec0156d925f366f597c35fb67a
+  data.tar.gz: 87aa38768884fd6181df7606c5490cdeaaba8310f0acb7002bbd7503e9cccd946ab2af7545efb4e92c6751e095598b62ba65c431edd5d454820f4bf71ddee91b

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/www_app.rb

@@ -709,7 +709,10 @@ class WWW_App < BasicObject
         if tag?(:form)
           input(:hidden, :auth_token, :auth_token.to_mustache(:html))
         end
-        (tag![:text] = results) if results.is_a?(::String) || results.is_a?(::Symbol)
+
+        if (results.is_a?(::Hash) && results[:type] == :string) || results.is_a?(::String) || results.is_a?(::Symbol)
+          tag![:text] = results
+        end
       }
     end
 
@@ -919,9 +922,19 @@ class WWW_App < BasicObject
       return unless  h[:render?]
 
       if html.empty? && h[:text]
-        html = h[:text].is_a?(::Symbol) ?
-          h[:text].to_mustache(:html) :
-          Sanitize.html(h[:text].strip)
+        html = if h[:text].is_a?(::Symbol)
+                 h[:text].to_mustache(:html)
+               else
+                 if h[:text].is_a?(::Hash)
+                   if h[:text][:escape] == false
+                     h[:text][:value]
+                   else
+                     Sanitize.html(h[:text][:value].strip)
+                   end
+                 else
+                   Sanitize.html(h[:text].strip)
+                 end
+               end
       end # === if html.empty?
 
       (html = nil) if html.empty?

data/specs/server-side/0060-string.rb

@@ -0,0 +1,22 @@
+
+describe "string content" do
+
+  it "prints a string if value is a hash: {:type=>:string, ...}" do
+    target :body, %^<p>string</p>^
+    actual do
+      p {
+        {:type=>:string, :escape=>true, :value=>"string"}
+      }
+    end
+  end # === it prints a string if value is a hash: {:type=>:string, ...}
+
+  it "does not escape string if: {:type=>:string, :escape=>false...}" do
+    target :body, %^<p>string & string</p>^
+    actual do
+      p {
+        {:type=>:string, :escape=>false, :value=>"string & string"}
+      }
+    end
+  end # === it prints a string if value is a hash: {:type=>:string, ...}
+
+end # === describe "string content"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: www_app
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - da99
@@ -243,6 +243,7 @@ files:
 - specs/server-side/0040-css.rb
 - specs/server-side/0041-font_family.rb
 - specs/server-side/0050-on.rb
+- specs/server-side/0060-string.rb
 - www_app.gemspec
 homepage: https://github.com/da99/www_app
 licenses: