www_app 2.1.1 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc3024db22e0dd0e4ccc06caf270dced51971cbb
-  data.tar.gz: 002d24337430dc8aff2269203bd6123c30a7944a
+  metadata.gz: ae67823b91ac54d165890af512d9c2b8b97fb7ea
+  data.tar.gz: abac21553d1cc1f37d9bc0793866075e00ffbef4
 SHA512:
-  metadata.gz: 7b4c1487fe5a0c623a033f2074ebe4a3bdbb663fff1c64e15995f2d6082091e7bd9642db4d82afec93a0dfbe21d5c8bcfff118d25d1929e48f91776e57ec6826
-  data.tar.gz: 2f0b7b3babf35782af496b5201ba6bb66d396822cd8c27a83e6196261eb33a34a23a925ce129ff24a73fe560a7776ebe17ceb996cebe0ad24a5555f646dfcd2a
+  metadata.gz: 6e5008e96ce87034649f61e66f21b7f61d06b24e8fbd980a90461694139ba86f82b1bf38d0a7107ea7100e8a176feb208f206adaf3d45d3147a2503b1defc30e
+  data.tar.gz: 804359ff34f1287b952f6f30587774a208fe9cd4bf955267727c9bb27d02c806093435d201f75a3be5d5c732d4c0bc647bd433bd5bd77275acae9867c547ac50

data/VERSION

@@ -1 +1 @@
-2.1.1
+2.1.3

data/lib/www_app.rb

@@ -373,10 +373,12 @@ class WWW_App
 
     @tag = new
 
-    @tag.merge!(opts) if opts
+    @tag.merge!(opts) if opts.is_a?(::Hash)
 
     if block_given?
       close { yield }
+    elsif opts.is_a?(::String)
+      close { text opts }
     end
 
     self

data/lib/www_app/HTML.rb

@@ -58,8 +58,8 @@ class WWW_App
 
     TAGS.each { |name|
       eval <<-EOF, nil, __FILE__, __LINE__ + 1
-        def #{name}
-          create(:#{name})
+        def #{name} str = :none
+          create(:#{name}, str)
           block_given? ?
             close { yield } :
             self
@@ -87,10 +87,14 @@ class WWW_App
       create(:meta, *args)
     end
 
-    def title
+    def title str = :none
       fail ":title not allowed here" if parent
-      create :title do
-        yield
+      if !block_given? && str != :none
+        create { text str }
+      else
+        create :title do
+          yield
+        end
       end
     end
 

data/lib/www_app/TO.rb

@@ -203,6 +203,9 @@ class WWW_App
         when t_name == :style
           style_tags[:children] << t
 
+        when t_name == :link
+          head[:children] << t
+
         when t_name == :_ && !parent
           body[:css] = (body[:css] || {}).merge(t[:css]) if t[:css]
           body[:class] = (body[:class] || []).concat(t[:class]) if t[:class]
@@ -382,6 +385,10 @@ class WWW_App
             Clean.html(tag[:value])
           )
 
+        when t_name == :link
+          final << (
+            %^#{SPACES(indent)}<link type="text/css" rel="stylesheet" href="#{::Escape_Escape_Escape.relative_href tag[:href]}" />^
+          )
 
         when t_name == :meta
           case
@@ -394,7 +401,7 @@ class WWW_App
           end
 
           final << (
-            %^#{SPACES(indent)}<meta #{key_name}="#{key_content}" content="#{content}" />^
+            %^#{SPACES(indent)}<meta #{key_name}="#{key_content}" content="#{content}" />\n^
           )
 
         when t_name == :html       # === :html tag ================
@@ -476,17 +483,19 @@ class WWW_App
             ]
           }
 
-          clean_vals = stacks[:js].map { |raw_x| stacks[:clean_text].call(raw_x) }
-          content = <<-EOF
-            \n#{SPACES(indent)}WWW_App.run( #{::Escape_Escape_Escape.json_encode(clean_vals)} );
-          EOF
+          if !stacks[:js].empty?
+            clean_vals = stacks[:js].map { |raw_x| stacks[:clean_text].call(raw_x) }
+            content = <<-EOF
+            \n#{SPACES(indent)}WWW_App.run( #{::Escape_Escape_Escape.json_encode(code: clean_vals)} );
+            EOF
 
-          new_todo.concat [
-            :clean_attrs, {:type=>'application/javascript'}, script_tag,
-            :open, :script,
-            {:tag_name=>:text, :skip_escape=>true, :value=> content },
-            :close, :script
-          ]
+            new_todo.concat [
+              :clean_attrs, {:type=>'application/javascript'}, script_tag,
+              :open, :script,
+              {:tag_name=>:text, :skip_escape=>true, :value=> content },
+              :close, :script
+            ]
+          end
 
           todo = new_todo.concat(todo)
 

data/specs/lib/helpers.rb

@@ -30,7 +30,7 @@ def strip_each_line str
 end
 
 def get_content tag, html
-  ( html.match(/\<#{tag}\>(.+)\<\/#{tag}\>/)[1] || '' ).
+  ( html.match(/\<#{tag}\>(.+)\<\/#{tag}\>/m)[1] || '' ).
     split("\n").
     map(&:strip).
     join "\n"

data/specs/server-side/0021-link.rb

@@ -10,17 +10,29 @@ describe :link do
   end
 
   it "escapes slashes in :href" do
-    target %^<link href="&#47;css&#47;css&#47;styles.css" />^
-    actual {
+    target = %^<link type="text/css" rel="stylesheet" href="&#47;css&#47;css&#47;styles.css" />^
+    WWW_App.new {
       link.href('/css/css/styles.css')./
-    }
+    }.to_html.scan(target).should == [target]
   end
 
+  it "gets rendered in :head" do
+    html = get_content(:head, WWW_App.new {
+      link.type('text/css').rel('stylesheet').href("/file.css")./
+    }.to_html)
+
+    html.
+    scan(%r!<link [^>]+>!).
+    should == [<<-EOF.strip]
+      <link type="text/css" rel="stylesheet" href="&#47;file.css" />
+    EOF
+  end # === it gets rendered in :head
+
   it "allows a relative :href" do
-    target %^<link href="&#47;css.css" />^
-    actual {
+    target = %^<link type="text/css" rel="stylesheet" href="&#47;css.css" />^
+    WWW_App.new {
       link.href('/css.css')./
-    }
+    }.to_html.scan(target).should == [target]
   end
 
 end # === describe :link

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

@@ -10,6 +10,13 @@ describe :text do
     end
   end # === it prints a string if value is a hash: {:type=>:string, ...}
 
+  it "prints a string passed to it as a single argument" do
+    target :body, %^<p>string string</p>^
+    actual do
+      p "string string"
+    end
+  end # === it prints a string passed to it as a single argument
+
 end # === describe "string content"
 
 describe :raw_text do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: www_app
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.3
 platform: ruby
 authors:
 - da99
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby