shining 1.3.2 → 1.3.3

data/CHANGELOG.txt

@@ -1,3 +1,8 @@
+= 1.3.3 (26/05/2010)
+
+* A bit more sensible reaction when running into a config file that's not valid JSON.
+* Fixed negative top CSS property for stage on very long slides.
+
 = 1.3.2 (19/05/2010)
 
 * Always including config.ru.

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.3.3

data/lib/ext/filemethods.rb

@@ -44,7 +44,13 @@ module FileMethods
   end
 
   def json file
-    JSON.parse read_file(file)
+    begin
+      JSON.parse read_file(file)
+    rescue Errno::ENOENT
+      raise Shining::NoSuchFile, "File #{file} doesn't exist"
+    rescue 
+      raise Shining::CantParseJSONFile, "File #{file} doesn't appear to be valid JSON"
+    end
   end
 
   def expand path

data/lib/shining.js

@@ -322,7 +322,9 @@
   }
   
   function centerStage() {
-  	$('#stage').css({ top: ($(window).height() - $('#stage').outerHeight()) / 2	});
+    var top = ($(window).height() - $('#stage').outerHeight()) / 2;
+    if (top < 0) top = 0;
+  	$('#stage').css({ top: top });
   }
 
   Shining.init();

data/lib/shining.rb

@@ -6,6 +6,7 @@ require 'ext/filemethods'
 require 'shining/preso'
 require 'shining/player'
 require 'shining/heroku'
+require 'shining/errors'
 
 module Shining
   class << self

data/lib/shining/errors.rb

@@ -0,0 +1,4 @@
+module Shining
+  class CantParseJSONFile < RuntimeError; end
+  class NoSuchFile < RuntimeError; end
+end

data/lib/shining/preso.rb

@@ -18,15 +18,11 @@ class Preso
       copy_templates
       vendorize!
     end
-    @config = json(@path/'config.json')
+    @config = json(@path/'config.json')      
   end
 
   def self.open dir
-    begin
-      new dir, false
-    rescue
-      raise "#{dir} is not a Shining presentation!"
-    end
+    new dir, false
   end
 
   def config refresh = false

data/shining.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shining}
-  s.version = "1.3.2"
+  s.version = "1.3.3"
 
   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-19}
+  s.date = %q{2010-05-26}
   s.default_executable = %q{shine}
   s.description = %q{HTML + CSS + Javascript = awesome presos}
   s.email = %q{julio.ody@gmail.com}
@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
      "lib/shCore.js",
      "lib/shining.js",
      "lib/shining.rb",
+     "lib/shining/errors.rb",
      "lib/shining/heroku.rb",
      "lib/shining/player.rb",
      "lib/shining/preso.rb",

data/spec/filemethods_spec.rb

@@ -24,6 +24,20 @@ describe Shining::FileMethods do
     dir?(TMP/'temp'/'adir').should be_true
   end
   
+  context '#json' do
+    it 'parses JSON' do
+      File.open(TMP/'foo.json', 'w') { |file| file << "[1, 2, 3]" }
+      json(TMP/'foo.json').should be_a Array
+    end
+    it "raises Shining::NoSuchFile if the file doesn't exist" do
+      lambda do json(TMP/'aaabbbbbbcccc') end.should raise_error Shining::NoSuchFile
+    end
+    it "raises Shining::CantParseJSONFile if the file isn't valid JSON" do
+      File.open(TMP/'foo.json', 'w') { |file| file << "oaskdo ksdp kdpo asdk apos" }
+      lambda do json(TMP/'foo.json') end.should raise_error Shining::CantParseJSONFile
+    end
+  end
+  
   context '#move and #copy' do
     before do
       FileUtils.mkdir TMP/'temp'/'dir1'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - Julio Cesar Ody
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 +10:00
+date: 2010-05-26 00:00:00 +10:00
 default_executable: shine
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -163,6 +163,7 @@ files:
 - lib/shCore.js
 - lib/shining.js
 - lib/shining.rb
+- lib/shining/errors.rb
 - lib/shining/heroku.rb
 - lib/shining/player.rb
 - lib/shining/preso.rb