shining 1.1.1 → 1.1.2

data/Rakefile

@@ -6,6 +6,14 @@ Spec::Rake::SpecTask.new do |t|
   t.spec_opts = ['--colour', '--format nested']
 end
 
+namespace :spec do
+  desc 'runs Javascript specs'
+  task :javascripts do
+    Dir.chdir File.join(File.dirname(__FILE__), 'spec', 'javascripts')
+    system "jspec run dom.html"
+  end
+end
+
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
@@ -21,12 +29,8 @@ begin
     gem.add_dependency      'rdiscount',      '>= 1.6.3'
     gem.add_dependency      'term-ansicolor', '>= 1.0.4'
     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'
-    gem.add_development_dependency 'rspec',      '1.3.0'
-    gem.add_development_dependency 'rake',       '0.8.7'
-    gem.add_development_dependency 'envjs',      '0.1.4'
-    gem.add_development_dependency 'juliocesar-harmony', '0.5.2'
+    gem.add_development_dependency 'jspec', '4.2.0'    
+    gem.add_development_dependency 'rake',  '0.8.7'
   end
 rescue LoadError
   puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/jquery.shining.js

@@ -87,9 +87,6 @@
       }
     }
     
-    $.shining.slice = slice;
-    $.shining.unslice = unslice;
-
     String.prototype.markup = function() { return this + '.html' };
     String.prototype.script = function() { return this + '.js' };
     String.prototype.style  = function() { return this + '.css' };

data/shining.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shining}
-  s.version = "1.1.1"
+  s.version = "1.1.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-04-07}
+  s.date = %q{2010-04-08}
   s.description = %q{Webkit + CSS + Javascript = awesome presos}
   s.email = %q{julio.ody@gmail.com}
   s.executables = ["console", "shine"]
@@ -44,6 +44,19 @@ Gem::Specification.new do |s|
      "shining.gemspec",
      "spec/cli_spec.rb",
      "spec/generators_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",
@@ -55,7 +68,6 @@ 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",
@@ -72,7 +84,6 @@ Gem::Specification.new do |s|
     "spec/cli_spec.rb",
      "spec/generators_spec.rb",
      "spec/preso_spec.rb",
-     "spec/shining_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -87,12 +98,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<rdiscount>, [">= 1.6.3"])
       s.add_runtime_dependency(%q<term-ansicolor>, [">= 1.0.4"])
       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"])
-      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"])
-      s.add_development_dependency(%q<envjs>, ["= 0.1.4"])
-      s.add_development_dependency(%q<juliocesar-harmony>, ["= 0.5.2"])
     else
       s.add_dependency(%q<haml>, [">= 2.2.17"])
       s.add_dependency(%q<json_pure>, [">= 1.1.9"])
@@ -100,12 +107,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rdiscount>, [">= 1.6.3"])
       s.add_dependency(%q<term-ansicolor>, [">= 1.0.4"])
       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"])
-      s.add_dependency(%q<rspec>, ["= 1.3.0"])
+      s.add_dependency(%q<jspec>, ["= 4.2.0"])
       s.add_dependency(%q<rake>, ["= 0.8.7"])
-      s.add_dependency(%q<envjs>, ["= 0.1.4"])
-      s.add_dependency(%q<juliocesar-harmony>, ["= 0.5.2"])
     end
   else
     s.add_dependency(%q<haml>, [">= 2.2.17"])
@@ -114,12 +117,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rdiscount>, [">= 1.6.3"])
     s.add_dependency(%q<term-ansicolor>, [">= 1.0.4"])
     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"])
-    s.add_dependency(%q<rspec>, ["= 1.3.0"])
+    s.add_dependency(%q<jspec>, ["= 4.2.0"])
     s.add_dependency(%q<rake>, ["= 0.8.7"])
-    s.add_dependency(%q<envjs>, ["= 0.1.4"])
-    s.add_dependency(%q<juliocesar-harmony>, ["= 0.5.2"])
   end
 end
 

data/spec/cli_spec.rb

@@ -77,7 +77,7 @@ describe 'shine' do
   
   describe 'go' do
     it "for now it only works on Mac OSX" do
-      player = Shining::Player.new
+      player = Shining::Player.new Shining::Preso.open(PRESO)
       player.should_receive(:osx?).and_return(false)
       lambda { player.go! }.should raise_error
     end

data/spec/javascripts/dom.html

@@ -0,0 +1,25 @@
+<html>
+	<head>
+		<link type="text/css" rel="stylesheet" href="/opt/local/lib/ruby/gems/1.8/gems/jspec-4.2.0/lib/jspec.css" />
+		<script src="/opt/local/lib/ruby/gems/1.8/gems/jspec-4.2.0/lib/jspec.js"></script>
+		<script src="/opt/local/lib/ruby/gems/1.8/gems/jspec-4.2.0/lib/jspec.xhr.js"></script>
+		<script src="unit/spec.helper.js"></script>
+		<script src="../../lib/jquery-1.4.1.min.js"></script>
+		<script src="../../lib/shCore.js"></script>
+		<script src="../../lib/shBrushAll.js"></script>
+		<script src="../../lib/jquery.shining.js"></script>
+		<script>
+			function runSuites() {
+				JSpec
+				.exec('unit/spec.js')
+				.run({ fixturePath: 'sample' })
+				.report()
+			}
+		</script>
+	</head>
+	<body class="jspec" onLoad="runSuites();">
+		<div id="jspec-top"><h2 id="jspec-title">JSpec <em><script>document.write(JSpec.version)</script></em></h2></div>
+		<div id="jspec"></div>
+		<div id="jspec-bottom"></div>
+	</body>
+</html>

data/spec/javascripts/rhino.js

@@ -0,0 +1,10 @@
+
+load('/opt/local/lib/ruby/gems/1.8/gems/jspec-4.2.0/lib/jspec.js')
+load('/opt/local/lib/ruby/gems/1.8/gems/jspec-4.2.0/lib/jspec.xhr.js')
+load('lib/yourlib.js')
+load('spec/unit/spec.helper.js')
+
+JSpec
+.exec('spec/unit/spec.js')
+.run({ reporter: JSpec.reporters.Terminal, fixturePath: 'spec/fixtures' })
+.report()

data/spec/javascripts/sample/config.json

@@ -0,0 +1,8 @@
+{
+  "transitions": "fade",
+  "slides": [
+    "welcome",
+    "slide1",
+    "slide2"
+  ]
+}

data/spec/javascripts/sample/index.html

@@ -0,0 +1,9 @@
+<section id="stage">
+  <div class="contents"></div>      
+</section>
+<nav id="controls" class="transparent">
+  <a id="first"><<</a>
+  <a id="previous"><</a>
+  <a id="next">></a>
+  <a id="last">>></a>
+</nav>

data/spec/javascripts/sample/slides/slide1.html

@@ -0,0 +1,2 @@
+<h1 class="centered">Shining</h1>
+<p class="centered">This is a new slide. It needs some lovin'!</p>

data/spec/javascripts/sample/slides/slide2.html

@@ -0,0 +1,2 @@
+<h1 class="centered">Shining</h1>
+<p class="centered">This is a new slide. It needs some lovin'!</p>

data/spec/javascripts/sample/slides/welcome.html

@@ -0,0 +1,4 @@
+<h1 class="centered">Welcome to your preso!</h1>
+<p class="centered">
+  Lorem Ipsum is hard to understand.
+</p>

data/spec/javascripts/unit/spec.helper.js

@@ -0,0 +1,2 @@
+JSpec.modules[0].utilities.mockRequest('config.json').and_return('{"transitions": false, "slides": ["welcome", "slide1", "slide2"]}');
+

data/spec/javascripts/unit/spec.js

@@ -0,0 +1,58 @@
+describe 'Shining'
+  before_each
+    window.$ = jQuery;
+    $.fn.offset = function() { return 0 };
+    if (!$('#hidden').length) {
+      var hidden = $('<div id="hidden"></div>').css({height: 0, width: 0, opacity: 0, marginLeft: -10000}).appendTo('body');
+      var stage = $($(fixture('index.html')).get(0)),
+        controls = $($(fixture('index.html')).get(2));
+      hidden.append(stage).append(controls);      
+    }
+  end
+  
+  describe "structurally speaking"  
+    it 'should have a stage'
+      $('#stage').length.should.be 1
+    end
+  
+    it 'should have navigation controls'
+      $('#controls').length.should.be 1
+    end
+  end
+  
+  describe "config file"
+    it 'gets read when shining gets loaded'
+      $.shining.config.constructor.should.be Object
+    end
+  end
+  
+  describe "slides"
+    it '#current() returns the first slide by default'
+      $.shining.slides.current().should.be 'welcome'
+    end  
+    
+    it '#current("slide1") sets the current slide to "slide1"'
+      $.shining.slides.current('slide1')
+      $.shining.slides.current().should.be 'slide1'
+    end
+    
+    it "#last() returns the last slide in the slides array"
+      $.shining.slides.last().should.be 'slide2'
+    end
+  end
+  
+  describe 'navigating slides'
+    it 'navigates to slide1 on $.shining.nextSlide()'
+      $.shining.slides.current('welcome')
+      mockRequest().and_return('<h1>Slide1</h1>');    
+      $.shining.nextSlide();
+      $('#stage .contents h1').text().should.be 'Slide1'
+    end
+    
+    it 'navigates to slide2 on $.shining.nextSlide()'
+      mockRequest().and_return('<h1>Slide2</h1>');
+      $.shining.nextSlide();
+      $('#stage .contents h1').text().should.be 'Slide2'
+    end
+  end
+end

data/spec/sample/index.html

@@ -1,21 +1,7 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta http-equiv="Content-type" content="text/html; charset=utf-8">
-    <title>Genesis</title>
-    <link rel="stylesheet" type="text/css" href="base.css" />
-    <link rel="stylesheet" type="text/css" href="effects.css" />    
-    <link rel="stylesheet" type="text/css" href="themes/default.css" />
-    <script type="text/javascript" charset="utf-8" src="../../lib/jquery-1.4.1.min.js"></script>
-    <script type="text/javascript" charset="utf-8" src="../../lib/jquery.shining.js"></script>
-  </head>
-  <body>
-    <section id="stage"></section>
-    <nav id="controls" class="transparent">
-      <a id="first"><<</a>
-      <a id="previous"><</a>
-      <a id="next">></a>
-      <a id="last">>></a>
-    </nav>
-  </body>
-</html>
+<section id="stage"></section>
+<nav id="controls" class="transparent">
+  <a id="first"><<</a>
+  <a id="previous"><</a>
+  <a id="next">></a>
+  <a id="last">>></a>
+</nav>

data/spec/spec_helper.rb

@@ -2,11 +2,7 @@ require 'rubygems'
 require 'tmpdir'
 require File.join(File.dirname(__FILE__), *%w(.. lib shining))
 
-gem 'stackdeck',  '0.2.0';          require 'stackdeck'
-gem 'johnson',    '2.0.0.pre2';     require 'johnson'
-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'
-gem 'haml',       '>= 2.2.17';      require 'haml'
+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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shining
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - Julio Cesar Ody
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 +10:00
+date: 2010-04-08 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,34 +73,14 @@ dependencies:
         version: 1.3.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: stackdeck
+  name: jspec
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.2.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: johnson
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 2.0.0.pre2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.3.0
+        version: 4.2.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -112,26 +92,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.8.7
     version: 
-- !ruby/object:Gem::Dependency 
-  name: envjs
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.1.4
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: juliocesar-harmony
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.5.2
-    version: 
 description: Webkit + CSS + Javascript = awesome presos
 email: julio.ody@gmail.com
 executables: 
@@ -169,6 +129,19 @@ files:
 - shining.gemspec
 - spec/cli_spec.rb
 - spec/generators_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
@@ -180,7 +153,6 @@ 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
@@ -219,5 +191,4 @@ test_files:
 - spec/cli_spec.rb
 - spec/generators_spec.rb
 - spec/preso_spec.rb
-- spec/shining_spec.rb
 - spec/spec_helper.rb

data/spec/shining_spec.rb

@@ -1,43 +0,0 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
-
-describe 'Shining' do  
-  before do
-    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
-    @page.execute_js("$('#stage').is(':visible')").should == true
-  end
-  
-  it "has navigation controls" do
-    @page.execute_js("$('#controls').length").should == 1
-  end
-  
-  describe ".slides" do
-    it ".current should return the first slide by default" do
-      @page.execute_js("$.shining.slides.current").should == 'first'
-    end
-    
-    it ".length returns 3 for when there's 3 slides" do
-      @page.execute_js("$.shining.slides.length").should == 3
-    end
-    
-    it ".current= sets the current slide, returning it's name" do
-      @page.execute_js("$.shining.slides.current = 'second'").should == 'second'
-      @page.execute_js("$.shining.slides._current").should == 1
-    end    
-    
-    it ".current returns undefined if set to an unexisting slide" do
-      @page.execute_js("$.shining.slides.current = 'omg'; $.shining.slides.current").should == nil
-    end
-    
-    it "returns the next slide in the list on .next" do
-      @page.execute_js("$.shining.slides.current = 'second'; $.shining.slides.next").should == 'third'
-    end
-    
-    it "returns the previous slide in the list on .previous" do
-      @page.execute_js("$.shining.slides.current = 'second'; $.shining.slides.previous").should == 'first'
-    end
-  end
-end