hyaslide 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8da32a463b9e78e260618047ce41e372051cba35
-  data.tar.gz: e777a229d8ea06fd9c0244917b85f1fb76505b98
+  metadata.gz: f56b285a8341fe0b88ef1f5ce271b6ea9853a284
+  data.tar.gz: da9b87369da14fbd6d49e84fadd01615748f0453
 SHA512:
-  metadata.gz: febb2b046ecd82944a9d17de00a6ba4404e44f813f52192300f730d3119a3ba9ba1b4aa637c733030ca922a49bef264b51d3d072311de1df5ba488be97f03776
-  data.tar.gz: 9a0635689640c296a674deba02dd8f94777a98944627124b1539fe57ca8dd4568d9fd7384ff087fc9972279723afd342250c629290a501368de921d7fbee27e9
+  metadata.gz: 993f6c4905143ad13fa585ce28a4af2a176bd199fd367fd7ea19094646a086fa87cfef4b4654679fde3880f1047f9eb3dc7b6243a3f248b41b015505b9f0295c
+  data.tar.gz: c486eeb28d03b7fb1489302dafc4bc4039183227f508feab6654d5339271e9e6db147a4c966f74928aba564fa8c3861455d10e2cc8623874a7d2c3b400e72be6

data/bin/hyaslide

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require File.expand_path('../../lib/hyaslide', __FILE__)
+require_relative '../lib/hyaslide/cli'
 
 Hyaslide::Cli.start(ARGV)

data/lib/hyaslide/version.rb

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

data/lib/hyaslide.rb

@@ -2,7 +2,6 @@ require "hyaslide/version"
 
 require 'hyaslide/cli'
 require "hyaslide/slide_loader"
-require "hyaslide/server"
 
 module Hyaslide
 end

data/template/project/app/application.rb

@@ -145,7 +145,7 @@ module Hyaslide
   end
 end
 
-require 'pages'
+require 'pages/pages'
 
 $document.ready do
   $window.on(:resize) do

data/template/project/config.ru

@@ -1,29 +1,33 @@
 require 'bundler/setup'
 Bundler.require(:default)
 
-require 'opal'
-require 'opal-browser'
-require 'rack'
+# require 'hyaslide'
+require_relative 'server'
 
 dir = 'data'
 Dir.mkdir dir + '/pages' unless Dir.exist? dir + '/pages'
-
 Hyaslide::SlideLoader.new(dir).run
 
-server = Opal::Server.new do |s|
-  s.append_path dir + '/pages'
-  s.append_path 'app'
-  s.append_path 'images'
-  s.append_path 'css'
-  s.append_path 'fonts'
+app = Rack::Builder.app do
+  server = Server.new(host: 'localhost')
+
+  map '/' do
+    run server
+  end
 
-  Opal.use_gem 'opal-router'
-  Opal.use_gem 'hyalite'
-  Opal.use_gem 'hyaslide'
+  map '/assets' do
+    run server.settings.opal.sprockets
+  end
 
-  s.debug = true
-  s.main = 'application'
-  s.index_path = 'index.html.haml'
+  map '/__OPAL_SOURCE_MAPS__' do
+    run Opal::SourceMapServer.new(server.settings.opal.sprockets, '/__OPAL_SOURCE_MAPS__')
+  end
 end
 
-Rack::Handler::WEBrick.run server
+Rack::Server.start({
+  app:    app,
+  server: 'thin',
+  Host:   '0.0.0.0',
+  Port:   8080,
+  signals: false,
+})

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

@@ -0,0 +1,37 @@
+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"

data/template/project/server.rb

@@ -0,0 +1,38 @@
+require 'sinatra'
+require 'opal'
+require 'opal/sprockets'
+
+class Server < Sinatra::Base
+
+  def sprockets
+    settings.opal.sprockets
+  end
+
+  configure do
+    opal = Opal::Server.new do |server|
+      server.append_path 'data'
+      server.append_path 'app'
+      server.append_path 'assets'
+
+      Opal.use_gem 'opal-router'
+      Opal.use_gem 'hyalite'
+      Opal.use_gem 'hyaslide'
+
+      Opal.paths.each {|path| server.append_path path }
+
+      server.main = 'application'
+    end
+
+    set :opal, opal
+    enable :sessions
+  end
+
+  get '/' do
+    haml :index
+  end
+
+  get "/favicon.ico" do
+  end
+end
+
+

data/template/project/views/index.haml

@@ -0,0 +1,13 @@
+!!!
+%html(lang="en" data-framework="hyalite")
+  %head
+    %meta{charset:"utf-8"}
+    %title Writting web application in Ruby
+    %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)
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyaslide
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - youchan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -220,24 +234,24 @@ files:
 - lib/hyaslide.rb
 - lib/hyaslide/cli.rb
 - lib/hyaslide/render_hyaslide.rb
-- lib/hyaslide/server.rb
 - lib/hyaslide/slide_loader.rb
 - lib/hyaslide/version.rb
 - template/project/Gemfile
-- template/project/Gemfile.lock
 - template/project/app/application.rb
 - template/project/app/page_base.rb
 - template/project/app/track_field.rb
+- template/project/assets/css/application.css
+- template/project/assets/css/highlight.css
+- template/project/assets/fonts/Inconsolata-Regular.ttf
+- template/project/assets/images/flag.png
+- template/project/assets/images/rabbit.png
+- template/project/assets/images/turtle.png
 - template/project/config.ru
-- template/project/css/application.css
-- template/project/css/highlight.css
 - template/project/data/css/custom.css
+- template/project/data/pages/pages.rb
 - template/project/data/slide.md
-- template/project/fonts/Inconsolata-Regular.ttf
-- template/project/images/flag.png
-- template/project/images/rabbit.png
-- template/project/images/turtle.png
-- template/project/index.html.haml
+- template/project/server.rb
+- template/project/views/index.haml
 homepage: https://github.com/youchan/hyalide
 licenses:
 - MIT

data/template/project/Gemfile.lock

@@ -1,96 +0,0 @@
-GIT
-  remote: git://github.com/adambeynon/opal-router.git
-  revision: bc8c242510794ecbb842b52423732f2ec55c2a1e
-  specs:
-    opal-router (0.0.1)
-      opal (>= 0.3.44)
-
-GIT
-  remote: git://github.com/opal/opal-haml.git
-  revision: ca3d7339098dc115c0cedb9f1aeccd1f7187dd71
-  specs:
-    opal-haml (0.4.1)
-      haml
-      opal (>= 0.5.0, < 1.0.0)
-
-PATH
-  remote: ../..
-  specs:
-    hyaslide (0.1.0)
-      eventmachine
-      fssm
-      haml
-      redcarpet
-      rouge
-      sass
-      sinatra
-      sinatra-contrib
-      thin
-      unindent
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    backports (3.6.8)
-    concurrent-ruby (1.0.2)
-    daemons (1.2.4)
-    eventmachine (1.2.0.1)
-    fssm (0.2.10)
-    haml (4.0.7)
-      tilt
-    hike (1.2.3)
-    hyalite (0.0.2)
-      opal
-      opal-browser
-    multi_json (1.12.1)
-    opal (0.10.2)
-      hike (~> 1.2)
-      sourcemap (~> 0.1.0)
-      sprockets (~> 3.1)
-      tilt (>= 1.4)
-    opal-browser (0.2.0)
-      opal
-      paggio
-    paggio (0.2.6)
-    rack (1.6.4)
-    rack-protection (1.5.3)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    redcarpet (3.3.4)
-    rouge (2.0.6)
-    sass (3.4.22)
-    sinatra (1.4.7)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    sinatra-contrib (1.4.7)
-      backports (>= 2.0)
-      multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (>= 1.3, < 3)
-    sourcemap (0.1.1)
-    sprockets (3.7.0)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    thin (1.7.0)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0, >= 1.0.4)
-      rack (>= 1, < 3)
-    tilt (2.0.5)
-    unindent (1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  hyalite
-  hyaslide!
-  opal-browser
-  opal-haml!
-  opal-router!
-
-BUNDLED WITH
-   1.12.5

data/template/project/index.html.haml

@@ -1,14 +0,0 @@
-!!!
-%html(lang="en" data-framework="hyalite")
-  %head
-    %meta{charset:"utf-8"}
-    %title Writting web application in Ruby
-    %link{rel:"stylesheet", href:"css/application.css"}
-    %link{rel:"stylesheet", href:"data/css/custom.css"}
-    %link{rel:"stylesheet", href:"css/highlight.css"}
-
-  %body
-    %section.hyaslide
-
-    = javascript_include_tag 'application'
-