yaks-html 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 733fdfe39b31e68417796181aaacb6ec63a9811c
-  data.tar.gz: cdbbc11bdf8a8a1a15f7a92ef7edd8cfc730652b
+  metadata.gz: 1555d183278030c85a244d6ea424eb409f656a26
+  data.tar.gz: d363127634e680fe518587797db332ca7a717090
 SHA512:
-  metadata.gz: 7eed79be212d207dd6523f1c38e6c05ae76337651240c991c66dd1eb03c8f151065ef268a174e9540d83bcca467ba62314d7284a7c63464148b51759ddebb2fa
-  data.tar.gz: 9280fb5d89ec22c8447c1e77899a48b47cf57e06a06a44c63a955d57e063da146be4f8dd4c86350dd7c4902e2b9d5bfaf931c1b8a91ed09dc99e637f8b99c6ac
+  metadata.gz: 05253a6638552c33c602d6676a545a2c17515cd6f802dd8c59e85c199acd4a9d3dd12d4acb63936a3b511812a1d99ef4c047f0777d3071cf812222b87222dd6f
+  data.tar.gz: f420be1f76999f21547c2458538925dc781cb22d842728085ddebd7511e1fb0730f618df7a91f4e439151b0f7b0c7048377d6db13a3663e82ebb167499bbe6d7

data/lib/yaks/format/html.rb

@@ -3,22 +3,25 @@
 module Yaks
   class Format
     class HTML < self
-      include Adamantium, Util
+      include Util
 
       register :html, :html, 'text/html'
 
       def template
-        Hexp.parse(File.read(File.expand_path('../template.html', __FILE__)))
+        @template ||= Hexp.parse(File.read(File.expand_path('../template.html', __FILE__)))
       end
-      memoize :template
 
       def section(name)
         template.select(".#{name}").first
       end
 
       def serialize_resource(resource)
-        template.replace('body') do |body|
-          body.content(render_resource(resource))
+        template.replace('.resource') do |_|
+          render_resource(resource)
+        end.replace('.yaks-version') do |ver|
+          ver.content(Yaks::VERSION)
+        end.replace('.request-info') do |req|
+          req.content(env['REQUEST_METHOD'], ' ', env['PATH_INFO'])
         end
       end
 
@@ -41,11 +44,19 @@ module Yaks
         end
       end
 
+      def rel_href(rel)
+        if rel.is_a?(Symbol)
+          "http://www.iana.org/assignments/link-relations/link-relations.xhtml"
+        else
+          rel.to_s
+        end
+      end
+
       def render_links(links)
         ->(templ) do
           links.map do |link|
             templ
-              .replace('.rel a') {|a| a.attr('href', link.rel.to_s).content(link.rel.to_s) }
+              .replace('.rel a') {|a| a.attr('href', rel_href(link.rel)).content(link.rel.to_s) }
               .replace('.uri a') {|a| a.attr('href', link.uri).content(link.uri) }
               .replace('.title') {|x| x.content(link.title.to_s) }
               .replace('.templated') {|x| x.content(link.templated?.inspect) }
@@ -61,9 +72,9 @@ module Yaks
           end
         else
           resource.subresources.map do |resources|
-            rel = resources.rels.first.to_s
+            rel = resources.rels.first
             sub_templ
-              .replace('.rel a') {|a| a.attr('href', rel).content(rel) }
+              .replace('.rel a') {|a| a.attr('href', rel_href(rel)).content(rel.to_s) }
               .replace('.value') {|x| x.content(resources.seq.map { |resource| render_resource(resource, templ) })}
           end
         end
@@ -87,7 +98,7 @@ module Yaks
 
         rows = form_control.fields.map(&method(:render_field))
 
-        form.content(H[:table, form_control.title || '', *rows, H[:tr, H[:td, H[:input, {type: 'submit'}]]]])
+        form.content(H[:table, H[:h4, form_control.title || form_control.name.to_s], *rows, H[:tr, H[:td], H[:td, H[:input, {type: 'submit'}]]]])
       end
 
       def render_field(field)
@@ -95,7 +106,7 @@ module Yaks
         extra_info = reject_keys(field.to_h_compact, :type, :name, :value, :label, :options)
         H[:tr,
           H[:td,
-            H[:label, {for: field.name}, [field.label, field.required ? '*' : ''].join]],
+            H[:label, {for: field.name}, [field.label || field.name.to_s, field.required ? '*' : ''].join]],
           H[:td,
             case field.type
             when /select/
@@ -104,6 +115,10 @@ module Yaks
               H[:textarea, reject_keys(field.to_h_compact, :value), field.value || '']
             when /legend/
               H[:legend, field.to_h_compact]
+            when /hidden/
+              [ field.value.inspect,
+                H[:input, field.to_h_compact]
+              ]
             else
               H[:input, field.to_h_compact]
             end],

data/lib/yaks/format/template.html

@@ -4,44 +4,78 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <style type="text/css">
+      * {
+        box-sizing: border-box;
+      }
+
       body {
-        background-color: #F9CDAD;
+        background-color: #F9E9DE;
+        margin: 0;
+        font-family: sans-serif;
       }
 
       .resource {
-        border: 1px solid #83AF9B;
-      border-radius: 8px;
-      margin: 0.3em;
+        margin-left: 0.3em;
+        padding-left: 0.3em;
+      }
+
+      body .resource {
+        padding-right: 0.5em;
+      }
+
+      .resource .resource {
+        border-left: 4px solid #bababa;
       }
 
       h1,h2,h3,h4,h5 {
-        background-color: #FE4365;
-        margin-top: 0;
+        background-color: #FFB662;
+        padding: 0.2em;
         margin-bottom: 0.2em;
-        border-radius: 8px;
       }
 
-      th { background-color: #FC9D9A; }
-      td { background-color: #C8C8A9; }
+      .attributes {
+        margin-bottom: 0.2em;
+      }
+
+      th { background-color: #FFD19D; }
+      td { background-color: #E2ECBA; }
+
+      .rel a {
+        color: black;
+        text-decoration: none;
+      }
 
       .subresource {
-        border: 1px solid #83AF9B;
-        border-radius: 8px;
-        margin: 0.5em;
-        margin-left: 1em;
+        padding-top: 1em;
       }
 
-      .subresource .rel {
-        background-color: #83AF9B;
-      border-radius: 8px;
-      padding: 0.5em;
-      margin-bottom: 0.5em;
+      .subresource-rel {
+        background-color: #FFB662;
+        padding: 0.5em;
+        margin-bottom: 0.5em;
+      }
+
+      .header, .footer {
+        width: 100%;
+        background-color: black;
+        color: white;
+        padding: 0.3em;
+      }
 
+      .footer a {
+        text-decoration: none;
+        color: white;
       }
 
+      .footer {
+        margin-top: 1em;
+      }
     </style>
   </head>
   <body>
+    <div class="header request-info">
+    </div>
+
     <div class="resource">
       <h1 class="type">Resource Type</h1>
 
@@ -50,7 +84,6 @@
       </table>
 
       <table class="links">
-        Links:
         <tr>
           <th>Rel</th>
           <th>URI</th>
@@ -66,14 +99,18 @@
         </tr>
       </table>
 
+      <div class="forms"></div>
+
       <div class="subresource">
-        <div class="rel"><a></a></div>
+        <div class="subresource-rel rel"><a></a></div>
         <div class="value"></div>
       </div>
 
-      <div class="forms"></div>
     </div>
 
+    <div class="footer">
+      generated with <a href="https://github.com/plexus/yaks">Yaks <span class="yaks-version"></span></a>
+    </div>
 
   </body>
 </html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaks-html
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Arne Brasseur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaks
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.8.2
 - !ruby/object:Gem::Dependency
   name: hexp
   requirement: !ruby/object:Gem::Requirement