reveal-ck 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df93270d9e2bdca17cee3ef0509379fe78153fcb
-  data.tar.gz: c624080d7150241aabf1b8361e8fc54ed7eab878
+  metadata.gz: d01a6401df8df2a518c8f1a4fd0de6602350466c
+  data.tar.gz: 6275bbbeea33d8433334bf70b98cc7c8923f9329
 SHA512:
-  metadata.gz: c8940445840714a2086d192b98d69f237ec6ac98abbf6f4ad0b00b39c5e332b0f8d032cffbf1124266409381cccf78758790ad82e3f9766cd397583f64f24caf
-  data.tar.gz: b44c7be1a5174701e08f793aea6a0710196910642097a17a1499186c8d0590a7d3aa23ed4e441fc130e7da8803b789f827dcc1eed5ffd246e00a3d5ebf59e410
+  metadata.gz: 0f973d4e4588fa716b013d124bb36386e45a6e374f008973378b3f16fabebe8180fd07286ebe2da04e08d4ebd4d89667bcff36c02cd59cd1eb94285a6900ceb8
+  data.tar.gz: 134953045dd3c84b5c2fce0eace04b98e45debc451274a32e3e65d0f22305764a49acd90f931a3095824bd28c79ababe6af06fc6dc7262fd18e7647a5e16f380

data/bin/reveal-ck

@@ -4,6 +4,7 @@ require 'reveal-ck'
 
 class RevealCKExecutable
   extend GLI::App
+  extend RevealCK::Misc::RemoveExtension
 
   program_desc 'A reveal.js construction kit'
 
@@ -11,14 +12,12 @@ class RevealCKExecutable
 
   desc 'Generate reveal.js slides'
   command :generate do |c|
-    slide_files = FileList['slides.*']
-    default_file = slide_files.empty? ? nil : slide_files.first
-
+    default_file = FileList['slides.*'].first
     c.desc 'The file containing your slide content'
     c.flag [:f, :file], default_value: default_file
 
-    c.desc 'The directory to place your generated slides in'
-    c.flag [:d, :dir], default_value: 'slides'
+    c.desc 'The directory for generated slides. Default based on slide file.'
+    c.flag [:d, :dir]
 
     c.action do |_, options, _|
       slides_file = options[:file]
@@ -36,11 +35,13 @@ class RevealCKExecutable
         msg = 'Create a file matching slides.* to proceed, such as slides.md.'
         exit_now!(msg)
       end
+      slides_dir = options[:dir] || remove_extension(options[:file])
+
       generate_args = {
         user_dir: Dir.pwd,
         gem_dir: RevealCK.path,
-        output_dir: options[:dir],
-        slides_file: options[:file]
+        output_dir: slides_dir,
+        slides_file: slides_file
       }
       RevealCK::Commands::Generate.new(generate_args).run
     end
@@ -48,14 +49,12 @@ class RevealCKExecutable
 
   desc 'Start webserver so slides are available via http'
   command :serve, :server do |c|
-    slide_files = FileList['slides.*']
-    default_file = slide_files.empty? ? nil : slide_files.first
-
+    default_file = FileList['slides.*'].first
     c.desc 'The file containing your slide content'
     c.flag [:f, :file], default_value: default_file
 
-    c.desc 'The directory to serve up'
-    c.flag [:d, :dir], default_value: 'slides'
+    c.desc 'The directory to serve up. Default is based on slide file.'
+    c.flag [:d, :dir]
 
     c.desc 'The port to serve on'
     c.flag [:p, :port], default_value: 10_000
@@ -64,10 +63,11 @@ class RevealCKExecutable
     c.flag ['test-quit-after-starting'], type: Integer
 
     c.action do |_, options, _|
+      slides_dir = options[:dir] || remove_extension(options[:file])
       serve_args = {
-        doc_root: options[:dir],
+        doc_root: slides_dir,
         gem_dir: RevealCK.path,
-        output_dir: options[:dir],
+        output_dir: slides_dir,
         port: options[:port],
         slides_file: options[:file],
         user_dir: Dir.pwd

data/features/step_definitions/html_match_steps.rb

@@ -1,12 +1,10 @@
 require 'nokogiri'
 
 def check_html_matches(file, selector_list, selector_type)
-  prep_for_fs_check do
-    content = IO.read(file)
-    doc = Nokogiri::HTML(content)
-    selector_list.each do |selector, description|
-      check_doc_matches(doc, selector, description, selector_type)
-    end
+  content = IO.read(expand_path(file))
+  doc = Nokogiri::HTML(content)
+  selector_list.each do |selector, description|
+    check_doc_matches(doc, selector, description, selector_type)
   end
 end
 

data/features/support/env.rb

@@ -1,6 +1,9 @@
 require 'aruba/cucumber'
 
+Aruba.configure do |config|
+  config.exit_timeout = 10
+end
+
 Before do
-  @aruba_io_wait_seconds = 10
-  @aruba_timeout_seconds = 10
+  aruba.config.io_wait_timeout = 10
 end

data/features/support/file_management.rb

@@ -8,7 +8,7 @@ end
 # at reveal-ck/features/data.
 def copy_file_under_features(rel_features_file, dest_file)
   abs_features_file = File.join features_dir, rel_features_file
-  in_current_dir do
+  cd '.' do
     dest_dir = File.dirname dest_file
     FileUtils.mkdir_p(dest_dir) unless File.directory?(dest_dir)
     FileUtils.cp abs_features_file, dest_dir

data/files/reveal-ck/css/reveal-ck.css

@@ -1,6 +1,10 @@
 .reveal section img.emoji {
+    position: relative;
     background: none;
     border: 0;
     box-shadow: none;
+    vertical-align:middle;
     margin: 0;
+    margin-bottom:.25em;
+    display:inline-block;
 }

data/lib/html/pipeline/reveal_ck_emoji_filter.rb

@@ -1,15 +1,15 @@
 module HTML
   class Pipeline
-    # This class is very similar EmojiFilter. It removes the inline
-    # width/height attributes so that reveal-ck supplied CSS takes effect.
+    # Very similar to EmojiFilter, but it removes the inline
+    # width/height/align attributes so that reveal-ck supplied CSS
+    # takes effect.
     class RevealCKEmojiFilter < EmojiFilter
       def emoji_image_filter(text)
         return text unless text.include?(':')
 
         text.gsub(emoji_pattern) do
           name = Regexp.last_match[1]
-          result = "<img class='emoji' title=':#{name}:' alt=':#{name}:' "
-          result + "src='#{emoji_url(name)}' align='absmiddle' />"
+          "<img class='emoji' alt=':#{name}:' src='#{emoji_url(name)}' />"
         end
       end
     end

data/lib/reveal-ck.rb

@@ -16,6 +16,7 @@ require_relative 'reveal-ck/builders'
 require_relative 'reveal-ck/markdown'
 require_relative 'reveal-ck/tilt/config'
 require_relative 'reveal-ck/commands'
+require_relative 'reveal-ck/misc'
 
 # RevealCK::path provides the path where files within the reveal-ck
 # gem are located on your system.

data/lib/reveal-ck/builders/slides_builder.rb

@@ -17,7 +17,7 @@ module RevealCK
         @output_dir = retrieve(:output_dir, args)
         @slides_file = retrieve(:slides_file, args)
         @application = Rake::Application.new
-        @config = Config.new
+        @config = args[:config] || Config.new
         @things_to_create = Set.new
       end
 

data/lib/reveal-ck/misc.rb

@@ -0,0 +1 @@
+require_relative 'misc/remove_extension'

data/lib/reveal-ck/misc/remove_extension.rb

@@ -0,0 +1,10 @@
+module RevealCK
+  module Misc
+    # Knows how to remove an extension from a filename
+    module RemoveExtension
+      def remove_extension(file_name)
+        file_name.sub(%r{\.[^/]*\z}, '')
+      end
+    end
+  end
+end

data/lib/reveal-ck/presentation_dsl.rb

@@ -14,9 +14,6 @@ module RevealCK
       @config = retrieve(:config, args)
     end
 
-    # Rubocop doesn't like trivial accessors, but docile breaks if
-    # trivial accessors are used.
-    # rubocop:disable TrivialAccessors
     def theme(theme)
       config.theme = theme
     end
@@ -32,7 +29,6 @@ module RevealCK
     def author(author)
       config.author = author
     end
-    # rubocop:enable TrivialAccessors
 
     def revealjs_config(key, value)
       config.revealjs_config[key] = value

data/lib/reveal-ck/rake_task.rb

@@ -0,0 +1,71 @@
+require 'rake'
+require 'rake/tasklib'
+require 'reveal-ck'
+
+module RevealCK
+  # Generate a reveal.js presentation
+  class RakeTask < Rake::TaskLib
+    include ::Rake::DSL if defined?(::Rake::DSL)
+
+    # Name of task.
+    #
+    # default:
+    #   :reveal
+    attr_accessor :name
+
+    # File containing slide content.
+    #
+    # default:
+    #   'slides.*'
+    attr_accessor :file
+
+    # Directory where slides are placed.
+    #
+    # default:
+    #   'slides'
+    attr_accessor :dir
+
+    attr_accessor :user_dir
+    attr_accessor :gem_dir
+    attr_accessor :config
+
+    def initialize(*args, &task_block)
+      @name     = args.shift || :reveal
+      @file     = FileList['slides.*'].first
+      @dir      = 'slides'
+      @user_dir = Dir.pwd
+      @gem_dir  = RevealCK.path
+      @config   = Config.new
+      yield self if block_given?
+      define(args, &task_block)
+    end
+
+    # @private
+    def run_task(verbose)
+      puts "Generating slides for '#{file}'.." if verbose
+
+      slides_builder = RevealCK::Builders::SlidesBuilder.new(
+        user_dir:      user_dir,
+        gem_dir:       gem_dir,
+        output_dir:    dir,
+        slides_file:   file,
+        config:        config
+      )
+      slides_builder.prepare
+      slides_builder.build
+    end
+
+    def define(args, &task_block)
+      last_comment = ::Rake.application.last_comment
+      desc 'Generate a reveal.js presentation' unless last_comment
+      task name, *args do |_, task_args|
+        RakeFileUtils.__send__(:verbose, verbose) do
+          if task_block
+            task_block.call(*[self, task_args].slice(0, task_block.arity))
+          end
+          run_task verbose
+        end
+      end
+    end
+  end
+end

data/lib/reveal-ck/version.rb

@@ -1,4 +1,4 @@
 # RevealCK::VERSION is the current version of reveal-ck
 module RevealCK
-  VERSION = '3.2.0'
+  VERSION = '3.3.0'
 end

data/rakelib/cucumber.rake

@@ -10,6 +10,6 @@ desc 'Run Cucumber'
 Cucumber::Rake::Task.new(:cucumber) do |t|
   opts = "features --format html -o #{CUKE_RESULTS} --format progress -x"
   opts += " --tags #{ENV['TAGS']}" if ENV['TAGS']
-  t.cucumber_opts =  opts
+  t.cucumber_opts = opts
   t.fork = false
 end

data/spec/lib/html/pipeline/reveal_ck_emoji_filter_spec.rb

@@ -12,9 +12,9 @@ module HTML
       end
 
       it 'works with defined emoji' do
-        expected = "I <img class='emoji' title=':heart:' "
+        expected = "I <img class='emoji' "
         expected += "alt=':heart:' src='asset_root/emoji/unicode/2764.png' "
-        expected += "align='absmiddle' /> emoji"
+        expected += '/> emoji'
         result = emoji_filter.emoji_image_filter('I :heart: emoji')
         expect(result).to eq(expected)
       end

data/spec/lib/reveal-ck/misc/remove_extension_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+module RevealCK
+  module Misc
+    describe RemoveExtension do
+      describe 'remove_extension' do
+        class Sample
+          include RemoveExtension
+        end
+
+        let :sample do
+          Sample.new
+        end
+
+        it 'removes a file extension' do
+          result = sample.remove_extension('slides.md')
+          expect(result).to eq 'slides'
+
+          result = sample.remove_extension('google_talk.haml')
+          expect(result).to eq 'google_talk'
+        end
+      end
+    end
+  end
+end

data/spec/lib/reveal-ck/templates/finder_spec.rb

@@ -76,7 +76,9 @@ module RevealCK
         end
 
         it 'raises if it cannot find what you asked for' do
-          expect { finder.find 'unknown' }.to raise_error
+          expect { finder.find 'unknown' }.to(
+            raise_error(RuntimeError, /Unable to find unknown/)
+          )
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reveal-ck
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Jed Northridge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docile
@@ -44,28 +44,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.12.3
+        version: 2.13.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.12.3
+        version: 2.13.2
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.12.4
+        version: 2.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.12.4
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: guard-livereload
   requirement: !ruby/object:Gem::Requirement
@@ -86,70 +86,70 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.6
+        version: 4.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.6
+        version: 4.0.7
 - !ruby/object:Gem::Dependency
   name: html-pipeline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.5
+        version: 3.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.8.5
+        version: 3.0.3
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: rack-livereload
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.15
+        version: 0.3.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.15
+        version: 0.3.16
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.2
+        version: 3.3.2
 - !ruby/object:Gem::Dependency
   name: rinku
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +198,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.0.6
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -224,16 +224,16 @@ dependencies:
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -252,16 +252,16 @@ dependencies:
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -294,30 +294,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.34'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.34'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -332,18 +332,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |-
-  A command line interface for generating reveal.js presentations.
-
-  You have something important to say, and you are a busy person. Why not write your next presentation in (github flavored) markdown?
-
-  reveal-ck has been used by students, teachers, trainers, and conference presenters. It just "works." It lets you stay focused on your content-- not the tools that you are using to make your content.
-
-  It produces reveal.js presentations, which are beautiful and world-class. If you are already familiar with reveal.js, great! You will now be able to use html, html+erb, haml, or slim to most efficiently write out your presentation markup. You can provide your own CSS tweaks without intermingling "your" presentation code with reveal.js's base CSS.
-
-  You can write slides with a Ruby DSL! You can generate slide content with database and network calls.. but that's another story.
-
-  Finally-- livereload is built in-- so it supports a nice flow where you keep a browser open on your slides, and save with your editor, the browser updates with your latest work.
+description: A command line interface for generating reveal.js presentations from
+  markdown.
 email:
 - reveal-ck@jedcn.com
 executables:
@@ -501,8 +491,11 @@ files:
 - lib/reveal-ck/markdown/pre_processor.rb
 - lib/reveal-ck/markdown/slide_markdown.rb
 - lib/reveal-ck/markdown/slide_markdown_template.rb
+- lib/reveal-ck/misc.rb
+- lib/reveal-ck/misc/remove_extension.rb
 - lib/reveal-ck/presentation.rb
 - lib/reveal-ck/presentation_dsl.rb
+- lib/reveal-ck/rake_task.rb
 - lib/reveal-ck/render.rb
 - lib/reveal-ck/render/contents_of.rb
 - lib/reveal-ck/render/css_files.rb
@@ -563,6 +556,7 @@ files:
 - spec/lib/reveal-ck/markdown/pre_processor_spec.rb
 - spec/lib/reveal-ck/markdown/slide_markdown_spec.rb
 - spec/lib/reveal-ck/markdown/slide_markdown_template_spec.rb
+- spec/lib/reveal-ck/misc/remove_extension_spec.rb
 - spec/lib/reveal-ck/presentation_dsl_spec.rb
 - spec/lib/reveal-ck/presentation_spec.rb
 - spec/lib/reveal-ck/render/scope_spec.rb
@@ -643,6 +637,7 @@ test_files:
 - spec/lib/reveal-ck/markdown/pre_processor_spec.rb
 - spec/lib/reveal-ck/markdown/slide_markdown_spec.rb
 - spec/lib/reveal-ck/markdown/slide_markdown_template_spec.rb
+- spec/lib/reveal-ck/misc/remove_extension_spec.rb
 - spec/lib/reveal-ck/presentation_dsl_spec.rb
 - spec/lib/reveal-ck/presentation_spec.rb
 - spec/lib/reveal-ck/render/scope_spec.rb