yaks-html 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed93c7c669916c02044d83a3551c54ae5bfe3453
-  data.tar.gz: b65cb8b1b64bfb732fd7d7a64e7839035ed07a7f
+  metadata.gz: 00098aaad249008d6a0748ed5d94483be2eb6694
+  data.tar.gz: e870922d4a96e4bd90ca12c31c4b5be8e71e0428
 SHA512:
-  metadata.gz: 1f434db45836fa126ffb99da5416d98d43ffeb4448d32bf252a1c533336ab5872d0f48787f391df2c055597ab26e240c1b11c9584e50095c16bbb7651607d294
-  data.tar.gz: d29d68208ab4b5688cf34b6709ef9c7f228b4a8fde9885e76c6d393962ae78335e02cc7827326818a72514ae2ee3270f268e4426ecca0b2482fb2bc5d15d5e32
+  metadata.gz: 73a42d1ca3639992a8ac660d15e5359d8e9647e67e0a5cc75aaa78eedad9cac63b01b0cf611bfc8e0fc9deb1a02d9636c6611e8bfb5ac787740580fb8e129766
+  data.tar.gz: 625d9f5d71a110d4c07383e6cca9a69fb27a89dbe1595591931c305e76804f5e1aad00134da11ad4bc720e1ae24b99646aade45aec92485268bee34ea623a550

data/lib/yaks-html.rb

@@ -3,6 +3,6 @@ require 'yaks'
 require 'yaks/format/html'
 
 -> do
-  unparser = Hexp::Unparser.new({})
-  Yaks::Serializer.register(:html, ->(data, env) { unparser.call(data) })
+  unparser = Hexp::Unparser.new(no_escape: [:script, :style])
+  Yaks::Serializer.register(:html, ->(data, _env) { unparser.call(data) })
 end.call

data/lib/yaks/format/html.rb

@@ -12,12 +12,12 @@ module Yaks
       end
 
       def section(name)
-        template.select(".#{name}").first
+        template.select(".#{name}").first   # rubocop:disable Performance/Detect
       end
 
       def serialize_resource(resource)
         template.replace('.resource') do |_|
-          render_resource(resource)
+          render(resource)
         end.replace('.yaks-version') do |ver|
           ver.content(Yaks::VERSION)
         end.replace('.request-info') do |req|
@@ -25,6 +25,12 @@ module Yaks
         end
       end
 
+      def render(*args)
+        object = args.first
+        type = object.class.name.split('::').last
+        send("render_#{underscore(type)}", *args)
+      end
+
       def render_resource(resource, templ = section('resource'))
         templ
           .replace('.type') { |header| header.content(resource.type.to_s + (resource.collection? ? ' collection' : '')) }
@@ -33,6 +39,8 @@ module Yaks
           .replace('.forms') {|div| render_forms(resource.forms).call(div) }
           .replace('.subresource') {|sub_templ| render_subresources(resource, templ, sub_templ) }
       end
+      alias_method :render_collection_resource, :render_resource
+      alias_method :render_null_resource, :render_resource
 
       def render_attributes(attributes)
         ->(templ) do
@@ -56,8 +64,13 @@ module Yaks
         ->(templ) do
           links.map do |link|
             templ
-              .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('.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)
+                  .attr('rel', link.rel.to_s)
+              }
               .replace('.title') {|x| x.content(link.title.to_s) }
               .replace('.templated') {|x| x.content(link.templated?.inspect) }
           end
@@ -65,26 +78,28 @@ module Yaks
       end
 
       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}") }
+        templ = templ
+                .replace('h1,h2,h3,h4') {|h| h.set_tag("h#{h.tag[/\d/].to_i.next}") }
+                .add_class('collapsed')
         if resource.collection?
           resource.seq.map do |r|
-            render_resource(r, templ)
+            render(r, templ)
           end
         else
           resource.subresources.map do |resources|
             rel = resources.rels.first
             sub_templ
               .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) })}
+              .replace('.value') {|x| x.content(resources.seq.map { |res| render(res, templ) })}
+              .attr('rel', rel.to_s)
           end
         end
       end
 
-
       def render_forms(forms)
         ->(div) do
           div.content(
-            forms.map(&method(:render_form))
+            forms.map(&method(:render))
           )
         end
       end
@@ -96,7 +111,7 @@ module Yaks
         form = form.attr('action', form_control.action)      if form_control.action
         form = form.attr('enctype', form_control.media_type) if form_control.media_type
 
-        rows = form_control.fields.map(&method(:render_field))
+        rows = form_control.fields.map(&method(:render))
         rows << H[:tr, H[:td], H[:td, H[:input, {type: 'submit'}]]]
 
         H[:div,
@@ -105,7 +120,6 @@ module Yaks
       end
 
       def render_field(field)
-        return render_fieldset(field) if field.type == :fieldset
         extra_info = reject_keys(field.to_h_compact, :type, :name, :value, :label, :options)
         H[:tr,
           H[:td,
@@ -116,8 +130,6 @@ module Yaks
               H[:select, reject_keys(field.to_h_compact, :options), render_select_options(field.options)]
             when /textarea/
               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]
@@ -130,12 +142,13 @@ module Yaks
       end
 
       def render_fieldset(fieldset)
-        legend = fieldset.fields.select {|field|field.type == :legend}.first
-        legend = legend ? legend.name : ''
+        legend = fieldset.fields.find {|field| field.type == :legend}
+        fields = fieldset.fields.reject {|field| field.type == :legend}
+        legend = legend ? legend.label : ''
 
         H[:tr,
           H[:th, legend],
-          H[:td, H[:fieldset, H[:table, fieldset.fields.map(&method(:render_field))]]]]
+          H[:td, H[:fieldset, H[:table, fields.map(&method(:render))]]]]
       end
 
       def render_select_options(options)

data/lib/yaks/format/template.html

@@ -70,6 +70,26 @@
       .footer {
         margin-top: 1em;
       }
+
+      .collapsed .heading::before, .expanded .heading::before {
+        font-size: 0.6em;
+        display: block;
+        float: left;
+        margin-top: 0.4em;
+        margin-right: 0.5em;
+      }
+
+      .collapsed .heading::before {
+        content: "▶";
+      }
+
+      .expanded .heading::before {
+        content: "▼";
+      }
+
+      .collapsed .body {
+        display: none;
+      }
     </style>
   </head>
   <body>
@@ -77,40 +97,65 @@
     </div>
 
     <div class="resource">
-      <h1 class="type">Resource Type</h1>
-
-      <table class="attributes">
-        <tr class="attribute"><td class="name">name</td><td class="value">value</td></tr>
-      </table>
-
-      <table class="links">
-        <tr>
-          <th>Rel</th>
-          <th>URI</th>
-          <th>Title</th>
-          <th>Templated</th>
-        </tr>
-
-        <tr class="link">
-          <td class="rel"><a href="">rel</a></td>
-          <td class="uri"><a href="">uri</a></td>
-          <td class="title">title</td>
-          <td class="templated">false</td>
-        </tr>
-      </table>
-
-      <div class="forms"></div>
-
-      <div class="subresource">
-        <div class="subresource-rel rel"><a></a></div>
-        <div class="value"></div>
-      </div>
+      <h1 class="heading type">Resource Type</h1>
+
+      <div class="resource-data body">
+        <table class="attributes">
+          <tr class="attribute"><td class="name">name</td><td class="value">value</td></tr>
+        </table>
+
+        <table class="links">
+          <tr>
+            <th>Rel</th>
+            <th>URI</th>
+            <th>Title</th>
+            <th>Templated</th>
+          </tr>
+
+          <tr class="link">
+            <td class="rel"><a href="">rel</a></td>
+            <td class="uri"><a href="">uri</a></td>
+            <td class="title">title</td>
+            <td class="templated">false</td>
+          </tr>
+        </table>
+
+        <div class="forms"></div>
+
+        <div class="subresource collapsed">
+          <div class="subresource-rel rel heading"><a></a></div>
+          <div class="value body" class="collapsed"></div>
+        </div>
 
+      </div>
     </div>
 
     <div class="footer">
       generated with <a href="https://github.com/plexus/yaks">Yaks <span class="yaks-version"></span></a>
     </div>
 
+    <script>
+      function setupCollapseExpand() {
+        var nodes = document.getElementsByClassName("heading");
+
+        for (var i=0; i < nodes.length; i++) {
+          var node = nodes[i];
+          node.onclick = function() {
+            var parent = this.parentNode;
+            if (parent.className.indexOf("collapsed") >= 0) {
+              parent.className = parent.className.replace("collapsed", "expanded");
+            } else {
+              parent.className = parent.className.replace("expanded", "collapsed");
+            }
+          };
+        }
+      };
+
+      if (window.addEventListener) {
+        window.addEventListener("load", setupCollapseExpand, false);
+      } else if (window.attachEvent) {
+        window.attachEvent("onload", setupCollapseExpand);
+      }
+    </script>
   </body>
 </html>

data/yaks-html.gemspec

@@ -1,5 +1,6 @@
 # encoding: utf-8
 
+require 'English'
 require File.expand_path('../../yaks/lib/yaks/version', __FILE__)
 
 Gem::Specification.new do |gem|
@@ -13,10 +14,12 @@ Gem::Specification.new do |gem|
   gem.license     = 'MIT'
 
   gem.require_paths    = %w[lib]
-  gem.files            = `git ls-files`.split($/)
+  gem.files            = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.test_files       = gem.files.grep(/^spec/)
   gem.extra_rdoc_files = %w[README.md]
 
+  gem.required_ruby_version = '>= 1.9.3'
+
   gem.add_runtime_dependency 'yaks', Yaks::VERSION
   gem.add_runtime_dependency 'hexp', '>= 0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yaks-html
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Arne Brasseur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaks
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: hexp
   requirement: !ruby/object:Gem::Requirement
@@ -65,7 +65,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: HTML output format for Yaks