prez 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2249ace5ffb8f6605523aa4604763b57445b4bd3
-  data.tar.gz: 7dba78c2ade67bd68bab76e895057aae7fb8cfed
+  metadata.gz: a9566ac0764fadc9bfd46520d7a5ab5accd03095
+  data.tar.gz: 2107dba528cc10fcf9caf3c74192f2c8308f2f94
 SHA512:
-  metadata.gz: 2e4dc2afb90be92edde3071a9dfef2901fbe7a6e629f3353dec14581b6b11b2e656f0d5b48b40a396e1f0c92a06a1f2e84773a7183cff69bc56fd0d22de98726
-  data.tar.gz: a4888d107c8efb98b12d363a5204ccfe26d838a730a2fb71e48c6d37a7bc9654a35ab11fa24e27f853a563e8a678e210c593c9a321efaa7293f6e7552caf0f5b
+  metadata.gz: 27ea96591daee1b5a597453f3c17ee810bb266821244b7a62c156eb9d20c8f6e3f449535189a4772fa1a6c1f149d8dec5bbb30ac1a95f91956cb94af6d921bbc
+  data.tar.gz: cb71ef8a94917acbd27b72418e6b9486b1f981f3d9b6e420581c00afb0bc9a2974252a39166392cbe6a979e9ee75a72745950db2cbb4e1a1b7f0298764cfd32e

data/bin/prez

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 require "rubygems"
-gem "prez", "= 0.0.1"
+gem "coffee-script", "~> 2.3"
+gem "launchy", "~> 2.4"
+gem "prez", "= 0.0.2"
 gem "sass", "~> 3.4"
 gem "therubyracer", "~> 0.12"
 gem "thor", "~> 0.19"

data/lib/prez/assets.rb

@@ -1,15 +1,18 @@
+require "coffee-script"
 require "prez/files"
+require "prez/sass_extensions"
 require "sass"
 require "uglifier"
 
 module Prez
   module Assets
     class Tagged
-      attr_reader :name, :contents
+      attr_reader :name, :contents, :file
 
       def initialize(name, options = {})
         @name = name
         @contents = Prez::Files.contents name, extension
+        @file = Prez::Files.find name, extension
         @dev = options.fetch :dev, false
       end
 
@@ -29,7 +32,7 @@ module Prez
         if dev?
           "#{open}\n#{contents}#{close}"
         else
-          "#{open}#{minified_contents}#{close}"
+          "#{open}#{minified_contents.strip}#{close}"
         end
       end
     end
@@ -48,6 +51,7 @@ module Prez
       end
 
       def minify(contents)
+        contents = CoffeeScript.compile contents if file =~ /\.coffee$/
         Uglifier.compile contents
       end
     end
@@ -66,7 +70,10 @@ module Prez
       end
 
       def minify(contents)
-        Sass::Engine.new(contents, syntax: :scss, style: :compressed).render
+        Sass::Engine.new(contents,
+                         syntax: :scss,
+                         style: :compressed,
+                         load_paths: [File.expand_path("..", file)]).render
       end
     end
 

data/lib/prez/build.rb

@@ -1,11 +1,12 @@
-require "prez/assets"
+require "prez/builder"
+require "prez/error"
 require "thor/actions"
-require "thor/error"
 require "thor/group"
 
 module Prez
   class Build < Thor::Group
     include Thor::Actions
+    include Prez::Builder
     argument :name, type: :string
 
     def check_file!
@@ -14,16 +15,16 @@ module Prez
       elsif File.exists? "#{name}.prez"
         @filename = "#{name}.prez"
       else
-        raise Thor::Error.new(set_color("Missing prez file '#{name}'", :red, :bold))
+        raise Prez::Error.new("Missing prez file '#{name}'")
       end
 
       if filename =~ /\.html$/
-        raise Thor::Error.new(set_color("Prez file cannot be html file: '#{name}'", :red, :bold))
+        raise Prez::Error.new("Prez file cannot be an html file: '#{name}'")
       end
     end
 
     def generate_html
-      template filename, html_filename
+      create_file html_filename, build_html(filename)
     end
 
     private
@@ -40,21 +41,9 @@ module Prez
       "#{base_name}.html"
     end
 
-    def javascript(name)
-      Prez::Assets.javascript name
-    rescue Prez::Files::MissingError
-      raise Thor::Error.new(set_color("Could not find file: '#{name}.js'", :red, :bold))
-    end
-
-    def stylesheet(name)
-      Prez::Assets.stylesheet name
-    rescue Prez::Files::MissingError
-      raise Thor::Error.new(set_color("Could not find file: '#{name}.css'", :red, :bold))
-    end
-
     class << self
       def source_root
-        File.expand_path "."
+        File.absolute_path File.expand_path("../../../templates", __FILE__)
       end
     end
   end

data/lib/prez/builder.rb

@@ -0,0 +1,19 @@
+require "erb"
+require "prez/helpers"
+
+module Prez
+  module Builder
+    include Prez::Helpers
+
+    private
+
+    def build_html(filename)
+      @_slide_contents = erb_eval filename
+      erb_eval File.expand_path("../../../templates/build.html.tt", __FILE__)
+    end
+
+    def erb_eval(template)
+      ERB.new(File.read(template), nil, "-", "@output_buffer").result(binding)
+    end
+  end
+end

data/lib/prez/cli.rb

@@ -1,20 +1,17 @@
 require "prez/build"
+require "prez/new"
+require "prez/start"
 require "prez/version"
 require "thor"
-require "thor/actions"
 
 module Prez
   class CLI < Thor
-    include Thor::Actions
     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"
 
     map "-v" => "version"
 
-    desc "new NAME", "Generates a new presentation"
-    def new(name)
-      template "new.prez.tt", "#{name}.prez"
-    end
-
     desc "version", "Show the prez version"
     long_desc "
       This can be optionally used as 'prez -v'"
@@ -26,10 +23,6 @@ module Prez
       def exit_on_failure?
         true
       end
-
-      def source_root
-        File.absolute_path File.expand_path("../../../templates", __FILE__)
-      end
     end
   end
 end

data/lib/prez/error.rb

@@ -0,0 +1,16 @@
+require "thor/error"
+require "thor/shell/color"
+
+module Prez
+  class Error < Thor::Error
+    def initialize(msg)
+      super colorize(msg)
+    end
+
+    private
+
+    def colorize(msg)
+      Thor::Shell::Color.new.set_color msg, :red, :bold
+    end
+  end
+end

data/lib/prez/files.rb

@@ -7,10 +7,12 @@ module Prez
     end
 
     class Paths
-      attr_reader :extension, :paths
+      attr_reader :extension_alias, :extensions, :paths
 
-      def initialize(extension, dirname)
-        @extension = extension
+      def initialize(extension_alias, extensions, dirname, options = {})
+        @extension_alias = extension_alias
+        @extensions = extensions
+        @binary = options.fetch :binary, false
 
         @paths = [].tap do |paths|
           paths << File.expand_path(".")
@@ -21,26 +23,44 @@ module Prez
 
       def find(name)
         paths.each do |path|
-          file = File.join path, "#{name}.#{extension}"
+          extensions.each do |extension|
+            files = [File.join(path, "#{name}.#{extension}")]
 
-          if File.exists?(file)
-            return file
+            if name.end_with?(".#{extension}")
+              files << File.join(path, name)
+            end
+
+            files.each do |file|
+              if File.exists?(file)
+                return file
+              end
+            end
           end
         end
 
-        raise Prez::Files::MissingError.new(name, extension)
+        raise Prez::Files::MissingError.new(name, extension_alias)
+      end
+
+      def binary?
+        @binary
       end
     end
 
     class << self
       SEARCH_PATHS = {
-        "js" => Prez::Files::Paths.new("js", "javascripts"),
-        "css" => Prez::Files::Paths.new("css", "stylesheets")
+        "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)
       }
 
       def contents(name, extension)
         file = find name, extension
-        File.read file
+
+        if SEARCH_PATHS[extension].binary?
+          File.read file, mode: "rb"
+        else
+          File.read file
+        end
       end
 
       def find(name, extension)

data/lib/prez/helpers.rb

@@ -0,0 +1,37 @@
+require "cgi"
+require "prez/assets"
+require "prez/error"
+
+module Prez
+  module Helpers
+    protected
+
+    def html_escape(value)
+      CGI.escape_html value
+    end
+
+    def slide
+      concat %{<div class="prez-slide">}
+      yield
+      concat %{</div>}
+    end
+
+    def notes
+      concat %{<div class="prez-notes">}
+      yield
+      concat %{</div>}
+    end
+
+    def javascript(name)
+      Prez::Assets.javascript name
+    rescue Prez::Files::MissingError
+      raise Prez::Error.new("Could not find file: '#{name}.js'")
+    end
+
+    def stylesheet(name)
+      Prez::Assets.stylesheet name
+    rescue Prez::Files::MissingError
+      raise Prez::Error.new("Could not find file: '#{name}.css'")
+    end
+  end
+end

data/lib/prez/new.rb

@@ -0,0 +1,36 @@
+require "prez/error"
+require "thor/actions"
+require "thor/group"
+
+module Prez
+  class New < Thor::Group
+    include Thor::Actions
+    argument :name, type: :string
+
+    def check_file!
+      if File.exists? filename
+        raise Prez::Error.new("There is already a presentation file named '#{filename}'")
+      end
+    end
+
+    def generate_prez
+      template "new.prez.tt", "#{name}.prez"
+    end
+
+    private
+
+    def filename
+      if name =~ /\.prez$/
+        name
+      else
+        "#{name}.prez"
+      end
+    end
+
+    class << self
+      def source_root
+        File.absolute_path File.expand_path("../../../templates", __FILE__)
+      end
+    end
+  end
+end

data/lib/prez/sass_extensions.rb

@@ -0,0 +1,40 @@
+require "base64"
+require "prez/error"
+require "prez/files"
+require "sass"
+
+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", ""
+    extension = path[/\.([^.]*)$/, 1]
+
+    case extension
+    when "eot"
+      font_type = "application/vnd.ms-fontobject"
+    when "svg"
+      font_type = "image/svg+xml"
+    when "ttf"
+      font_type = "font/ttf"
+    when "woff"
+      font_type = "application/font-woff"
+    when "woff2"
+      font_type = "application/font-woff2"
+    else
+      raise Prez::Error.new("Unknown font extension '#{extension}'")
+    end
+
+    Sass::Script::Value::String.new("data:#{font_type};base64,#{font_data}")
+  rescue Prez::Files::MissingError => e
+    raise Prez::Error.new("Could not find font: '#{path}'")
+  end
+
+  def twbs_image_path(path)
+    Sass::Script::Value::String.new("ARGLE BARGLE IMAGE #{path.inspect}")
+  end
+
+  declare :twbs_font_path, [:path]
+  declare :twbs_image_path, [:path]
+end

data/lib/prez/start.rb

@@ -0,0 +1,69 @@
+require "launchy"
+require "prez/builder"
+require "prez/error"
+require "thor/actions"
+require "thor/group"
+require "webrick"
+
+module Prez
+  class Start < Thor::Group
+    include Thor::Actions
+    include Prez::Builder
+    argument :name, type: :string
+
+    def check_file!
+      if File.exists? name
+        @filename = name
+      elsif File.exists? "#{name}.prez"
+        @filename = "#{name}.prez"
+      else
+        raise Prez::Error.new("Missing prez file '#{name}'")
+      end
+
+      if filename =~ /\.html$/
+        raise Prez::Error.new("Prez file cannot be an html file: '#{name}'")
+      end
+    end
+
+    def generate_html
+      say "Generating html..."
+      @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.mount_proc "/" do |request, response|
+        response.body = @html
+        server.stop
+      end
+
+      begin
+        Launchy.open "http://localhost:#{port}/"
+        server.start
+      ensure
+        server.shutdown
+      end
+    end
+
+    private
+
+    def filename
+      @filename
+    end
+
+    class << self
+      def source_root
+        File.absolute_path File.expand_path("../../../templates", __FILE__)
+      end
+    end
+
+    class NoopLog < WEBrick::BasicLog
+      def initialize
+        @level = INFO
+      end
+    end
+  end
+end

data/lib/prez/version.rb

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

data/templates/build.html.tt

@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <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" %>
+    <%= javascript "bootstrap" %>
+  </head>
+
+  <body>
+    <div id="container" class="container-fluid">
+      <div id="pre-launch">
+        <div id="filler"></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">
+              <span class="glyphicon glyphicon-new-window"></span>
+              <span id="launch-message">Launch in new window</span>
+            </button>
+          </div>
+
+          <div class="col-xs-6 col-md-4 col-lg-3">
+            <button id="launch" class="btn btn-primary btn-block btn-lg">Start Presentation</button>
+          </div>
+        </div>
+
+        <div id="slides-document" style="display: none;"><%= html_escape @_slide_contents %></div>
+      </div>
+
+      <div id="post-launch">
+        <div class="row">
+          <div class="col-xs-2">
+            <button class="prev-slide btn btn-primary btn-block btn-lg"><span class="glyphicon glyphicon-chevron-left"></span></button>
+          </div>
+
+          <div class="col-xs-offset-3 col-xs-2">
+            <button class="end-prez btn btn-danger btn-block btn-lg"><span class="glyphicon glyphicon-remove"></span></button>
+          </div>
+
+          <div class="col-xs-offset-3 col-xs-2">
+            <button class="next-slide btn btn-primary btn-block btn-lg"><span class="glyphicon glyphicon-chevron-right"></span></button>
+          </div>
+        </div>
+
+        <p class="lead text-center">
+          <strong>Current slide: <span class="current-slide-number"></span></strong>
+        </p>
+
+        <iframe id="preview-frame"></iframe>
+        <div id="preview-frame-padding"></div>
+
+        <div class="row">
+          <div class="col-xs-offset-2 col-xs-8">
+            <div id="slide-notes" class="lead">
+            </div>
+          </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/templates/new.prez.tt

@@ -1,10 +1,19 @@
 <html>
   <head>
-    <%%= javascript "jquery" %>
-    <%%= javascript "prez" %>
     <%%= stylesheet "prez" %>
   </head>
 
   <body>
+    <%% slide do %>
+      <p>
+        Put each slide inside slide blocks.
+      </p>
+
+      <%% notes do %>
+        <p>
+          Nest your slide notes inside the slide.
+        </p>
+      <%% end %>
+    <%% end %>
   </body>
 </html>