rhet-butler 0.12.1 → 0.13.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmJjMGFjYThjNTljOTU0NjU0OWJhZGNiMTQ3YzlhOGJjNjMxYzFiMQ==
+    ODZlMjBlZjY5N2JhNjhiNjkwYjA0MWE0YjBmNDhmZTRiY2M5MTVhNA==
   data.tar.gz: !binary |-
-    MGQ5ZTFjOGEzMDBhY2U2NDIxYzAzYTI4OGY2N2E3NDQzYzY2ZTZmOA==
+    ZWI4OWU5YzZlZWM3ODdjYzBlOTA1NTE5MTAwYTEyYmUyMzJlMWVlYQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZjM5N2RjODMxMjBkYWQyMzBhMzMwODQxY2YyYWIwMGFmMjIzNjBjNzY4Y2Jh
-    NjllNmIwNDdiYzVkYWQ2YTg5OTBiMGY3MWFkNGYxNzFlNjI2NTFmMzJhYmU0
-    NWQ2YjMwNGIzOTcwZDI0MDRkMmE0NDY5NWUxY2FmODRjMWY0NGI=
+    MTJjYjA1Nzg4NGI5ZWQyYTczZGYwOTViNWIxYTc5OTJiYmMwODNkN2RkNDFh
+    MDRjZDIzNTVlNzE2MTVkOGFiNDljYTdhMTZkYWZjMTk2ZTNmMzQ5ODc3MmNh
+    NDg0Yzc5YzRkM2VmN2UxMDBlOGU2YTVjYTVkMDJkZjNhYzI0YzI=
   data.tar.gz: !binary |-
-    MmI3MTkzOTc2NzI4NzUyZDM5OTUwNTZkMzVhOWUyOTg3MGFjOTg1MGJiMzQ5
-    NDE4OTQ4ZDYxYzRkZTg2ZTFjOGQxZWM3ZGExYmIyMDI3YzA1Y2RkMTYxMmZj
-    MWM0ODRhYTM0NzQwNDhmNWRiMmMzYWZkZTgyZjIzYmM4ZGJmNjI=
+    Mzg5OTE4YzNjYjc5ZjliZmU1MGJjNzFkN2M2MTBkMjBiNGNiZTEwZjdjZmRj
+    ZTFkOGVhYzc3ODFjZDY3MGRiOGY2NGU4NWUwY2VlNGI3NWQxMDQ0NjdkYTll
+    NzNhMTFiOWFiYmZkOTU4MzQ5YzhiODk0N2Q2YmIyYTkxYmRkM2Q=

data/default-configuration/assets/stylesheets/font.sass

@@ -0,0 +1,33 @@
+@font-face
+  font-family: 'Arimo'
+  font-style: normal
+  font-weight: 700
+  src: local("Arimo Bold"), local("Arimo-Bold"), url(../../themes.googleusercontent.com/static/fonts/arimo/v5/K-bXE71xZHgbUS_UdQjugvesZW2xOQ-xsNqO47m55DA.ttf) format("truetype")
+
+
+@font-face
+  font-family: 'Cinzel Decorative'
+  font-style: normal
+  font-weight: 700
+  src: local("Cinzel Decorative Bold"), local("CinzelDecorative-Bold"), url(../../themes.googleusercontent.com/static/fonts/cinzeldecorative/v1/pXhIVnhFtL_B9Vb1wq2F9wIh9oxuYcmvOvyh_107lQs.ttf) format("truetype")
+
+
+@font-face
+  font-family: 'Cinzel Decorative'
+  font-style: normal
+  font-weight: 900
+  src: local("Cinzel Decorative Black"), local("CinzelDecorative-Black"), url(../../themes.googleusercontent.com/static/fonts/cinzeldecorative/v1/pXhIVnhFtL_B9Vb1wq2F9zCUrkmwPfdnoTjOU_kXqBI.ttf) format("truetype")
+
+
+@font-face
+  font-family: 'Droid Sans Mono'
+  font-style: normal
+  font-weight: 400
+  src: local("Droid Sans Mono"), local("DroidSansMono"), url(../../themes.googleusercontent.com/static/fonts/droidsansmono/v4/ns-m2xQYezAtqh7ai59hJYW_AySPyikQrZReizgrnuw.ttf) format("truetype")
+
+
+@font-face
+  font-family: 'Slackey'
+  font-style: normal
+  font-weight: 400
+  src: local("Slackey"), url(../../themes.googleusercontent.com/static/fonts/slackey/v3/bJZDrYrGx8atJRHR9DVdqg.ttf) format("truetype")

data/default-configuration/assets/stylesheets/rhet.css.sass

@@ -1,6 +1,6 @@
 @import 'compass/reset'
 @import 'compass'
-@import 'font.css'
+@import 'font'
 @import 'animate-helpers'
 @import 'animate/windblown'
 @import 'animate/fade'

data/default-configuration/common/config.yaml

@@ -1,11 +1,11 @@
 ---
 named-filters:
   normal:
-    - !textile
+    - !markdown
     - !cues
   code:
     - !code
-    - !textile
+    - !markdown
     - !cues
 
 template-cache: .template-cache

data/default-configuration/skels/slides.yaml

@@ -3,5 +3,5 @@
 - !group
   - !include whoami.yaml
 - !group
-  - !slide |
-    contents: It'll knock your socks off!
+  - !slide
+    content: It'll knock your socks off!

data/lib/rhet-butler/filter-resolver.rb

@@ -48,7 +48,6 @@ module RhetButler
           content.filters = get_filters(content.filters || default_content_filters)
         end
       end
-
     rescue
       puts "While processing #{slide}:"
       raise

data/lib/rhet-butler/slide-renderer.rb

@@ -39,4 +39,5 @@ end
 
 require 'rhet-butler/slide-renderers/code'
 require 'rhet-butler/slide-renderers/textile'
+require 'rhet-butler/slide-renderers/markdown'
 require 'rhet-butler/slide-renderers/cues'

data/lib/rhet-butler/slide-renderers/markdown.rb

@@ -0,0 +1,15 @@
+require 'kramdown'
+
+module RhetButler
+  module SlideRenderers
+    class Markdown < SlideRenderer
+      register "markdown"
+      register "kramdown"
+      register "gfm"
+
+      def process(string)
+        Kramdown::Document.new(string).to_html
+      end
+    end
+  end
+end

data/lib/rhet-butler/slide-rendering.rb

@@ -13,6 +13,9 @@ module RhetButler
       slide.notes = filter_text(slide.raw_notes, slide.note_filters)
       raise "Slide content needs to be a string, was: #{slide.content.inspect}" unless String === slide.content
       raise "Slide notes needs to be a string, was: #{slide.notes.inspect}" unless String === slide.notes
+    rescue
+      puts "While processing #{slide}:"
+      raise
     end
 
     def filter_text(content, filters)

data/lib/rhet-butler/stasis/css-transform.rb

@@ -28,6 +28,7 @@ module RhetButler
               [:block, :value].each do |key|
                 children = children[key]
                 break if children.nil?
+                break if children.is_a? Array
               end
               list += url_nodes(children)
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhet-butler
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Judson Lester
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass-core
@@ -206,6 +206,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 4.2.9
+- !ruby/object:Gem::Dependency
+  name: kramdown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.0
 description: ! "  Rhet Butler is a presentation assistant. Build a slide deck in simple
   YAML,\n  design it in CSS, run the presentation with your smartphone over Websockets.\n"
 email:
@@ -240,6 +254,7 @@ files:
 - lib/rhet-butler/slide-renderers/code.rb
 - lib/rhet-butler/slide-renderers/cues.rb
 - lib/rhet-butler/slide-renderers/textile.rb
+- lib/rhet-butler/slide-renderers/markdown.rb
 - lib/rhet-butler/slide-rendering.rb
 - lib/rhet-butler/slide-traverser.rb
 - lib/rhet-butler/resource-localizer.rb
@@ -285,7 +300,7 @@ files:
 - default-configuration/assets/stylesheets/solarized.scss
 - default-configuration/assets/stylesheets/google-open-sans.css
 - default-configuration/assets/stylesheets/rhet.css.sass
-- default-configuration/assets/stylesheets/font.css
+- default-configuration/assets/stylesheets/font.sass
 - default-configuration/assets/stylesheets/presenter/rhet.css.sass
 - default-configuration/assets/stylesheets/_animate-helpers.scss
 - default-configuration/assets/stylesheets/animate/fade/_fadeIn.sass
@@ -390,7 +405,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- rhet-butler-0.12.1 Documentation
+- rhet-butler-0.13.0 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement

data/default-configuration/assets/stylesheets/font.css

@@ -1,30 +0,0 @@
-@font-face {
-  font-family: 'Arimo';
-  font-style: normal;
-  font-weight: 700;
-  src: local('Arimo Bold'), local('Arimo-Bold'), url(../../themes.googleusercontent.com/static/fonts/arimo/v5/K-bXE71xZHgbUS_UdQjugvesZW2xOQ-xsNqO47m55DA.ttf) format('truetype');
-}
-@font-face {
-  font-family: 'Cinzel Decorative';
-  font-style: normal;
-  font-weight: 700;
-  src: local('Cinzel Decorative Bold'), local('CinzelDecorative-Bold'), url(../../themes.googleusercontent.com/static/fonts/cinzeldecorative/v1/pXhIVnhFtL_B9Vb1wq2F9wIh9oxuYcmvOvyh_107lQs.ttf) format('truetype');
-}
-@font-face {
-  font-family: 'Cinzel Decorative';
-  font-style: normal;
-  font-weight: 900;
-  src: local('Cinzel Decorative Black'), local('CinzelDecorative-Black'), url(../../themes.googleusercontent.com/static/fonts/cinzeldecorative/v1/pXhIVnhFtL_B9Vb1wq2F9zCUrkmwPfdnoTjOU_kXqBI.ttf) format('truetype');
-}
-@font-face {
-  font-family: 'Droid Sans Mono';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Droid Sans Mono'), local('DroidSansMono'), url(../../themes.googleusercontent.com/static/fonts/droidsansmono/v4/ns-m2xQYezAtqh7ai59hJYW_AySPyikQrZReizgrnuw.ttf) format('truetype');
-}
-@font-face {
-  font-family: 'Slackey';
-  font-style: normal;
-  font-weight: 400;
-  src: local('Slackey'), url(../../themes.googleusercontent.com/static/fonts/slackey/v3/bJZDrYrGx8atJRHR9DVdqg.ttf) format('truetype');
-}