hyaslide 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b1309b029e63871fa5502347a9f0affede6510d
-  data.tar.gz: 7ad330af25e54778f296b72f1d499234c3dd1194
+  metadata.gz: d773246c1bf2e1e2ab74c42db9ed6dde47d41bae
+  data.tar.gz: 84554225d647e2cad5f9ad5b16705465cc4ad216
 SHA512:
-  metadata.gz: fc289bd9a4ff9e9ff7e98003885505c533c5d487f4ba07b29645fea3a9dc25a4708f6b374e6c34c9dda2f2a817de11eeff2264ac0c664b827da5503512080ad3
-  data.tar.gz: 52296be7cd8e7d71c1c710cebf8a0f8d21ac48227a8c04d57af40768a7c79af315d805f68e1697591b1a81aca37be9c813d13a049ebe5564b8f6aafebe827620
+  metadata.gz: e5bee3218504024156e104a044b653e9fb01af1d82b878dc8a5c100e10c368ce5967c908e5ac0e62510d435cf01c7ee4f5f5528610d23131cdb6c5d8b99a803f
+  data.tar.gz: 4eccfe9359b02fdd5309d57a04161a07a92b1007c0bc3c38c43ea3d71f02f26dc2734db1b6b5cf9efa39522c3e0e91913df482775fc902c48dc9593dec3c82ff

data/lib/hyaslide/render_hyaslide.rb

@@ -18,201 +18,216 @@ class String
   end
 end
 
-module Redcarpet
-  module Render
-    class Hyaslide < Base
-      def initialize
-        super
-        @enter_title_page = false
-        @enter_page = false
-        @page_count = 0
-        clear_list_state
-      end
+module Hyaslide
+  class Renderer < Redcarpet::Render::Base
+    def self.create(name)
+      Class.new(Renderer) do
+        def self.page_name
+          @page_name
+        end
 
-      def clear_list_state
-        @enter_list = false
-        @list_depth = 0
-      end
+        def self.page_name=(name)
+          @page_name = name
+        end
 
-      [
-        # block-level calls
-        :block_quote,
+        def page_name
+          self.class.page_name
+        end
+      end.tap{|c| c.page_name = name }
+    end
 
-        # span-level calls
-        :autolink,
-        :underline, :raw_html,
-        :triple_emphasis, :strikethrough,
-        :superscript, :highlight,
+    def initialize
+      super
+      @enter_title_page = false
+      @enter_page = false
+      @page_count = 0
+      clear_list_state
+    end
 
-        # footnotes
-        :footnotes, :footnote_def, :footnote_ref,
+    def clear_list_state
+      @enter_list = false
+      @list_depth = 0
+    end
 
-        # low level rendering
-        #:entity, :normal_text
-      ].each do |method|
-        define_method method do |*args|
-          "#{method} #{args.first}"
-        end
+    [
+      # block-level calls
+      :block_quote,
+
+      # span-level calls
+      :autolink,
+      :underline, :raw_html,
+      :triple_emphasis, :strikethrough,
+      :superscript, :highlight,
+
+      # footnotes
+      :footnotes, :footnote_def, :footnote_ref,
+
+      # low level rendering
+      #:entity, :normal_text
+    ].each do |method|
+      define_method method do |*args|
+        "#{method} #{args.first}"
       end
+    end
 
-      def hrule
-        clear_list_state
-        "".tap do |result|
-          if @enter_title_page || @enter_page
-            result <<
+    def hrule
+      clear_list_state
+      "".tap do |result|
+        if @enter_title_page || @enter_page
+          result <<
 <<EOD
-    end
   end
 end
+end
 
 EOD
-            @enter_title_page = @enter_page = false
-          end
+          @enter_title_page = @enter_page = false
+        end
 
-          result << <<EOD
+        result << <<EOD
 class Hyaslide::Page#{@page_count} < Hyaslide::PageBase
-  def content
-    [].tap do |children|
+def content
+  [].tap do |children|
 EOD
 
-          @enter_page = true
-          @page_count += 1
-        end
+        @enter_page = true
+        @page_count += 1
       end
+    end
 
-      def header(text, header_level)
-        clear_list_state
+    def header(text, header_level)
+      clear_list_state
 
-        if header_level > 3
-          return "      children << h#{header_level}(nil, #{text.escape})\n"
-        end
+      if header_level > 3
+        return "      children << h#{header_level}(nil, #{text.escape})\n"
+      end
 
-        "".tap do |result|
-          if @enter_title_page || @enter_page
-            result <<
+      "".tap do |result|
+        if @enter_title_page || @enter_page
+          result <<
 <<EOD
-    end
   end
 end
+end
 
 EOD
-            @enter_title_page = @enter_page = false
-          end
+          @enter_title_page = @enter_page = false
+        end
 
-          if header_level == 1
-            @enter_title_page = true
-            @title = text.escape
-          else
-            @enter_page = true
-          end
+        if header_level == 1
+          @enter_title_page = true
+          @title = text.escape
+        else
+          @enter_page = true
+        end
 
 
-          result <<
+        result <<
 <<EOD
 class Hyaslide::Page#{@page_count} < Hyaslide::PageBase
-  def header
-    h#{header_level}(nil, #{text.escape})
-  end
+def header
+  h#{header_level}(nil, #{text.escape})
+end
 
-  def content
-    [].tap do |children|
+def content
+  [].tap do |children|
 EOD
 
-          @page_count += 1
-        end
+        @page_count += 1
       end
+    end
 
-      def doc_footer(*args)
+    def doc_footer(*args)
 <<EOD
-    end
   end
 end
+end
 
 Hyaslide.page_count = #{@page_count}
 Hyaslide.title = #{@title}
 EOD
-      end
-
-      def list_item(item, orderd)
-        "".tap do |result|
-          if item =~ /.*\n +children << /
-            result << item.sub(/(.*)\n +children << /) { "                  li(nil, #{$1.strip.escape}),\n                  " }.rstrip
-            result << ",\n"
-            @enter_list = false
-          else
-            result << "                    li(nil, #{item.strip.escape}),\n"
-          end
-        end
-      end
+    end
 
-      def list(text, ordered)
-        "".tap do |result|
-          result << "      children << ul(nil,\n"
-          result << text.sub(/,\n\z/, "\n")
-          result << "      )\n"
+    def list_item(item, orderd)
+      "".tap do |result|
+        if item =~ /.*\n +children << /
+          result << item.sub(/(.*)\n +children << /) { "                  li(nil, #{$1.strip.escape}),\n                  " }.rstrip
+          result << ",\n"
           @enter_list = false
+        else
+          result << "                    li(nil, #{item.strip.escape}),\n"
         end
       end
+    end
 
-      def link(link, title, content)
-        "<a>{href: #{link.escape}, target: \"_blank\"}, #{content.escape}</a>"
+    def list(text, ordered)
+      "".tap do |result|
+        result << "      children << ul(nil,\n"
+        result << text.sub(/,\n\z/, "\n")
+        result << "      )\n"
+        @enter_list = false
       end
+    end
 
-      def image(link, title, alt_text)
-        "<img>{className: \"#{alt_text}\", src: #{link.escape}}</img>"
-      end
+    def link(link, title, content)
+      "<a>{href: #{link.escape}, target: \"_blank\"}, #{content.escape}</a>"
+    end
 
-      def block_code(code, language)
-        clear_list_state
-
-        formatter = Rouge::Formatters::HTML.new(css_class: 'highlight', line_numbers: true)
-        lexer = case language
-                when 'ruby'
-                  Rouge::Lexers::Ruby.new
-                when 'javascript'
-                  Rouge::Lexers::Javascript.new
-                else
-                  Rouge::Lexers::PlainText.new
-                end
-        highlight = formatter.format(lexer.lex(code))
-        "      children << code({ dangerouslySetInnerHTML: { __html: %q{#{highlight}} } })\n"
-      end
+    def image(link, title, alt_text)
+      href = "assets/#{page_name}/images/#{link}"
+      "<img>{className: \"#{alt_text}\", src: #{href.escape}}</img>"
+    end
 
-      def block_html(html)
-        clear_list_state
-        "      children << code({ dangerouslySetInnerHTML: { __html: %q{#{html}} } })\n"
-      end
+    def block_code(code, language)
+      clear_list_state
+
+      formatter = Rouge::Formatters::HTML.new(css_class: 'highlight', line_numbers: true)
+      lexer = case language
+              when 'ruby'
+                Rouge::Lexers::Ruby.new
+              when 'javascript'
+                Rouge::Lexers::Javascript.new
+              else
+                Rouge::Lexers::PlainText.new
+              end
+      highlight = formatter.format(lexer.lex(code))
+      "      children << code({ dangerouslySetInnerHTML: { __html: %q{#{highlight}} } })\n"
+    end
 
-      def emphasis(*args)
-        "# #{args}"
-      end
+    def block_html(html)
+      clear_list_state
+      "      children << code({ dangerouslySetInnerHTML: { __html: %q{#{html}} } })\n"
+    end
 
-      def double_emphasis(*args)
-        "<strong>#{args.first}</strong>"
-      end
+    def emphasis(*args)
+      "# #{args}"
+    end
 
-      def paragraph(text)
-        lines = text.split(/  $/)
-        if text[0] == '%'
-          class_name = text[1...text.index(':')]
-          lines[0] = lines.first[(lines.first.index(':') + 1)...lines.first.length].lstrip
-          "      children << p({className:\"#{class_name}\"}, #{lines.map{|l| l.escape}.join(',Hyalite.create_element(\'br\'),')})\n"
-        else
-          "      children << p(nil, #{lines.map{|l| l.escape}.join(',Hyalite.create_element(\'br\'),')})\n"
-        end
-      end
+    def double_emphasis(*args)
+      "<strong>#{args.first}</strong>"
+    end
 
-      def table(header, body)
-        "#{header}#{body}"
+    def paragraph(text)
+      lines = text.split(/  $/)
+      if text[0] == '%'
+        class_name = text[1...text.index(':')]
+        lines[0] = lines.first[(lines.first.index(':') + 1)...lines.first.length].lstrip
+        "      children << p({className:\"#{class_name}\"}, #{lines.map{|l| l.escape}.join(',Hyalite.create_element(\'br\'),')})\n"
+      else
+        "      children << p(nil, #{lines.map{|l| l.escape}.join(',Hyalite.create_element(\'br\'),')})\n"
       end
+    end
 
-      def table_row(content)
-        content + "\n"
-      end
+    def table(header, body)
+      "#{header}#{body}"
+    end
 
-      def table_cell(content, alignment)
-        content + "\t"
-      end
+    def table_row(content)
+      content + "\n"
+    end
+
+    def table_cell(content, alignment)
+      content + "\t"
     end
   end
 end

data/lib/hyaslide/slide_loader.rb

@@ -7,7 +7,6 @@ require_relative './render_hyaslide'
 
 module Hyaslide
   class SlideLoader
-    MARKDOWN = Redcarpet::Markdown.new(Redcarpet::Render::Hyaslide, fenced_code_blocks: true)
 
     attr_reader :slides
 
@@ -15,9 +14,11 @@ module Hyaslide
       @slides = []
     end
 
-    def load_slide(name)
+    def init_slide(name)
       Dir.mkdir('app/slides') unless Dir.exist?('app/slides')
-      Dir.mkdir(src_path(name)) unless Dir.exist?(src_path(name))
+      Dir.mkdir('app/scripts') unless Dir.exist?('app/scripts')
+      Dir.mkdir(SlideLoader.src_path(name)) unless Dir.exist?(SlideLoader.src_path(name))
+      Dir.mkdir(SlideLoader.script_path(name)) unless Dir.exist?(SlideLoader.script_path(name))
 
       File.foreach("data/#{name}/slide.md") do |line|
         if line =~ /\A# (.+)/
@@ -26,26 +27,47 @@ module Hyaslide
         end
       end
 
+      SlideLoader.load_slide(name)
+    end
+
+    def self.load_slide(name)
       File.open("#{src_path(name)}/pages.rb", "w+") do |f|
         data = File.read("data/#{name}/slide.md")
-        f.write MARKDOWN.render(data)
+        markdown = Redcarpet::Markdown.new(Hyaslide::Renderer.create(name), fenced_code_blocks: true)
+        f.write markdown.render(data)
+      end
+
+      if File.exist?("data/#{name}/script.md")
+        File.open("#{script_path(name)}/script.html", "w+") do |f|
+          script = File.read("data/#{name}/script.md")
+          markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML.new(hard_wrap: true), autolink: true, fenced_code_blocks: true)
+          f.write markdown.render(script)
+        end
       end
 
       File.open("#{src_path(name)}/app.rb", "w+") do |f|
         f.write Tilt::StringTemplate.new(File.expand_path('../../../template/app.rb', __FILE__)).render(Object.new, name: name)
       end
+
+      File.open("#{src_path(name)}/script.rb", "w+") do |f|
+        f.write Tilt::StringTemplate.new(File.expand_path('../../../template/script.rb', __FILE__)).render(Object.new, name: name)
+      end
     end
 
-    def src_path(name)
+    def self.src_path(name)
       "app/slides/#{name}"
     end
 
+    def self.script_path(name)
+      "app/scripts/#{name}"
+    end
+
     def add_slide(name)
-      load_slide(name)
+      init_slide(name)
 
       EM.defer do
-        FSSM.monitor("data/#{@name}", "slide.md") do
-          update {|base, relative| SlideLoader.load_slide(@name) }
+        FSSM.monitor("data/#{name}", %w(slide.md script.md)) do
+          update {|base, relative| Hyaslide::SlideLoader.load_slide(name) }
           delete {|base, relative|}
           create {|base, relative|}
         end

data/lib/hyaslide/version.rb

@@ -1,3 +1,3 @@
 module Hyaslide
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/template/app.rb

@@ -1,19 +1,23 @@
 require 'slide'
 require 'page_base'
 require 'slides/#{name}/pages'
+require 'browser/socket'
+require 'browser/location'
 
 Hyaslide.slide_name = '#{name}'
 
 module App
-  def self.render
-    Hyalite.render(Hyalite.create_element(Hyaslide::Slide, nil), $document['.hyaslide'])
+  def self.render(ws)
+    Hyalite.render(Hyalite.create_element(Hyaslide::Slide, {ws:ws}), $document['.hyaslide'])
   end
 end
 
 $document.ready do
+  ws = Browser::Socket.new("ws://\#{$window.location.host}/push_notification/start/slide/#{name}")
+
   $window.on(:resize) do
-    App.render
+    App.render(ws)
   end
 
-  App.render
+  App.render(ws)
 end

data/template/project/app/slide.rb

@@ -51,7 +51,7 @@ module Hyaslide
     end
 
     def initial_state
-      page_num = $window.location.uri.sub(/.*\/#\/([0-9]+)/, '\1').to_i
+      page_num = $window.location.uri.sub(/.*#([0-9]+)/, '\1').to_i
 
       {
         page_number: page_num,
@@ -63,7 +63,15 @@ module Hyaslide
 
     def component_did_mount
       $window.on(:keydown) do |evt|
-        handle_key_down(evt)
+        handle_key_down(evt.code)
+      end
+
+      @props[:ws].on(:message) do |msg|
+        (event, value) = msg.data.split(':')
+        case event
+        when 'keydown'
+          handle_key_down(value.to_i)
+        end
       end
 
       router = Router.new
@@ -75,8 +83,8 @@ module Hyaslide
       $window.location.assign("/#{Hyaslide.slide_name}##{num}")
     end
 
-    def handle_key_down(evt)
-      case evt.code
+    def handle_key_down(keycode)
+      case keycode
       when 39
         page_to(@state[:page_number] + 1) if @state[:page_number] < Hyaslide.page_count
       when 37
@@ -96,7 +104,7 @@ module Hyaslide
       when 70
         set_state(footer_visible: !@state[:footer_visible])
       else
-        puts "keycode = #{evt.code}"
+        puts "keycode = #{keycode}"
       end
     end
 
@@ -119,7 +127,7 @@ module Hyaslide
           div({
             className: 'slide',
             style: {zoom: zoom, top: "#{top}px", left: "#{left}px"},
-            onKeyDown: -> (evt) { handle_key_down(evt) }
+            onKeyDown: -> (evt) { handle_key_down(evt.code) }
           },
             pages(SLIDE_HEIGHT * zoom)
           ),

data/template/project/data/sample/script.md

@@ -0,0 +1,7 @@
+# Sample
+
+Write script here.
+
+This page accessible from psth: '/script/sample'
+
+You can controll the slide from this page. Press arrow keys.

data/template/project/server.rb

@@ -1,4 +1,5 @@
 require 'sinatra'
+require 'sinatra-websocket'
 require 'opal'
 require 'opal/sprockets'
 
@@ -28,6 +29,8 @@ class Server < Sinatra::Base
     end
 
     set :opal, opal
+    set :sockets, []
+    set :slide_sockets, {}
     enable :sessions
   end
 
@@ -36,13 +39,38 @@ class Server < Sinatra::Base
     haml :index
   end
 
+  get "/favicon.ico" do
+  end
+
   get '/:slide_name' do
     @slide_name = params['slide_name']
     haml :slide
   end
 
-  get "/favicon.ico" do
+  get '/script/:slide_name' do
+    @slide_name = params['slide_name']
+    @script_html = "<h1>Test</h1>"
+    haml :script
   end
-end
-
 
+  get '/push_notification/start/:page/:slide_name' do
+    request.websocket do |ws|
+      ws.onopen do
+        if params['page'] == 'slide'
+          slide_name = params['slide_name']
+          (settings.slide_sockets[slide_name] ||= []) << ws
+        end
+        settings.sockets << ws
+      end
+      ws.onmessage do |msg|
+        (slide_name, evt, value) = msg.split(':')
+        EM.next_tick do
+          settings.slide_sockets[slide_name].each{|s| s.send("#{evt}:#{value}") }
+        end
+      end
+      ws.onclose do
+        settings.sockets.delete(ws)
+      end
+    end
+  end
+end

data/template/project/views/index.haml

@@ -10,4 +10,4 @@
       %ul
         - @slides.each do |slide|
           %li
-            %a{href: slide[:name]}= slide[:title]
+            %a{href: slide[:name]}= "[#{slide[:name]}] \"#{slide[:title]}\""

data/template/project/views/script.haml

@@ -0,0 +1,10 @@
+!!!
+%html(lang="en" data-framework="hyalite")
+  %head
+    %meta{charset:"utf-8"}
+    %title= "Script of #{@slide_name}"
+
+  %body
+    %section.script
+
+    = ::Opal::Sprockets.javascript_include_tag("slides/#{@slide_name}/script", sprockets: settings.opal.sprockets, prefix: '/assets', debug: true)

data/template/script.rb

@@ -0,0 +1,24 @@
+require 'hyalite'
+require 'browser/http'
+require 'browser/socket'
+require 'browser/location'
+
+class Script
+  include Hyalite::Component
+  include Hyalite::Component::ShortHand
+
+  def render
+    div({dangerouslySetInnerHTML: { __html: @props[:script_html]}})
+  end
+end
+
+$document.ready do
+  ws = Browser::Socket.new("ws://\#{$window.location.host}/push_notification/start/script/#{name}")
+  $window.on('keydown') do |evt|
+    ws.write("#{name}:keydown:\#{evt.code}")
+  end
+
+  response = Browser::HTTP.get!('/assets/scripts/#{name}/script.html')
+  Hyalite.render(Hyalite.create_element(Script, script_html: response.text), $document['.script'])
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyaslide
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - youchan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-11 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-websocket
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
@@ -249,10 +263,13 @@ files:
 - template/project/assets/images/turtle.png
 - template/project/config.ru
 - template/project/data/sample/css/custom.css
+- template/project/data/sample/script.md
 - template/project/data/sample/slide.md
 - template/project/server.rb
 - template/project/views/index.haml
+- template/project/views/script.haml
 - template/project/views/slide.haml
+- template/script.rb
 homepage: https://github.com/youchan/hyalide
 licenses:
 - MIT