magic_reveal 2.4.0.1 → 2.4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d5c1f685fc06356224773be6c761b559d20dcb7
-  data.tar.gz: f6061b79e83be0baf5637ee4957045881c3bf3cf
+  metadata.gz: ef3ebbd0e2d2b2310a04a204fa9d180b256bc2a6
+  data.tar.gz: 83ca908557fa7b2444abd666d86f64fa674ab0af
 SHA512:
-  metadata.gz: e638920d89ab90ffcea767da5676b43c77954a93ee68bd42ad3ff86ff501319a91b60ca693e37e7b3ae9cac918d9f40d7b4e02e01c532eb0527a92bc1a921a2f
-  data.tar.gz: 4ba1e2768b60d18b3a54ad24cc8ab858ba4db57d210a61f039c78a46de6d2c527d94e90403a7e27a16a41c466952a12e684ffe657a92488a16d0ae3679f6f5ac
+  metadata.gz: 9f8f146b2ae5377270f5a5a3bdafb798e99860d92f90b18eb466a98bbaa6070e38b91527c4eb3a56019277077be64455fc961c6d73c8b441935e4abaa8dd6a01
+  data.tar.gz: 65e1377de6d882644bf01d8b6708a585cec9970bb0a8f520cb34e1f8d716235943091a15cb352d8a2c5cfe63d27288afa9212f552092e4e08769e0ce9f206d32

data/README.md

@@ -39,10 +39,16 @@ Feel free to replace [vim](http://vim.org/) with the editor of your choice.
 
 ### Viewing the presentation
 
-    $ rackup
+    $ magic-reveal start
 
 Then open your browser to [`http://localhost:9292`](http://localhost:9292).
 
+### Write a static index.html
+
+    $ magic-reveal static
+
+This generates a static `index.html` suitable for committing to git.
+
 ### The format of slides.md
 
 Magic Reveal uses [github-flavored

data/lib/magic_reveal/app.rb

@@ -19,17 +19,11 @@ module MagicReveal
       end
     end
 
-    set :public_folder, File.expand_path('reveal.js', Dir.getwd)
+    set :public_folder, Dir.getwd
 
     helpers do
       def markdown
-        @markdown ||= Redcarpet::Markdown.new(
-          MagicReveal::SlideRenderer.new,
-          :space_after_headers => true,
-          :filter_html => true,
-          :fenced_code_blocks => true,
-          :no_intra_emphasis => true,
-        )
+        @markdown ||=  SlideRenderer.markdown_renderer
       end
 
       def index_html_path

data/lib/magic_reveal/cli.rb

@@ -2,6 +2,8 @@ require 'forwardable'
 
 require 'magic_reveal/cli/options'
 require 'magic_reveal/creator'
+require 'magic_reveal/slide_renderer'
+require 'magic_reveal/index_libber'
 
 module MagicReveal
   class Cli
@@ -19,10 +21,53 @@ module MagicReveal
     end
 
     # Action Classes
+    def show_help
+      puts "Usage: #{program_name} <command>"
+      puts
+      puts "  new <name>"
+      puts "    Creates new presentation in directory <name>"
+      puts
+      puts "  start [options]"
+      puts "    Starts serving the presentation in the current directory"
+      puts
+      puts "  static"
+      puts "    Creates a static index.html file from your slides"
+      puts
+      exit
+    end
+
     def creator
       @creator ||= Creator.new(Dir.getwd)
     end
 
+    def start_server
+      require 'rack'
+      ARGV.shift
+      Rack::Server.start
+      exit
+    end
+
+    def create_static
+      slides = Pathname.pwd + 'slides.md'
+      reveal_js_html = Pathname.pwd + 'reveal.js' + 'index.html'
+      index_html = Pathname.pwd + 'index.html'
+
+      markdown =  SlideRenderer.markdown_renderer
+      slides = markdown.render slides.read
+      libber = IndexLibber.new reveal_js_html.read
+      libber.update_author       Identifier.name
+      libber.update_description  "A Magical Presentiation"
+      libber.update_slides       slides
+
+      index_html.open('w') { |f| f.print libber.to_s }
+    end
+
+    def avenge_programmer
+      puts "The programmer messed up."
+      puts "Please file a bug at https://github.com/docwhat/magic_reveal"
+      exit 13
+    end
+
     def options
       @options ||= Options.new
     end
@@ -33,10 +78,14 @@ module MagicReveal
       case command
       when :new
         creator.create_project(project)
+      when :start
+        start_server
+      when :static
+        create_static
+      when :help
+        show_help
       else
-        puts "Usage: #{program_name}"
-        puts
-        puts "This isn't written yet."
+        avenge_programmer
       end
     end
   end

data/lib/magic_reveal/cli/options.rb

@@ -19,9 +19,11 @@ module MagicReveal
             @command = :new
             @project = args[1]
           end
-        when 'help'
-          @command = :help
-        else
+        when 'start'
+          @command = :start
+        when 'static'
+          @command = :static
+        else # including help
           @command = :help
         end
       end

data/lib/magic_reveal/creator.rb

@@ -33,6 +33,7 @@ module MagicReveal
       top_dir.mkdir
 
       reveal_js_fetcher.save_to(reveal_dir)
+
       FileUtils.copy_file template_slides.to_s, (top_dir + 'slides.md').to_s
       FileUtils.copy_file template_config_ru.to_s, (top_dir + 'config.ru').to_s
       gemfile.open('w') do |f|
@@ -41,6 +42,11 @@ module MagicReveal
         f.puts "gem 'magic_reveal', '~> #{VERSION}'"
       end
 
+      reveal_dir.children.each do |subdir|
+        next unless subdir.directory?
+        (top_dir + subdir.basename).make_symlink(subdir.relative_path_from(top_dir))
+      end
+
       Dir.chdir(top_dir.to_s) do
         system 'bundle install'
       end

data/lib/magic_reveal/index_libber.rb

@@ -28,6 +28,8 @@ module MagicReveal
       if container = html.at_css('div.reveal div.slides')
         container.children = slides
       end
+      headers = slides.css('h1', 'h2', 'h3', 'h4', 'h5', 'h6')
+      html.title = headers.first.text unless headers.nil? || headers.empty?
     end
 
     def to_s

data/lib/magic_reveal/slide_renderer.rb

@@ -12,6 +12,16 @@ module MagicReveal
       super(no_styles: true)
     end
 
+    def self.markdown_renderer
+      Redcarpet::Markdown.new(
+        self.new,
+        :space_after_headers => true,
+        :filter_html => true,
+        :fenced_code_blocks => true,
+        :no_intra_emphasis => true,
+      )
+    end
+
     def doc_header
       @has_shown_slides = false
       "<!-- generated by magic_reveal v#{VERSION} on #{Time.now} -->"

data/lib/magic_reveal/version.rb

@@ -1,4 +1,4 @@
 module MagicReveal
   REVEAL_JS_VERSION = "2.4.0"
-  VERSION = "#{REVEAL_JS_VERSION}.1"
+  VERSION = "#{REVEAL_JS_VERSION}.2"
 end

data/spec/magic_reveal/cli/options_spec.rb

@@ -19,6 +19,18 @@ describe MagicReveal::Cli::Options do
       its(:project) { should be_nil }
     end
 
+    context "given 'start'" do
+      let(:args) { %w[start] }
+
+      its(:command) { should be(:start) }
+    end
+
+    context "given 'static'" do
+      let(:args) { %w[static] }
+
+      its(:command) { should be(:static) }
+    end
+
     context "given 'help'" do
       let(:args) { %w{help} }
 

data/spec/magic_reveal/cli_spec.rb

@@ -7,7 +7,11 @@ describe MagicReveal::Cli do
     context "with a null options" do
       let(:options) { double(MagicReveal::Cli::Options).as_null_object }
       let(:args) { double("ARGV") }
-      before { subject.stub(:options).and_return(options) }
+      before do
+        subject.stub(:show_help)
+        subject.stub(:avenge_programmer)
+        subject.stub(:options).and_return(options)
+      end
 
       context "command=nil" do
         before { subject.run args }
@@ -19,6 +23,10 @@ describe MagicReveal::Cli do
         it "fetches the command" do
           expect(options).to have_received(:command)
         end
+
+        it "avenges the programmer" do
+          expect(subject).to have_received(:avenge_programmer)
+        end
       end
 
       context "command=new" do
@@ -39,11 +47,38 @@ describe MagicReveal::Cli do
             with(options.project)
         end
       end
+
+      context "command=help" do
+        it "shows help" do
+          subject.stub(:show_help)
+          subject.should_receive(:show_help).and_return(nil)
+          options.stub(:command).and_return(:help)
+          subject.run args
+        end
+      end
+
+      context "command=start" do
+        it "starts the server" do
+          subject.stub(:start_server)
+          subject.should_receive(:start_server).and_return(nil)
+          options.stub(:command).and_return(:start)
+          subject.run args
+        end
+      end
+
+      context "command=static" do
+        it "creates a static file" do
+          subject.stub(:create_static)
+          subject.should_receive(:create_static).and_return(nil)
+          options.stub(:command).and_return(:static)
+          subject.run args
+        end
+      end
     end
   end
 
   describe ".creator" do
-    it "narf" do
+    it "sends new to creator" do
       MagicReveal::Creator.should_receive(:new).with(Dir.getwd)
       subject.creator
     end

data/spec/magic_reveal/creator_spec.rb

@@ -3,8 +3,11 @@ require 'magic_reveal/creator'
 require 'pathname'
 
 describe MagicReveal::Creator do
-  before { subject.reveal_js_fetcher = fetcher }
   let(:fetcher) { double(MagicReveal::RevealJsFetcher).as_null_object }
+  before do
+    subject.stub(:system) # This is an integration test thingy.
+    subject.reveal_js_fetcher = fetcher
+  end
 
   context "with a temporary directory" do
     subject { described_class.new @tmpdir }
@@ -14,7 +17,10 @@ describe MagicReveal::Creator do
 
     describe "create_project" do
       let(:project) { "project#{rand 99}" }
-      before { FileUtils.stub(:copy_file)  }
+      before do
+        FileUtils.stub(:copy_file)
+        Pathname.any_instance.stub(:children).and_return([])
+      end
 
       it "makes the project directory" do
         subject.create_project(project)

data/spec/magic_reveal/index_libber_spec.rb

@@ -26,11 +26,16 @@ describe MagicReveal::IndexLibber do
 
   describe ".update_slides" do
     let(:slides) { '<section><h2>life with Joe</h2><p>&hellip;is good</section>' * 2 }
-    let(:html_text) { '<!DOCTYPE html><div class="reveal"><div class="slides"><section>text</section></div></div>' }
+    let(:html_text) { '<!DOCTYPE html><title>bogus</title><div class="reveal"><div class="slides"><section>text</section></div></div>' }
 
-    it "does stuff" do
+    it "inserts the slides" do
       subject.update_slides slides
-      puts subject
+      expect(subject.to_s).to include('life with Joe')
+    end
+
+    it "sets the title from the first Hx item" do
+      subject.update_slides slides
+      expect(subject.html.at_css('title').text).to eq('life with Joe')
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: magic_reveal
 version: !ruby/object:Gem::Version
-  version: 2.4.0.1
+  version: 2.4.0.2
 platform: ruby
 authors:
 - Christian Höltje
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra