slippery 0.0.3 → 0.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWFiYjgwMGViMWZkOGRjOGY1ODRhZTkzZjc2NWU3OWM3NDVmNGM2ZQ==
+    Yzk3NmU1ZGE3ZjY2MzM1OTRkOWQ3NDRlYzI0ZDkwOGEzOTYxMTgyOA==
   data.tar.gz: !binary |-
-    OWFjYjk2MzlkNTExM2NlMWI5ZTE1ZGY4MDc5NTgzMGZiMzFiNWQxYQ==
+    MDI2MjA1M2FjN2Y4ZmY3Y2U1MDY2YWYzMTQ2NTFmZTU0NzZmMTE2MQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTc0NGNhMTM5MWE4ZDA1ZDI3MWQ3YjU4ODMwMTJkMjgwYjYyNzRjMTc4OTNh
-    NDFhZDI1YzA5YmI5OTJmNDk2MmI2ZWExNzg5MGM4ZTg4NDAyM2NjZWQxYjNk
-    MDlkMjc0ZmRjMWJhYmVhOGZjZDI2ZWM2YWQ2NTQzNTc3YTBhYmM=
+    ZWFiMmQ4MmJmNTI0OThkNjkwMjNiMWE5NDJhNDIyNGI2ZGU0ZTlkM2I2NThl
+    NDUyYzM1NDNkOWMzMmRkNmU5ZmVkOWY3ZThlOWY4ZTNmNGY0ZGQyN2M3ZmZk
+    ZDdhNzE2MjZlZTg3ZmYyMmU3NzVjZDkwYTVjYjQ4NzJmZmYzNDQ=
   data.tar.gz: !binary |-
-    YmY2NTNlNjlhOTRlMjA4YmEyMmY1MTNkZTIwZmRhNTYwNjNhMzc3YmMwNzcx
-    ZmI2ZmJhMzNmOTU1NTYwN2IzMjAyMWQxY2EyMmM0YmQ0OWM0NjBiYzU1MWFl
-    YTNjNWM2YzA5MWIwNjM3YTQwZDdlNGVmZTgxNmI2ZjBjZDhkYmM=
+    YTYxMjg0YWEwNzFhN2ZkZTQxMDU5MmVjNzc1N2Q3MTIxZjQ4YThlMmE0NDI1
+    YzA5NDBiMjM5ZjJhMzQxYTJhYTU1YjI1ZTUxODM5MWU1MTVlMTgwODkzYjU1
+    ODZhZjlkZGRmNWY4MWRjMzIyNjcwYjRlYmIxYjMxZDkyY2E3NTE=

data/Gemfile

@@ -5,6 +5,6 @@ group :development do
   eval File.read('Gemfile.devtools')
 end
 
-gem 'hexp', path: '/home/arne/github/hexp'
+#gem 'hexp', path: '/home/arne/github/hexp'
 
 gemspec

data/Gemfile.lock

@@ -27,21 +27,12 @@ GIT
 PATH
   remote: .
   specs:
-    slippery (0.0.3)
+    slippery (0.1.0)
       hexp (~> 0.0)
       kramdown (~> 1.1)
+      rake (~> 10.1)
       rb-inotify
 
-PATH
-  remote: /home/arne/github/hexp
-  specs:
-    hexp (0.3.1)
-      equalizer (~> 0.0)
-      fzip (~> 0.1)
-      ice_nine (~> 0.9)
-      nokogiri (~> 1.6)
-      sass (~> 3.2)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -81,7 +72,6 @@ GEM
       ruby_parser (~> 3.1, > 3.1.0)
       sexp_processor (~> 4.0)
     formatador (0.2.4)
-    fzip (0.2.0)
     guard (1.8.1)
       formatador (>= 0.2.4)
       listen (>= 1.0.0)
@@ -101,6 +91,11 @@ GEM
     guard-rubocop (0.2.0)
       guard (~> 1.8)
       rubocop (~> 0.9)
+    hexp (0.3.1)
+      equalizer (~> 0.0)
+      ice_nine (~> 0.9)
+      nokogiri (~> 1.6)
+      sass (~> 3.2)
     ice_nine (0.9.0)
     inflecto (0.0.2)
     kramdown (1.1.0)
@@ -200,7 +195,6 @@ DEPENDENCIES
   guard-mutant (~> 0.0.1)
   guard-rspec (~> 3.0.2)
   guard-rubocop (~> 0.2.0)
-  hexp!
   jruby-openssl (~> 0.8.5)
   kramdown (~> 1.1.0)
   libnotify (~> 0.8.0)

data/lib/slippery.rb

@@ -1,8 +1,11 @@
 require 'kramdown'
 require 'hexp'
+require 'pathname'
 
 # Slippery namespace module
 module Slippery
+  ROOT = Pathname(__FILE__).dirname.parent
+
   def self.convert(element)
     Slippery::Converter.new.convert(element)
   end
@@ -36,6 +39,7 @@ require 'slippery/processors/add_google_font'
 require 'slippery/processors/graphviz_dot'
 require 'slippery/processors/hr_to_sections'
 require 'slippery/processors/self_contained'
+require 'slippery/processors/add_highlight'
 
 require 'slippery/processors/impress_js/add_impress_js'
 require 'slippery/processors/impress_js/auto_offsets'

data/lib/slippery/assets.rb

@@ -1,13 +1,12 @@
-require 'fileutils'
-
 # Manage the assets and their URI/path
 module Slippery
   module Assets
-    ASSETS_PATH = '../../../assets/'
+    ASSETS_PATH = ROOT.join('assets')
 
     # Copies the assets locally
     def self.embed_locally
-      FileUtils.cp_r(File.expand_path(ASSETS_PATH, __FILE__), './')
+      raise 'damn'
+      FileUtils.cp_r(ASSETS_PATH, './')
     end
 
     # returns a composer returning a URI for a given relative file path

data/lib/slippery/presentation.rb

@@ -4,7 +4,8 @@ module Slippery
 
     DEFAULT_OPTIONS = {
       type: :reveal_js,
-      local: true
+      local: true,
+      history: true
     }.freeze
 
     def initialize(document, options = {})
@@ -19,8 +20,8 @@ module Slippery
         impress_js: [
           Processors::HrToSections.new(H[:div, class: 'step']),
           Processors::ImpressJs::AddImpressJs.new(Assets::path_composer(@options[:local]), js_options),
-          Processors::ImpressJs::AutoOffsets.new,
-        ],
+          (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),

data/lib/slippery/processors/add_highlight.rb

@@ -0,0 +1,23 @@
+module Slippery
+  module Processors
+    class AddHighlight
+
+      DEFAULT_STYLE   = :default
+      DEFAULT_VERSION = '8.0'
+
+      def initialize(style = DEFAULT_STYLE, version = DEFAULT_VERSION)
+        @style = style
+        @version = version
+      end
+
+      def call(doc)
+        doc.rewrite 'head' do |head|
+          head <<= H[:link, rel: "stylesheet", href: "http://yandex.st/highlightjs/#{@version}/styles/#{@style}.min.css"]
+          head <<= H[:script, src: "http://yandex.st/highlightjs/#{@version}/highlight.min.js"]
+          head <<= H[:script, 'hljs.initHighlightingOnLoad();']
+        end
+      end
+
+    end
+  end
+end

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

@@ -22,7 +22,7 @@ module Slippery
        def call(doc)
          doc.replace('body') do |body|
            include_local_javascript(body, @path_composer.call('impress.js/js/impress.js'))
-             .set_attributes({id: 'impress'}.merge(data_attributes(attributes)))
+             .set_attrs({id: 'impress'}.merge(data_attributes(attributes)))
              .add H[:script, 'impress().init();']
          end
        end

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

@@ -10,7 +10,7 @@ module Slippery
         def call(doc)
           doc.replace('.step') do |step|
             ['data-x', 'data-y'].each_with_index do |axis, idx|
-              if step.attr?(axis)
+              if step.has_attr?(axis)
                 @position[idx] = step[axis].to_i
               else
                 @position[idx] += @offsets[idx]

data/lib/slippery/rake_tasks.rb

@@ -26,11 +26,11 @@ module Slippery
       presentations.map {|path| [ path.basename(path.extname), path ] }
     end
 
-    def markdown_to_hexp(infile)
+    def markdown_to_hexp(infile, options = {})
       doc = Slippery::Document.new(infile.read)
-      doc = Slippery::Presentation.new(doc, options)
+      doc = Slippery::Presentation.new(doc, @options.merge(options))
 
-      doc.process(*processors)
+      doc.process(*processors.reject {|pr| options[:skip_self_contained] && pr == Slippery::Processors::SelfContained})
     end
 
     def processor(selector, &blk)
@@ -45,6 +45,16 @@ module Slippery
       processors << Slippery::Processors::SelfContained
     end
 
+    def title(title)
+      processor 'head' do |head|
+        head <<= H[:title, title]
+      end
+    end
+
+    def add_highlighting(style = Slippery::Processors::AddHighlight::DEFAULT_STYLE, version = Slippery::Processors::AddHighlight::DEFAULT_VERSION)
+      processors << Slippery::Processors::AddHighlight.new(style, version)
+    end
+
     def define
       namespace @name do
         desc "build all"
@@ -61,14 +71,17 @@ module Slippery
 
         namespace :watch do
           presentation_names.each do |name, path|
+            files = markdown_to_hexp(path, skip_self_contained: true).select('link,script').map {|link| link.attr('href') || link.attr('src')}.compact
+            files = files.select {|f| File.exist?(f)}
+
             desc "watch #{name} for changes"
-            WatchTask.new(name, [path.to_s]) do
+            WatchTask.new(name, [path.to_s, *files]) do
               dest = Tempfile.new("#{name}.html")
               File.open("#{name}.html") { |src| FileUtils.copy_stream(src, dest) }
               dest.close
               Rake::Task["#{@name}:build:#{name}"].execute
               puts "="*60
-              print `diff -u #{dest.path} #{name}.html` if File.exist? "#{name}.html"
+              print `diff -u #{dest.path} #{name}.html | cut -c1-150` if File.exist? "#{name}.html"
             end
           end
         end

data/lib/slippery/version.rb

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

data/slippery.gemspec

@@ -17,11 +17,11 @@ 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 '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_development_dependency 'rake',  '~> 10.1'
   gem.add_development_dependency 'rspec', '~> 2.14'
   gem.add_development_dependency 'rubygems-tasks'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slippery
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors:
 - Arne Brasseur
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-23 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -60,7 +60,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.1'
-  type: :development
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
@@ -182,6 +182,7 @@ files:
 - lib/slippery/presentation.rb
 - lib/slippery/processor_helpers.rb
 - lib/slippery/processors/add_google_font.rb
+- lib/slippery/processors/add_highlight.rb
 - lib/slippery/processors/graphviz_dot.rb
 - lib/slippery/processors/hr_to_sections.rb
 - lib/slippery/processors/impress_js/add_impress_js.rb