showoff 0.18.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b8bc22bca10cb765cb6f12290bdf44b2ba0c17f
-  data.tar.gz: 73e786933d4992b577a70cc4ad469d9da9ddb749
+  metadata.gz: 5049af41567ade99af8a0949da8f756bdbe4eaad
+  data.tar.gz: 09b6a2ba7fadc69530ac3465a1a5497576fc5319
 SHA512:
-  metadata.gz: bf8d8dd4ab0851ceab926316dbcf25da51c7037a87b0a5401dcdacec770602d6395be99fb83954fc79e6d41f4bf184a0707768a489d5139d667840eee6e73093
-  data.tar.gz: 3e0e1fb262a34f67d885e145283179e29e4199c9bc8e59c11f80a95f67c8c294e9d2f652ac549520aea8d303066f452de208c860095dca5049de8f015e6800b4
+  metadata.gz: 4332919c9668a1549a91512a74b0b91ec86b8f930a29779dc10c5b0858e4d418cf3a9efe7dddf6977b890e8a16ed13a0e4a8a5ce2a1293040ee59501d954c410
+  data.tar.gz: 720a04998515eba5fa39ff989e18b6a351d69bbcd56a2e55bb435f5b596987e5ffb930d07fa7f4c337060de5f5c7624a02aa5a6f899e9ca1aea1c648c66ade89

data/bin/showoff

@@ -68,6 +68,21 @@ module Wrapper
     end
   end
 
+  desc 'Display information about a Showoff presentation'
+  long_desc 'This command compiles the presentation, then lists out all Markdown files, images, stylesheets, and javascripts included.'
+  command [:info] do |c|
+
+    c.desc 'alternate json filename'
+    c.flag [:f,:file]
+
+    c.desc 'render output as json'
+    c.switch [:j,:json]
+
+    c.action do |global_options,options,args|
+      ShowOffUtils.info(options[:f], options[:j])
+    end
+  end
+
   desc 'Validate the consistency of your presentation.'
   long_desc 'This ensures that each file listed in showoff.json exists and validates code blocks on each slide.'
   command [:validate] do |c|

data/lib/showoff.rb

@@ -1036,10 +1036,17 @@ class ShowOff < Sinatra::Application
       end
 
       doc.css('img').each do |img|
-        # clean up the path and remove some of the relative nonsense
-        img_path  = Pathname.new(File.join(slide_dir, img[:src])).cleanpath.to_path
+
+        # does the image path start from the preso root?
+        if img[:src].start_with? '/'
+          img_path = img[:src]
+        else
+          # clean up the path and remove some of the relative nonsense
+          img_path = Pathname.new(File.join(slide_dir, img[:src])).cleanpath.to_path
+        end
         src       = "#{replacement_prefix}/#{img_path}"
         img[:src] = src
+
       end
       doc.to_html
     end
@@ -1251,12 +1258,12 @@ class ShowOff < Sinatra::Application
     end
 
     def slides(static=false)
-      @logger.warn "Cached presentations: #{@@cache.keys}"
+      @logger.info "Cached presentations: #{@@cache.keys}"
 
       # if we have a cache and we're not asking to invalidate it
       return @@cache[@locale] if (@@cache[@locale] and params['cache'] != 'clear')
 
-      @logger.warn "Generating locale: #{@locale}"
+      @logger.info "Generating locale: #{@locale}"
 
       # If we're displaying from a repository, let's update it
       ShowOffUtils.update(settings.verbose) if settings.url

data/lib/showoff/version.rb

@@ -1,3 +1,3 @@
 # 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.18.1'
+SHOWOFF_VERSION = '0.18.2'

data/lib/showoff_utils.rb

@@ -97,6 +97,37 @@ class ShowOffUtils
     end
   end
 
+  def self.info(config, json = false)
+    ShowOffUtils.presentation_config_file = config
+    showoff = ShowOff.new!
+    content = showoff.slides
+    dom     = Nokogiri::HTML(content)
+
+    data = {}
+    data['files']   = self.showoff_slide_files('.')
+    data['images']  = dom.css('img').map {|img| img[:src].sub(/.\/image\/+/,'') }
+    data['styles']  = Dir.glob('*.css')
+    data['scripts'] = Dir.glob('*.js')
+
+    # now grep through the styles and identify referenced images
+    data['styles'].each do |style|
+      File.readlines(style).each do |line|
+        next unless line =~ /url\(\'(\S+)\'\)/
+        data['images'] << $1
+      end
+    end
+
+    if json
+      puts JSON.pretty_generate(data)
+    else
+      data.each do |key, list|
+        puts "#{key.capitalize}:"
+        list.each {|file| puts "    * #{file}" }
+        puts
+      end
+    end
+  end
+
   def self.validate(config)
     showoff    = ShowOff.new!(:pres_file  => config)
     validators = showoff.settings.showoff_config['validators'] || {}
@@ -449,6 +480,9 @@ class ShowOffUtils
     # - { "section": [ "array.md, "of.md, "files.md"] }
     # - { "include": "sections.json" }
     sections = {}
+    counters = {}
+    lastpath = nil
+
     data.map do |entry|
       next entry if entry.is_a? String
       next nil unless entry.is_a? Hash
@@ -489,6 +523,20 @@ class ShowOffUtils
         end
       else
         path = File.dirname(entry)
+
+        # this lastpath business allows us to reference files in a directory that aren't
+        # necessarily contiguous.
+        if path != lastpath
+          counters[path] ||= 0
+          counters[path]  += 1
+        end
+
+        # now record the last path we've seen
+        lastpath = path
+
+        # and if there are more than one disparate occurences of path, add a counter to this string
+        path = "#{path} (#{counters[path]})" unless counters[path] == 1
+
         sections[path] ||= []
         sections[path]  << filename
       end

data/locales/de.yml

@@ -28,6 +28,7 @@ de:
   navigation:
     next: Nächste Folie
     previous: Vorherige Folie
+    sync: Synchronisieren der Präsentation
   loading: laden der Präsentation...
   activity_complete: Aktivität vollständig
   follow:

data/locales/en.yml

@@ -28,6 +28,7 @@ en:
   navigation:
     next: Next
     previous: Previous
+    sync: Sync Presentation
   loading: loading presentation...
   activity_complete: Activity complete
   follow:

data/locales/es.yml

@@ -28,6 +28,7 @@ es:
   navigation:
     next: Siguiente
     previous: Anterior
+    sync: Sincronizar presentación
   loading: cargando presentación...
   activity_complete: Actividad completa
   follow:

data/locales/fr.yml

@@ -28,6 +28,7 @@ fr:
   navigation:
     next: Prochain
     previous: Précédent
+    sync: Synchroniser la présentation
   loading: Chargement de la présentation...
   activity_complete: Activité terminée
   follow:

data/locales/ja.yml

@@ -28,6 +28,7 @@ ja:
   navigation:
     next: 次へ
     previous: 前へ
+    sync: プレゼンテーションの同期
   loading: プレゼンテーション？ロード中...
   activity_complete: アクティビティ完了
   follow:

data/locales/nl.yml

@@ -28,6 +28,7 @@ nl:
   navigation:
     next: Volgende
     previous: Vorige
+    sync: Presentatie synchroniseren
   loading: Laden van presentatie...
   activity_complete: Activiteiten voltooid
   follow:

data/locales/pt.yml

@@ -28,6 +28,7 @@ pt:
   navigation:
     next: Próximo
     previous: Anterior
+    sync: Sincronizar Apresentação
   loading: carregando apresentação...
   activity_complete: Atividade completada
   follow:

data/public/css/presenter.css

@@ -293,7 +293,7 @@
       min-width: 210px;
       min-height: 210px;
       height: 210px;
-      border-top: 1px solid #ccc;
+      border-top: 3px solid #ccc;
       overflow: auto;
     }
 

data/public/css/showoff.css

@@ -1199,6 +1199,14 @@ a.term:after {
   right: 1em;
 }
 
+#synchronize {
+  display: none;
+  position: absolute;
+  bottom: 1em;
+  left: 1em;
+  font-size: 0.8em;
+}
+
 /* Render hidden headlines so that when we print with wkhtmltopdf, we can use section
    titles for page headers.  it would make sense to put this in the print section, but
    then you get a weird double headline when previewing a print in the browser. */

data/public/js/presenter.js

@@ -293,6 +293,10 @@ function openSlave()
       // Add a class to differentiate from the audience view
       slaveWindow.document.getElementById("preso").className = 'display';
 
+      // remove some display view chrome
+      $('.slide.activity', slaveWindow.document).removeClass('activity').children('.activityToggle').remove();
+      $('#synchronize', slaveWindow.document).remove();
+
       // call back and update the parent presenter if the window is closed
       slaveWindow.onunload = function(e) {
         slaveWindow.opener.closeSlave(true);
@@ -630,7 +634,9 @@ reconnectControlChannel = function() {
     },
     error: function() {
       console.log("Showoff server unavailable");
-      setTimeout(reconnectControlChannel(), 5000);
+      setTimeout( function() {
+        reconnectControlChannel();
+      }, 5000);
     },
   });
 }

data/public/js/showoff.js

@@ -4,6 +4,7 @@ var ShowOff = {};
 
 var preso_started = false
 var slidenum = 0
+var presenterSlideNum = 0
 var slideTotal = 0
 var slides
 var currentSlide
@@ -117,6 +118,11 @@ function setupPreso(load_slides, prefix) {
     buttons: buttons
   });
 
+  $("#synchronize").button();
+  $("#synchronize").click(function() {
+    synchronize();
+  });
+
   // wait until the presentation is loaded to hook up the previews.
   $("body").bind("showoff:loaded", function (event) {
     var target = $('#navigationHover');
@@ -249,10 +255,6 @@ function initializePresentation(prefix) {
     }
   });
 
-  // The display window doesn't need the extra chrome
-  if(typeof(presenterView) != 'undefined') {
-    $('.slide.activity').removeClass('activity').children('.activityToggle').remove();
-  }
   $('.slide.activity .activityToggle input.activity').checkboxradio();
   $('.slide.activity .activityToggle input.activity').change(toggleComplete);
 
@@ -772,6 +774,9 @@ function showSlide(back_step, updatepv) {
     activityIncomplete = false;
   }
 
+  // show the sync button if we're not on the same slide as the presenter
+  checkSyncState();
+
   // make all bigly text tremendous
   currentSlide.children('.content.bigtext').bigtext();
 
@@ -1278,8 +1283,10 @@ function editSlide() {
   window.open(link);
 }
 
-function follow(slide, newIncrement) {
-  if (mode.follow && ! activityIncomplete) {
+function follow(slide, newIncrement, force) {
+  presenterSlideNum = slide;
+
+  if ((mode.follow && ! activityIncomplete) || force) {
     var lastSlide = slidenum;
     console.log("New slide: " + slide);
     gotoSlide(slide);
@@ -1302,6 +1309,22 @@ function follow(slide, newIncrement) {
 
     }
   }
+
+  // show the sync button if we're not on the same slide as the presenter
+  checkSyncState();
+}
+
+function checkSyncState() {
+  if (presenterSlideNum != slidenum && presenterSlideNum != null) {
+    $("#synchronize").show();
+  }
+  else {
+    $("#synchronize").hide();
+  }
+}
+
+function synchronize() {
+  follow(presenterSlideNum, 0, true);
 }
 
 function getPosition() {

data/views/index.erb

@@ -95,7 +95,7 @@
 <%= erb :help %>
 
 <div id="preso"><center><%= I18n.t('loading') %></center></div>
-
+<a id="synchronize"><i class="fa fa-link" aria-hidden="true" href="#"></i> <%= I18n.t('navigation.sync') %></a>
 <div id="notes"></div>
 
 <footer id="footer">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: showoff
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.2
 platform: ruby
 authors:
 - Scott Chacon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-23 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra