yaks-html 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: 403c75e00fe2fd800a4f8e6ed5747fa66da4677e
-  data.tar.gz: 9d251e41e9c6b4ac6ff9d4eaf070c45e877ded89
-SHA512: 
-  metadata.gz: 8d762bc75008d4329a3d9d4234db3ae1ddde7f544cd53fb90aa79745a0dcd55a4310d6510c468e1c5c99c0d7f2f9a934ca7ca3363eb30485c5054c8addc1239a
-  data.tar.gz: 33ea66e8f92da89ae5e9f190a957fc419f98b590fc483d7de0a3843da33e85f2e35ceb1eb30b4e2f5743985ddb879ad23fe3f82b64bcd62caacccbc95f1f8715
+---
+SHA1:
+  metadata.gz: 18b28bb7180d5d6f07d0c10c40fd14a6beda9f23
+  data.tar.gz: cb771dc27b2dc16b7db118bfac3c342c94bcc54b
+SHA512:
+  metadata.gz: 66db9029a90c53ddf6d3da2001b7b9a3b02a68cb92b6911db526a8e6755b6e548e0a13e009bc1a84a0efda7c3076c221d018d7565288411d9f647463dc57c6c8
+  data.tar.gz: 3089ec5f28fd38a2f3f09a72d92e432d5dab7039ecf17fc403ed7f6a021da5a92a445ce433487836ccbdf6f50507de5af08e87ed168478b0e11194c8bf5cc677

data/lib/yaks/format/html.rb

@@ -26,8 +26,9 @@ module Yaks
         templ
           .replace('.type') { |header| header.content(resource.type.to_s + (resource.collection? ? ' collection' : '')) }
           .replace('.attribute', &render_attributes(resource.attributes))
-          .replace('.link', &render_links(resource.links))
-          .replace('.subresources') {|table| resource.subresources.empty? ? [] : render_subresources(resource.subresources, templ).call(table) }
+          .replace('.links') {|links| resource.links.empty? ? [] : links.replace('.link', &render_links(resource.links)) }
+          .replace('.controls') {|div| render_controls(resource.controls).call(div) }
+          .replace('.subresource') {|sub_templ| render_subresources(resource, templ, sub_templ) }
       end
 
       def render_attributes(attributes)
@@ -52,19 +53,50 @@ module Yaks
         end
       end
 
-      def render_subresources(subresources, templ)
+      def render_subresources(resource, templ, sub_templ)
         templ = templ.replace('h1,h2,h3,h4') {|h| h.set_tag("h#{h.tag[/\d/].to_i.next}") }
-        ->(wrap) do
-          wrap.replace('.subresource') { |row|
-            subresources.map do |rel, resources|
-              row
-                .replace('.rel a') {|a| a.attr('href', rel.to_s).content(rel.to_s) }
-                .replace('.value') {|x| x.content(resources.map { |resource| render_resource(resource, templ) })}
-            end
-          }
+        if resource.collection?
+          resource.map do |r|
+            render_resource(r, templ)
+          end
+        else
+          resource.subresources.map do |rel, resources|
+            sub_templ
+              .replace('.rel a') {|a| a.attr('href', rel.to_s).content(rel.to_s) }
+              .replace('.value') {|x| x.content(resources.map { |resource| render_resource(resource, templ) })}
+          end
         end
       end
 
+
+      def render_controls(controls)
+        ->(div) do
+          div.content(
+            controls.map(&method(:render_control))
+          )
+        end
+      end
+
+      def render_control(control)
+        form = H[:form]
+        form = form.attr('name', control.name)          if control.name
+        form = form.attr('method', control.method)      if control.method
+        form = form.attr('action', control.href)        if control.href
+        form = form.attr('enctype', control.media_type) if control.media_type
+
+        rows = control.fields.map do |field|
+          H[:tr,
+            H[:td, H[:label, {for: field.name}, field.label || '']],
+            H[:td, case field.type
+                   when /\A(button|checkbox|file|hidden|image|password|radio|reset|submit|text)\z/
+                     H[:input, type: field.type, value: field.value, name: field.name]
+                   when /textarea/
+                     H[:textarea, { name: field.name },  field.value || '']
+                   end]
+           ]
+        end
+        form.content(H[:table, control.title || '', *rows, H[:tr, H[:td, H[:input, {type: 'submit'}]]]])
+      end
     end
   end
 end

data/lib/yaks/format/template.html

@@ -4,21 +4,40 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <style type="text/css">
+      body {
+        background-color: #F9CDAD;
+      }
+
       .resource {
-        border: 1px solid black;
-        padding: 0.3em;
+        border: 1px solid #83AF9B;
+      border-radius: 8px;
+      margin: 0.3em;
       }
 
       h1,h2,h3,h4,h5 {
-        background-color: #090
+        background-color: #FE4365;
+        margin-top: 0;
+        margin-bottom: 0.2em;
+        border-radius: 8px;
       }
 
-      table {
-        width:99%;
+      th { background-color: #FC9D9A; }
+      td { background-color: #C8C8A9; }
+
+      .subresource {
+        border: 1px solid #83AF9B;
+        border-radius: 8px;
         margin: 0.5em;
+        margin-left: 1em;
       }
 
-      th{ background-color: #fee; }
+      .subresource .rel {
+        background-color: #83AF9B;
+      border-radius: 8px;
+      padding: 0.5em;
+      margin-bottom: 0.5em;
+
+      }
 
     </style>
   </head>
@@ -26,12 +45,12 @@
     <div class="resource">
       <h1 class="type">Resource Type</h1>
 
-      <table border="1" class="attributes">
-        <tr><th>Attribute</th><th>Value</th></tr>
+      <table class="attributes">
         <tr class="attribute"><td class="name">name</td><td class="value">value</td></tr>
       </table>
 
-      <table border="1" class="links">
+      <table class="links">
+        Links:
         <tr>
           <th>Rel</th>
           <th>URI</th>
@@ -47,10 +66,14 @@
         </tr>
       </table>
 
-      <table border="1" class="subresources">
-        <tr><th>Rel</th><th>Subresource</th></tr>
-        <tr class="subresource"><td class="rel"><a>rel</a></td><td class="value">value</td></tr>
-      </table>
+      <div class="subresource">
+        <div class="rel"><a></a></div>
+        <div class="value"></div>
+      </div>
+
+      <div class="controls"></div>
     </div>
+
+
   </body>
 </html>

metadata

@@ -1,46 +1,51 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: yaks-html
-version: !ruby/object:Gem::Version 
-  version: 0.6.1
+version: !ruby/object:Gem::Version
+  version: 0.6.2
 platform: ruby
-authors: 
+authors:
 - Arne Brasseur
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-10-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.6.1
+date: 2014-11-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: yaks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.2
   type: :runtime
-  requirement: *id001
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0.4"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.2
+- !ruby/object:Gem::Dependency
   name: hexp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :runtime
-  requirement: *id002
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.4'
 description: HTML output format for Yaks
-email: 
+email:
 - arne@arnebrasseur.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - README.md
 - Rakefile
 - lib/yaks-html.rb
@@ -49,30 +54,28 @@ files:
 - spec/spec_helper.rb
 - yaks-html.gemspec
 homepage: https://github.com/plexus/yaks
-licenses: 
+licenses:
 - MIT
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - &id003 
-    - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id003
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: HTML output format for Yaks
-test_files: 
+test_files:
 - spec/spec_helper.rb