slippery 0.1.0 → 0.2.0

data/lib/slippery/converter.rb

@@ -6,125 +6,127 @@
 # See https://github.com/3/blob/master/lib/kramdown/element.rb for a list of
 # types
 #
-class Slippery::Converter
-  private_attr_accessor :type, :value, :attr, :children, :options
-  undef_method :p
+module Slippery
+  class Converter
+    attr_accessor :type, :value, :attr, :children, :options
+    undef_method :p
 
-  # Convert a Kramdown syntax tree into Hexp.
-  #
-  # @example
-  #   markdown = "# Hello!\n\nChunky *bacon*!\n"
-  #   document = Kramdown::Document.new(markdown)
-  #   hexp = converter.convert(document.root)
-  #
-  # @param el [Kramdown::Element] The root element to convert
-  # @return [Hexp::Node]
-  # @api public
-  #
-  def convert(el)
-    #Kernel.p el ; exit
-    @type, @value, @attr, @children, @options =
-      el.type, el.value, el.attr, el.children, el.options
-    send(type)
-  end
+    # Convert a Kramdown syntax tree into Hexp.
+    #
+    # @example
+    #   markdown = "# Hello!\n\nChunky *bacon*!\n"
+    #   document = Kramdown::Document.new(markdown)
+    #   hexp = converter.convert(document.root)
+    #
+    # @param el [Kramdown::Element] The root element to convert
+    # @return [Hexp::Node]
+    # @api public
+    #
+    def convert(el)
+      #Kernel.p el ; exit
+      @type, @value, @attr, @children, @options =
+        el.type, el.value, el.attr, el.children, el.options
+      send(type)
+    end
 
-  # Process a Kramdown :root type element
-  #
-  # @return [Hexp::Node]
-  # @api semipublic
-  #
-  def root
-    H[:html, [H[:head], tag!(:body)]]
-  end
+    # Process a Kramdown :root type element
+    #
+    # @return [Hexp::Node]
+    # @api semipublic
+    #
+    def root
+      H[:html, [H[:head], tag!(:body)]]
+    end
 
-  # Process a Kramdown :header type element
-  #
-  # @return [Hexp::Node]
-  # @api semipublic
-  #
-  def header
-    tag! "h#{options[:level]}".intern
-  end
+    # Process a Kramdown :header type element
+    #
+    # @return [Hexp::Node]
+    # @api semipublic
+    #
+    def header
+      tag! "h#{options[:level]}".intern
+    end
 
-  # Process a Kramdown :codeblock type element
-  #
-  # @return [Hexp::Node]
-  # @api semipublic
-  #
-  def codeblock
-    H[:pre, attr, H[:code, value]]
-  end
+    # Process a Kramdown :codeblock type element
+    #
+    # @return [Hexp::Node]
+    # @api semipublic
+    #
+    def codeblock
+      H[:pre, attr, H[:code, value]]
+    end
 
-  def smart_quote
-    {
-      :lsquo => '‘',
-      :rsquo => '’',
-      :ldquo => '“',
-      :rdquo => '”',
-    }[value]
-  end
+    def smart_quote
+      {
+        :lsquo => '‘',
+        :rsquo => '’',
+        :ldquo => '“',
+        :rdquo => '”',
+      }[value]
+    end
 
-  def typographic_sym
-    {
-      :hellip => '…',
-      :mdash  => '—',
-      :ndash  => '–',
-      :laquo  => '«',
-      :raquo  => '»',
-      :laquo_space => '« ',
-      :raquo_space => ' »',
-    }[value]
-  end
+    def typographic_sym
+      {
+        :hellip => '…',
+        :mdash  => '—',
+        :ndash  => '–',
+        :laquo  => '«',
+        :raquo  => '»',
+        :laquo_space => '« ',
+        :raquo_space => ' »',
+      }[value]
+    end
 
-  def html_element
-    H[value.to_sym, attr, convert_children]
-  end
+    def html_element
+      H[value.to_sym, attr, convert_children]
+    end
 
-  def entity
-    value.char
-  end
+    def entity
+      value.char
+    end
 
-  def codespan
-    H[:code, value]
-  end
+    def codespan
+      H[:code, value]
+    end
 
-  def xml_comment; end
+    def xml_comment; end
 
-  # Create a Hexp::Node from the current element
-  #
-  # Helper for when you want to turn the Kramdown element straight into a
-  # Hexp::Node with the same attributes, and a one-to-one mapping of the child
-  # elements.
-  #
-  # @param tag [Symbol] The HTML tag to generate
-  # @return [Hexp::Node]
-  # @api semipublic
-  #
-  def tag!(tag)
-    H[tag, attr, convert_children]
-  end
+    # Create a Hexp::Node from the current element
+    #
+    # Helper for when you want to turn the Kramdown element straight into a
+    # Hexp::Node with the same attributes, and a one-to-one mapping of the child
+    # elements.
+    #
+    # @param tag [Symbol] The HTML tag to generate
+    # @return [Hexp::Node]
+    # @api semipublic
+    #
+    def tag!(tag)
+      H[tag, attr, convert_children]
+    end
 
-  [:text, :blank, :raw].each do |sym|
-    define_method sym do
-      Hexp::TextNode.new(value)
+    [:text, :blank, :raw].each do |sym|
+      define_method sym do
+        Hexp::TextNode.new(value)
+      end
     end
-  end
 
-  [:p, :blockquote, :ul, :li, :ol, :dl, :dt, :dd, :em, :strong, :img, :a, :hr, :br].each do |sym|
-    define_method sym do
-      tag! type
+    [:p, :blockquote, :ul, :li, :ol, :dl, :dt, :dd, :em, :strong, :img, :a, :hr, :br].each do |sym|
+      define_method sym do
+        tag! type
+      end
     end
-  end
 
-  # Convert the children of the Kramdown element to Hexps
-  #
-  # In other words, recurse down the tree. This will pass each
-  # child element into the converter.
-  #
-  # @return [Array<Hexp::Node>]
-  # @api private
-  #
-  def convert_children
-    children.map {|ch| convert ch }.compact
+    # Convert the children of the Kramdown element to Hexps
+    #
+    # In other words, recurse down the tree. This will pass each
+    # child element into the converter.
+    #
+    # @return [Array<Hexp::Node>]
+    # @api private
+    #
+    def convert_children
+      children.map {|ch| convert ch }.compact
+    end
   end
 end

data/lib/slippery/document.rb

@@ -2,8 +2,6 @@ module Slippery
   class Document
     include Hexp
 
-    private_attr_accessor :processors
-
     def initialize(markdown)
       @markdown = markdown
     end

data/lib/slippery/presentation.rb

@@ -11,20 +11,18 @@ module Slippery
     def initialize(document, options = {})
       @document = document
       @options = DEFAULT_OPTIONS.merge(options).freeze
-
-      Assets::embed_locally if @options[:local]
     end
 
     def processors
       {
         impress_js: [
           Processors::HrToSections.new(H[:div, class: 'step']),
-          Processors::ImpressJs::AddImpressJs.new(Assets::path_composer(@options[:local]), js_options),
+          Processors::ImpressJs::AddImpressJs.new(js_options),
           (Processors::ImpressJs::AutoOffsets.new unless @options.fetch(:manual_offsets, false)),
         ].compact,
         reveal_js: [
           Processors::HrToSections.new(H[:section]),
-          Processors::RevealJs::AddRevealJs.new(Assets::path_composer(@options[:local]), js_options),
+          Processors::RevealJs::AddRevealJs.new(js_options),
         ]
       }[@options[:type]]
     end

data/lib/slippery/processor_helpers.rb

@@ -4,6 +4,10 @@ module Slippery
       klz.extend ClassMethods
     end
 
+    def asset_uri(path)
+      "file://" + Slippery::ROOT.join('assets', path).to_s
+    end
+
     def include_local_javascript(element, path)
       element.add javascript_include_tag(path)
     end

data/lib/slippery/processors/graphviz_dot.rb

@@ -14,8 +14,8 @@ module Slippery
 
       def call(doc)
         doc
-          .rewrite(@selector, &create_svg_from_dot)
-          .rewrite('polygon[fill=white][stroke=white]') { [] }
+          .replace(@selector, &create_svg_from_dot)
+          .replace('polygon[fill=white][stroke=white]') { [] }
       end
 
       def create_svg_from_dot

data/lib/slippery/processors/impress_js/add_impress_js.rb

@@ -14,14 +14,13 @@ module Slippery
         'transition-duration' => 1000
       }.freeze
 
-       def initialize(path_composer, attributes = {})
-         @path_composer = path_composer
-         @attributes = DEFAULT_ATTRS.merge(attributes).freeze
+       def initialize(attributes = {})
+         @attributes    = DEFAULT_ATTRS.merge(attributes).freeze
        end
 
        def call(doc)
          doc.replace('body') do |body|
-           include_local_javascript(body, @path_composer.call('impress.js/js/impress.js'))
+           include_local_javascript(body, asset_uri('impress.js/js/impress.js'))
              .set_attrs({id: 'impress'}.merge(data_attributes(attributes)))
              .add H[:script, 'impress().init();']
          end

data/lib/slippery/processors/reveal_js/add_reveal_js.rb

@@ -12,8 +12,7 @@ module Slippery
 
         DEFAULT_OPTIONS = {theme: 'default'}.freeze
 
-        def initialize(path_composer, options = {})
-          @path_composer = path_composer
+        def initialize(options = {})
           @options = DEFAULT_OPTIONS.merge(options).freeze
         end
 
@@ -28,16 +27,16 @@ module Slippery
         end
 
         processor :add_reveal_js, 'body' do |body|
-          body = include_local_javascript(body, @path_composer.call('reveal.js/lib/js/head.min.js'))
-          include_local_javascript(body, @path_composer.call('reveal.js/js/reveal.js'))
+          body = include_local_javascript(body, asset_uri('reveal.js/lib/js/head.min.js'))
+          include_local_javascript(body, asset_uri('reveal.js/js/reveal.js'))
         end
 
         processor :add_reveal_css, 'head' do |head|
-          include_local_css(head, @path_composer.call('reveal.js/css/reveal.min.css'))
+          include_local_css(head, asset_uri('reveal.js/css/reveal.min.css'))
         end
 
         processor :add_theme, 'head' do |head|
-          include_local_css(head, @path_composer.call("reveal.js/css/theme/#{@options[:theme]}.css"))
+          include_local_css(head, asset_uri("reveal.js/css/theme/#{@options[:theme]}.css"))
         end
 
         processor :add_settings, 'body' do |body|

data/lib/slippery/rake_tasks.rb

@@ -27,10 +27,11 @@ module Slippery
     end
 
     def markdown_to_hexp(infile, options = {})
+      @infile = infile
       doc = Slippery::Document.new(infile.read)
       doc = Slippery::Presentation.new(doc, @options.merge(options))
 
-      doc.process(*processors.reject {|pr| options[:skip_self_contained] && pr == Slippery::Processors::SelfContained})
+      doc.process(*processors)
     end
 
     def processor(selector, &blk)
@@ -41,9 +42,19 @@ module Slippery
       end
     end
 
-    def self_contained
-      processors << Slippery::Processors::SelfContained
+    def include_assets
+      processors << method(:call_asset_packer)
     end
+    alias self_contained include_assets
+
+    def call_asset_packer(doc)
+      AssetPacker::Processor::Local.new(
+        @infile.to_s,
+        @infile.dirname.join('assets'),
+        @infile
+      ).(doc)
+    end
+
 
     def title(title)
       processor 'head' do |head|

data/lib/slippery/version.rb

@@ -1,3 +1,3 @@
 module Slippery
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/slippery.gemspec

@@ -17,11 +17,13 @@ Gem::Specification.new do |gem|
   gem.test_files       = `git ls-files -- spec`.split($/)
   gem.extra_rdoc_files = %w[README.md LICENSE]
 
-  gem.add_runtime_dependency 'hexp'       , '~> 0.0'
-  gem.add_runtime_dependency 'kramdown'   , '~> 1.1'
-  gem.add_runtime_dependency 'rb-inotify'
-  gem.add_runtime_dependency 'rake'       ,  '~> 10.1'
+  gem.add_runtime_dependency 'hexp'         , '~> 0.3.3'
+  gem.add_runtime_dependency 'kramdown'     , '~> 1.1'
+  gem.add_runtime_dependency 'rake'         , '~> 10.1'
+  gem.add_runtime_dependency 'rb-inotify'   , '~> 0.9.3'
+  gem.add_runtime_dependency 'concord'      , '~> 0.1.4'
+  gem.add_runtime_dependency 'asset_packer' , '~> 0.1.0'
 
-  gem.add_development_dependency 'rspec', '~> 2.14'
-  gem.add_development_dependency 'rubygems-tasks'
+  gem.add_development_dependency 'rspec'        , '~> 2.14'
+  gem.add_development_dependency 'mutant-rspec' , '~> 0.5.3'
 end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 require 'slippery'
-require 'devtools/spec_helper'
+#require 'devtools/spec_helper'
 
 # Helper to load markdown files under spec/fixtures
 #

metadata

@@ -1,31 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: slippery
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Arne Brasseur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-06 00:00:00.000000000 Z
+date: 2014-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: hexp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 0.3.3
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.0'
+        version: 0.3.3
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -33,41 +32,69 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.1'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.1'
+- !ruby/object:Gem::Dependency
   name: rb-inotify
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.3
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  name: rake
+  name: concord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 0.1.4
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
+  name: asset_packer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -75,25 +102,26 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
-  prerelease: false
-  name: rubygems-tasks
+  name: mutant-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.3
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.5.3
 description: Make presentations with Markdown
 email:
 - arne@arnebrasseur.net
@@ -103,10 +131,9 @@ extra_rdoc_files:
 - README.md
 - LICENSE
 files:
-- .bundle/install.log
+- .gitignore
 - .travis.yml
 - Gemfile
-- Gemfile.devtools
 - Gemfile.lock
 - LICENSE
 - README.md
@@ -176,7 +203,6 @@ files:
 - config/rubocop.yml
 - config/yardstick.yml
 - lib/slippery.rb
-- lib/slippery/assets.rb
 - lib/slippery/converter.rb
 - lib/slippery/document.rb
 - lib/slippery/presentation.rb
@@ -188,7 +214,6 @@ files:
 - lib/slippery/processors/impress_js/add_impress_js.rb
 - lib/slippery/processors/impress_js/auto_offsets.rb
 - lib/slippery/processors/reveal_js/add_reveal_js.rb
-- lib/slippery/processors/self_contained.rb
 - lib/slippery/rake_tasks.rb
 - lib/slippery/version.rb
 - slippery.gemspec
@@ -199,8 +224,7 @@ files:
 - spec/fixtures/headers.md
 - spec/fixtures/ordered_list.md
 - spec/fixtures/unordered_list.md
-- spec/slippery/converter_spec.rb
-- spec/slippery_spec.rb
+- spec/integration/slippery/converter_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/plexus/slippery
 licenses:
@@ -212,17 +236,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Make presentations with Markdown
@@ -234,6 +258,5 @@ test_files:
 - spec/fixtures/headers.md
 - spec/fixtures/ordered_list.md
 - spec/fixtures/unordered_list.md
-- spec/slippery/converter_spec.rb
-- spec/slippery_spec.rb
+- spec/integration/slippery/converter_spec.rb
 - spec/spec_helper.rb