gibier 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eaa4122a847c17707fe41faa5102caf81c29b806
-  data.tar.gz: 06b7879985defd6be84fc2d42bf6e69dae9d7939
+  metadata.gz: 54ee7db66d7a6a0f8b0ea96ed4c6a3946c0b3fde
+  data.tar.gz: c626e010bb1c7c8f5d0eef18c43b75ce3e6f3aac
 SHA512:
-  metadata.gz: 1a67bc2f4752d1dc6e822866e61640dc7436c7cfa6e8ab37b3cf2450d8bdbed16dee5fbda43f546b0d5bb545d14f24550e09fb5d3edc822b584c2bdac3a730af
-  data.tar.gz: fb2d1f34ac4188dbc747bbc2a64f62186702d8f5a7fb201651d105fe96bebf8022ac77262189bfd74567632b7203b75fadc6a1e24828478caa1d3baaeeb1ea40
+  metadata.gz: 1d5bf74ef88f413cb9cd3ed26e1b0aebaa2d9f811ed11c632637f0325855a08e908456b5ba42d3acd1a8ff70b7daf043b0fde6a388b69c26b2331d1498839a69
+  data.tar.gz: ef1c644cc1d0fbc71bc95c0c789f0de856de7230c098994bc5eddf703f9560ee57495c084562921bb703cd749e0bb4423ae01af19e10cdaa90b67531026f6f37

data/lib/gibier/static_generator.rb

@@ -41,13 +41,12 @@ module Gibier
     def build(name, filename)
       builder = Opal::Builder.new
 
-      use_gem(builder, 'opal-browser', 'opal')
       use_gem(builder, 'opal-router', 'opal')
-      use_gem(builder, 'hyalite', 'client')
 
       builder.append_paths './app'
+      builder.use_gem 'hyalite'
+      builder.use_gem 'opal-websocket'
       builder.use_gem 'gibier'
-      builder.use_gem 'paggio'
       builder.build "./app/slides/#{name}/app.rb"
 
       File.open(filename, 'w') do |file|

data/lib/gibier/version.rb

@@ -1,3 +1,3 @@
 module Gibier
-  VERSION = "0.8.8"
+  VERSION = "0.8.9"
 end

data/template/app.rb

@@ -1,8 +1,7 @@
 require 'slide'
 require 'page_base'
 require 'slides/#{name}/pages'
-require 'browser/socket'
-require 'browser/location'
+require 'opal/websocket'
 
 Gibier.slide_name = '#{name}'
 Gibier.gh_pages = `window.ghPages`
@@ -15,7 +14,7 @@ module App
 end
 
 $document.ready do
-  ws = Browser::Socket.new("ws://\#{$window.location.host}/push_notification/start/slide/#{name}") unless Gibier.gh_pages
+  ws = Opal::WebSocket.new("ws://\#{`window.location.host`}/push_notification/start/slide/#{name}") unless Gibier.gh_pages
 
   $window.on(:resize) do
     App.render(ws)

data/template/project/Gemfile

@@ -1,8 +1,8 @@
 source "https://rubygems.org"
 
 gem 'gibier'
-gem 'opal-browser'
 gem 'opal-router',    github: 'adambeynon/opal-router'
 gem 'opal-haml',      github: 'opal/opal-haml'
-gem 'hyalite', '0.1.0'
+gem 'opal-websocket', github: 'youchan/opal-websocket'
+gem 'hyalite'
 

data/template/project/app/slide.rb

@@ -1,8 +1,5 @@
 require 'hyalite'
 require 'opal-router'
-require 'browser'
-require 'browser/interval'
-require 'browser/location'
 require 'track_field'
 
 module Gibier
@@ -51,7 +48,6 @@ module Gibier
 
   class Slide
     include Hyalite::Component
-    include Hyalite::Component::ShortHand
 
     def pages(height)
       case @state[:mode]
@@ -67,7 +63,8 @@ module Gibier
     end
 
     def initial_state
-      page_num = $window.location.uri.sub(/.*#([0-9]+)/, '\1').to_i
+      uri = $window.location.toString
+      page_num = uri.sub(/.*#([0-9]+)/, '\1').to_i
 
       {
         page_number: page_num,
@@ -83,7 +80,7 @@ module Gibier
       end
 
       unless Gibier.gh_pages
-        @props[:ws].on(:message) do |msg|
+        @props[:ws].onmessage do |msg|
           (event, value) = msg.data.split(':')
           case event
           when 'keydown'
@@ -98,35 +95,43 @@ module Gibier
     end
 
     def page_to(num)
-      $window.location.assign("#{$window.location.to_s.sub(/#\d+$/, '')}##{num}")
+      $window.location.assign("#{$window.location.toString.sub(/#\d+$/, '')}##{num}")
+    end
+
+    def page_back
+      page_to(@state[:page_number] - 1) if @state[:page_number] > 0
+    end
+
+    def page_forward
+      page_to(@state[:page_number] + 1) if @state[:page_number] < Gibier.page_count
     end
 
     def handle_key_down(event)
       keycode = event.code
       case keycode
-      when 39,34
-        page_to(@state[:page_number] + 1) if @state[:page_number] < Gibier.page_count
-      when 37,33
-        page_to(@state[:page_number] - 1) if @state[:page_number] > 0
-      when 83,66
+      when :Space, :ArrowRight, :ArrowUp
+        page_forward
+      when :Backspace, :ArrowLeft, :ArrowDown
+        page_back
+      when :KeyS, :KeyB
         unless @state[:start]
           set_state(start: Time.now)
         else
           set_state(start: nil)
         end
-      when 80
+      when :KeyP
         if @state[:mode] == :slide
           set_state(mode: :print)
         else
           set_state(mode: :slide)
         end
-      when 70
+      when :KeyF
         set_state(footer_visible: !@state[:footer_visible])
-        if `event.native.ctrlKey`
+        if event.ctrl_key
           fullscreen
         end
-      when 116
-        if `event.native.shiftKey`
+      when :F5
+        if event.shift_key
           fullscreen
         end
       else
@@ -158,15 +163,15 @@ module Gibier
     end
 
     def render
-      follow_height = $window.view.height / $window.view.width < SLIDE_HEIGHT / SLIDE_WIDTH
+      follow_height = $window.height / $window.width < SLIDE_HEIGHT / SLIDE_WIDTH
       if follow_height
-        zoom = $window.view.height.to_f / SLIDE_HEIGHT * 0.98
+        zoom = $window.height.to_f / SLIDE_HEIGHT * 0.98
       else
-        zoom = $window.view.width.to_f / SLIDE_WIDTH * 0.98
+        zoom = $window.width.to_f / SLIDE_WIDTH * 0.98
       end
 
-      top = ($window.view.height / zoom - SLIDE_HEIGHT) / 2
-      left = ($window.view.width / zoom - SLIDE_WIDTH) / 2
+      top = ($window.height / zoom - SLIDE_HEIGHT) / 2
+      left = ($window.width / zoom - SLIDE_WIDTH) / 2
 
       footer_style = @state[:page_number] == 1 || !@state[:footer_visible] ? {style: {display: 'none'}} : {}
 
@@ -174,17 +179,21 @@ module Gibier
       when :slide
         div({className: 'background'},
           div({className: 'background-filter'},
-            div({
-              className: 'slide',
-              style: {zoom: zoom, top: "#{top}px", left: "#{left}px"},
-              onKeyDown: -> (event) { handle_key_down(event) }
-            },
-              pages(SLIDE_HEIGHT * zoom)
-            ),
-            Gibier::TrackField.el({total_time: duration, start: @state[:start], page_number: @state[:page_number], page_count: Gibier.page_count}),
-            section({className: 'footer'}.merge(footer_style),
-              p({className: 'title'}, Gibier.title),
-              p({className: 'powered-by'}, "Powered by ", span({className: "hyalite"}, "Hyalite"))
+            div({class: 'slide-controll'},
+              div({class: 'page-back', onClick: -> { page_back }}),
+              div({class: 'page-forward', onClick: -> { page_forward }}),
+              div({
+                className: 'slide',
+                style: {zoom: zoom, top: "#{top}px", left: "#{left}px"},
+                onKeyDown: -> (event) { handle_key_down(event) }
+              },
+                pages(SLIDE_HEIGHT * zoom)
+              ),
+              Gibier::TrackField.el({total_time: duration, start: @state[:start], page_number: @state[:page_number], page_count: Gibier.page_count}),
+              section({className: 'footer'}.merge(footer_style),
+                p({className: 'title'}, Gibier.title),
+                p({className: 'powered-by'}, "Powered by ", span({className: "hyalite"}, "Hyalite"))
+              )
             )
           )
         )

data/template/project/app/track_field.rb

@@ -1,9 +1,6 @@
-require 'browser/interval'
-
 module Gibier
   class TrackField
     include Hyalite::Component
-    include Hyalite::Component::ShortHand
 
     def initialize
       super
@@ -15,15 +12,17 @@ module Gibier
     end
 
     def component_did_mount
-      every(1) do
+      func = Proc.new do
         set_state(tic: !@state[:tic])
-        if el = $document.css(".track-field")[0]
+        if el = $document[".track-field"].first
           @width = el.width.to_i
           spend_time = @props[:start] ? Time.now - @props[:start] : 0
           rabbit_pos = [(spend_time / @props[:total_time]), 1].min * (@width - 40) * 0.96 + @width * 0.02
           set_state(rabbit_pos: rabbit_pos)
         end
       end
+
+      `setInterval(func, 1000)`
     end
 
     def render

data/template/project/assets/css/application.css

@@ -61,6 +61,29 @@ body {
   width: 100%;
 }
 
+.slide-controll {
+  position: absolute;
+  height: 100%;
+  width: 100%;
+}
+
+.slide-controll .page-back {
+  position: absolute;
+  width: 25%;
+  height: 100%;
+  z-index: 10;
+  background-color: rgba(0, 0, 0, 0);
+}
+
+.slide-controll .page-forward {
+  position: absolute;
+  width: 25%;
+  height: 100%;
+  left: 75%;
+  z-index: 10;
+  background-color: rgba(0, 0, 0, 0);
+}
+
 .page p.icon {
   margin: 0;
   position: absolute;

data/template/project/server.rb

@@ -20,6 +20,7 @@ class Server < Sinatra::Base
       server.append_path 'assets'
 
       Opal.use_gem 'opal-router'
+      Opal.use_gem 'opal-websocket'
       Opal.use_gem 'hyalite'
       Opal.use_gem 'gibier'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gibier
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - youchan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-20 00:00:00.000000000 Z
+date: 2017-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -315,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: A slide tool inspired by Rabbit