shining 2.0.0 → 2.0.1

data/lib/plugins/resize.js

@@ -2,14 +2,14 @@
 Shining.pluginProcesses['resize'] = setInterval(function() {
   var width = $(window).width();
   if (width >= 640 && width < 800) {
-    $('#stage').css({fontSize: '100%'});
+    $('body').css({fontSize: '100%'});
   } else if (width >= 800 && width < 1024) {
-    $('#stage').css({fontSize: '130%'});
+    $('body').css({fontSize: '110%'});
   } else if (width >= 1024 && width < 1280) {
-    $('#stage').css({fontSize: '160%'});
+    $('body').css({fontSize: '120%'});
   } else if (width >= 1280 && width < 1440) {
-    $('#stage').css({fontSize: '180%'});
+    $('body').css({fontSize: '130%'});
   } else if (width > 1440) {
-    $('#stage').css({fontSize: '200%'});
+    $('body').css({fontSize: '140%'});
   }  
 }, 500);

data/lib/shining.js

@@ -43,7 +43,7 @@
     when:     when,
     trigger:  trigger,
     pluginProcesses: {},
-    centerStage: centerStage,
+    centerSlide: centerSlide,
 
     // slide scripts
     scripts: {
@@ -93,16 +93,12 @@
   // Transitions
   var Transitions = {
     'fade': {
-      enter: function() { $('#stage').fadeIn(200); },
-      leave: function() { $('#stage').fadeOut(200); }
-    },
-    'slide': {
-      enter: function() { $('#stage').css({ marginLeft: null, marginRight: '-200px' }).animate({ opacity: 1, marginRight: '0' }, 200); },
-      leave: function() { $('#stage').animate({ opacity: 0, marginLeft: '-200' }, 200); }
+      enter: function() { $('div.slide').fadeIn(200); },
+      leave: function() { $('div.slide').fadeOut(200); }
     },
     'none': {
-      enter: $.noop,
-      leave: $.noop
+      enter: function() { $('div.slide').show(); },
+      leave: function() { $('div.slide').hide(); }
     }
   }
 
@@ -168,40 +164,34 @@
     }
     return name;
   }
-
-  function loadSlide(name, callback) {
-    if (!Shining.slides.loaded(name)) {
-      $.get(
-        'slides/' + name,
-        function(data) {
-          Shining.slides._loaded[name] = {};
-          Shining.slides._loaded[name].markup = compileSlide(name, data);
-          trigger('slideloaded', [name]);
-          if (data) { loadSlideScript(name, callback); };
-        }
-      );
-    } else {
-      if ($.isFunction(callback)) callback.call();
-    }
-  }
-
-  function preloadSlides() {
-    $(Shining.config.slides).each(function() { loadSlide(this); })
+  
+  function loadSlides(callback) {    
+    $.getJSON(
+      '/slides.json',
+      function(slides) {
+        Shining.slides._loaded = slides;
+        for (slide in slides) {
+          slides[slide].markup = compileSlide(slide, slides[slide].markup)
+        };
+        trigger('slidesloaded');
+        if ($.isFunction(callback)) callback();
+      }
+    );
   }
 
   function playSlide(name) {
-    $('#stage')
+    $('body')
       .queue(function() { Transitions[Shining.config.transitions].leave(); $(this).dequeue(); })
       .queue(function() {
         Shining.scripts.reap();
         var slide = Shining.slides._loaded[name];
         Shining.slides.current(name);
-        $('#stage').html(slide.markup);
-        setTimeout(centerStage, 500);
+        $('body').html('<div class="slide">' + slide.markup + '</div>');
+        setTimeout(centerSlide, 500);
         trigger('slideplay', [name]);
         $(this).dequeue();
       })
-      .queue(function() { Transitions[Shining.config.transitions].enter(); $(this).dequeue(); centerStage(); });
+      .queue(function() { Transitions[Shining.config.transitions].enter(); $(this).dequeue(); centerSlide(); });
   }
 
   function loadPlugins() {
@@ -212,16 +202,6 @@
     }
   }
 
-  function loadSlideScript(name, callback) {
-    $.ajax({
-      url: 'slides/' + slidePlusExtension(name, 'js'),
-      dataType: 'text',
-      type: 'GET',
-      success: function(script) { Shining.slides._loaded[name].script = script },
-      complete: function()      { if ($.isFunction(callback)) callback.call() }
-    })
-  }
-
   function loadSlideStyle(name) {
     $('link.slide').remove();
     $('head').append('<link rel="stylesheet" type="text/css" href="slides/' + slidePlusExtension(name, 'css') + '" media="all" class="slide"/>')
@@ -236,18 +216,18 @@
     });
   }
 
-  function centerStage() {
-    var top = ($(window).height() - $('#stage').outerHeight()) / 2;
+  function centerSlide() {    
+    var top = ($(window).height() - $('div.slide:visible').outerHeight()) / 2;
     if (top < 0) top = 0;
-    $('#stage').css({ top: top });
+    $('div.slide').css({ top: top });
   }
 
   function hasPendingStep() {
-    return !!$('#stage .step:not(:visible)').length;
+    return !!$('div.slide .step:not(:visible)').length;
   }
 
   function runPendingStep() {
-    $('#stage .step:not(:visible):first').show();
+    $('div.slide .step:not(:visible):first').show();
   }
 
   // Now configure everything!
@@ -274,20 +254,15 @@
     loadSlideStyle(name);
     Shining.scripts.runSlide(name);
     if (SyntaxHighlighter) SyntaxHighlighter.highlight({gutter: false, toolbar: false});
-    if ($('#stage aside').length) setTimeout(function() { note($('#stage aside').html(), 5000) }, 500);
+    if ($('body aside').length) setTimeout(function() { note($('body aside').html(), 5000) }, 500);
   });
 
-  when('slideloaded', function(event, name) {
-    help('Loaded ' + Shining.slides.totalLoaded() + '/' + Shining.slides._slides.length, 5000);
-    if (Shining.slides.totalLoaded() == Shining.config.slides.length) trigger('slidesloaded');
-  })
-
   when('slidesloaded', function() {
     help('← (previous slide), → or SPACE BAR (next slide)', 3000);
   })
 
   $(window)
-    .resize(function() { centerStage(); })
+    .resize(function() { centerSlide(); })
     .bind('hashchange', function() {
       var slide = document.location.hash.replace('#', '');
       if (slide) Shining.playSlide(slide);
@@ -309,7 +284,7 @@
       loadConfig(function() {
         loadPlugins();
         var startAt = document.location.hash.replace('#', ''), first = startAt || Shining.slides.current();
-        loadSlide(first, function() { playSlide(first); preloadSlides(); setTimeout(centerStage, 500); });
+        loadSlides(function() { playSlide(first); });
         setTitle(Shining.config.title);
         setTheme(Shining.config.theme);
       });

data/lib/shining/preso.rb

@@ -7,7 +7,7 @@ class Preso
   include FileMethods and extend FileMethods
   attr_reader :path, :name
 
-  SLIDE_FORMATS = %w(markdown html md)
+  SLIDE_FORMATS = %w(markdown md html)
 
   def initialize dir, fresh = true
     @path   = expand(dir)
@@ -53,9 +53,9 @@ class Preso
   def remove_slide file
     file = basename(file)
     name, format = basename(file, extname(file)), extname(file).sub(/^./, '')
-    delete! file
-    delete! "#{name}.css"
-    delete! "#{name}.js"
+    delete! path/'slides'/file
+    delete! path/'slides'/"#{name}.css"
+    delete! path/'slides'/"#{name}.js"
     config['slides'].delete file and save_config!
   end
 

data/shining.gemspec

@@ -1,97 +1,99 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{shining}
-  s.version = "2.0.0"
+  s.version = "2.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julio Cesar Ody"]
-  s.date = %q{2010-09-17}
+  s.date = %q{2011-02-25}
   s.default_executable = %q{shine}
   s.description = %q{HTML + CSS + Javascript = awesome presos}
   s.email = %q{julio.ody@gmail.com}
   s.executables = ["shine"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
-     "README.markdown"
+    "README.markdown"
   ]
   s.files = [
     "CHANGELOG.txt",
-     "LICENSE.txt",
-     "README.markdown",
-     "Rakefile",
-     "TODO.txt",
-     "VERSION",
-     "bin/shine",
-     "css/base.css",
-     "css/effects.css",
-     "css/shAll.css",
-     "css/shThemeFadeToGrey.css",
-     "images/default-noise.png",
-     "lib/config.ru",
-     "lib/deps.js",
-     "lib/ext/filemethods.rb",
-     "lib/ext/string.rb",
-     "lib/jquery-1.4.2.min.js",
-     "lib/plugins/iphone.js",
-     "lib/plugins/resize.js",
-     "lib/shining.js",
-     "lib/shining.rb",
-     "lib/shining/errors.rb",
-     "lib/shining/heroku.rb",
-     "lib/shining/player.rb",
-     "lib/shining/preso.rb",
-     "shining.gemspec",
-     "spec/cli_spec.rb",
-     "spec/filemethods_spec.rb",
-     "spec/heroku_spec.rb",
-     "spec/javascripts/dom.html",
-     "spec/javascripts/rhino.js",
-     "spec/javascripts/sample/config.json",
-     "spec/javascripts/sample/index.html",
-     "spec/javascripts/sample/slides/slide1.css",
-     "spec/javascripts/sample/slides/slide1.html",
-     "spec/javascripts/sample/slides/slide1.js",
-     "spec/javascripts/sample/slides/slide2.css",
-     "spec/javascripts/sample/slides/slide2.html",
-     "spec/javascripts/sample/slides/slide2.js",
-     "spec/javascripts/sample/slides/welcome.html",
-     "spec/javascripts/unit/spec.helper.js",
-     "spec/javascripts/unit/spec.js",
-     "spec/preso_spec.rb",
-     "spec/sample/base.css",
-     "spec/sample/config.json",
-     "spec/sample/effects.css",
-     "spec/sample/index.html",
-     "spec/sample/slides/first.html",
-     "spec/sample/slides/first.js",
-     "spec/sample/slides/second.html",
-     "spec/sample/slides/second.js",
-     "spec/sample/slides/third.html",
-     "spec/sample/slides/third.js",
-     "spec/shining_spec.rb",
-     "spec/spec_helper.rb",
-     "templates/config.json",
-     "templates/index.html",
-     "templates/slides/welcome.html",
-     "themes/default.css",
-     "themes/slidedown.css"
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.markdown",
+    "Rakefile",
+    "TODO.txt",
+    "VERSION",
+    "bin/shine",
+    "css/base.css",
+    "css/effects.css",
+    "css/shAll.css",
+    "css/shThemeFadeToGrey.css",
+    "images/default-noise.png",
+    "lib/config.ru",
+    "lib/deps.js",
+    "lib/ext/filemethods.rb",
+    "lib/ext/string.rb",
+    "lib/jquery-1.4.4.min.js",
+    "lib/plugins/iphone.js",
+    "lib/plugins/resize.js",
+    "lib/shining.js",
+    "lib/shining.rb",
+    "lib/shining/errors.rb",
+    "lib/shining/heroku.rb",
+    "lib/shining/player.rb",
+    "lib/shining/preso.rb",
+    "shining.gemspec",
+    "spec/cli_spec.rb",
+    "spec/filemethods_spec.rb",
+    "spec/heroku_spec.rb",
+    "spec/javascripts/dom.html",
+    "spec/javascripts/rhino.js",
+    "spec/javascripts/sample/config.json",
+    "spec/javascripts/sample/index.html",
+    "spec/javascripts/sample/slides/slide1.css",
+    "spec/javascripts/sample/slides/slide1.html",
+    "spec/javascripts/sample/slides/slide1.js",
+    "spec/javascripts/sample/slides/slide2.css",
+    "spec/javascripts/sample/slides/slide2.html",
+    "spec/javascripts/sample/slides/slide2.js",
+    "spec/javascripts/sample/slides/welcome.html",
+    "spec/javascripts/unit/spec.helper.js",
+    "spec/javascripts/unit/spec.js",
+    "spec/preso_spec.rb",
+    "spec/sample/base.css",
+    "spec/sample/config.json",
+    "spec/sample/effects.css",
+    "spec/sample/index.html",
+    "spec/sample/slides/first.html",
+    "spec/sample/slides/first.js",
+    "spec/sample/slides/second.html",
+    "spec/sample/slides/second.js",
+    "spec/sample/slides/third.html",
+    "spec/sample/slides/third.js",
+    "spec/shining_spec.rb",
+    "spec/spec_helper.rb",
+    "templates/config.json",
+    "templates/index.html",
+    "templates/slides/welcome.html",
+    "themes/default.css",
+    "themes/retro.css",
+    "themes/slidedown.css"
   ]
   s.homepage = %q{http://shining.heroku.com}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{HTML + CSS + Javascript = awesome presos}
   s.test_files = [
     "spec/cli_spec.rb",
-     "spec/filemethods_spec.rb",
-     "spec/heroku_spec.rb",
-     "spec/preso_spec.rb",
-     "spec/shining_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/filemethods_spec.rb",
+    "spec/heroku_spec.rb",
+    "spec/preso_spec.rb",
+    "spec/shining_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -99,30 +101,48 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<json_pure>, ["= 1.4.6"])
+      s.add_runtime_dependency(%q<rack>, ["= 1.2.1"])
+      s.add_runtime_dependency(%q<rainbow>, ["= 1.1"])
+      s.add_runtime_dependency(%q<heroku>, ["= 1.15.1"])
+      s.add_runtime_dependency(%q<stringex>, ["= 1.2.0"])
       s.add_runtime_dependency(%q<json_pure>, [">= 1.1.9"])
       s.add_runtime_dependency(%q<heroku>, [">= 1.9.9"])
-      s.add_runtime_dependency(%q<rack>, [">= 0.9"])
+      s.add_runtime_dependency(%q<rack>, [">= 1.0"])
       s.add_runtime_dependency(%q<stringex>, [">= 1.1.0"])
       s.add_runtime_dependency(%q<jeweler>, [">= 1.4.0"])
+      s.add_runtime_dependency(%q<rainbow>, ["= 1.1"])
       s.add_development_dependency(%q<rspec>, ["= 1.3.0"])
       s.add_development_dependency(%q<jspec>, ["= 4.2.0"])
       s.add_development_dependency(%q<rake>, ["= 0.8.7"])
     else
+      s.add_dependency(%q<json_pure>, ["= 1.4.6"])
+      s.add_dependency(%q<rack>, ["= 1.2.1"])
+      s.add_dependency(%q<rainbow>, ["= 1.1"])
+      s.add_dependency(%q<heroku>, ["= 1.15.1"])
+      s.add_dependency(%q<stringex>, ["= 1.2.0"])
       s.add_dependency(%q<json_pure>, [">= 1.1.9"])
       s.add_dependency(%q<heroku>, [">= 1.9.9"])
-      s.add_dependency(%q<rack>, [">= 0.9"])
+      s.add_dependency(%q<rack>, [">= 1.0"])
       s.add_dependency(%q<stringex>, [">= 1.1.0"])
       s.add_dependency(%q<jeweler>, [">= 1.4.0"])
+      s.add_dependency(%q<rainbow>, ["= 1.1"])
       s.add_dependency(%q<rspec>, ["= 1.3.0"])
       s.add_dependency(%q<jspec>, ["= 4.2.0"])
       s.add_dependency(%q<rake>, ["= 0.8.7"])
     end
   else
+    s.add_dependency(%q<json_pure>, ["= 1.4.6"])
+    s.add_dependency(%q<rack>, ["= 1.2.1"])
+    s.add_dependency(%q<rainbow>, ["= 1.1"])
+    s.add_dependency(%q<heroku>, ["= 1.15.1"])
+    s.add_dependency(%q<stringex>, ["= 1.2.0"])
     s.add_dependency(%q<json_pure>, [">= 1.1.9"])
     s.add_dependency(%q<heroku>, [">= 1.9.9"])
-    s.add_dependency(%q<rack>, [">= 0.9"])
+    s.add_dependency(%q<rack>, [">= 1.0"])
     s.add_dependency(%q<stringex>, [">= 1.1.0"])
     s.add_dependency(%q<jeweler>, [">= 1.4.0"])
+    s.add_dependency(%q<rainbow>, ["= 1.1"])
     s.add_dependency(%q<rspec>, ["= 1.3.0"])
     s.add_dependency(%q<jspec>, ["= 4.2.0"])
     s.add_dependency(%q<rake>, ["= 0.8.7"])

data/spec/cli_spec.rb

@@ -20,10 +20,6 @@ describe 'shine' do
     quiet "cd #{PRESO} && #{SHINE} slide #{name} #{format}"
   end
 
-  def compile_templates
-    quiet "cd #{PRESO} && #{SHINE} compile"
-  end
-
   def make_markdown_template!(name)
     File.open(PRESO/'slides'/"#{name}.md", 'w') { |f| f << "# Look ma\n\nNo hands" }
   end
@@ -38,7 +34,7 @@ describe 'shine' do
     new_preso
   end
 
-  it "creates a new shining preso when passing an argument thats not 'build', 'compile', or 'slide'" do
+  it "creates a new shining preso when passing an argument thats not 'build', or 'slide'" do
     File.directory?(PRESO).should == true
   end
 
@@ -53,16 +49,5 @@ describe 'shine' do
       new_slide 'test', 'md'
       File.exists?(PRESO/'slides'/'test.md').should be_true
     end
-  end
-  
-  context 'go' do
-    it "for now it only works on Mac OSX" do
-      player = Shining::Player.new Shining::Preso.open(PRESO)
-      player.should_receive(:osx?).and_return(false)
-      lambda { player.go! }.should raise_error
-    end
-    
-    it "downloads and decompresses Plainview and if it's not found #{'PRESO_ROOT'/'vendor'/'Plainview.app'}"
-    it "fires up Plainview"
-  end
+  end  
 end