showoff 0.9.10.6 → 0.9.10.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 451c6ca8036598422dbbc889ed67b1cb574f6bcd
-  data.tar.gz: f423916c2003ed85acb0d97f27743b1d6969cbd9
+  metadata.gz: 7912a55347b4c5f15def2fb0f260993609fba24d
+  data.tar.gz: c224a40d9d832ee8dbfb92fbc187e7f7896e496d
 SHA512:
-  metadata.gz: 5b82ad5e1c3920b7827cd3d687584a3d5b515f502cf3e5d2951adefd19bb544664f75e217fb2080646076bc90a64f85aaf4ea242eb14d5d8f6f33755331b6fc0
-  data.tar.gz: 9cb4aba7936cec6edf5bc15c90c840316517442950b6d666ffb65ca50f697affe7d39f8f633d5636aa4e45ccfedf2ad065a8ae2bd4e6cf613cd659831eb85477
+  metadata.gz: 32fa15fe9ff154bb26737c7c35ae6e08560bc12b51a5bc65addad8012c34ba277697e1b1331d59d08f06a2ab818d31f63008decf51f15befd165e4e073ad97a2
+  data.tar.gz: 4625138c29121dec99bd54dce503b5a5d515329921725c81e79b589104711bba9d4795f5b3d9110000fd11650507e5d0fecffc6e74e2234f7d25bd5562b7c10a

data/lib/showoff.rb

@@ -209,7 +209,7 @@ class ShowOff < Sinatra::Application
         end
       end
 
-      slides.delete_if {|slide| slide.empty? }
+      slides.delete_if {|slide| slide.empty? and not slide.bg }
 
       final = ''
       if slides.size > 1
@@ -277,7 +277,7 @@ class ShowOff < Sinatra::Application
         classes = content_classes.join(' ')
         content = "<div"
         content += " id=\"#{id}\"" if id
-        content += " style=\"background: url('file/#{slide.bg}') center no-repeat;\"" if slide.bg
+        content += " style=\"background-image: url('file/#{slide.bg}');\"" if slide.bg
         content += " class=\"slide #{classes}\" data-transition=\"#{transition}\">"
 
         # name the slide. If we've got multiple slides in this file, we'll have a sequence number
@@ -417,25 +417,26 @@ class ShowOff < Sinatra::Application
 
     # replace custom markup with html forms
     def build_forms(content, classes=[])
-      classes.select { |cl| cl =~ /^form=(\w+)$/ }
+      title = classes.collect { |cl| $1 if cl =~ /^form=(\w+)$/ }.compact.first
       # only process slides marked as forms
-      return content unless $1
+      return content if title.nil?
 
       begin
         tools =  '<div class="tools">'
         tools << '<input type="button" class="display" value="Display Results">'
         tools << '<input type="submit" value="Save" disabled="disabled">'
         tools << '</div>'
-        form  = "<form id='#{$1}' action='/form/#{$1}' method='POST'>#{content}#{tools}</form>"
+        form  = "<form id='#{title}' action='/form/#{title}' method='POST'>#{content}#{tools}</form>"
         doc = Nokogiri::HTML::DocumentFragment.parse(form)
         doc.css('p').each do |p|
           if p.text =~ /^(\w*) ?(?:->)? ?([^\*]*)? ?(\*?)= ?(.*)?$/
-            id       = $1
-            name     = $2.empty? ? $1 : $2
+            code     = $1
+            id       = "#{title}_#{code}"
+            name     = $2.empty? ? code : $2
             required = ! $3.empty?
             rhs      = $4
 
-            p.replace form_element(id, name, required, rhs, p.text)
+            p.replace form_element(id, code, name, required, rhs, p.text)
           end
         end
         doc.to_html
@@ -446,50 +447,50 @@ class ShowOff < Sinatra::Application
       end
     end
 
-    def form_element(id, name, required, rhs, text)
+    def form_element(id, code, name, required, rhs, text)
       required = required ? 'required' : ''
-      str =  "<div class='form element #{required}' id='#{id}'>"
+      str =  "<div class='form element #{required}' id='#{id}' data-name='#{code}'>"
       str << "<label for='#{id}'>#{name}</label>"
       case rhs
       when /^\[\s+(\d*)\]$$/             # value = [    5]                                    (textarea)
-        str << form_element_textarea(id, name, $1)
+        str << form_element_textarea(id, code, $1)
       when /^___+(?:\[(\d+)\])?$/        # value = ___[50]                                    (text)
-        str << form_element_text(id, name, $1)
+        str << form_element_text(id, code, $1)
       when /^\(x?\)/                     # value = (x) option one () opt2 () opt3 -> option 3 (radio)
-        str << form_element_radio(id, name, rhs.scan(/\((x?)\)\s*([^()]+)\s*/))
+        str << form_element_radio(id, code, rhs.scan(/\((x?)\)\s*([^()]+)\s*/))
       when /^\[x?\]/                     # value = [x] option one [] opt2 [] opt3 -> option 3 (checkboxes)
-        str << form_element_checkboxes(id, name, rhs.scan(/\[(x?)\] ?([^\[\]]+)/))
+        str << form_element_checkboxes(id, code, rhs.scan(/\[(x?)\] ?([^\[\]]+)/))
       when /^\{(.*)\}$/                  # value = {BOS, SFO, (NYC)}                          (select shorthand)
-        str << form_element_select(id, name, rhs.scan(/\(?\w+\)?/))
+        str << form_element_select(id, code, rhs.scan(/\(?\w+\)?/))
       when /^\{$/                        # value = {                                          (select)
-        str << form_element_select_multiline(id, name, text)
+        str << form_element_select_multiline(id, code, text)
       when ''                            # value =                                            (radio/checkbox list)
-        str << form_element_multiline(id, name, text)
+        str << form_element_multiline(id, code, text)
       else
         @logger.warn "Unmatched form element: #{rhs}"
       end
       str << '</div>'
     end
 
-    def form_element_text(id, name, length)
-      "<input type='text' id='#{id}' name='#{id}' size='#{length}' />"
+    def form_element_text(id, code, length)
+      "<input type='text' id='#{id}_response' name='#{code}' size='#{length}' />"
     end
 
-    def form_element_textarea(id, name, rows)
+    def form_element_textarea(id, code, rows)
       rows = 3 if rows.empty?
-      "<textarea id='#{id}' name='#{id}' rows='#{rows}'></textarea>"
+      "<textarea id='#{id}_response' name='#{code}' rows='#{rows}'></textarea>"
     end
 
-    def form_element_radio(id, name, items)
-      form_element_check_or_radio_set('radio', id, name, items)
+    def form_element_radio(id, code, items)
+      form_element_check_or_radio_set('radio', id, code, items)
     end
 
-    def form_element_checkboxes(id, name, items)
-      form_element_check_or_radio_set('checkbox', id, name, items)
+    def form_element_checkboxes(id, code, items)
+      form_element_check_or_radio_set('checkbox', id, code, items)
     end
 
-    def form_element_select(id, name, items)
-      str =  "<select id='#{id}' name='#{name}'>"
+    def form_element_select(id, code, items)
+      str =  "<select id='#{id}_response' name='#{code}'>"
       str << '<option value="">----</option>'
 
       items.each do |item|
@@ -504,8 +505,8 @@ class ShowOff < Sinatra::Application
       str << '</select>'
     end
 
-    def form_element_select_multiline(id, name, text)
-      str =  "<select id='#{id}' name='#{id}'>"
+    def form_element_select_multiline(id, code, text)
+      str =  "<select id='#{id}_response' name='#{code}'>"
       str << '<option value="">----</option>'
 
       text.split("\n")[1..-1].each do |item|
@@ -523,7 +524,7 @@ class ShowOff < Sinatra::Application
       str << '</select>'
     end
 
-    def form_element_multiline(id, name, text)
+    def form_element_multiline(id, code, text)
       str = '<ul>'
 
       text.split("\n")[1..-1].each do |item|
@@ -541,13 +542,13 @@ class ShowOff < Sinatra::Application
         end
 
         str << '<li>'
-        str << form_element_check_or_radio(type, id, value, label, checked)
+        str << form_element_check_or_radio(type, id, code, value, label, checked)
         str << '</li>'
       end
       str << '</ul>'
     end
 
-    def form_element_check_or_radio_set(type, id, name, items)
+    def form_element_check_or_radio_set(type, id, code, items)
       str = ''
       items.each do |item|
         checked = item[0].empty? ? '': "checked='checked'"
@@ -559,17 +560,17 @@ class ShowOff < Sinatra::Application
           value = label = item[1]
         end
 
-        str << form_element_check_or_radio(type, id, value, label, checked)
+        str << form_element_check_or_radio(type, id, code, value, label, checked)
       end
       str
     end
 
-    def form_element_check_or_radio(type, id, value, label, checked)
+    def form_element_check_or_radio(type, id, code, value, label, checked)
       # yes, value and id are conflated, because this is the id of the parent widget
 
-      id  = "#{id}[]" if type == 'checkbox'
-      str =  "<input type='#{type}' name='#{id}' id='#{value}' value='#{value}' #{checked} />"
-      str << "<label for='#{value}'>#{label}</label>"
+      name = (type == 'checkbox') ? "#{code}[]" : code
+      str  =  "<input type='#{type}' name='#{name}' id='#{id}_#{value}' value='#{value}' #{checked} />"
+      str << "<label for='#{id}_#{value}'>#{label}</label>"
     end
 
     # TODO: deprecated

data/lib/showoff/version.rb

@@ -1,4 +1,4 @@
 # No namespace here since ShowOff is a class and I'd have to inherit from
 # Sinatra::Application (which we don't want to load here)
-SHOWOFF_VERSION = '0.9.10.6'
+SHOWOFF_VERSION = '0.9.10.7'
 

data/public/css/showoff.css

@@ -18,6 +18,13 @@
       -webkit-box-shadow:0 0 25px rgba(0,0,0,0.35);
       -moz-box-shadow:0 0 25px rgba(0,0,0,0.35);
       box-shadow:0 0 25px rgba(0,0,0,0.35);
+      background-repeat: no-repeat;
+      background-position: center;
+      background-size: cover;
+  }
+
+  #preso, .slide.background-fit {
+      background-size: contain;
   }
 
   #footer {

data/public/js/showoff.js

@@ -182,6 +182,7 @@ function initializePresentation(prefix) {
       slaveWindow.renderForm($(this).closest('form').attr('id'));
     }
     catch (e) {
+      console.log(e);
       renderForm($(this).closest('form'));
     }
   });
@@ -495,7 +496,7 @@ function renderForm(form) {
   $.getJSON(action, function( data ) {
     //console.log(data);
     form.children('div.form.element').each(function() {
-      var key = $(this).attr('id');
+      var key = $(this).attr('data-name');
       var sum = 0;
 
       $(this).find('ul > li > *').each(function() {
@@ -521,7 +522,7 @@ function renderForm(form) {
           case 'radio':
           case 'checkbox':
             // Just render these directly and migrate the label to inside the span
-            var name  = $(this).attr('id');
+            var value = $(this).attr('value');
             var label = $(this).next('label');
             var text  = label.text();
 
@@ -529,7 +530,7 @@ function renderForm(form) {
               $(this).remove();
             }
             else{
-              $(this).replaceWith('<div class="item barstyle'+style+'" id="'+name+'">'+text+'</div>');
+              $(this).replaceWith('<div class="item barstyle'+style+'" data-value="'+value+'">'+text+'</div>');
             }
             label.remove();
             break;
@@ -544,7 +545,7 @@ function renderForm(form) {
               var text  = $(this).text();
 
               if(! text.match(/^-+$/)) {
-                parent.append('<div class="item barstyle'+style+'" id="'+value+'">'+text+'</div>');
+                parent.append('<div class="item barstyle'+style+'" data-value="'+value+'">'+text+'</div>');
 
                 // loop style counter
                 style++; style %= max;
@@ -562,18 +563,26 @@ function renderForm(form) {
       if(data) {
         // double loop so we can handle re-renderings of the form
         $(this).find('.item').each(function() {
-          var name  = $(this).attr('id');
-          var count = data[key][name];
+          var name = $(this).attr('data-value');
 
-          if(count) { sum += count; }
+          if(key in data) {
+            var count = data[key][name];
+            if(count) { sum += count; }
+          }
         });
 
 
         $(this).find('.item').each(function() {
-          var name     = $(this).attr('id');
+          var name     = $(this).attr('data-value');
           var oldCount = $(this).attr('data-count');
           var oldSum   = $(this).attr('data-sum');
-          var count    = data[key][name] || 0;
+
+          if(key in data) {
+            var count = data[key][name] || 0;
+          }
+          else {
+            var count = 0;
+          }
 
           if(count != oldCount || sum != oldSum) {
             var percent = (sum) ? ((count/sum)*100)+'%' : '0%';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: showoff
 version: !ruby/object:Gem::Version
-  version: 0.9.10.6
+  version: 0.9.10.7
 platform: ruby
 authors:
 - Scott Chacon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra