prez 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8a3c4b86dda6730ee9740ea901ac7a5e3dbc6a1
-  data.tar.gz: 739a8d0578e0a1042f0521995a86fe62d725ff5f
+  metadata.gz: 13415316b5dd25295ffe13e8beeb11fd298be3fd
+  data.tar.gz: 40e50b72d184a9dee9860bcfeb88138325dc760b
 SHA512:
-  metadata.gz: c62e954206895f70899306942c6940083064e3bc73181e6528b93f4174382605059b76fa7e90797155120f2fea85474ecff72d802a25938af04221cf35f6cab2
-  data.tar.gz: 45ad9018218f0584c38d878b7f55aa8e3e243022067d9573582ef66eb6233d4ab5067acf75686f392fabf577c1c6546e2c42daa968da50b308a909ff1b2e0d79
+  metadata.gz: 32fcb1f65a52968389fc0641a002079807cd328f278854e5b19da0b4b748119c381a37e9edc67a88873d3c9fba67f661577feee1dad88cdbcf50c1f0f3ca21cb
+  data.tar.gz: 26d7be1f411008d9fe81a9a55894d950202b0ddad08f182e3273063dd82d1c4f5056c57874ef6e9ad7d13fda0c8608e69525de26f91f83bd9535cc74c65702e1

data/bin/prez

@@ -2,10 +2,10 @@
 require "rubygems"
 gem "coffee-script", "~> 2.3"
 gem "launchy", "~> 2.4"
-gem "prez", "= 0.0.6"
+gem "prez", "= 0.1.0"
 gem "sass", "~> 3.4"
 gem "therubyracer", "~> 0.12"
 gem "thor", "~> 0.19"
 gem "uglifier", "~> 2.7"
-require "prez/cli"
+require "prez"
 Prez::CLI.start

data/lib/prez/assets.rb

@@ -1,8 +1,4 @@
 require "coffee-script"
-require "prez/cache"
-require "prez/data_uri"
-require "prez/error"
-require "prez/files"
 require "prez/sass_extensions"
 require "sass"
 require "uglifier"

data/lib/prez/build.rb

@@ -1,5 +1,3 @@
-require "prez/builder"
-require "prez/error"
 require "thor/actions"
 require "thor/group"
 
@@ -7,19 +5,19 @@ module Prez
   class Build < Thor::Group
     include Thor::Actions
     include Prez::Builder
-    argument :name, type: :string
+    argument :name, type: :string, required: false, default: nil
 
     def check_file!
-      if File.exists? name
-        @filename = name
-      elsif File.exists? "#{name}.prez"
-        @filename = "#{name}.prez"
+      if File.exists? prez_name
+        @filename = prez_name
+      elsif File.exists? "#{prez_name}.prez"
+        @filename = "#{prez_name}.prez"
       else
-        raise Prez::Error.new("Missing prez file '#{name}'")
+        raise Prez::Error.new("Missing prez file '#{prez_name}'")
       end
 
       if filename =~ /\.html$/
-        raise Prez::Error.new("Prez file cannot be an html file: '#{name}'")
+        raise Prez::Error.new("Prez file cannot be an html file: '#{prez_name}'")
       end
     end
 
@@ -29,6 +27,22 @@ module Prez
 
     private
 
+    def prez_name
+      @prez_name = name || only_existing_prez
+    end
+
+    def only_existing_prez
+      results = Dir.glob "*.prez"
+
+      if results.empty?
+        raise Prez::Error.new("No .prez files found!")
+      elsif results.size > 1
+        raise Prez::Error.new("More than one .prez file found!\nPlease specify which one you want to build.")
+      end
+
+      results.first
+    end
+
     def base_name
       filename.sub /\.prez$/, ""
     end

data/lib/prez/builder.rb

@@ -1,5 +1,4 @@
 require "erb"
-require "prez/helpers"
 
 module Prez
   module Builder

data/lib/prez/cache.rb

@@ -1,6 +1,5 @@
 require "digest"
 require "fileutils"
-require "prez/version"
 require "yaml"
 
 module Prez

data/lib/prez/cli.rb

@@ -1,14 +1,10 @@
-require "prez/build"
-require "prez/new"
-require "prez/start"
-require "prez/version"
 require "thor"
 
 module Prez
   class CLI < Thor
-    register Prez::Build, "build", "build NAME", "Builds the single html presentation from the prez file"
+    register Prez::Build, "build", "build [NAME]", "Builds the single html presentation from the prez file"
     register Prez::New, "new", "new NAME", "Generates a new presentation"
-    register Prez::Start, "start", "start NAME", "Launches your browser with the given presentation"
+    register Prez::Start, "start", "start [NAME]", "Launches your browser with the given presentation"
 
     map "-v" => "version"
 

data/lib/prez/helpers.rb

@@ -1,6 +1,4 @@
 require "cgi"
-require "prez/assets"
-require "prez/error"
 
 module Prez
   module Helpers

data/lib/prez/new.rb

@@ -1,4 +1,3 @@
-require "prez/error"
 require "thor/actions"
 require "thor/group"
 

data/lib/prez/sass_extensions.rb

@@ -1,6 +1,3 @@
-require "prez/data_uri"
-require "prez/error"
-require "prez/files"
 require "sass"
 
 module Sass::Script::Functions

data/lib/prez/start.rb

@@ -1,6 +1,4 @@
 require "launchy"
-require "prez/builder"
-require "prez/error"
 require "thor/actions"
 require "thor/group"
 require "webrick"
@@ -9,20 +7,20 @@ module Prez
   class Start < Thor::Group
     include Thor::Actions
     include Prez::Builder
-    argument :name, type: :string
+    argument :name, type: :string, required: false, default: nil
     class_option :server, type: :boolean, desc: "Keep the server up for dynamic refreshes"
 
     def check_file!
-      if File.exists? name
-        @filename = name
-      elsif File.exists? "#{name}.prez"
-        @filename = "#{name}.prez"
+      if File.exists? prez_name
+        @filename = prez_name
+      elsif File.exists? "#{prez_name}.prez"
+        @filename = "#{prez_name}.prez"
       else
-        raise Prez::Error.new("Missing prez file '#{name}'")
+        raise Prez::Error.new("Missing prez file '#{prez_name}'")
       end
 
       if filename =~ /\.html$/
-        raise Prez::Error.new("Prez file cannot be an html file: '#{name}'")
+        raise Prez::Error.new("Prez file cannot be an html file: '#{prez_name}'")
       end
     end
 
@@ -69,6 +67,22 @@ module Prez
 
     private
 
+    def prez_name
+      @prez_name = name || only_existing_prez
+    end
+
+    def only_existing_prez
+      results = Dir.glob "*.prez"
+
+      if results.empty?
+        raise Prez::Error.new("No .prez files found!")
+      elsif results.size > 1
+        raise Prez::Error.new("More than one .prez file found!\nPlease specify which one you want to start.")
+      end
+
+      results.first
+    end
+
     def stop_server
       say "Shutting down server..."
       @server.shutdown

data/lib/prez/version.rb

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

data/lib/prez.rb

@@ -1 +1,14 @@
-require "prez/version"
+module Prez
+  autoload :Assets,  "prez/assets"
+  autoload :Build,   "prez/build"
+  autoload :Builder, "prez/builder"
+  autoload :Cache,   "prez/cache"
+  autoload :CLI,     "prez/cli"
+  autoload :DataUri, "prez/data_uri"
+  autoload :Error,   "prez/error"
+  autoload :Files,   "prez/files"
+  autoload :Helpers, "prez/helpers"
+  autoload :New,     "prez/new"
+  autoload :Start,   "prez/start"
+  autoload :Version, "prez/version"
+end

data/templates/build.html.tt

@@ -85,27 +85,6 @@
           </div>
         </div>
       </div>
-
-      <div id="in-window-not-implemented-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="not-implemented" aria-hidden="true">
-        <div class="modal-dialog">
-          <div class="modal-content">
-            <div class="modal-header">
-              <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-              <h4 class="modal-title" id="not-implemented">Not Implemented</h4>
-            </div>
-
-            <div class="modal-body">
-              <p>
-                Sorry, same window presentations are not yet implemented!
-              </p>
-            </div>
-
-            <div class="modal-footer">
-              <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-            </div>
-          </div>
-        </div>
-      </div>
     </div>
   </body>
 </html>

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

@@ -7,6 +7,7 @@ $.fn.slideDuration = ->
 class Prez
     DEFAULT_OPTIONS =
         useHash: true
+        displayTime: true
         duration: 0
         slideElementStyle: "hide"
 
@@ -14,11 +15,20 @@ class Prez
         @options = $.extend {}, DEFAULT_OPTIONS, options
         @window = options.window
         @document = @window.document
-        @document.write $("#slides-document").text()
+
+        if options.content
+            @document.write options.content
+            delete options.content
+        else
+            @document.write $("#slides-document").text()
+
         @document.close()
         @options.beforeStart?(@)
         @start()
 
+    showTime: ->
+        @options.displayTime
+
     start: ->
         changeToHashSlide = =>
             return false unless @options.useHash
@@ -205,6 +215,7 @@ class Prez
 
         timeChange: ->
             return unless Prez.current
+            return unless Prez.current.showTime()
             $(".prez-total-duration").text Prez.current.remainingPresentationTime()
             seconds = Prez.current.remainingPresentationSeconds()
             $(".prez-total-duration").toggleClass("prez-danger-time", seconds <= 60 && seconds >= 0)
@@ -237,40 +248,55 @@ $(document).on "click", "#new-window", (e) ->
 $(document).on "click", "#launch", (e) ->
     e.preventDefault()
     return if Prez.current
-
-    unless $("#new-window").is(".active")
-        $("#in-window-not-implemented-modal").modal "show"
-        return
-
+    useNewWindow = $("#new-window").is(".active")
     iframe = $("iframe")[0]
 
-    iframe = if iframe.contentWindow
-        iframe.contentWindow
-    else if iframe.contentDocument.document
-        iframe.contentDocument.document
+    iframe.getFrameWindow = ->
+        if @contentWindow
+            @contentWindow
+        else if @contentDocument.document
+            @contentDocument.document
+        else
+            @contentDocument
+
+
+    if useNewWindow
+        iframePrez = new Prez
+            window: iframe.getFrameWindow()
+            useHash: false
+            slideElementStyle: "opacity"
+
+        Prez.current = new Prez
+            duration: Prez.timeToSeconds($("#prez-duration").val())
+            window: window.open("", "prez", "width=640,height=480")
+            slideChanged: ($slide, slideNumber, elementNumber) ->
+                notes = $slide.find(".prez-notes").html() || ""
+                $("#slide-notes").html notes
+                $(".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>"""
     else
-        iframe.contentDocument
-
-    iframePrez = new Prez
-        window: iframe
-        useHash: false
-        slideElementStyle: "opacity"
-
-    Prez.current = new Prez
-        duration: Prez.timeToSeconds($("#prez-duration").val())
-        window: window.open("", "prez", "width=640,height=480")
-        slideChanged: ($slide, slideNumber, elementNumber) ->
-            notes = $slide.find(".prez-notes").html() || ""
-            $("#slide-notes").html notes
-            $(".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>"""
+        $iframe = $(iframe).detach().css
+            position: "absolute"
+            left: "0px"
+            top: "0px"
+            width: "100%"
+            height: "100%"
+            zIndex: 10000
+        iframeContent = $("#slides-document").text()
+        $("body").empty()
+        $iframe.prependTo("body")
+
+        Prez.current = new Prez
+            displayTime: false
+            content: iframeContent
+            window: iframe.getFrameWindow()
 
     $(".total-slides").text Prez.current.countSlides()
     $("#pre-launch").hide()
@@ -303,6 +329,3 @@ $(window).bind "beforeunload", ->
 
 $(document).on "keydown", Prez.handlers.keyDown
 $.setInterval 50, Prez.handlers.timeChange
-
-$ ->
-    $("#in-window-not-implemented-modal").modal show: false

data/vendor/stylesheets/prez.scss

@@ -32,11 +32,19 @@ body {
     padding: $prez-padding;
     text-align: center;
 
-    &.left-aligned {
+    .center-aligned {
+        text-align: center;
+    }
+
+    &.left-aligned, .left-aligned {
         text-align: left;
     }
 
-    &.right-aligned {
+    .left-aligned {
+        padding-left: 5%;
+    }
+
+    &.right-aligned, .right-aligned {
         text-align: right;
     }
 
@@ -49,10 +57,37 @@ body {
     }
 }
 
-.smaller {
+.pre {
+    font-family: monospace;
+    font-size: 0.9em;
+    white-space: pre;
+}
+
+.smaller, .smaller.pre {
     font-size: 0.7em;
 }
 
+.biggest {
+    font-size: 5.0em;
+}
+
+
+.red-background {
+    background-color: #ffcccc;
+}
+
+.green-background {
+    background-color: #ccffcc;
+}
+
+.blue-background {
+    background-color: #ccccff;
+}
+
+.emphasize {
+    font-weight: bold;
+}
+
 dt {
     font-weight: bold;
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prez
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Mike Virata-Stone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Create simple single file presentations