shining 1.3.1 → 1.3.2

data/CHANGELOG.txt

@@ -1,3 +1,8 @@
+= 1.3.2 (19/05/2010)
+
+* Always including config.ru.
+* Added the iphone plugin. It's iPhone friendly for now. TODO: get it to behave crazy awesome in it.
+
 = 1.3.1 (18/05/2010)
 
 * Fixed stage resizing issues.

data/Rakefile

@@ -18,16 +18,16 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name                = "shining"
-    gem.summary             = "Webkit + CSS + Javascript = awesome presos"
-    gem.description         = "Webkit + CSS + Javascript = awesome presos"
+    gem.summary             = "HTML + CSS + Javascript = awesome presos"
+    gem.description         = "HTML + CSS + Javascript = awesome presos"
     gem.email               = "julio.ody@gmail.com"
-    gem.homepage            = "http://github.com/juliocesar/shining"
+    gem.homepage            = "http://shining.heroku.com"
     gem.authors             = "Julio Cesar Ody"
     gem.add_dependency      'haml',           '>= 2.2.17'
     gem.add_dependency      'json_pure',      '>= 1.1.9'
     gem.add_dependency      'tilt',           '>= 0.6'
     gem.add_dependency      'rdiscount',      '>= 1.6.3'
-    gem.add_dependency      'term-ansicolor', '>= 1.0.4'
+    gem.add_dependency      'heroku',         '>= 1.9.9'
     gem.add_development_dependency 'rspec', '1.3.0'
     gem.add_development_dependency 'jspec', '4.2.0'    
     gem.add_development_dependency 'rake',  '0.8.7'

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

data/css/base.css

@@ -9,7 +9,7 @@ ins { text-decoration : none; }
 del { text-decoration : line-through }
 
 body    { font: 12px/1.5 "Lucida Grande", Tahoma, serif; overflow: hidden; text-align: center }
-#stage  { position: relative; display: inline-block; padding: 40px 20px; max-width: 90%; text-align: left; margin: 0 auto; }
+#stage  { position: relative; display: inline-block; padding: 40px 20px; max-width: 90%; text-align: left; margin: 0 auto }
 
 .no-text-shadow { text-shadow: none }
 .no-drop-shadow {}
@@ -38,7 +38,7 @@ div.slice { position: absolute; display: block; width: 0; top: -10px; bottom: -1
   right: 10px;
   top: 10px;
   background-color: #000;
-  background-color: rgba(0, 0, 0, 0.2);
+  background-color: rgba(0, 0, 0, 0.6);
   color: #fff;
   padding: 10px;
 }

data/css/iphone.css

@@ -0,0 +1,14 @@
+#stage    { -webkit-box-shadow: none }
+#help     { font-size: 200% }
+
+@media all and (max-width: 320px) {
+  h1    { font-size: 3em }
+  h2    { font-size: 2.8em }
+  h3    { font-size: 2.5em }
+  p, li { font-size: 1.6em }
+  p     { margin: 0.5em 0 }
+}
+
+@media all and (min-width: 321px) {
+  #stage { font-size: 90% };
+}

data/lib/plugins/iphone.js

@@ -0,0 +1,17 @@
+// iphone.js: iPhone friendliness. Free of charge.
+
+if (navigator.userAgent.match(/iPhone/i)) {
+  Shining.when('init', function() {
+    Shining.config.help = false;
+    $('head').append('<link rel="stylesheet" type="text/css" href="vendor/css/iphone.css" media="all" class="iphone"/>')
+    $('#stage').click(function(event) {
+      if ($(event.target).is('a')) return false;
+      if (event.pageX < ($(window).width() / 2)) {
+        Shining.previousSlide();
+      } else {
+        Shining.nextSlide();
+      }
+    })
+    Shining.help('Tap on the left or right hand side to navigate', 3000, true);
+  });  
+}

data/lib/plugins/resize.js

@@ -3,20 +3,16 @@
 $(window).resize(function() {
   $.throttle(function() {
     var width = $(window).width();
-    if (width < 480) {
-      $('#stage').css({fontSize: '80%'});
-    } else if (width >= 480 && width < 640) {
-      $('#stage').css({fontSize: '80%'});
-    } else if (width >= 640 && width < 800) {
+    if (width >= 640 && width < 800) {
       $('#stage').css({fontSize: '100%'});    
-    } else if (width >= 800 && width < 640) {
+    } else if (width >= 800 && width < 1024) {
       $('#stage').css({fontSize: '130%'});
     } else if (width >= 1024 && width < 800) {
       $('#stage').css({fontSize: '160%'});
     } else if (width >= 1280 & width < 1024) {
       $('#stage').css({fontSize: '180%'});
     } else if (width > 1280) {
-      $('#stage').css({fontSize: '180%'});
+      $('#stage').css({fontSize: '200%'});
     }       
   }, 500);
 })

data/lib/shining/heroku.rb

@@ -8,7 +8,6 @@ class Heroku
   class << self
     def deploy preso, name
       check_for_git_and_heroku
-      preso.vendorize! unless preso.vendorized?
       copy Shining.root/'lib'/'config.ru', preso.path
       change_dir preso.path
       `git init && git add . && git commit -m 'heroku deploy'`

data/lib/shining/preso.rb

@@ -82,6 +82,7 @@ class Preso
   def vendorize!
     new_dir @path/'vendor'
     new_dir @path/'vendor'/'lib'
+    copy Shining.root/'lib'/'config.ru', @path + '/'
     copy Shining.root/'lib'/'*.js', @path/'vendor'/'lib'
     copy Shining.root/'lib'/'plugins', @path/'vendor'/'lib/'
     %w(css images themes).each do |required|

data/lib/shining.js

@@ -184,8 +184,8 @@
     }
   }
 
-  function help(message, duration) {
-    if (Shining.config.help == false) return false;
+  function help(message, duration, force) {
+    if (Shining.config.help == false && force != true) return false;
     var duration = duration || 500;
     $('#help').remove();
     $('<div id="help"></div>')
@@ -204,13 +204,13 @@
       when('next',      function() { help('→') });
       loadConfig(function() {
         loadPlugins();
+        trigger('init');
         var startAt = document.location.hash.replace('#', ''),
           first = startAt ? startAt : Shining.slides.current();
         loadSlide(first, function() { playSlide(first) });
         preloadSlides();
         setTitle(Shining.config.title);
         setTheme(Shining.config.theme);
-        trigger('init');
         help('← (previous slide), → or SPACE BAR (next slide)', 3000);
       });
     });
@@ -271,7 +271,6 @@
     $('#stage .contents').html(slide.markup);
     trigger('slideplay');
     $(window).trigger('resize');
-
     Shining.scripts.run(slide.script);
   }
 
@@ -346,4 +345,4 @@ $(window).bind('hashchange', function(event) {
 });
 
 // IE Array.prototype.indexOf fix
-if(!Array.prototype.indexOf){Array.prototype.indexOf=function(elt,from){var len=this.length;var from=Number(arguments[1])||0;from=(from<0)?Math.ceil(from):Math.floor(from);if(from<0)from+=len;for(;from<len;from++){if(from in this&&this[from]===elt)return from;} return-1;};}
+if(!Array.prototype.indexOf){Array.prototype.indexOf=function(elt,from){var len=this.length;var from=Number(arguments[1])||0;from=(from<0)?Math.ceil(from):Math.floor(from);if(from<0)from+=len;for(;from<len;from++){if(from in this&&this[from]===elt)return from;} return-1;};}

data/lib/shining.rb

@@ -9,8 +9,20 @@ require 'shining/heroku'
 
 module Shining
   class << self
+    def quiet!
+      @quiet = true
+    end
+    
+    def quiet?
+      !!@quiet
+    end
+    
+    def verbose!
+      @quiet = false
+    end
+    
     def say something
-      STDOUT.puts(something) unless defined?(Spec) # shush when running tests
+      STDOUT.puts(something) unless quiet?
       yield if block_given?
     end
 

data/shining.gemspec

@@ -5,14 +5,15 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shining}
-  s.version = "1.3.1"
+  s.version = "1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julio Cesar Ody"]
-  s.date = %q{2010-05-18}
-  s.description = %q{Webkit + CSS + Javascript = awesome presos}
+  s.date = %q{2010-05-19}
+  s.default_executable = %q{shine}
+  s.description = %q{HTML + CSS + Javascript = awesome presos}
   s.email = %q{julio.ody@gmail.com}
-  s.executables = ["console", "shine"]
+  s.executables = ["shine"]
   s.extra_rdoc_files = [
     "README.markdown"
   ]
@@ -21,10 +22,10 @@ Gem::Specification.new do |s|
      "README.markdown",
      "Rakefile",
      "VERSION",
-     "bin/console",
      "bin/shine",
      "css/base.css",
      "css/effects.css",
+     "css/iphone.css",
      "css/shCore.css",
      "css/shThemeFadeToGrey.css",
      "images/help.png",
@@ -36,6 +37,7 @@ Gem::Specification.new do |s|
      "lib/ext/filemethods.rb",
      "lib/ext/string.rb",
      "lib/jquery-1.4.1.min.js",
+     "lib/plugins/iphone.js",
      "lib/plugins/resize.js",
      "lib/plugins/syntaxhighlighter.js",
      "lib/shBrushAll.js",
@@ -73,6 +75,7 @@ Gem::Specification.new do |s|
      "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",
@@ -80,16 +83,17 @@ Gem::Specification.new do |s|
      "themes/default.css",
      "themes/slidedown.css"
   ]
-  s.homepage = %q{http://github.com/juliocesar/shining}
+  s.homepage = %q{http://shining.heroku.com}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Webkit + CSS + Javascript = awesome presos}
+  s.summary = %q{HTML + CSS + Javascript = awesome presos}
   s.test_files = [
     "spec/cli_spec.rb",
      "spec/filemethods_spec.rb",
      "spec/generators_spec.rb",
      "spec/preso_spec.rb",
+     "spec/shining_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -102,7 +106,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<json_pure>, [">= 1.1.9"])
       s.add_runtime_dependency(%q<tilt>, [">= 0.6"])
       s.add_runtime_dependency(%q<rdiscount>, [">= 1.6.3"])
-      s.add_runtime_dependency(%q<term-ansicolor>, [">= 1.0.4"])
+      s.add_runtime_dependency(%q<heroku>, [">= 1.9.9"])
       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"])
@@ -111,7 +115,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<json_pure>, [">= 1.1.9"])
       s.add_dependency(%q<tilt>, [">= 0.6"])
       s.add_dependency(%q<rdiscount>, [">= 1.6.3"])
-      s.add_dependency(%q<term-ansicolor>, [">= 1.0.4"])
+      s.add_dependency(%q<heroku>, [">= 1.9.9"])
       s.add_dependency(%q<rspec>, ["= 1.3.0"])
       s.add_dependency(%q<jspec>, ["= 4.2.0"])
       s.add_dependency(%q<rake>, ["= 0.8.7"])
@@ -121,7 +125,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<json_pure>, [">= 1.1.9"])
     s.add_dependency(%q<tilt>, [">= 0.6"])
     s.add_dependency(%q<rdiscount>, [">= 1.6.3"])
-    s.add_dependency(%q<term-ansicolor>, [">= 1.0.4"])
+    s.add_dependency(%q<heroku>, [">= 1.9.9"])
     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/preso_spec.rb

@@ -1,7 +1,6 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
-describe 'Shining::Preso' do
-
+describe Shining::Preso do
   before :all do
     TMP = Dir.tmpdir/'shining-tmp' unless defined?(TMP)
     FileUtils.rm_rf   TMP

data/spec/shining_spec.rb

@@ -0,0 +1,18 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe Shining do
+  after do Shining.quiet! end
+  context 'quiet and verbose' do
+    it '#verbose! means it will output to the console' do
+      STDOUT.should_receive :puts
+      Shining.verbose!
+      Shining.say 'whelps, handle it!'
+    end
+    
+    it '#quiet! means nothing will be outputted to the console' do
+      STDOUT.should_not_receive :puts
+      Shining.quiet!
+      Shining.say "whelps, handle it!"      
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -5,4 +5,6 @@ require File.join(File.dirname(__FILE__), *%w(.. lib shining))
 gem 'rspec',      '>= 1.3.0';    require 'spec'
 gem 'rake',       '>= 0.8.7';    require 'rake'
 gem 'json_pure',  '>= 1.1.9';    require 'json/pure'
-gem 'haml',       '>= 2.2.17';   require 'haml'
+gem 'haml',       '>= 2.2.17';   require 'haml'
+
+Shining.quiet!

data/templates/config.json

@@ -1,6 +1,6 @@
 {
   "slides":       ["welcome"],
   "title":        "Your presentation",
-  "plugins":      ["resize", "syntaxhighlighter"],
+  "plugins":      ["resize", "syntaxhighlighter", "iphone"],
   "transitions":  "fade"
 }

data/templates/index.html

@@ -2,6 +2,8 @@
 <html>
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8">
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="viewport" content="width=device-width, maximum-scale=1.0, user-scalable=no" />
     <title>Your presentation</title>
     <link rel="stylesheet" type="text/css" href="vendor/css/base.css" media="all"/>
     <link rel="stylesheet" type="text/css" href="vendor/css/effects.css" media="all"/>

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Julio Cesar Ody
@@ -14,8 +14,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-18 00:00:00 +10:00
-default_executable: 
+date: 2010-05-19 00:00:00 +10:00
+default_executable: shine
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: haml
@@ -73,7 +73,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: term-ansicolor
+  name: heroku
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
@@ -81,9 +81,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 0
-        - 4
-        version: 1.0.4
+        - 9
+        - 9
+        version: 1.9.9
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -128,10 +128,9 @@ dependencies:
         version: 0.8.7
   type: :development
   version_requirements: *id008
-description: Webkit + CSS + Javascript = awesome presos
+description: HTML + CSS + Javascript = awesome presos
 email: julio.ody@gmail.com
 executables: 
-- console
 - shine
 extensions: []
 
@@ -142,10 +141,10 @@ files:
 - README.markdown
 - Rakefile
 - VERSION
-- bin/console
 - bin/shine
 - css/base.css
 - css/effects.css
+- css/iphone.css
 - css/shCore.css
 - css/shThemeFadeToGrey.css
 - images/help.png
@@ -157,6 +156,7 @@ files:
 - lib/ext/filemethods.rb
 - lib/ext/string.rb
 - lib/jquery-1.4.1.min.js
+- lib/plugins/iphone.js
 - lib/plugins/resize.js
 - lib/plugins/syntaxhighlighter.js
 - lib/shBrushAll.js
@@ -194,6 +194,7 @@ files:
 - 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
@@ -201,7 +202,7 @@ files:
 - themes/default.css
 - themes/slidedown.css
 has_rdoc: true
-homepage: http://github.com/juliocesar/shining
+homepage: http://shining.heroku.com
 licenses: []
 
 post_install_message: 
@@ -229,10 +230,11 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Webkit + CSS + Javascript = awesome presos
+summary: HTML + CSS + Javascript = awesome presos
 test_files: 
 - spec/cli_spec.rb
 - spec/filemethods_spec.rb
 - spec/generators_spec.rb
 - spec/preso_spec.rb
+- spec/shining_spec.rb
 - spec/spec_helper.rb

data/bin/console

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-
-require 'shining'
-require 'irb'
-
-IRB.start