rhet-butler 0.11.1 → 0.12.1

data/lib/rhet-butler/stasis/rack-loader.rb

@@ -1,6 +1,8 @@
 require 'rhet-butler/stasis'
 module RhetButler
   module Stasis
+    class LoadFailed < StandardError; end
+
     class RackLoader
       def initialize(url, app)
         require 'stringio'
@@ -46,7 +48,7 @@ module RhetButler
         code, headers, body = *response
 
         unless code == 200
-          raise "Bad response from local server: #{response[0..1].inspect} body: #{response[2].to_a.join.length}"
+          raise LoadFailed, "Bad response from local server for #{source_uri}:\n#{response[0..1].inspect} body: #{response[2].to_a.join.length}"
         end
         doc.type = headers["Content-Type"]
         doc.body = body.to_a.join("")

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

@@ -4,9 +4,9 @@ module RhetButler
     class TranformationOrder
       attr_accessor :source_link, :target_link, :storage_target
 
-      def initialize(source_link, target_link, storage_target)
-        @source_link, @target_link, @storage_target =
-          source_link, target_link, storage_target
+      def initialize(document, source_link, target_link, storage_target)
+        @document, @source_link, @target_link, @storage_target =
+          document, source_link, target_link, storage_target
       end
     end
 
@@ -33,16 +33,16 @@ module RhetButler
       end
       attr_accessor :loader, :writer, :mapping
 
-      def add(source)
+      def add(document, source)
         store_to = mapping.storage_for(source)
         link_target = mapping.target_link_for(source)
-        add_mapping(source, link_target, store_to)
+        add_mapping(document, source, link_target, store_to)
         return link_target
       end
 
-      def add_mapping(source_uri, target_uri, target_path)
+      def add_mapping(document, source_uri, target_uri, target_path)
         @hash[source_uri] = target_uri
-        @list << TranformationOrder.new(source_uri, target_uri, target_path)
+        @list << TranformationOrder.new(document, source_uri, target_uri, target_path)
       end
 
       def transform_class(type)
@@ -50,9 +50,15 @@ module RhetButler
       end
 
       def target_for(document, link)
-        link = canonicalize_uri(mapping.absolute_uri(document.source_uri).join(link))
-        @hash.fetch(link) do
-          add(link)
+        link = Addressable::URI.parse(link)
+        case link.scheme
+        when 'data'
+          link
+        else
+          link = canonicalize_uri(mapping.absolute_uri(document.source_uri).join(link))
+          @hash.fetch(link) do
+            add(document, link)
+          end
         end
       end
 
@@ -62,8 +68,12 @@ module RhetButler
         uri
       end
 
-      def load_document(source_path)
-        loader.load(canonicalize_uri(source_path))
+      def load_document(order)
+        loader.load(canonicalize_uri(order.source_link))
+      rescue LoadFailed
+        require 'pp'
+        puts "Problem loading #{order.pretty_inspect}"
+        raise
       end
 
       def write_document(target_path, document_body)
@@ -74,7 +84,7 @@ module RhetButler
         until @list.empty?
           order = @list.pop
 
-          doc = load_document(order.source_link)
+          doc = load_document(order)
           transformer = transform_class(doc.type).new
           transformer.queue = self
           transformer.document = doc

data/lib/rhet-butler/static-generator.rb

@@ -29,7 +29,7 @@ module RhetButler
       transform_queue.writer = Stasis::ValiseWriter.new(@target_valise)
       transform_queue.writer.store_log = store_log
 
-      transform_queue.add("/")
+      transform_queue.add(nil, "/")
       transform_queue.go
     end
   end

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

@@ -77,7 +77,7 @@ module RhetButler
 
       def builder
         sockjs_options = {
-          :sockjs_url => "/assets/javascript/sockjs-0.2.1.js",
+          :sockjs_url => "/assets/javascript/sockjs-0.3.4.js",
           :queue => SlideMessageQueue.new
         }
 
@@ -127,25 +127,25 @@ module RhetButler
         end
       end
 
-      def start
+      def build_server
         configuration = @file_manager.base_config
 
-        puts "Starting server. Try one of these:"
+        Thin::Logging.log_info "Starting server. Try one of these:"
         require 'system/getifaddrs'
         System.get_all_ifaddrs.each do |interface|
-          puts "  http://#{interface[:inet_addr].to_s}:#{configuration.serve_port}/"
-          puts "  http://#{interface[:inet_addr].to_s}:#{configuration.serve_port}/qr"
+          Thin::Logging.log_info "  http://#{interface[:inet_addr].to_s}:#{configuration.serve_port}/"
+          Thin::Logging.log_info "  http://#{interface[:inet_addr].to_s}:#{configuration.serve_port}/qr"
         end
         server = Thin::Server.new(builder.to_app, configuration.serve_port)
         server.threaded = true
-        server.start
-#        EM.run do
-#          thin = Rack::Handler.get("thin")
-#          thin.run(builder.to_app, :Host => "0.0.0.0", :Port => configuration.serve_port) do |server|
-#            server.threaded = true
-#          end
-#        end
+        server
+      end
+
+      #:nocov:
+      def start
+        build_server.start
       end
+      #:nocov:
     end
   end
 end

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

@@ -25,8 +25,12 @@ module RhetButler
         @file_manager.slide_files
       end
 
+      def assets_valise
+        @file_manager.base_assets(configuration.template_cache)
+      end
+
       def root_step
-        slide_loader = SlideLoader.new(slides_valise, configuration)
+        slide_loader = SlideLoader.new(slides_valise, assets_valise, configuration)
         slide_loader.load_slides
       end
 

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

@@ -2,7 +2,7 @@ require 'yaml'
 require 'rhet-butler/slide'
 require 'rhet-butler/slide-group'
 require 'rhet-butler/slide-includer'
-require 'rhet-butler/layout-rule'
+require 'rhet-butler/slide-contents'
 
 #YAML.add_tag('!slide', RhetButler::Slide)
 #YAML.add_tag('!group', RhetButler::SlideGroup)

data/spec/slide-loader.rb

@@ -14,12 +14,16 @@ describe RhetButler::SlideLoader do
     end
   end
 
+  let :assets do
+    files.templates("assets")
+  end
+
   let :configuration do
     RhetButler::Configuration.new(files)
   end
 
   let :loader do
-    described_class.new(files, configuration)
+    described_class.new(files, assets, configuration)
   end
 
   let :slides do
@@ -37,6 +41,12 @@ describe RhetButler::SlideLoader do
     end.should_not be_nil
   end
 
+  it "should have the embedded text" do
+    slides.find do |slide|
+      slide.content =~ /which I embedded/ if slide.respond_to? :content
+    end.should_not be_nil
+  end
+
   it "should have the slide group" do
     slides.each_slide.find do |slide|
       slide.content =~ /grouped/

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rhet-butler
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.1
 platform: ruby
 authors:
 - Judson Lester
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: compass-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: compass-import-once
   requirement: !ruby/object:Gem::Requirement
@@ -225,20 +225,17 @@ files:
 - lib/rhet-butler/command-line.rb
 - lib/rhet-butler/html-generator.rb
 - lib/rhet-butler/slide-group.rb
-- lib/rhet-butler/arrangement.rb
 - lib/rhet-butler/yaml-schema.rb
 - lib/rhet-butler/slide-loader.rb
 - lib/rhet-butler/slide.rb
 - lib/rhet-butler/slide-includer.rb
 - lib/rhet-butler/static-generator.rb
 - lib/rhet-butler/yaml-type.rb
-- lib/rhet-butler/layout-rule.rb
-- lib/rhet-butler/arrangement-finder.rb
 - lib/rhet-butler/file-loading.rb
 - lib/rhet-butler/filter-resolver.rb
 - lib/rhet-butler/include-processor.rb
-- lib/rhet-butler/slide-arranger.rb
-- lib/rhet-butler/slide-processor.rb
+- lib/rhet-butler/slide-contents.rb
+- lib/rhet-butler/slide-contents/embed.rb
 - lib/rhet-butler/slide-renderer.rb
 - lib/rhet-butler/slide-renderers/code.rb
 - lib/rhet-butler/slide-renderers/cues.rb
@@ -259,11 +256,9 @@ files:
 - lib/rhet-butler/stasis/writer.rb
 - bin/rhet-butler
 - spec/slide-loader.rb
-- spec/slide-processing.rb
 - spec/html-generation.rb
 - spec/rhet-butler.rb
 - spec/presentation-view.rb
-- spec/arrangements.rb
 - default-configuration/assets/favicon.ico
 - default-configuration/assets/apple-touch-icon-precomposed.png
 - default-configuration/assets/apple-touch-icon.png
@@ -357,6 +352,7 @@ files:
 - default-configuration/assets/stylesheets/setup.css
 - default-configuration/assets/stylesheets/presentation.css
 - default-configuration/assets/javascript/sockjs-0.2.1.js
+- default-configuration/assets/javascript/sockjs-0.3.4.js
 - default-configuration/assets/javascript/keyboard-nav.js
 - default-configuration/assets/javascript/highlight.pack.js
 - default-configuration/assets/javascript/highlight.js/LICENSE
@@ -394,7 +390,7 @@ rdoc_options:
 - --main
 - doc/README
 - --title
-- rhet-butler-0.11.1 Documentation
+- rhet-butler-0.12.1 Documentation
 require_paths:
 - lib/
 required_ruby_version: !ruby/object:Gem::Requirement

data/lib/rhet-butler/arrangement-finder.rb

@@ -1,71 +0,0 @@
-require 'rhet-butler/arrangement'
-require 'rhet-butler/slide-traverser'
-module RhetButler
-  class ArrangementFinder < SlideTraverser
-    attr_accessor :root_arrangement, :root_group, :blueprint
-
-    def initialize
-      super
-    end
-
-    def setup
-      if @blueprint.empty?
-        raise "Empty blueprint - can't layout slides"
-      end
-
-      @blueprint.combination(2) do |first, second|
-        if first.match == second.match
-          if first.match == {}
-            raise "Two default rules (default or match: {}) - please fix"
-          end
-          warn "Blueprint rules with duplicate rules: will ignore the later one:"
-          warn second.inspect
-        end
-      end
-
-      unless @blueprint.last.match == {}
-        warn "Last blueprint rule not a default - fixing..."
-        defaults, rules = @blueprint.partition{|rule| rule.match == {}}
-        raise "Multiple default blueprint rules" unless defaults.length < 2
-        raise "No default blueprint rule" unless defaults.length > 0
-        @blueprint = rules + defaults
-      end
-
-      default_rule = @blueprint.last
-      @active_match = default_rule
-      @root_arrangement = default_rule.layout
-      descend(@root_group, @root_arrangement)
-    end
-
-    def on_slide(slide)
-      target_stack.last.slides << slide
-    end
-
-    def on_group(group)
-      arrangement = find_arrangement(group)
-      if arrangement != target_stack.last
-        target_stack.last.slides << arrangement
-      end
-      descend(group, arrangement)
-    end
-
-    def match?(filter, value)
-      return filter === value
-    end
-
-    def find_arrangement(group)
-      match = {}
-      template = nil
-      match = blueprint.find do |rule|
-        rule.match?(group)
-      end
-
-      if !match.nil? and match != @active_match
-        @active_match = match
-        return match.layout
-      else
-        return target_stack.last
-      end
-    end
-  end
-end

data/lib/rhet-butler/arrangement.rb

@@ -1,78 +0,0 @@
-module RhetButler
-  class Arrangement
-    include Enumerable
-
-    def initialize(*args)
-      @slides = []
-      @slide_width = 1000
-      @slide_height = 1000
-    end
-
-    attr_accessor :slides, :slide_width, :slide_height
-
-    def previous_slide
-      @slides.last
-    end
-
-    def each
-      if block_given?
-        @slides.each{|slide| yield slide}
-      else
-        @slides.each
-      end
-    end
-
-    class << self
-      def register(name)
-        Arrangement.registry[name] = self
-      end
-
-      def registry
-        @registry ||= {}
-      end
-
-      def [](name)
-        @registry[name]
-      end
-    end
-  end
-
-  class Linear < Arrangement
-    register "linear"
-
-    def initialize(plus_x, plus_y)
-      super
-      @plus_x = plus_x
-      @plus_y = plus_y
-    end
-
-    def arrange(slideset)
-      slide = slideset.current_slide
-      slide.position.x = slideset.previous_slide.position.x + @plus_x
-      slide.position.y = slideset.previous_slide.position.y + @plus_y
-      return slide
-    end
-  end
-
-  class LinearDigression < Linear
-    register "digress-linear"
-    register "linear-digress"
-
-    def previous_slide
-      @preceeding
-    end
-
-    def arrange(slideset)
-      @preceeding ||= slideset.previous_slide
-      super
-    end
-  end
-
-  class Horizontal < Linear
-    register "horizontal"
-
-    def initialize
-      super(1000, 0)
-    end
-  end
-end

data/lib/rhet-butler/layout-rule.rb

@@ -1,61 +0,0 @@
-require 'rhet-butler/yaml-type'
-
-module RhetButler
-  class LayoutRule < YamlType
-    register "layout-rule"
-
-    def initialize
-      @match = {}
-      @layout_args = nil
-    end
-    attr_accessor :match, :layout_type, :layout_args
-
-    def self.optional_config
-      %w[match]
-    end
-
-    def self.required_config
-      %w[layout]
-    end
-
-    def setup_defaults
-
-    end
-
-    def normalize_config(coder)
-      case coder.type
-      when :seq
-        { 'match' => coder.seq[0], 'layout' => coder.seq[1] }
-      when :map
-        coder.map
-      else
-        raise "Tried to configure a layout rule with non-sequence: #{coder.inspect}"
-      end
-    end
-
-    def configure
-      value_from_config("match") do |value|
-        if value == 'default'
-          @match = {}
-        else
-          @match = value
-        end
-      end
-
-      @layout_type, @layout_args = *@config_hash['layout']
-    end
-
-    def layout
-      Arrangement[@layout_type].new(*(@layout_args||[]))
-    end
-
-    def match?(group)
-      @match.all? do |key, value|
-        target = group.metadata.fetch(key)
-        value === target
-      end
-    rescue KeyError
-      false
-    end
-  end
-end