gibier 0.8.10 → 0.8.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a10560339aa48e9a04da2106ff021ce223d312b2
-  data.tar.gz: 2973da5a1bde0aaddc26d98fcc571880234b4714
+SHA256:
+  metadata.gz: 5aabc0d1586e400deb20155328b6bb2a579fb54a75c76dba6ae52a6edcbc0831
+  data.tar.gz: 38c32fe911c3575483032e25f83428b19792b22f766be2494b5891c5d3a91340
 SHA512:
-  metadata.gz: eea5bf41fb2aa99546211e9228fd7d2d637b239da10a5354a62bf119f448a7085c2b4b5d02bf57f4edf79d4300c8ad6ddf9171389c862dbb135ab42ae560750b
-  data.tar.gz: 6e37edc935824720aef9a2ec3bec5dd445e592e13e06047a55da2b06e6dc65eabdb220cfdf2bf56da451b7365d3c3d0a53c2696e77143f9327a1bd36ebe83e59
+  metadata.gz: 0fb1c164b0464033c4bb989d502d1ffa06c5a726c146150766b30e2abbf4c5321c5f3f1299ee70e396c37d146732e1fecbfafe9cbde635defbb86c78c83ae073
+  data.tar.gz: e8352a563aba3f65a7d915e95572b97d03463e0fad48a638b1772ee5d56b341f98c7980a9033cd39e20b602759d332319a42046152960d65d446635681bb947a

data/lib/gibier/renderer.rb

@@ -22,7 +22,7 @@ class String
 end
 
 module Gibier
-  class Renderer < Redcarpet::Render::Base
+  class Renderer < Redcarpet::Render::HTML
     def self.create(name)
       Class.new(Renderer) do
         def self.page_name
@@ -58,8 +58,8 @@ module Gibier
 
       # span-level calls
       :autolink,
-      :underline, :raw_html,
-      :triple_emphasis, :strikethrough,
+      :underline,
+      :triple_emphasis,
       :superscript, :highlight,
 
       # footnotes
@@ -203,12 +203,28 @@ EOD
       "      children << code({ dangerouslySetInnerHTML: { __html: %q{#{html}} } })\n"
     end
 
-    def emphasis(*args)
-      "# #{args}"
+    def raw_html(html)
+      html
     end
 
-    def double_emphasis(*args)
-      "<strong>#{args.first}</strong>"
+    def emphasis(text)
+      "<i>#{text}</i>"
+    end
+
+    def double_emphasis(text)
+      "<strong>#{text}</strong>"
+    end
+
+    def stikethrough(text)
+      "<s>#{text}</s>"
+    end
+
+    def codespan(code)
+      "<code>#{code}</code>"
+    end
+
+    def normal_text(text)
+      text
     end
 
     def paragraph(text)

data/lib/gibier/version.rb

@@ -1,3 +1,3 @@
 module Gibier
-  VERSION = "0.8.10"
+  VERSION = "0.8.11"
 end

data/template/project/app/page_background.rb

@@ -0,0 +1,34 @@
+class PageBackground
+  include Hyalite::Component
+
+  def background
+    case @props[:page_number] 
+    when 0
+      [
+        div({class: 'particleground'},
+          div({class: 'logo'}),
+          div({class: 'copyright'}, "© 2017 Retrieva, Inc.")
+        ),
+        div({class: 'vborder'})
+      ]
+    when Gibier.page_count - 1
+      [
+        div({class: 'particleground'},
+          div({class: 'logo large'}),
+          div({class: 'copyright'}, "© 2017 Retrieva, Inc.")
+        ),
+      ]
+    else
+      [
+        div({class: 'border'}),
+        div({class: 'dog'}),
+        div({class: 'copyright'}, "© 2017 Retrieva, Inc.")
+      ]
+    end
+  end
+
+  def render
+    div({class: 'page-background', style: {zoom: @props[:zoom]}}, background)
+  end
+end
+

data/template/project/app/page_base.rb

@@ -1,7 +1,8 @@
+require_relative './page_background'
+
 module Gibier
   class PageBase
     include Hyalite::Component
-    include Hyalite::Component::ShortHand
 
     def initialize
       @height = 0
@@ -27,10 +28,6 @@ module Gibier
       "page_#{@props[:page_number]}"
     end
 
-    def style
-      {top: @state[:top]}.merge(@props[:visible] ? {display: 'block'} : {display: 'none'})
-    end
-
     def header
       nil
     end
@@ -40,7 +37,16 @@ module Gibier
     end
 
     def render
-      section({className: "page #{page_class_name}", style: style}, header, content)
+      rect = @props[:rect]
+      container_style = {zoom: rect.zoom, top: "#{rect.top}px", left: "#{rect.left}px", width: "#{rect.width}px", height: "#{rect.height}px"}
+      display = @props[:visible] ? 'block' : 'none'
+      section({class: "page #{page_class_name}", style: {width: "#{$window.width}px", height: "#{$window.height}px", display: display}},
+        div({class: 'page-container', style: container_style},
+          div({class: 'page-header'}, header),
+          div({class: 'page-content'}, content)
+        ),
+        PageBackground.el({zoom: rect.zoom, page_number: @props[:page_number]})
+      )
     end
   end
 end

data/template/project/app/slide.rb

@@ -1,10 +1,11 @@
 require 'hyalite'
 require 'opal-router'
 require 'track_field'
+require 'ostruct'
 
 module Gibier
-  SLIDE_WIDTH = 960
-  SLIDE_HEIGHT = 720
+  SLIDE_WIDTH = 1920
+  SLIDE_HEIGHT = 1080
 
   def self.page_count
     @page_count
@@ -49,11 +50,11 @@ module Gibier
   class Slide
     include Hyalite::Component
 
-    def pages(height)
+    def pages(rect)
       case @state[:mode]
       when :slide
         Gibier.page_count.times.map do |i|
-          Object.const_get("Gibier::Page#{i}").el({visible: @state[:page_number] == i, page_number: i, slide_height: height})
+          Object.const_get("Gibier::Page#{i}").el({visible: @state[:visible] || @state[:page_number] == i, page_number: i, rect: rect})
         end
       when :print
         Gibier.page_count.times.map do |i|
@@ -109,9 +110,9 @@ module Gibier
     def handle_key_down(event)
       keycode = event.code
       case keycode
-      when :Space, :ArrowRight, :ArrowUp
+      when :Space, :ArrowRight, :ArrowDown, :PageDown
         page_forward
-      when :Backspace, :ArrowLeft, :ArrowDown
+      when :Backspace, :ArrowLeft, :ArrowUp, :PageUp
         page_back
       when :KeyS, :KeyB
         unless @state[:start]
@@ -163,16 +164,17 @@ module Gibier
     end
 
     def render
-      follow_height = $window.height / $window.width < SLIDE_HEIGHT / SLIDE_WIDTH
-      if follow_height
-        zoom = $window.height.to_f / SLIDE_HEIGHT * 0.98
+      if $window.height / $window.width < SLIDE_HEIGHT / SLIDE_WIDTH
+        zoom = $window.height.to_f / SLIDE_HEIGHT
       else
-        zoom = $window.width.to_f / SLIDE_WIDTH * 0.98
+        zoom = $window.width.to_f / SLIDE_WIDTH
       end
 
       top = ($window.height / zoom - SLIDE_HEIGHT) / 2
       left = ($window.width / zoom - SLIDE_WIDTH) / 2
 
+      rect = OpenStruct.new(top: top, left: left, width: SLIDE_WIDTH, height: SLIDE_HEIGHT, zoom: zoom)
+
       footer_style = @state[:page_number] == 1 || !@state[:footer_visible] ? {style: {display: 'none'}} : {}
 
       case @state[:mode]
@@ -184,10 +186,9 @@ module Gibier
               div({class: 'page-forward', onClick: -> { page_forward }, onTouchStart: -> { page_forward }}),
               div({
                 className: 'slide',
-                style: {zoom: zoom, top: "#{top}px", left: "#{left}px"},
                 onKeyDown: -> (event) { handle_key_down(event) }
               },
-                pages(SLIDE_HEIGHT * zoom)
+                pages(rect)
               ),
               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),
@@ -205,7 +206,7 @@ module Gibier
             top += SLIDE_HEIGHT * zoom
             div({
               className: 'wrap-page',
-              style: {zoom: zoom, top: "#{top}px", left: "#{left}px"},
+              style: {zoom: zoom, width: "#{SLIDE_WIDTH}px", height: "#{SLIDE_HEIGHT}px", top: "#{top}px", left: "#{left}px"},
             }, page)
           end
         )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gibier
 version: !ruby/object:Gem::Version
-  version: 0.8.10
+  version: 0.8.11
 platform: ruby
 authors:
 - youchan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-21 00:00:00.000000000 Z
+date: 2018-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -273,6 +273,7 @@ files:
 - template/gh_pages/index.haml
 - template/gh_pages/slide.haml
 - template/project/Gemfile
+- template/project/app/page_background.rb
 - template/project/app/page_base.rb
 - template/project/app/slide.rb
 - template/project/app/track_field.rb
@@ -315,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A slide tool inspired by Rabbit