prez 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9566ac0764fadc9bfd46520d7a5ab5accd03095
-  data.tar.gz: 2107dba528cc10fcf9caf3c74192f2c8308f2f94
+  metadata.gz: 82d042197610a8de84aefe9c5d966f5d5c218eba
+  data.tar.gz: 67e617fa968d220c919ddeea986ca007f3a2e55c
 SHA512:
-  metadata.gz: 27ea96591daee1b5a597453f3c17ee810bb266821244b7a62c156eb9d20c8f6e3f449535189a4772fa1a6c1f149d8dec5bbb30ac1a95f91956cb94af6d921bbc
-  data.tar.gz: cb71ef8a94917acbd27b72418e6b9486b1f981f3d9b6e420581c00afb0bc9a2974252a39166392cbe6a979e9ee75a72745950db2cbb4e1a1b7f0298764cfd32e
+  metadata.gz: 25b2fddcb34be8dd5a376698d011bc9cfd1c949700c5af3eb9a82500c1be6c438d0ded954caaca8c956a713a6a504c1fde5eb407d1beb2f34444ece76985c62e
+  data.tar.gz: 9888f3403ac1575ba470643ee616e7471db98caef858dd6eed70eb3844a9e5933a63b0339878d79e53361af7a79913c1ef2065993aa1ffc1b2081c07b050a249

data/bin/prez

@@ -2,7 +2,7 @@
 require "rubygems"
 gem "coffee-script", "~> 2.3"
 gem "launchy", "~> 2.4"
-gem "prez", "= 0.0.2"
+gem "prez", "= 0.0.3"
 gem "sass", "~> 3.4"
 gem "therubyracer", "~> 0.12"
 gem "thor", "~> 0.19"

data/lib/prez/assets.rb

@@ -1,4 +1,6 @@
 require "coffee-script"
+require "prez/data_uri"
+require "prez/error"
 require "prez/files"
 require "prez/sass_extensions"
 require "sass"
@@ -7,17 +9,21 @@ require "uglifier"
 module Prez
   module Assets
     class Tagged
-      attr_reader :name, :contents, :file
+      attr_reader :name, :contents, :file, :options
 
       def initialize(name, options = {})
         @name = name
         @contents = Prez::Files.contents name, extension
         @file = Prez::Files.find name, extension
-        @dev = options.fetch :dev, false
+        @options = options
       end
 
       def dev?
-        @dev
+        options.fetch :dev, false
+      end
+
+      def self_closing?
+        false
       end
 
       def minified_contents
@@ -29,7 +35,7 @@ module Prez
       end
 
       def to_tag
-        if dev?
+        if dev? && !self_closing?
           "#{open}\n#{contents}#{close}"
         else
           "#{open}#{minified_contents.strip}#{close}"
@@ -37,6 +43,57 @@ module Prez
       end
     end
 
+    class Image < Prez::Assets::Tagged
+      def self_closing?
+        true
+      end
+
+      def extension
+        "image"
+      end
+
+      def open
+        attributes = []
+
+        if options[:width]
+          attributes << %{width="#{options[:width]}"}
+        end
+
+        if options[:height]
+          attributes << %{height="#{options[:height]}"}
+        end
+
+        %{<img #{attributes.join " "} src="}
+      end
+
+      def close
+        %{" />}
+      end
+
+      def image_type
+        extension = file[/\.([^.]*)$/, 1]
+
+        case extension
+        when "gif"
+          "image/gif"
+        when "jpeg", "jpg"
+          "image/jpeg"
+        when "png"
+          "image/png"
+        when "svg"
+          "image/svg+xml"
+        when "tif", "tiff"
+          "image/tiff"
+        else
+          raise Prez::Error.new("Unknown image extension '#{extension}'")
+        end
+      end
+
+      def minify(contents)
+        Prez::DataUri.new(image_type, contents).to_s
+      end
+    end
+
     class Javascript < Prez::Assets::Tagged
       def extension
         "js"
@@ -78,6 +135,10 @@ module Prez
     end
 
     class << self
+      def image(name, options = {})
+        Prez::Assets::Image.new(name, options).to_tag
+      end
+
       def javascript(name, options = {})
         Prez::Assets::Javascript.new(name, options).to_tag
       end

data/lib/prez/data_uri.rb

@@ -0,0 +1,17 @@
+require "base64"
+
+module Prez
+  class DataUri
+    attr_reader :type, :contents
+
+    def initialize(type, contents)
+      @type = type
+      @contents = Base64.encode64 contents
+      @contents.gsub! "\n", ""
+    end
+
+    def to_s
+      "data:#{type};base64,#{contents}"
+    end
+  end
+end

data/lib/prez/files.rb

@@ -50,7 +50,8 @@ module Prez
       SEARCH_PATHS = {
         "js" => Prez::Files::Paths.new("js", ["js.coffee", "coffee", "js"], "javascripts"),
         "css" => Prez::Files::Paths.new("css", ["css.scss", "scss", "css"], "stylesheets"),
-        "font" => Prez::Files::Paths.new("font", ["eot", "svg", "ttf", "woff", "woff2"], "fonts", binary: true)
+        "font" => Prez::Files::Paths.new("font", ["eot", "svg", "ttf", "woff", "woff2"], "fonts", binary: true),
+        "image" => Prez::Files::Paths.new("image", ["gif", "jpeg", "jpg", "png", "svg", "tif", "tiff"], "images", binary: true)
       }
 
       def contents(name, extension)

data/lib/prez/helpers.rb

@@ -6,12 +6,72 @@ module Prez
   module Helpers
     protected
 
+    def duration(value)
+      if @duration
+        raise Prez::Error.new("The duration helper can only be called once!")
+      end
+
+      if value.kind_of?(String) && value.split(":").size > 3
+        raise Prez::Eror.new("Only hours:minutes:seconds are supported for the duration!")
+      end
+
+      @duration = value
+      nil
+    end
+
+    def duration_amount
+      return if @duration.nil? || @duration.to_i <= 0
+
+      # Ensure it is an integer first... then we can normalize based
+      # on standard times (ie, no 70 seconds, or 100 minutes)
+      if @duration.kind_of? String
+        @duration = @duration.split ":"
+        @duration.map! &:to_i
+        value = @duration.pop || 0
+        value += (@duration.pop || 0) * 60
+        value += (@duration.pop || 0) * 60 * 60
+        @duration = value
+      end
+
+      # Ensure we don't have a floating point number
+      @duration = @duration.to_i
+      seconds = @duration % 60
+      minutes = (@duration / 60) % 60
+      hours = @duration / 60 / 60
+
+      if hours > 0
+        "%d:%02d:%02d" % [hours, minutes, seconds]
+      elsif minutes > 0
+        "%2d:%02d" % [minutes, seconds]
+      else
+        seconds.to_s
+      end
+    end
+
     def html_escape(value)
       CGI.escape_html value
     end
 
-    def slide
-      concat %{<div class="prez-slide">}
+    def slide(options = {})
+      classes = ["prez-slide"]
+      align = options.fetch :align, :center
+
+      case align
+      when :left
+        classes << "left-aligned"
+      when :right
+        classes << "right-aligned"
+      when :center
+        # Nothing needed
+      else
+        raise Prez::Error.new("Invalid slide align: #{align.inspect}")
+      end
+
+      if options[:duration]
+        duration_attribute = %{ data-duration="#{options[:duration]}"}
+      end
+
+      concat %{<div class="#{classes.join " "}"#{duration_attribute}>}
       yield
       concat %{</div>}
     end
@@ -22,6 +82,12 @@ module Prez
       concat %{</div>}
     end
 
+    def image(name, options = {})
+      Prez::Assets.image name, options
+    rescue Prez::Files::MissingError
+      raise Prez::Error.new("Could not find image file: '#{name}'")
+    end
+
     def javascript(name)
       Prez::Assets.javascript name
     rescue Prez::Files::MissingError

data/lib/prez/sass_extensions.rb

@@ -1,4 +1,4 @@
-require "base64"
+require "prez/data_uri"
 require "prez/error"
 require "prez/files"
 require "sass"
@@ -7,8 +7,7 @@ module Sass::Script::Functions
   def twbs_font_path(path)
     assert_type path, :String
     path = path.value.sub /[?#].*/, ""
-    font_data = Base64.encode64 Prez::Files.contents(path, "font")
-    font_data.gsub! "\n", ""
+    contents = Prez::Files.contents path, "font"
     extension = path[/\.([^.]*)$/, 1]
 
     case extension
@@ -26,7 +25,7 @@ module Sass::Script::Functions
       raise Prez::Error.new("Unknown font extension '#{extension}'")
     end
 
-    Sass::Script::Value::String.new("data:#{font_type};base64,#{font_data}")
+    Sass::Script::Value::String.new Prez::DataUri.new(font_type, contents).to_s
   rescue Prez::Files::MissingError => e
     raise Prez::Error.new("Could not find font: '#{path}'")
   end

data/lib/prez/version.rb

@@ -2,7 +2,7 @@ module Prez
   module Version
     class << self
       def to_s
-        "0.0.2"
+        "0.0.3"
       end
     end
   end

data/templates/build.html.tt

@@ -4,7 +4,6 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <%= stylesheet "bootstrap" %>
     <%= stylesheet "prez-controller" %>
     <%= javascript "jquery" %>
     <%= javascript "prez-controller" %>
@@ -16,6 +15,15 @@
       <div id="pre-launch">
         <div id="filler"></div>
 
+        <div class="row">
+          <div class="col-md-offset-2 col-md-8 col-lg-offset-3 col-lg-6">
+            <div class="form-group">
+              <label for="prez-duration">Duration</label>
+              <input type="text" id="prez-duration" class="form-control" placeholder="hours:minutes:seconds" value="<%= duration_amount %>" />
+            </div>
+          </div>
+        </div>
+
         <div class="row">
           <div class="col-xs-6 col-md-offset-2 col-md-4 col-lg-offset-3 col-lg-3">
             <button id="new-window" type="button" class="btn btn-default btn-block btn-lg active" data-toggle="button">
@@ -47,9 +55,25 @@
           </div>
         </div>
 
-        <p class="lead text-center">
-          <strong>Current slide: <span class="current-slide-number"></span></strong>
-        </p>
+        <div class="row">
+          <div class="col-xs-2">
+            <div>
+              <span class="prez-total-duration"></span>
+            </div>
+          </div>
+
+          <div class="col-xs-8">
+            <p class="lead text-center">
+              <strong>Current slide: <span class="current-slide-number"></span> of <span class="total-slides"></span></strong>
+            </p>
+          </div>
+
+          <div class="col-xs-2">
+            <div class="text-right">
+              <span class="prez-current-slide-duration"></span>
+            </div>
+          </div>
+        </div>
 
         <iframe id="preview-frame"></iframe>
         <div id="preview-frame-padding"></div>

data/vendor/javascripts/prez-controller.js.coffee

@@ -1,6 +1,13 @@
+$.setTimeout = (t, fn) -> setTimeout fn, t
+$.setInterval = (t, fn) -> setInterval fn, t
+
+$.fn.slideDuration = ->
+    parseInt(@data("duration") || "0", 10)
+
 class Prez
     DEFAULT_OPTIONS =
         useHash: true
+        duration: 0
 
     constructor: (options) ->
         @options = $.extend {}, DEFAULT_OPTIONS, options
@@ -22,6 +29,7 @@ class Prez
                 false
 
         $(".prez-slide", @document).each (i) -> $(@).attr "data-slide", "#{i + 1}"
+        @startTime = Date.now()
         @changeSlideTo 1 unless changeToHashSlide()
         $(@window).on "hashchange", changeToHashSlide
         $(@document).on "keydown", Prez.handlers.keyDown
@@ -31,6 +39,18 @@ class Prez
         return false if $next.size() == 0
         $(".prez-slide", @document).hide()
         $next.show()
+        @slideStartTime = Date.now()
+        @slideDuration = $next.slideDuration()
+
+        # When unspecified, the slide duration is an even amount based
+        # on the remaining slides that don't have a specific duration
+        if @slideDuration <= 0
+            $remainingUntimed = $next.nextAll(".prez-slide").filter -> $(@).slideDuration() <= 0
+            @slideDuration = @remainingPresentationSeconds() / ($remainingUntimed.size() + 1)
+
+            if @slideDuration < 0
+                @slideDuration = 0
+
         @options.slideChanged? $next, nextValue
         true
 
@@ -45,6 +65,55 @@ class Prez
     prevSlide: -> @changeSlideBy -1
     end: -> @window.close()
 
+    remainingPresentationSeconds: ->
+        Math.floor(@options.duration - ((Date.now() - @startTime) / 1000))
+
+    remainingPresentationTime: ->
+        Prez.secondsToTime @remainingPresentationSeconds(), Prez.timeLevels(@options.duration)
+
+    remainingSlideSeconds: ->
+        Math.floor(@slideDuration - ((Date.now() - @slideStartTime) / 1000))
+
+    remainingSlideTime: ->
+        Prez.secondsToTime @remainingSlideSeconds(), Prez.timeLevels(@slideDuration)
+
+    @timeLevels: (s) ->
+        if s >= (60 * 60)
+            3
+        else if s >= 60
+            2
+        else
+            1
+
+    @timeToSeconds: (t) ->
+        values = t.split ":"
+        result = parseInt(values.pop() || "0", 10)
+        result += parseInt(values.pop() || "0", 10) * 60
+        result += parseInt(values.pop() || "0", 10) * 60 * 60
+        result
+
+    @secondsToTime: (s, minLevels = 1) ->
+        pad = (n, size) ->
+            result = "#{n}"
+
+            while result.length < size
+                result = "0#{result}"
+
+            result
+
+        s = Math.floor s
+        s = Math.abs s
+        seconds = s % 60
+        minutes = Math.floor(s / 60) % 60
+        hours = Math.floor(s / 60 / 60)
+
+        if hours > 0 || minLevels >= 3
+            "#{hours}:#{pad minutes, 2}:#{pad seconds, 2}"
+        else if minutes > 0 || minLevels == 2
+            "#{minutes}:#{pad seconds, 2}"
+        else
+            "#{seconds}"
+
     KEY_ENTER = 13
     KEY_SPACE = 32
     KEY_LEFT = 37
@@ -62,10 +131,30 @@ class Prez
                     e.preventDefault()
                     Prez.current?.nextSlide()
 
+        timeChange: ->
+            return unless Prez.current
+            $(".prez-total-duration").text Prez.current.remainingPresentationTime()
+            seconds = Prez.current.remainingPresentationSeconds()
+            $(".prez-total-duration").toggleClass("prez-danger-time", seconds <= 60 && seconds >= 0)
+            $(".prez-total-duration").toggleClass("prez-over-time", seconds < 0)
+            $(".prez-current-slide-duration").text Prez.current.remainingSlideTime()
+            seconds = Prez.current.remainingSlideSeconds()
+            $(".prez-current-slide-duration").toggleClass("prez-danger-time", seconds <= 3 && seconds >= 0)
+            $(".prez-current-slide-duration").toggleClass("prez-over-time", seconds < 0)
+
+            if Math.floor(Date.now() / 250) % 2 == 0
+                $(".prez-danger-time").hide()
+            else
+                $(".prez-danger-time").show()
+
+            # Ensure transitions stay shown
+            $(".prez-total-duration:not(.prez-danger-time)").show()
+            $(".prez-current-slide-duration:not(.prez-danger-time)").show()
+
 $(document).on "click", "#new-window", (e) ->
     return if Prez.current
 
-    callback = =>
+    $.setTimeout 1, =>
         if $(this).is(".active")
             $("#new-window #launch-message").text "Launch in new window"
             $("#new-window .glyphicon").addClass("glyphicon-new-window").removeClass("glyphicon-unchecked")
@@ -73,8 +162,6 @@ $(document).on "click", "#new-window", (e) ->
             $("#new-window #launch-message").text "Launch in this window"
             $("#new-window .glyphicon").removeClass("glyphicon-new-window").addClass("glyphicon-unchecked")
 
-    setTimeout callback, 1
-
 $(document).on "click", "#launch", (e) ->
     e.preventDefault()
     return if Prez.current
@@ -97,13 +184,16 @@ $(document).on "click", "#launch", (e) ->
         useHash: false
 
     Prez.current = new Prez
+        duration: Prez.timeToSeconds($("#prez-duration").val())
         window: window.open("", "prez", "width=640,height=480")
         slideChanged: ($slide, slideNumber) ->
             notes = $slide.find(".prez-notes").html() || ""
             $("#slide-notes").html notes
             $(".current-slide-number").text $slide.data("slide")
+            Prez.handlers.timeChange()
             iframePrez.changeSlideTo slideNumber
 
+    $(".total-slides").text $(".prez-slide", Prez.current.document).size()
     $("#pre-launch").hide()
     $("#post-launch").show()
 
@@ -126,6 +216,7 @@ $(document).on "click", ".end-prez", (e) ->
     Prez.current?.end()
 
 $(document).on "keydown", Prez.handlers.keyDown
+$.setInterval 50, Prez.handlers.timeChange
 
 $ ->
     $("#in-window-not-implemented-modal").modal show: false

data/vendor/stylesheets/prez-controller.scss

@@ -1,3 +1,5 @@
+$bootstrap-sass-asset-helper: true;
+@import "bootstrap";
 @import "prez/variables";
 
 html, body, #container, #pre-launch, #post-launch {
@@ -11,6 +13,15 @@ html, body, #container, #pre-launch, #post-launch {
 #post-launch {
     display: none;
 
+    .prez-total-duration, .prez-current-slide-duration {
+        font-size: 2em;
+    }
+
+    .prez-danger-time, .prez-over-time {
+        font-weight: bold;
+        color: $brand-danger;
+    }
+
     iframe {
         display: block;
         position: absolute;

data/vendor/stylesheets/prez.scss

@@ -22,18 +22,22 @@ body {
     font-weight: bold;
 }
 
-.prez-slide, .prez-slide input {
-    font-size: 50;
-}
-
 .prez-slide {
+    &, & input {
+        font-size: 50;
+    }
+
     display: none;
     min-height: $prez-slide-min-height;
     text-align: center;
-}
 
-.prez-slide.left-aligned {
-    text-align: left;
+    &.left-aligned {
+        text-align: left;
+    }
+
+    &.right-aligned {
+        text-align: right;
+    }
 }
 
 .smaller {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prez
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Mike Virata-Stone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
@@ -136,6 +136,7 @@ files:
 - lib/prez/build.rb
 - lib/prez/builder.rb
 - lib/prez/cli.rb
+- lib/prez/data_uri.rb
 - lib/prez/error.rb
 - lib/prez/files.rb
 - lib/prez/helpers.rb
@@ -154,7 +155,6 @@ files:
 - vendor/javascripts/jquery.js
 - vendor/javascripts/prez-controller.js.coffee
 - vendor/stylesheets/_bootstrap.scss
-- vendor/stylesheets/bootstrap.scss
 - vendor/stylesheets/bootstrap/_alerts.scss
 - vendor/stylesheets/bootstrap/_badges.scss
 - vendor/stylesheets/bootstrap/_breadcrumbs.scss

data/vendor/stylesheets/bootstrap.scss

@@ -1,2 +0,0 @@
-$bootstrap-sass-asset-helper: true;
-@import "_bootstrap";