rhet-butler 0.5.0 → 0.9.0

data/lib/rhet-butler/web/main-app.rb

@@ -29,8 +29,12 @@ module RhetButler
     class MainApp
       def initialize(file_manager)
         @file_manager = file_manager
+        @capture_exceptions = true
       end
 
+      attr_accessor :presentation_app_class, :assets_app_class
+      attr_accessor :capture_exceptions
+
       # Notes re filesets config and slides:
       # All PresentationApps need the same slides but different configs
       # (including templates, etc.)
@@ -50,11 +54,14 @@ module RhetButler
         @file_manager.slide_files
       end
 
+      def viewer_app
+        @viewer_app ||= presentation_app_class.new(:viewer, @file_manager)
+      end
+
       #Simply renders the bodies of the viewer and presenter apps to make sure
       #there aren't any exceptions
       def check
-        viewer_app = PresentationApp.new(:viewer, @file_manager)
-        presenter_app = PresentationApp.new(:presenter, @file_manager)
+        presenter_app = presentation_app_class.new(:presenter, @file_manager)
         viewer_app.body
         presenter_app.body
         #XXX static generator "populate assets" - make sure all the assets
@@ -68,15 +75,15 @@ module RhetButler
         end)
       end
 
-      def app
+      def builder
         sockjs_options = {
           :sockjs_url => "/assets/javascript/sockjs-0.2.1.js",
           :queue => SlideMessageQueue.new
         }
 
-        viewer_app = PresentationApp.new(:viewer, @file_manager)
-        presenter_app = PresentationApp.new(:presenter, @file_manager)
-        assets_app = AssetsApp.new(@file_manager)
+        viewer_app = self.viewer_app
+        presenter_app = presentation_app_class.new(:presenter, @file_manager)
+        assets_app = assets_app_class.new(@file_manager)
         qr_app = QrDisplayApp.new(@file_manager, "/presenter")
         presenter_config = presenter_app.configuration
         auth_validation = build_authentication_block(presenter_config)
@@ -93,7 +100,9 @@ module RhetButler
             run Rack::SockJS.new(LeaderSession, sockjs_options)
           end
 
-          use Rack::ShowExceptions
+          if @capture_exceptions
+            use Rack::ShowExceptions
+          end
 
           map "/assets" do
             run assets_app
@@ -129,7 +138,7 @@ module RhetButler
         end
         EM.run do
           thin = Rack::Handler.get("thin")
-          thin.run(app.to_app, :Host => "0.0.0.0", :Port => configuration.serve_port) do |server|
+          thin.run(builder.to_app, :Host => "0.0.0.0", :Port => configuration.serve_port) do |server|
             server.threaded = true
           end
         end

data/lib/rhet-butler/web/presentation-app.rb

@@ -13,38 +13,46 @@ module RhetButler
         @file_manager.aspect_config(@aspect)
       end
 
+      def template_cache
+        ::Tilt::Cache.new
+      end
+
       def template_handler
-        @file_manager.aspect_templates(@aspect)
+        @file_manager.aspect_templates(@aspect, template_cache)
       end
 
       def slides_valise
         @file_manager.slide_files
       end
 
-      def slides
-        @slides ||=
-          begin
-            slide_loader = SlideLoader.new(slides_valise, configuration)
-            slide_loader.load_slides
-          end
+      def root_step
+        slide_loader = SlideLoader.new(slides_valise, configuration)
+        slide_loader.load_slides
       end
 
       def html_generator
-        @html_generator ||=
-          begin
-            generator = HTMLGenerator.new(configuration, template_handler)
-            generator.slides = slides
-            generator
-          end
+        generator = HTMLGenerator.new(configuration, template_handler)
+        generator.root_step = root_step
+        generator
       end
 
       def body
-        @body ||= html_generator.render(configuration.root_slide_template)
+        html_generator.render(configuration.root_slide_template)
       end
 
       def call(env)
         [200, {'Content-Type' => "text/html"}, [body]]
       end
     end
+
+    class MemoizedPresentationApp < PresentationApp
+      def configuration
+        @configuration ||= super
+      end
+
+      def body
+        @body ||= super
+      end
+    end
   end
 end

data/lib/rhet-butler/web/qr-display-app.rb

@@ -11,6 +11,8 @@ module RhetButler
 
       attr_reader :template_handler
 
+      QRItem = Struct.new(:qr, :view_url, :presenter_url)
+
       def call(env)
         url = [env["rack.url_scheme"], "://"]
         if env["HTTP_HOST"].nil? or env["HTTP_HOST"].empty?
@@ -27,9 +29,10 @@ module RhetButler
         qr = RQRCode::QRCode.new(url, :size => 5)
 
         mime_type = "text/html"
+        qr_item = QRItem.new(qr, view_url, url)
         generator = HTMLGenerator.new(@config, @templates)
         [200, {'Content-Type' => mime_type}, [
-          generator.render("presenter-qr.html", qr, :view_url => view_url, :presenter_url => url)
+          generator.render("presenter-qr.html", qr_item)
         ]]
       end
     end

data/lib/rhet-butler/yaml-schema.rb

@@ -1,9 +1,10 @@
+require 'yaml'
 require 'rhet-butler/slide'
 require 'rhet-butler/slide-group'
 require 'rhet-butler/slide-includer'
 require 'rhet-butler/layout-rule'
 
-YAML.add_tag('!slide', RhetButler::Slide)
-YAML.add_tag('!group', RhetButler::SlideGroup)
-YAML.add_tag('!include', RhetButler::Includer)
-YAML.add_tag('!layout-rule', RhetButler::LayoutRule)
+#YAML.add_tag('!slide', RhetButler::Slide)
+#YAML.add_tag('!group', RhetButler::SlideGroup)
+#YAML.add_tag('!include', RhetButler::Includer)
+#YAML.add_tag('!layout-rule', RhetButler::LayoutRule)

data/lib/rhet-butler/yaml-type.rb

@@ -1,5 +1,14 @@
+require 'yaml'
+
 module RhetButler
-  module YamlType
+  class YamlType
+    def self.register(name)
+      YAML.add_tag("!#{name}", self)
+    end
+
+    def setup_defaults
+    end
+
     def check_config_hash(config_hash)
       expected_keys = self.class.required_config + self.class.optional_config
       weird_keys = config_hash.keys.find_all{|key| !expected_keys.include?(key)}
@@ -19,5 +28,19 @@ module RhetButler
         yield(@config_hash[name])
       end
     end
+
+    def initialize
+      setup_defaults
+    end
+
+    def init_with(coder)
+      setup_defaults
+
+      @config_hash = normalize_config(coder)
+
+      check_config_hash(@config_hash)
+
+      configure
+    end
   end
 end

data/spec/html-generation.rb

@@ -10,6 +10,12 @@ describe RhetButler::HTMLGenerator do
     [ one ]
   end
 
+  let :prez do
+    RhetButler::SlideGroup.new.tap do |prez|
+      prez.slides = slides
+    end
+  end
+
   let :files do
     manager = RhetButler::FileManager.new
   end
@@ -24,7 +30,7 @@ describe RhetButler::HTMLGenerator do
 
   let :generator do
     described_class.new(configuration, template_handler).tap do |gen|
-      gen.slides = slides
+      gen.root_step = prez
     end
   end
 

data/spec/presentation-view.rb

@@ -8,11 +8,14 @@ describe RhetButler::Web::MainApp do
     include Rack::Test::Methods
 
     let :files do
-      RhetButler::FileManager.new
+      RhetButler::FileManager.new("sources" => %w{ spec_support/fixtures/project })
     end
 
     let :app do
-      described_class.new(files).app
+      main = described_class.new(files)
+      main.presentation_app_class = RhetButler::Web::MemoizedPresentationApp
+      main.assets_app_class = RhetButler::Web::MemoizedAssetsApp
+      main.builder.to_app
     end
 
     describe "/" do
@@ -26,13 +29,23 @@ describe RhetButler::Web::MainApp do
 
       it "should have a script tag for impress.js" do
         doc = Nokogiri::HTML(last_response.body)
-        doc.xpath("//script[contains(@src, 'impress.js')]").should_not be_empty
+        doc.xpath("//script[contains(@src, 'rhet-present.js')]").should_not be_empty
       end
     end
 
-    describe "/javascript/impress.js" do
+    describe "/qr" do
       before :each do
-        get "/javascript/impress.js"
+        get "/qr"
+      end
+
+      it "should serve a presentation" do
+        last_response.should be_ok
+      end
+    end
+
+    describe "/javascript/rhet-present.js" do
+      before :each do
+        get "/javascript/rhet-present.js"
       end
 
       it "should serve the javascript" do
@@ -42,12 +55,11 @@ describe RhetButler::Web::MainApp do
       it "should serve as application/javascript" do
         last_response.headers["Content-Type"].should == "application/javascript"
       end
-
     end
 
-    describe "/assets/javascript/impress.js" do
+    describe "/assets/javascript/rhet-present.js" do
       before :each do
-        get "/assets/javascript/impress.js"
+        get "/assets/javascript/rhet-present.js"
       end
 
       it "should serve the javascript" do
@@ -57,7 +69,20 @@ describe RhetButler::Web::MainApp do
       it "should serve as application/javascript" do
         last_response.headers["Content-Type"].should == "application/javascript"
       end
+    end
+
+    describe "/stylesheets/test.css" do
+      before :each do
+        get "/stylesheets/test.css"
+      end
 
+      it "should serve the CSS" do
+        last_response.should be_ok
+      end
+
+      it "should serve as text/css" do
+        last_response.headers["Content-Type"].should == "text/css"
+      end
     end
 
 

data/spec/rhet-butler.rb

@@ -2,19 +2,6 @@ require 'rhet-butler'
 
 describe RhetButler do
   describe "web server" do
-    describe "presentation view" do
-      it "should serve a presentation"
-
-      it "should include impress.js"
-
-      it "should have get WebSocket commands to sync with presenter"
-
-      it "should be able to split from presenter"
-
-      it "should be able to resync with presenter"
-
-      it "should have a resource for the current presenter's slide"
-    end
 
     describe "passive view" do
       it "should serve the presentation"

data/spec/slide-loader.rb

@@ -28,17 +28,17 @@ describe RhetButler::SlideLoader do
 
   it "should parse YAML for the configs" do
     slides.should have_at_least(1).slides
-    slides.should be_all{|slide| RhetButler::Slide === slide}
+    slides.should be_all{|slide| RhetButler::Slide === slide or RhetButler::SlideGroup === slide }
   end
 
   it "should have the included slide" do
     slides.find do |slide|
-      slide.content =~ /included/
+      slide.content =~ /included/ if slide.respond_to? :content
     end.should_not be_nil
   end
 
   it "should have the slide group" do
-    slides.find do |slide|
+    slides.each_slide.find do |slide|
       slide.content =~ /grouped/
     end.should_not be_nil
   end

data/spec/slide-processing.rb

@@ -4,6 +4,8 @@ describe RhetButler::SlideProcessor do
   def slide(content)
     slide = RhetButler::Slide.new
     slide.content = content
+    slide.content_filters = default_content_filters
+    slide.note_filters = default_content_filters
     slide
   end
 
@@ -37,15 +39,16 @@ describe RhetButler::SlideProcessor do
     ]
   end
 
-  let :default_slide_type do
-    "textile"
+  let :default_content_filters do
+    [RhetButler::SlideRenderers::Textile.new]
   end
 
   let :processor do
     processor = RhetButler::SlideProcessor.new
     processor.root_group = root_group
     processor.blueprint = blueprint
-    processor.default_slide_type = default_slide_type
+    processor.default_content_filters = default_content_filters
+    processor.default_note_filters = default_content_filters
     processor
   end