shining 1.0.0 → 1.0.1

data/README.markdown

@@ -2,6 +2,77 @@
 
 A presentation framework to be used with Webkit. Yeah, it's all in-browser.
 
+# Installation
+
+    $ sudo gem install shining
+
+# How to use
+
+Create a new presentation by
+
+    $ shine mypreso
+    
+Where "mypreso" is the directory name you'll use for it. A base presentation has the
+following base structure.
+
+* ROOT
+  * config.json
+  * slides
+  * index.html
+  
+Which leads us to...
+
+# Configuration
+
+Presentation-wide configuration happens through the **config.json** file. The existing
+parameters are what I like to call "self documenting" enough so I'll refrain from
+explaining them for now. The only detail worth nothing is that the slides _have_ to be
+listed in the slides array, or else Shining will ignore their existence.
+
+# Slides
+
+Easy way first. Change the directory to the presentation's directory first. Then
+
+    $ shine slide mynewslide
+    
+Where "mynewslide" is the name of the slide. This will create a slide in
+**ROOT/slides/mynewslide.html**, and a slide script in **ROOT/slides/mynewslide.js**.
+It will also automagically edit the **config.json** file for you, adding the new slide.
+
+You can also create slides manually by adding an HTML file to **ROOT/slides**, and then
+adding the file name (minus the extension) to **config.json**. Though really, just use 
+the generator.
+
+# Slide templates
+
+Shining supports Haml and ERb templates. For now, you can use it by manually dropping
+a template file or either of those formats in **ROOT/slides**, and then running (from
+inside the presentation's directory)
+
+    $ shine compile
+    
+Say you have a slide template named **ROOT/slides/test.haml**. Running the aforementioned
+command will generate a new **test.html** from it. Note that this will _overwrite_ an
+existing **test.html** slide if one exists.
+
+# Steps to winning
+
+Quickly outline of things I'm going to do with this project:
+
+* More effects, because there's no such thing as visually appealing enough. Some
+fine tuning of the existing ones is in order as well.
+* More themes.
+* Add a CSS parser, so I can build jQuery queues with the effects and order them
+without the end-user needing to make sure things happen when they expect.
+* Better generators. For now the requirements are simple enough so they can stay
+as a single file, but I'm confident that will change.
+* Better DSL for slide scripts. I know it's awesome already, but there's always
+room for improvement.
+* Macros, or configurable shortcuts for adding things like audio and video
+without having to know how to use the tags.
+* Did I say I wanna add macros, so you'll need to know next to zero HTML in order
+to create *really* awesome presentations?
+
 # License
 
 The MIT License

data/Rakefile

@@ -15,8 +15,10 @@ begin
     gem.email               = "julio.ody@gmail.com"
     gem.homepage            = "http://github.com/juliocesar/shining"
     gem.authors             = "Julio Cesar Ody"
-    gem.add_dependency      'haml', '>= 2.2.17'
-    gem.add_dependency      'json_pure', '>= 1.1.9'
+    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_development_dependency 'rspec', '1.3.0'
     gem.add_development_dependency 'stackdeck',  '0.2.0'
     gem.add_development_dependency 'johnson',    '2.0.0.pre2'

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

data/bin/shine

@@ -1,34 +1,19 @@
 #!/usr/bin/env ruby
 
-require File.join(File.dirname(__FILE__), *%w(.. lib shining))
-require 'fileutils'
-require 'tilt'
-require 'erb'
-require 'json/pure'
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'shining'
 
 ACTIONS   = {
-  :new_on!            => ['build'], 
-  :new_slide!         => ['slide'], 
+  :new_on!            => ['build'],
+  :new_slide!         => ['slide'],
   :compile_templates! => ['compile'],
   :vendorize          => ['vendor', 'vendorize']
 }
-TEMPLATES = %w(haml erb)
-
-class String; def /(s) File.join(self, s) end end
-
-def doing what, &block
-  puts what
-  block.call if block_given?
-end
 
 def bail! reason
-  STDERR.puts(reason) and exit(-2)
-end
-
-def vendorized?
-  bail!("This isn't a Shining preso!") unless shining?
-  File.exists? Dir.pwd/'vendor'/'lib'/'jquery.shining.js' and
-    File.exists? Dir.pwd/'vendor'/'themes'
+  Shining.error reason
+  exit -2
 end
 
 def figure_what_to_do!
@@ -53,51 +38,23 @@ Shine - Generates a new Shining presentation
 end
 
 def new_on! dir
-  target = File.expand_path(dir)
-  doing("Creating #{target}")      { FileUtils.mkdir_p target }
-  doing("Creating #{target/'config.json'}") { FileUtils.cp SHINING_ROOT/'templates'/'config.json', target/'config.json' }
-  doing("Creating #{target/'index.html'}") {
-    contents = File.read(SHINING_ROOT/'templates'/'index.html')
-    File.open(target/'index.html', 'w') do |file| file.write ERB.new(contents).result end
-  }
-  doing("Creating #{target/'slides'}")      { FileUtils.cp_r SHINING_ROOT/'templates'/'slides', target/'slides' }
+  Shining::Preso.new dir
 end
 
-def new_slide! name
-  bail!("This isn't a Shining preso!") unless shining?
-  config = JSON.parse File.read(Dir.pwd/'config.json')
-  config['slides'] << name
-  File.open(Dir.pwd/'config.json', 'w') do |file| file.write JSON.pretty_generate(config) end
-  doing("Creating #{Dir.pwd/'slides'/name}.html")  {
-    File.open(Dir.pwd/'slides'/"#{name}.html", 'w') do |file| file.write "<h1 class='centered'>#{name}</h1><p class='centered>♫ ♫ ♫</p>" end
-  }
-  doing("Creating #{Dir.pwd/'slides'/name}.js")    { FileUtils.touch Dir.pwd/'slides'/name + '.js' }
+def new_slide! name, format = 'html'
+  preso = Shining::Preso.open Dir.pwd
+  preso.new_slide "#{name}.#{format}", :with => ['styles', 'script']
 end
 
 def vendorize
-  bail! 'This preso seems vendorized already.' if vendorized?
-  FileUtils.mkdir Dir.pwd/'vendor'
-  %w(lib css images themes).each do |required|
-    FileUtils.cp_r SHINING_ROOT/required, Dir.pwd/'vendor/'
-  end
-  index = File.read SHINING_ROOT/'templates'/'index.html'
-  Object.send(:remove_const, :SHINING_ROOT) and Object.const_set(:SHINING_ROOT, 'vendor')
-  File.open(Dir.pwd/'index.html', 'w') do |file| file.write ERB.new(index).result end
-  puts "Done!"
+  preso = Shining::Preso.open Dir.pwd
+  bail! 'This preso seems vendorized already.' if preso.vendorized?
+  preso.vendorize!
 end
 
 def compile_templates!
-  bail!("This isn't a Shining preso!") unless shining?
-  Dir[Dir.pwd/'slides'/'*'].reject { |f| f =~ /html|js$/ }.each do |template|
-    begin
-      target   = File.basename(template).sub(File.extname(template), '.html')
-      rendered = Tilt.new(template).render
-      File.open(Dir.pwd/'slides'/target, 'w') do |file| file.write rendered end
-      puts "Compiled: #{File.basename(template)} -> #{target}"
-    rescue RuntimeErroor
-      STDERR.puts "Tilt coult not compile #{File.basename template}. Skipping."
-    end
-  end
+  preso = Shining::Preso.open Dir.pwd
+  preso.compile_templates!
 end
 
 def shining?

data/css/effects.css

@@ -122,15 +122,15 @@
 }
 
 @-webkit-keyframes speeds-in-left {
-  0%    { opacity: 0; -webkit-transform: skew(40deg); margin-left: -4em }
-  10%   { opacity: 1; -webkit-transform: skew(0deg); margin-left: -2em }
-  90%   { opacity: 1; -webkit-transform: skew(0deg); margin-left: 0em }
-  100%  { opacity: 0; -webkit-transform: skew(-40deg); margin-right: -4em }
+  0%    { opacity: 0; -webkit-transform: skew(40deg) translate(-4em, 0) }
+  10%   { opacity: 1; -webkit-transform: skew(0deg) translate(-2em, 0) }
+  90%   { opacity: 1; -webkit-transform: skew(0deg) translate(0) }
+  100%  { opacity: 0; -webkit-transform: skew(-40deg) translate(4em, 0) }
 }
 
 @-webkit-keyframes speeds-in-right {
-  0%    { opacity: 0; -webkit-transform: skew(-40deg); margin-right: -4em }
-  10%   { opacity: 1; -webkit-transform: skew(0deg); margin-right: -2em }
-  90%   { opacity: 1; -webkit-transform: skew(0deg); margin-right: 0em }
-  100%  { opacity: 0; -webkit-transform: skew(40deg); margin-left: -4em }
+  0%    { opacity: 0; -webkit-transform: skew(-40deg) translate(4em, 0) }
+  10%   { opacity: 1; -webkit-transform: skew(0deg) translate(2em, 0) }
+  90%   { opacity: 1; -webkit-transform: skew(0deg) translate(0) }
+  100%  { opacity: 0; -webkit-transform: skew(40deg) translate(-4em, 0) }
 }

data/lib/ext/filemethods.rb

@@ -0,0 +1,72 @@
+require 'fileutils'
+require 'erb'
+
+module Shining
+
+module FileMethods
+  def file? file
+    File.exists? file
+  end
+
+  def dir? dir
+    File.directory? dir
+  end
+
+  def copy from, to
+    Shining.say("Copying #{from} to #{to}") { File.directory?(from) ? FileUtils.cp_r(from, to) : FileUtils.cp(from, to) }
+  end
+
+  def new_dir dir, careful = true
+    confirm "#{dir} already exists. Proceed?" if careful and dir?(dir)
+    Shining.say("Creating directory #{dir}") { FileUtils.mkdir_p dir }
+  end
+
+  def read_file file
+    File.read file
+  end
+
+  def erb file
+    ERB.new(read_file(file)).result(binding)
+  end
+  
+  def json file
+    JSON.parse read_file(file)
+  end
+
+  def expand path
+    File.expand_path path
+  end
+
+  def dirname file
+    File.dirname file
+  end
+  
+  def extname file
+    File.extname file
+  end
+  
+  def basename file, take = ''
+    File.basename file, take
+  end
+  
+  def delete! file
+    dir?(file) ? FileUtils.rm_rf(file) : FileUtils.rm(file)
+  end
+
+  def new_file path
+    Shining.say "Creating file #{path}" do
+      File.open path, 'w' do |file|
+        yieldage = yield if block_given?
+        file.write yieldage unless yieldage.empty? or not yieldage.is_a?(String)
+      end
+    end
+  end
+
+  private
+  def confirm text
+    Shining.say text
+    !!(STDIN.gets =~ /yes|y/i) ? true : exit(-2)
+  end
+end
+
+end

data/lib/ext/string.rb

@@ -0,0 +1 @@
+class String; def /(s) File.join(self, s) end end

data/lib/jquery.shining.js

@@ -39,7 +39,19 @@
         $('#stage').centralize();
       });
       $(window).resize(function() { $('#stage').centralize() });
-      loadConfig(function() { getSlide($.shining.slides.current) });
+      $(document).click(function(event) {
+        if ($(event.target).is('a')) return false;
+        if (event.pageX < ($(window).width() / 2)) {
+          $.shining.previousSlide();
+        } else {
+          $.shining.nextSlide();
+        }
+      })
+      loadConfig(function() { 
+        getSlide($.shining.slides.current);
+        setTitle($.shining.config.title);
+        setTheme($.shining.config.theme);
+      });
     }
 
     function getSlide(name) {
@@ -60,12 +72,27 @@
         loadSlide(name);
       }
     }
+    
+    function setTitle(title) {
+      if (!title) { return false };
+      $('title').text(title);
+    }
+    
+    function setTheme(name) {
+      if (!name || name == "default") { return false };
+      var path = $('link.theme').attr('href').replace('default.css', name + 'css');
+      return $('link.theme').attr('href', path);
+    }
 
     // private
     function slide(name) {
       return 'slides/' + name;
     }
     
+    function vendored() {
+      return $('script:first').attr('src').match(/^vendor/);
+    }
+    
     function loadSlide(name) {
       $('#stage').load(
         slide(name).markup(),

data/lib/shining.rb

@@ -1,7 +1,47 @@
+$:.unshift File.join(File.dirname(__FILE__))
+
 require 'rubygems'
-require 'tilt'
-require 'haml'
-require 'tmpdir'
-require 'fileutils'
+require 'ext/string'
+require 'ext/filemethods'
+require 'shining/preso'
+
+module Shining
+  class << self
+    def say something
+      STDOUT.puts(something) unless defined?(Spec) # shush when running tests
+      yield if block_given?
+    end
+
+    def error message
+      STDERR.puts message
+    end
+
+    def root
+      @root ||= File.expand_path File.dirname(__FILE__)/'..'
+    end
+
+    def templates_path
+      root/'templates'
+    end
 
-SHINING_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+    def sample_content_for format = 'html'
+      case format
+      when 'markdown'
+        <<-CONTENTS
+# #{name}
+This is a new slide. It needs some lovin'!
+        CONTENTS
+      when 'haml'
+        <<-CONTENTS
+%h1.centered #{name}
+%p.centered This is a new slide. It needs some lovin'!
+        CONTENTS
+      when 'html'
+        <<-CONTENTS
+<h1 class="centered">#{name}</h1>
+<p class="centered">This is a new slide. It needs some lovin'!</p>
+        CONTENTS
+      end
+    end
+  end
+end

data/lib/shining/preso.rb

@@ -0,0 +1,108 @@
+require 'fileutils'
+require 'json/pure'
+require 'tilt'
+
+module Shining
+
+class Preso
+  include FileMethods and extend FileMethods
+  attr_accessor :path
+
+  SLIDE_FORMATS     = %w(haml markdown html)
+  TEMPLATE_FORMATS  = SLIDE_FORMATS - ['html']
+
+  def initialize dir, fresh = true
+    @path   = expand(dir)
+    if fresh
+      new_dir dir
+      copy_templates
+    end
+    @config = json(@path/'config.json')
+  end
+
+  def self.open dir
+    begin
+      new dir, false
+    rescue
+      raise "#{dir} is not a Shining presentation!"
+    end
+  end
+
+  def config refresh = false
+    refresh ? @config = json(path/'config.json') : @config
+  end
+
+  def save_config!
+    new_file path/'config.json' do JSON.pretty_generate(@config) end
+    true
+  end
+
+  def copy_templates
+    %w(config.json slides).each do |template|
+      copy Shining.templates_path/template, @path + '/'
+    end
+    new_file @path/'index.html' do erb(Shining.templates_path/'index.html') end
+    true
+  end
+
+  def templates
+    Dir[path/'slides'/"*.{#{TEMPLATE_FORMATS.join(',')}}"].map { |template| basename(template) }
+  end
+
+  def new_slide file, options = {}
+    file = basename(file)
+    name, format = basename(file, extname(file)), extname(file).sub(/^./, '')
+    raise ArgumentError, "Format needs to be #{SLIDE_FORMATS.join(' or ')}." unless SLIDE_FORMATS.include? format
+    new_file path/'slides'/file do Shining.sample_content_for(format) end
+    new_file path/'slides'/"#{name}.css"  if options[:with].include?('styles') rescue nil
+    new_file path/'slides'/"#{name}.js"   if options[:with].include?('script') rescue nil
+    config['slides'] << name and save_config!
+  end
+
+  def slides
+    @config['slides']
+  end
+
+  def templates
+    Dir[path/'slides'/"*.{#{TEMPLATE_FORMATS.join(',')}}"].map { |t| basename(t) }
+  end
+
+  def compile_templates!
+    templates.each do |template|
+      begin
+        target   = basename(template).sub(extname(template), '.html')
+        rendered = Tilt.new(path/'slides'/template).render
+        new_file path/'slides'/target do rendered end
+      rescue RuntimeError
+        Shining.error "Tilt coult not compile #{File.basename template}. Skipping."
+      end
+    end
+  end
+
+  def vendorize!
+    new_dir @path/'vendor'
+    %w(lib css images themes).each do |required|
+      copy Shining.root/required, @path/'vendor/'
+    end
+    new_file @path/'index.html' do erb(Shining.templates_path/'index.html') end
+    true
+  end
+
+  def vendorized?
+    dir? @path/'vendor'
+  end
+
+  def unvendorize!
+    delete! @path/'vendor'
+    copy_templates
+  end
+
+  def vendorized?
+    dir? @path/'vendor'/'lib' and
+      dir? @path/'vendor'/'themes' and
+      dir? @path/'vendor'/'css' and
+      dir? @path/'vendor'/'images'
+  end
+end
+
+end

data/shining.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shining}
-  s.version = "1.0.0"
+  s.version = "1.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-03-08}
+  s.date = %q{2010-03-11}
   s.description = %q{Webkit + CSS + Javascript = awesome presos}
   s.email = %q{julio.ody@gmail.com}
   s.executables = ["console", "shine"]
@@ -31,13 +31,19 @@ Gem::Specification.new do |s|
      "images/page_white_code.png",
      "images/page_white_copy.png",
      "images/printer.png",
+     "lib/ext/filemethods.rb",
+     "lib/ext/string.rb",
      "lib/jquery-1.4.1.min.js",
      "lib/jquery.shining.js",
+     "lib/plugins/jquery.shining-audio-0.0.1.js",
      "lib/shBrushAll.js",
      "lib/shCore.js",
      "lib/shining.rb",
+     "lib/shining/preso.rb",
      "shining.gemspec",
      "spec/cli_spec.rb",
+     "spec/generators_spec.rb",
+     "spec/preso_spec.rb",
      "spec/sample/base.css",
      "spec/sample/config.json",
      "spec/sample/effects.css",
@@ -62,6 +68,8 @@ Gem::Specification.new do |s|
   s.summary = %q{Webkit + CSS + Javascript = awesome presos}
   s.test_files = [
     "spec/cli_spec.rb",
+     "spec/generators_spec.rb",
+     "spec/preso_spec.rb",
      "spec/shining_spec.rb",
      "spec/spec_helper.rb"
   ]
@@ -73,6 +81,8 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<haml>, [">= 2.2.17"])
       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_development_dependency(%q<rspec>, ["= 1.3.0"])
       s.add_development_dependency(%q<stackdeck>, ["= 0.2.0"])
       s.add_development_dependency(%q<johnson>, ["= 2.0.0.pre2"])
@@ -83,6 +93,8 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<haml>, [">= 2.2.17"])
       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<rspec>, ["= 1.3.0"])
       s.add_dependency(%q<stackdeck>, ["= 0.2.0"])
       s.add_dependency(%q<johnson>, ["= 2.0.0.pre2"])
@@ -94,6 +106,8 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<haml>, [">= 2.2.17"])
     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<rspec>, ["= 1.3.0"])
     s.add_dependency(%q<stackdeck>, ["= 0.2.0"])
     s.add_dependency(%q<johnson>, ["= 2.0.0.pre2"])

data/spec/cli_spec.rb

@@ -2,68 +2,72 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe 'shine' do
   PRESO = Dir.tmpdir/'shining-tmp'/'preso'
-  SHINE = ROOT/'bin'/'shine'
-  
+  SHINE = Shining.root/'bin'/'shine'
+
   def new_preso
     system "#{SHINE} #{PRESO}"
   end
-  
+
   def vendorize
     system "cd #{PRESO} && #{SHINE} vendor"
   end
-  
-  def new_slide(name)
-    system "cd #{PRESO} && #{SHINE} slide #{name}"
+
+  def new_slide(name, format = 'html')
+    system "cd #{PRESO} && #{SHINE} slide #{name} #{format}"
   end
-  
+
   def compile_templates
     system "cd #{PRESO} && #{SHINE} compile"
   end
-  
+
   def make_haml_template!(name)
     File.open(PRESO/'slides'/"#{name}.haml", 'w') { |f| f << "%p LOOK MA" }
   end
-  
+
   before :all do
     FileUtils.rm_rf   Dir.tmpdir/'shining-tmp'
     FileUtils.mkdir_p Dir.tmpdir/'shining-tmp'
   end
-  
+
   before :each do
     FileUtils.rm_rf PRESO
     new_preso
   end
-  
+
   it "creates a new shining preso when passing an argument thats not 'build', 'compile', or 'slide'" do
     File.directory?(PRESO).should == true
   end
-  
+
   describe 'the slide option' do
     it "creates a new slide and slide script named 'foo' on 'shine slide foo'" do
       new_slide 'foo'
       File.exists?(PRESO/'slides'/'foo.html').should be_true
       File.exists?(PRESO/'slides'/'foo.js').should be_true
     end
-    
+
+    it "creates a new slide template named 'test.haml' on 'shine slide test haml'" do
+      new_slide 'test', 'haml'
+      File.exists?(PRESO/'slides'/'test.haml').should be_true
+      File.exists?(PRESO/'slides'/'test.js').should be_true
+    end
+
     it "updates the presentation's config file with the slide added" do
       new_slide 'test'
       config = JSON.parse(File.read(PRESO/'config.json'))
       config['slides'].should include('test')
     end
-    
-    it "won't let you create a slide with the same name of an already existing one"
   end
-  
+
   it "vendorizes Shining to #{PRESO/'vendor'} with the 'vendor' option" do
     vendorize
     %w(lib themes css).each do |required|
       File.exists?(PRESO/'vendor'/required).should be_true
     end
   end
-  
+
   it "compiles a Haml template if there is one in #{'PRESO_ROOT'/'slides'/'test.haml'} with the 'compile' option" do
     make_haml_template! 'test'
-    compile_templates    
+    compile_templates
     File.read(PRESO/'slides'/'test.html').should == "<p>LOOK MA</p>\n"
-  end  
+  end
 end

data/spec/preso_spec.rb

@@ -0,0 +1,115 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe 'Shining::Preso' do
+
+  before :all do
+    TMP = Dir.tmpdir/'shining-tmp' unless defined?(TMP)
+    FileUtils.rm_rf   TMP
+    FileUtils.mkdir_p TMP
+  end
+
+  before :each do
+    FileUtils.rm_rf TMP/'temp'
+    @preso = Shining::Preso.new TMP/'temp'
+  end
+
+  describe '#new' do
+    it "creates a folder for the presentation on #new" do
+      File.directory?(TMP/'temp').should be_true
+    end
+
+    it "copies an initial set of templates to the presentation folder" do
+      (File.exists?(TMP/'temp'/'config.json')
+      File.exists?(TMP/'temp'/'index.html')
+      File.directory?(TMP/'temp'/'slides')
+      File.exists?(TMP/'temp'/'slides'/'welcome.html')).should be_true
+    end
+  end
+  
+  describe "#open" do
+    it "opens an existing presentation" do
+      preso = Shining::Preso.open TMP/'temp'
+      preso.should be_an_instance_of(Shining::Preso)
+    end
+    
+    it "errors out if the directory is not a Shining presentation" do
+      lambda do Shining::preso.open TMP end.should raise_error
+    end
+  end
+
+  describe 'vendorization' do
+    before do
+      @preso.vendorize!
+    end
+
+    it "#vendorize! copies everything necessary for the presentation to run without the gem being installed" do
+      (File.directory?(@preso.path/'vendor'/'lib') and
+        File.directory?(@preso.path/'vendor'/'themes') and
+        File.directory?(@preso.path/'vendor'/'css') and
+        File.directory?(@preso.path/'vendor'/'images')).should be_true
+    end
+
+    it "returns true on #vendorized? if a presentation is vendorized, false when not" do
+      @preso.vendorized?.should be_true
+      File.read(@preso.path/'index.html').should =~ /vendor\/lib/
+    end
+
+    it "\"unvendorizes\" a gem on #unvendorize!" do
+      @preso.unvendorize!
+      (File.directory?(@preso.path/'vendor'/'lib') and
+        File.directory?(@preso.path/'vendor'/'themes') and
+        File.directory?(@preso.path/'vendor'/'css') and
+        File.directory?(@preso.path/'vendor'/'images')).should be_false
+      File.read(@preso.path/'index.html').should_not =~ /vendor\/lib/
+    end
+  end
+
+  describe 'config' do
+    it "#config(true) force loads from config.json" do
+      @preso.should_receive :json
+      @preso.config(true)
+    end
+
+    it "#config simply returns the in-memory config Hash" do
+      @preso.should_not_receive :json
+      @preso.config
+    end
+  end
+
+  describe 'slides' do
+    before do
+      FileUtils.rm_f @preso.path/'slides'/'*.haml'
+      FileUtils.rm_f @preso.path/'slides'/'*.markdown'      
+    end
+
+    it "raises an error if the format is not in the allowed formats list" do
+      lambda do @preso.new_slide 'foo.erb' end.should raise_error(ArgumentError)
+    end
+
+    it "#new_slide creates a new Markdown/Haml/HTML template and adds it's name to the config file" do
+      @preso.new_slide 'foo.haml'
+      JSON.parse(File.read(@preso.path/'config.json'))['slides'].should include('foo')
+    end
+  end
+  
+  describe 'templates' do
+    it "#templates returns exclusively these template formats: #{Shining::Preso::TEMPLATE_FORMATS.join(', ')}." do
+      @preso.new_slide 'foo.haml'
+      @preso.new_slide 'test.markdown'
+      @preso.templates.should     include('foo.haml', 'test.markdown')
+      @preso.templates.should_not include('welcome.html')
+    end
+    
+    it "#compile_templates! compiles either Markdown/Haml templates into HTML (slides)" do
+      @preso.new_slide 'test2.haml'
+      @preso.new_slide 'test3.markdown'
+      @preso.compile_templates!
+      (File.exists?(@preso.path/'slides'/'test2.html') and
+        File.exists?(@preso.path/'slides'/'test3.html')).should be_true
+    end
+  end
+
+  it "returns a collection of slides on #slides, which is what's in @config['slides']" do
+    @preso.slides.should include('welcome')
+  end
+end

data/spec/shining_spec.rb

@@ -2,8 +2,8 @@ require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe 'Shining' do  
   before do
-    Dir.chdir File.join(ROOT, *%w(spec sample))
-    @page = Harmony::Page.fetch("file:////#{ROOT}/spec/sample/index.html")
+    Dir.chdir File.join(Shining.root, *%w(spec sample))
+    @page = Harmony::Page.fetch("file:////#{Shining.root}/spec/sample/index.html")
   end
   
   it "has a stage" do

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'rubygems'
+require 'tmpdir'
 require File.join(File.dirname(__FILE__), *%w(.. lib shining))
 
 gem 'stackdeck',  '0.2.0';          require 'stackdeck'
@@ -7,8 +8,4 @@ gem 'rspec',      '1.3.0';          require 'spec'
 gem 'rake',       '0.8.7';          require 'rake'
 gem 'envjs',      '0.1.4';          require 'envjs'
 gem 'juliocesar-harmony', '0.5.2';  require 'harmony'
-gem 'json_pure',  '1.1.9';          require 'json/pure'
-
-ROOT = File.expand_path File.join(File.dirname(__FILE__), '..')
-
-class String; def /(s) File.join(self, s) end end
+gem 'json_pure',  '1.1.9';          require 'json/pure'

data/templates/index.html

@@ -3,15 +3,15 @@
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8">
     <title>Genesis</title>
-    <link rel="stylesheet" type="text/css" href="<%= SHINING_ROOT %>/css/base.css" media="all"/>
-    <link rel="stylesheet" type="text/css" href="<%= SHINING_ROOT %>/css/effects.css" media="all"/>
-    <link rel="stylesheet" type="text/css" href="<%= SHINING_ROOT %>/css/shCore.css" media="all"/>
-    <link rel="stylesheet" type="text/css" href="<%= SHINING_ROOT %>/css/shThemeFadeToGrey.css" media="all"/>
-    <link rel="stylesheet" type="text/css" href="<%= SHINING_ROOT %>/themes/default.css" media="all"/>
-    <script type="text/javascript" charset="utf-8" src="<%= SHINING_ROOT %>/lib/jquery-1.4.1.min.js"></script>
-    <script type="text/javascript" charset="utf-8" src="<%= SHINING_ROOT %>/lib/shCore.js"></script>
-    <script type="text/javascript" charset="utf-8" src="<%= SHINING_ROOT %>/lib/shBrushAll.js"></script>
-    <script type="text/javascript" charset="utf-8" src="<%= SHINING_ROOT %>/lib/jquery.shining.js"></script>
+    <link rel="stylesheet" type="text/css" href="<%= vendorized? ? 'vendor' : Shining.root %>/css/base.css" media="all"/>
+    <link rel="stylesheet" type="text/css" href="<%= vendorized? ? 'vendor' : Shining.root %>/css/effects.css" media="all"/>
+    <link rel="stylesheet" type="text/css" href="<%= vendorized? ? 'vendor' : Shining.root %>/css/shCore.css" media="all"/>
+    <link rel="stylesheet" type="text/css" href="<%= vendorized? ? 'vendor' : Shining.root %>/css/shThemeFadeToGrey.css" media="all"/>
+    <link rel="stylesheet" type="text/css" href="<%= vendorized? ? 'vendor' : Shining.root %>/themes/default.css" media="all"/>
+    <script type="text/javascript" charset="utf-8" src="<%= vendorized? ? 'vendor' : Shining.root %>/lib/jquery-1.4.1.min.js"></script>
+    <script type="text/javascript" charset="utf-8" src="<%= vendorized? ? 'vendor' : Shining.root %>/lib/shCore.js"></script>
+    <script type="text/javascript" charset="utf-8" src="<%= vendorized? ? 'vendor' : Shining.root %>/lib/shBrushAll.js"></script>
+    <script type="text/javascript" charset="utf-8" src="<%= vendorized? ? 'vendor' : Shining.root %>/lib/jquery.shining.js"></script>
   </head>
   <body>
     <section id="stage"></section>

data/themes/default.css

@@ -5,7 +5,7 @@ body          { background-color: rgb(48, 48, 48) }
 }
 
 h1, h2, h3, p, li { color: rgb(238, 238, 238); text-shadow: rgb(0, 0, 0) 2px 2px 4px }
-a                 { color: rgb(255, 255, 255) }
+a                 { color: rgb(73, 157, 255) }
 ul                { list-style-type: disc }
 
 #controls     { 
@@ -17,5 +17,6 @@ ul                { list-style-type: disc }
   -webkit-border-top-left-radius: 5px;
   -webkit-border-top-right-radius: 5px;  
 }
-#controls a   { display: inline-block; width: 75px; padding: 5px 0; font-weight: bold }
-em            { font-weight: bold; color: rgb(167, 213, 32) }
+#controls a   { display: inline-block; width: 75px; padding: 5px 0; font-weight: bold; color: #fff; }
+em            { color: rgb(73, 255, 80) }
+strong        { color: rgb(255, 171, 73); font-weight: bold }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shining
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Julio Cesar Ody
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-08 00:00:00 +11:00
+date: 2010-03-11 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.9
     version: 
+- !ruby/object:Gem::Dependency 
+  name: tilt
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.6"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rdiscount
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 1.6.3
+    version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   type: :development
@@ -126,13 +146,19 @@ files:
 - images/page_white_code.png
 - images/page_white_copy.png
 - images/printer.png
+- lib/ext/filemethods.rb
+- lib/ext/string.rb
 - lib/jquery-1.4.1.min.js
 - lib/jquery.shining.js
+- lib/plugins/jquery.shining-audio-0.0.1.js
 - lib/shBrushAll.js
 - lib/shCore.js
 - lib/shining.rb
+- lib/shining/preso.rb
 - shining.gemspec
 - spec/cli_spec.rb
+- spec/generators_spec.rb
+- spec/preso_spec.rb
 - spec/sample/base.css
 - spec/sample/config.json
 - spec/sample/effects.css
@@ -179,5 +205,7 @@ specification_version: 3
 summary: Webkit + CSS + Javascript = awesome presos
 test_files: 
 - spec/cli_spec.rb
+- spec/generators_spec.rb
+- spec/preso_spec.rb
 - spec/shining_spec.rb
 - spec/spec_helper.rb