prez 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4edcfe95816075e7070a7472e68f2f4f21b6c6b6
-  data.tar.gz: cced4bd53a7d8f3bb6cbe3908424ad0a4c23a245
+  metadata.gz: c8a3c4b86dda6730ee9740ea901ac7a5e3dbc6a1
+  data.tar.gz: 739a8d0578e0a1042f0521995a86fe62d725ff5f
 SHA512:
-  metadata.gz: fa0623cd0f4f127362a77cbd66611146da48a7324027b1670b7310a439fa2e4dd9e4395b5fefd76f9d728a588be94377e20fdfa3ab726e942b816859b63141ac
-  data.tar.gz: 64243e4db2523f314378870c63d7b0d69a563e492efbf236ba0cebf22c19fadaa5a64586020e7ee48e45a167130391a7c7ec906aeddd2248e8d78d16910a5ca9
+  metadata.gz: c62e954206895f70899306942c6940083064e3bc73181e6528b93f4174382605059b76fa7e90797155120f2fea85474ecff72d802a25938af04221cf35f6cab2
+  data.tar.gz: 45ad9018218f0584c38d878b7f55aa8e3e243022067d9573582ef66eb6233d4ab5067acf75686f392fabf577c1c6546e2c42daa968da50b308a909ff1b2e0d79

data/bin/prez

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

data/lib/prez/assets.rb

@@ -76,6 +76,10 @@ module Prez
           attributes << %{height="#{options[:height]}"}
         end
 
+        if options[:style]
+          attributes << %{style="#{options[:style]}"}
+        end
+
         %{<img #{attributes.join " "} src="}
       end
 

data/lib/prez/builder.rb

@@ -8,6 +8,8 @@ module Prez
     private
 
     def build_html(filename)
+      say "Generating html..."
+      reset_helpers!
       @_slide_contents = erb_eval filename
       erb_eval File.expand_path("../../../templates/build.html.tt", __FILE__)
     end

data/lib/prez/helpers.rb

@@ -6,6 +6,10 @@ module Prez
   module Helpers
     protected
 
+    def reset_helpers!
+      @duration = nil
+    end
+
     def duration(value)
       if @duration
         raise Prez::Error.new("The duration helper can only be called once!")
@@ -48,8 +52,28 @@ module Prez
       end
     end
 
-    def html_escape(value)
-      CGI.escape_html value
+    def html_escape(value = nil, &block)
+      if block
+        value = capture &block
+      end
+
+      value = CGI.escape_html value
+
+      if block
+        concat value
+      else
+        value
+      end
+    end
+
+    def capture()
+      buf = ""
+      old_buffer = @output_buffer
+      @output_buffer = buf
+      yield
+      buf.to_s
+    ensure
+      @output_buffer = old_buffer
     end
 
     def slide(options = {})

data/lib/prez/start.rb

@@ -10,6 +10,7 @@ module Prez
     include Thor::Actions
     include Prez::Builder
     argument :name, type: :string
+    class_option :server, type: :boolean, desc: "Keep the server up for dynamic refreshes"
 
     def check_file!
       if File.exists? name
@@ -26,30 +27,61 @@ module Prez
     end
 
     def generate_html
-      say "Generating html..."
+      return if options[:server]
       @html = build_html filename
     end
 
     def start_server
       say "Starting server..."
-      server = WEBrick::HTTPServer.new Port: 0, Logger: Prez::Start::NoopLog.new, AccessLog: []
-      port = server.config[:Port]
+      @server = WEBrick::HTTPServer.new Port: 0, Logger: Prez::Start::NoopLog.new, AccessLog: []
+      port = @server.config[:Port]
 
-      server.mount_proc "/" do |request, response|
-        response.body = @html
-        server.stop
+      if options[:server]
+        ["INT", "TERM"].each do |signal|
+          trap signal do
+            stop_server
+          end
+        end
+      end
+
+      @server.mount_proc "/" do |request, response|
+        if request.path == "/"
+          response.body = html
+
+          unless options[:server]
+            @server.stop
+          end
+        else
+          say "Ignoring request: #{request.path}"
+          response.status = 404
+        end
       end
 
       begin
         Launchy.open "http://localhost:#{port}/"
-        server.start
+        @server.start
       ensure
-        server.shutdown
+        unless options[:server]
+          stop_server
+        end
       end
     end
 
     private
 
+    def stop_server
+      say "Shutting down server..."
+      @server.shutdown
+    end
+
+    def html
+      if options[:server]
+        build_html filename
+      else
+        @html
+      end
+    end
+
     def filename
       @filename
     end

data/lib/prez/version.rb

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

data/templates/build.html.tt

@@ -64,7 +64,7 @@
 
           <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>
+              <strong>Current slide: <select class="form-control current-slide-number"></select> of <span class="total-slides"></span></strong>
             </p>
           </div>
 

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

@@ -8,6 +8,7 @@ class Prez
     DEFAULT_OPTIONS =
         useHash: true
         duration: 0
+        slideElementStyle: "hide"
 
     constructor: (options) ->
         @options = $.extend {}, DEFAULT_OPTIONS, options
@@ -15,6 +16,7 @@ class Prez
         @document = @window.document
         @document.write $("#slides-document").text()
         @document.close()
+        @options.beforeStart?(@)
         @start()
 
     start: ->
@@ -37,11 +39,14 @@ class Prez
 
             false
 
+        slideElementClass = "#{@options.slideElementStyle}-style"
+
         $(".prez-slide", @document).each (i) ->
             $(@).attr "data-slide", "#{i + 1}"
 
             $(@).find(".prez-element").each (j) ->
                 $(@).attr "data-slide-element", "#{j + 1}"
+                $(@).addClass("hidden #{slideElementClass}")
 
         @startTime = Date.now()
         @changeSlideTo 1 unless changeToHashSlide()
@@ -72,13 +77,18 @@ class Prez
             @slideStarted $next
 
         if nextElement == 0
-            $next.find(".prez-element").hide()
+            $next.find(".prez-element").addClass("hidden").removeClass("visible")
         else if @currentElement() > nextElement
             for i in [@currentElement()..(nextElement + 1)]
-                $next.find(".prez-element[data-slide-element='#{i}']").hide()
+                $next.find(".prez-element[data-slide-element='#{i}']").addClass("hidden").removeClass("visible")
         else if @currentElement() < nextElement
             for i in [(@currentElement() + 1)..nextElement]
-                $next.find(".prez-element[data-slide-element='#{i}']").show()
+                $next.find(".prez-element[data-slide-element='#{i}']").removeClass("hidden").addClass("visible")
+
+        # Hack to fix Chrome sometimes not rendering opacity changes,
+        # thanks to http://stackoverflow.com/a/8840703/122
+        if @options.slideElementStyle == "opacity"
+            $next.hide().show(0)
 
         @options.slideChanged? $next, nextValue, nextElement
         true
@@ -89,14 +99,17 @@ class Prez
 
     currentElement: ->
         return null if @currentSlide() == null
-        return 0 if $(".prez-element:visible", @document).size() == 0
-        parseInt $(".prez-element:visible:last", @document).data("slide-element"), 10
+        return 0 if $(".prez-slide:visible .prez-element.visible", @document).size() == 0
+        parseInt $(".prez-slide:visible .prez-element.visible:last", @document).data("slide-element"), 10
 
     countSlideElements: (slide) ->
         $slide = $(".prez-slide[data-slide='#{slide}']", @document)
         return 0 if $slide.size() == 0
         $slide.find(".prez-element").size()
 
+    countSlides: ->
+        $(".prez-slide", @document).size()
+
     changeSlideBy: (amount) ->
         slide = @currentSlide()
         element = @currentElement()
@@ -241,6 +254,7 @@ $(document).on "click", "#launch", (e) ->
     iframePrez = new Prez
         window: iframe
         useHash: false
+        slideElementStyle: "opacity"
 
     Prez.current = new Prez
         duration: Prez.timeToSeconds($("#prez-duration").val())
@@ -248,11 +262,17 @@ $(document).on "click", "#launch", (e) ->
         slideChanged: ($slide, slideNumber, elementNumber) ->
             notes = $slide.find(".prez-notes").html() || ""
             $("#slide-notes").html notes
-            $(".current-slide-number").text $slide.data("slide")
+            $(".current-slide-number:not(select)").text $slide.data("slide")
+            $("select.current-slide-number").val $slide.data("slide")
             Prez.handlers.timeChange()
             iframePrez.changeSlideTo slideNumber, elementNumber
+        beforeStart: (prez) ->
+            $("select.current-slide-number").empty()
+
+            for i in [1..prez.countSlides()]
+                $("select.current-slide-number").append """<option value="#{i}">#{i}</option>"""
 
-    $(".total-slides").text $(".prez-slide", Prez.current.document).size()
+    $(".total-slides").text Prez.current.countSlides()
     $("#pre-launch").hide()
     $("#post-launch").show()
 
@@ -274,6 +294,13 @@ $(document).on "click", ".end-prez", (e) ->
     e.preventDefault()
     Prez.current?.end()
 
+$(document).on "change", "select.current-slide-number", (e) ->
+    Prez.current?.changeSlideTo parseInt($(@).val(), 10)
+    $(@).blur()
+
+$(window).bind "beforeunload", ->
+    Prez.current?.end()
+
 $(document).on "keydown", Prez.handlers.keyDown
 $.setInterval 50, Prez.handlers.timeChange
 

data/vendor/stylesheets/prez-controller.scss

@@ -22,6 +22,12 @@ html, body, #container, #pre-launch, #post-launch {
         color: $brand-danger;
     }
 
+    select.current-slide-number {
+        display: inherit;
+        margin-top: 15px;
+        width: inherit;
+    }
+
     iframe {
         display: block;
         position: absolute;

data/vendor/stylesheets/prez.scss

@@ -2,7 +2,7 @@
 
 body {
     margin: 0;
-    padding: $prez-padding;
+    padding: 0;
 }
 
 .header {
@@ -29,6 +29,7 @@ body {
 
     display: none;
     min-height: $prez-slide-min-height;
+    padding: $prez-padding;
     text-align: center;
 
     &.left-aligned {
@@ -39,9 +40,13 @@ body {
         text-align: right;
     }
 
-    .prez-element {
+    .prez-element.hide-style.hidden {
         display: none;
     }
+
+    .prez-element.opacity-style.hidden {
+        opacity: 0.25;
+    }
 }
 
 .smaller {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prez
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Mike Virata-Stone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script