hyaslide 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f56b285a8341fe0b88ef1f5ce271b6ea9853a284
-  data.tar.gz: da9b87369da14fbd6d49e84fadd01615748f0453
+  metadata.gz: 22c7c4f76f12c7be2c6fb054129f7930b3242e3f
+  data.tar.gz: 3f512237b030db92f662c1f85661520dd57f83da
 SHA512:
-  metadata.gz: 993f6c4905143ad13fa585ce28a4af2a176bd199fd367fd7ea19094646a086fa87cfef4b4654679fde3880f1047f9eb3dc7b6243a3f248b41b015505b9f0295c
-  data.tar.gz: c486eeb28d03b7fb1489302dafc4bc4039183227f508feab6654d5339271e9e6db147a4c966f74928aba564fa8c3861455d10e2cc8623874a7d2c3b400e72be6
+  metadata.gz: e52ad7732a36b1f21fc70beb8f4c759e888cc5de9693afb58e6ac606395d9d66f096e00e40f069f6e6959e74be55401478eae43e3b8941e26905adb95f7fb0f4
+  data.tar.gz: be75426d0761129b76263e3303f33c983a1a9e6711bdd21ab2cb7b461db0a7b502879c16837e275470b18b28168ab36add3a91e698c413f27752362aac02cf86

data/lib/hyaslide/slide_loader.rb

@@ -7,24 +7,36 @@ require_relative './render_hyaslide'
 
 module Hyaslide
   class SlideLoader
-    def initialize(dir)
-      @dir = dir
+    MARKDOWN = Redcarpet::Markdown.new(Redcarpet::Render::Hyaslide, fenced_code_blocks: true)
+
+    def initialize(name)
+      @name = name
     end
 
-    def self.load_slide(dir)
-      markdown = Redcarpet::Markdown.new(Redcarpet::Render::Hyaslide, fenced_code_blocks: true)
-      File.open("#{dir}/pages/pages.rb", "w+") do |f|
-        data = File.read("#{dir}/slide.md")
-        f.write markdown.render(data)
+    def self.load_slide(name)
+      Dir.mkdir('app/slides') unless Dir.exist?('app/slides')
+      Dir.mkdir(src_path(@name)) unless Dir.exist?(src_path(@name))
+
+      File.open("#{src_path(name)}/pages.rb", "w+") do |f|
+        data = File.read("data/#{name}/slide.md")
+        f.write MARKDOWN.render(data)
+      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
     end
 
+    def self.src_path(name)
+      "app/slides/#{name}"
+    end
+
     def run
-      Hyaslide::SlideLoader.load_slide(@dir)
+      SlideLoader.load_slide(@name)
 
       EM.defer do
-        FSSM.monitor("#{@dir}", "slide.md") do
-          update {|base, relative| SlideLoader.load_slide }
+        FSSM.monitor("data/#{@name}", "slide.md") do
+          update {|base, relative| SlideLoader.load_slide(@name) }
           delete {|base, relative|}
           create {|base, relative|}
         end

data/lib/hyaslide/version.rb

@@ -1,3 +1,3 @@
 module Hyaslide
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/template/app.rb

@@ -0,0 +1,19 @@
+require 'slide'
+require 'page_base'
+require 'slides/#{name}/pages'
+
+Hyaslide.slide_name = '#{name}'
+
+module App
+  def self.render
+    Hyalite.render(Hyalite.create_element(Hyaslide::Slide, nil), $document['.hyaslide'])
+  end
+end
+
+$document.ready do
+  $window.on(:resize) do
+    App.render
+  end
+
+  App.render
+end

data/template/project/app/{application.rb → slide.rb}

@@ -3,13 +3,6 @@ require 'opal-router'
 require 'browser/interval'
 require 'browser/location'
 require 'track_field'
-require 'page_base'
-
-module App
-  def self.render
-    Hyalite.render(Hyalite.create_element(Hyaslide::Slide, nil), $document['.hyaslide'])
-  end
-end
 
 module Hyaslide
   SLIDE_WIDTH = 960
@@ -32,6 +25,14 @@ module Hyaslide
     @title = title
   end
 
+  def self.slide_name
+    @slide_name
+  end
+
+  def self.slide_name=(name)
+    @slide_name = name
+  end
+
   class Slide
     include Hyalite::Component
     include Hyalite::Component::ShortHand
@@ -67,11 +68,11 @@ module Hyaslide
 
       router = Router.new
       router.route('/') { page_to(num) }
-      router.route('/:page') {|params| p params; set_state(page_number: params[:page].to_i) }
+      router.route(':page') {|params| set_state(page_number: params[:page].to_i) }
     end
 
     def page_to(num)
-      $window.location.assign("/#/#{num}")
+      $window.location.assign("/#{Hyaslide.slide_name}##{num}")
     end
 
     def handle_key_down(evt)
@@ -145,12 +146,3 @@ module Hyaslide
   end
 end
 
-require 'pages/pages'
-
-$document.ready do
-  $window.on(:resize) do
-    App.render
-  end
-
-  App.render
-end

data/template/project/config.ru

@@ -1,12 +1,15 @@
 require 'bundler/setup'
 Bundler.require(:default)
 
-# require 'hyaslide'
 require_relative 'server'
 
 dir = 'data'
-Dir.mkdir dir + '/pages' unless Dir.exist? dir + '/pages'
-Hyaslide::SlideLoader.new(dir).run
+
+Dir.foreach(dir) do |dir_name|
+  if !dir_name.start_with?('.') && File.directory?("#{dir}/#{dir_name}")
+    Hyaslide::SlideLoader.new(dir_name).run
+  end
+end
 
 app = Rack::Builder.app do
   server = Server.new(host: 'localhost')

data/template/project/server.rb

@@ -27,7 +27,8 @@ class Server < Sinatra::Base
     enable :sessions
   end
 
-  get '/' do
+  get '/:slide_name' do
+    @slide_name = params['slide_name']
     haml :index
   end
 

data/template/project/views/index.haml

@@ -2,12 +2,13 @@
 %html(lang="en" data-framework="hyalite")
   %head
     %meta{charset:"utf-8"}
-    %title Writting web application in Ruby
+    %title= @slide_name
     %link{rel:"stylesheet", href:"assets/css/application.css"}
     %link{rel:"stylesheet", href:"assets/css/highlight.css"}
 
   %body
     %section.hyaslide
 
-    = ::Opal::Sprockets.javascript_include_tag('application', sprockets: settings.opal.sprockets, prefix: 'assets', debug: true)
-
+    :javascript
+      window.slideName = '#{@slide_name}'
+    = ::Opal::Sprockets.javascript_include_tag('slides/sample/app', sprockets: settings.opal.sprockets, prefix: 'assets', debug: true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyaslide
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - youchan
@@ -236,9 +236,10 @@ files:
 - lib/hyaslide/render_hyaslide.rb
 - lib/hyaslide/slide_loader.rb
 - lib/hyaslide/version.rb
+- template/app.rb
 - template/project/Gemfile
-- template/project/app/application.rb
 - template/project/app/page_base.rb
+- template/project/app/slide.rb
 - template/project/app/track_field.rb
 - template/project/assets/css/application.css
 - template/project/assets/css/highlight.css
@@ -247,9 +248,8 @@ files:
 - template/project/assets/images/rabbit.png
 - template/project/assets/images/turtle.png
 - template/project/config.ru
-- template/project/data/css/custom.css
-- template/project/data/pages/pages.rb
-- template/project/data/slide.md
+- template/project/data/sample/css/custom.css
+- template/project/data/sample/slide.md
 - template/project/server.rb
 - template/project/views/index.haml
 homepage: https://github.com/youchan/hyalide

data/template/project/data/pages/pages.rb

@@ -1,37 +0,0 @@
-class Hyaslide::Page0 < Hyaslide::PageBase
-  def header
-    h1(nil, "Title")
-  end
-
-  def content
-    [].tap do |children|
-      children << p({className:"author"}, "Your Name")
-    end
-  end
-end
-
-class Hyaslide::Page1 < Hyaslide::PageBase
-  def content
-    [].tap do |children|
-      children << h4(nil, "Press 's' then starting the race of rabbit and turtle.")
-    end
-  end
-end
-
-class Hyaslide::Page2 < Hyaslide::PageBase
-  def header
-    h2(nil, "Slide")
-  end
-
-  def content
-    [].tap do |children|
-      children << ul(nil,
-                    li(nil, "Listing"),
-                    li(nil, "...")
-      )
-    end
-  end
-end
-
-Hyaslide.page_count = 3
-Hyaslide.title = "Title"