www_app 2.1.3 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae67823b91ac54d165890af512d9c2b8b97fb7ea
-  data.tar.gz: abac21553d1cc1f37d9bc0793866075e00ffbef4
+  metadata.gz: 5ba6234504f5f7340da85bfe01588b2ab29d0454
+  data.tar.gz: a3aa5263e6e9f66957d1b3592af6bb5488f72297
 SHA512:
-  metadata.gz: 6e5008e96ce87034649f61e66f21b7f61d06b24e8fbd980a90461694139ba86f82b1bf38d0a7107ea7100e8a176feb208f206adaf3d45d3147a2503b1defc30e
-  data.tar.gz: 804359ff34f1287b952f6f30587774a208fe9cd4bf955267727c9bb27d02c806093435d201f75a3be5d5c732d4c0bc647bd433bd5bd77275acae9867c547ac50
+  metadata.gz: 6989163602f3504521c582dd448cdf1c9f83c166ce1dc714c3540116bc2e746167a90ea5dde63ad26d54bc0cefd111bf0354406dc616e72b4259cf809a6a4db8
+  data.tar.gz: d8e942a86c8c0575f4636f34225600a20a4adad332db21d1ad584806da199b9b68fede2abe830fb2c70308242722b39219645dff1c9534497d264724c99558bf

data/VERSION

@@ -1 +1 @@
-2.1.3
+2.3.0

data/lib/www_app/HTML.rb

@@ -9,6 +9,8 @@ class WWW_App
       title
       body   div    span
 
+      h1 h2 h3 h4 h5 h6
+
       img
       b      em     i  strong  u  a 
       abbr   blockquote  cite
@@ -19,6 +21,8 @@ class WWW_App
 
       link
 
+      label
+
       script
     ].map(&:to_sym)
 
@@ -28,6 +32,7 @@ class WWW_App
       :form        => [:action, :method, :accept_charset],
       :input       => [:type, :name, :value],
       :style       => [:type],
+      :label       => [:for],
       :script      => [:type, :src, :language],
       :link        => [:rel, :type, :sizes, :href, :title],
       :meta        => [:name, :http_equiv, :property, :content, :charset],
@@ -90,7 +95,7 @@ class WWW_App
     def title str = :none
       fail ":title not allowed here" if parent
       if !block_given? && str != :none
-        create { text str }
+        create(:title) { text str }
       else
         create :title do
           yield

data/lib/www_app/TO.rb

@@ -355,6 +355,9 @@ class WWW_App
                                when tag_name == :style && attr == :type
                                  'text/css'
 
+                               when tag_name == :label && attr == :for && val.is_a?(::Symbol)
+                                 Clean.html(val.to_s)
+
                                when ::WWW_App::HTML::TAGS_TO_ATTRIBUTES[tag_name].include?(attr)
                                  Clean.html(val)
 
@@ -600,7 +603,7 @@ class WWW_App
                       end
 
                     when ::WWW_App::CSS::PROPERTIES.include?(raw_k)
-                      Clean.css_value raw_val
+                      Clean.css raw_k, raw_val
 
                     else
                       fail "Invalid css attr: #{name.inspect}"

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

@@ -18,5 +18,20 @@ describe :forms do
     }.message.should.match /google.com/
   end
 
+
+  describe :label do
+
+    it "allows :for attribute" do
+      target :body, <<-EOF
+        <label for="me">Title</label>
+      EOF
+      actual {
+        label.for(:me) { 'Title' }
+      }
+    end # === it allows :for attribute
+
+  end # === describe :label
+
 end # === describe :forms ===
 
+

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

@@ -10,4 +10,13 @@ describe "page_title" do
     should == ['<title>yo</title>']
   end # === it creates on :title tag
 
+  it "accepts a String argument" do
+    html = WWW_App.new {
+      title 'yo yo string'
+    }.to_html
+
+    html.scan(/<title>[^>]+<\/title>/).
+    should == ['<title>yo yo string</title>']
+  end # === it accepts a String argument
+
 end # === describe "page_title"

data/specs/server-side/0040-css.rb

@@ -12,8 +12,8 @@ describe :css do
     }.message.should.match /hi;o/
   end
 
-  it "raises Invalid if css value has invalid chars: something *" do
-    should.raise(Escape_Escape_Escape::Invalid) {
+  it "raises ArgumentError if css value has invalid chars: something *" do
+    should.raise(ArgumentError) {
       actual do
         div {
           background 'something *'
@@ -30,8 +30,8 @@ describe :css do
     }.message.should.match /s\*s/
   end
 
-  it "raises Invalid if contains 'expression:'" do
-    should.raise(Escape_Escape_Escape::Invalid) {
+  it "raises ArgumentError if contains 'expression:'" do
+    should.raise(ArgumentError) {
       actual do
         div {
           background 'solid expression:'
@@ -40,8 +40,8 @@ describe :css do
     }.message.should.match /expression:/
   end
 
-  it "raises Invalid if contains 'expression&'" do
-    should.raise(Escape_Escape_Escape::Invalid) {
+  it "raises ArgumentError if contains 'expression&'" do
+    should.raise(ArgumentError) {
       actual do
         div {
           background 'solid expression&'
@@ -169,6 +169,19 @@ describe :css do
     }
   end
 
+  it "turns numbers into strings" do
+    target :style, %^
+      div {
+        margin: 0;
+      }
+    ^
+    actual {
+      div {
+        margin 0
+      }
+    }
+  end # === it turns numbers into strings
+
 end # === sanitize css selectors
 
 

data/specs/server-side/0070-heading_tags.rb

@@ -0,0 +1,26 @@
+
+describe :heading_tags do
+
+  [:h1, :h2, :h3, :h4].each { |meth|
+    it "renders a :#{meth} tag" do
+      target :body, <<-EOF
+        <#{meth}>Title</#{meth}>
+      EOF
+
+      actual {
+        send(meth) { 'Title' }
+      }
+    end # === it renders a .... tag
+
+    it "accepts a String argument" do
+      target :body, <<-EOF
+        <#{meth}>Title Title</#{meth}>
+      EOF
+
+      actual {
+        send(meth, 'Title Title')
+      }
+    end # === it accepts a String argument
+  }
+
+end # === describe :heading_tags

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: www_app
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.3.0
 platform: ruby
 authors:
 - da99
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-28 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
@@ -250,6 +250,7 @@ files:
 - specs/server-side/0042-slash.rb
 - specs/server-side/0050-use.rb
 - specs/server-side/0060-text.rb
+- specs/server-side/0070-heading_tags.rb
 - www_app.gemspec
 homepage: https://github.com/da99/www_app
 licenses:
@@ -271,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby -> HTML/CSS/JS