shining 1.3.7 → 2.0.0

data/lib/shining.rb

@@ -41,16 +41,11 @@ module Shining
 
     def sample_content_for format = 'html'
       case format
-      when 'markdown'
+      when 'markdown', 'md'
         <<-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>

data/lib/shining/heroku.rb

@@ -32,7 +32,6 @@ class Heroku
   end
     
   def deploy name
-    copy Shining.root/'lib'/'config.ru', @preso.path
     change_dir @preso.path
     Shining.say "Creating Git repository on #{@preso.path}" do `git init` end unless git_repo?
     Shining.say "Updating presentation's contents" do

data/lib/shining/preso.rb

@@ -7,7 +7,7 @@ class Preso
   include FileMethods and extend FileMethods
   attr_reader :path, :name
 
-  SLIDE_FORMATS     = %w(haml markdown html)
+  SLIDE_FORMATS = %w(markdown html md)
 
   def initialize dir, fresh = true
     @path   = expand(dir)

data/shining.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shining}
-  s.version = "1.3.7"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julio Cesar Ody"]
-  s.date = %q{2010-07-13}
+  s.date = %q{2010-09-17}
   s.default_executable = %q{shine}
   s.description = %q{HTML + CSS + Javascript = awesome presos}
   s.email = %q{julio.ody@gmail.com}
@@ -28,22 +28,16 @@ Gem::Specification.new do |s|
      "bin/shine",
      "css/base.css",
      "css/effects.css",
-     "css/iphone.css",
-     "css/shCore.css",
+     "css/shAll.css",
      "css/shThemeFadeToGrey.css",
-     "images/help.png",
-     "images/magnifier.png",
-     "images/page_white_code.png",
-     "images/page_white_copy.png",
-     "images/printer.png",
+     "images/default-noise.png",
      "lib/config.ru",
      "lib/deps.js",
      "lib/ext/filemethods.rb",
      "lib/ext/string.rb",
-     "lib/jquery-1.4.1.min.js",
+     "lib/jquery-1.4.2.min.js",
      "lib/plugins/iphone.js",
      "lib/plugins/resize.js",
-     "lib/plugins/syntaxhighlighter.js",
      "lib/shining.js",
      "lib/shining.rb",
      "lib/shining/errors.rb",

data/spec/cli_spec.rb

@@ -24,8 +24,8 @@ describe 'shine' do
     quiet "cd #{PRESO} && #{SHINE} compile"
   end
 
-  def make_haml_template!(name)
-    File.open(PRESO/'slides'/"#{name}.haml", 'w') { |f| f << "%p LOOK MA" }
+  def make_markdown_template!(name)
+    File.open(PRESO/'slides'/"#{name}.md", 'w') { |f| f << "# Look ma\n\nNo hands" }
   end
 
   before :all do
@@ -49,18 +49,9 @@ describe 'shine' do
       File.exists?(PRESO/'slides'/'foo.html').should be_true
     end
                 
-    it 'creates a new slide script by default' do
-      File.exists?(PRESO/'slides'/'foo.js').should be_true
-    end
-    
-    it 'creates a slide stylesheet by default' do
-      File.exists?(PRESO/'slides'/'foo.css').should be_true
-    end
-
-    it "creates a new Haml slide 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
+    it "creates a new Markdown slide named 'test.md' on 'shine slide test md'" do
+      new_slide 'test', 'md'
+      File.exists?(PRESO/'slides'/'test.md').should be_true
     end
   end
   

data/spec/preso_spec.rb

@@ -48,9 +48,9 @@ describe Shining::Preso 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.haml')
+    it "#new_slide creates a new Markdown/HTML template and adds it's name to the config file" do
+      @preso.new_slide 'foo.md'
+      JSON.parse(File.read(@preso.path/'config.json'))['slides'].should include('foo.md')
     end
     
     context '#remove_slide' do

data/templates/config.json

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

data/templates/index.html

@@ -6,17 +6,13 @@
     <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"/>
-    <link rel="stylesheet" type="text/css" href="vendor/css/shCore.css" media="all"/>
-    <link rel="stylesheet" type="text/css" href="vendor/css/shThemeFadeToGrey.css" media="all"/>
-    <link rel="stylesheet" type="text/css" href="vendor/themes/default.css" media="all" class="theme"/>
-    <script type="text/javascript" charset="utf-8" src="vendor/lib/jquery-1.4.1.min.js"></script>
+    <link rel="stylesheet" type="text/css" href="vendor/css/shAll.css" media="all"/>
+    <script type="text/javascript" charset="utf-8" src="vendor/lib/jquery-1.4.2.min.js"></script>
     <script type="text/javascript" charset="utf-8" src="vendor/lib/deps.js"></script>
     <script type="text/javascript" charset="utf-8" src="vendor/lib/shining.js"></script>
   </head>
   <body>
     <div id="stage">
-      <div class="contents"></div>
     </div>
   </body>
 </html>

data/templates/slides/welcome.html

@@ -1,4 +1,4 @@
 <h1 class="centered">Welcome to your preso!</h1>
 <p class="centered">
-  Bettlejuice! Bettlejuice! Bettlejuice!
+  This is a default slide.
 </p>

data/themes/default.css

@@ -1,17 +1,14 @@
-body          {
-  background-color: #303030;
+body              { 
+  background: #303030 url(/vendor/images/default-noise.png) repeat scroll;
+  background: -webkit-gradient(radial, 40% bottom, 500, 70% top, 400, from(rgba(99, 99, 99, 0)), to(rgba(99, 99, 99, 0.2))), #303030 url(/vendor/images/default-noise.png) repeat scroll;
 }
-#stage        { 
-  -webkit-box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.6);
-  -webkit-border-radius: 5px;
-  -moz-box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.6);
-  -moz-border-radius: 5px;
-  box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.6);
-  border-radius: 5px;  
-}
-
 h1, h2, h3, p, li { color: #EEEEEE; text-shadow: #000 2px 2px 4px }
 a                 { color: #499DFF; text-decoration: none }
 ul                { list-style-type: disc }
 em                { color: #4BFF50 }
-strong            { color: #FFAB49; font-weight: bold }
+strong            { color: #FFAB49; font-weight: bold }
+
+@media all and (max-device-width: 480px) {
+  body  { background: #303030 }
+  h1    { line-height: 1em; margin-bottom: 0.2em !important }
+}

data/themes/slidedown.css

@@ -1,5 +1,5 @@
 body          { background-color: #FFFFFF }
-#stage        { display: block; margin: 0; padding: 0 2em; color: #000000 }
+#stage        { display: block !important; margin: 0; padding: 0 2em; color: #000000 }
 
 /* override centered */
 #stage h1, h2, h3 { text-align: left; margin: 0 }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shining
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 15
   prerelease: false
   segments: 
-  - 1
-  - 3
-  - 7
-  version: 1.3.7
+  - 2
+  - 0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - Julio Cesar Ody
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-13 00:00:00 +10:00
+date: 2010-09-17 00:00:00 +10:00
 default_executable: shine
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -164,22 +164,16 @@ files:
 - bin/shine
 - css/base.css
 - css/effects.css
-- css/iphone.css
-- css/shCore.css
+- css/shAll.css
 - css/shThemeFadeToGrey.css
-- images/help.png
-- images/magnifier.png
-- images/page_white_code.png
-- images/page_white_copy.png
-- images/printer.png
+- images/default-noise.png
 - lib/config.ru
 - lib/deps.js
 - lib/ext/filemethods.rb
 - lib/ext/string.rb
-- lib/jquery-1.4.1.min.js
+- lib/jquery-1.4.2.min.js
 - lib/plugins/iphone.js
 - lib/plugins/resize.js
-- lib/plugins/syntaxhighlighter.js
 - lib/shining.js
 - lib/shining.rb
 - lib/shining/errors.rb

data/css/iphone.css

@@ -1,14 +0,0 @@
-#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/css/shCore.css

@@ -1,330 +0,0 @@
-/**
- * SyntaxHighlighter
- * http://alexgorbatchev.com/
- *
- * SyntaxHighlighter is donationware. If you are using it, please donate.
- * http://alexgorbatchev.com/wiki/SyntaxHighlighter:Donate
- *
- * @version
- * 2.1.364 (October 15 2009)
- * 
- * @copyright
- * Copyright (C) 2004-2009 Alex Gorbatchev.
- *
- * @license
- * This file is part of SyntaxHighlighter.
- * 
- * SyntaxHighlighter is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- * 
- * SyntaxHighlighter is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with SyntaxHighlighter.  If not, see <http://www.gnu.org/copyleft/lesser.html>.
- */
-.syntaxhighlighter,
-.syntaxhighlighter div,
-.syntaxhighlighter code,
-.syntaxhighlighter table,
-.syntaxhighlighter table td,
-.syntaxhighlighter table tr,
-.syntaxhighlighter table tbody
-{
-	margin: 0 !important;
-	padding: 0 !important;
-	border: 0 !important;
-	outline: 0 !important;
-	background: none !important;
-	text-align: left !important;
-	float: none !important;
-	vertical-align: baseline !important;
-	position: static !important;
-	left: auto !important;
-	top: auto !important;
-	right: auto !important;
-	bottom: auto !important;
-	height: auto !important;
-	width: auto !important;
-	line-height: 1.1em !important;
-	font-family: "Consolas", "Bitstream Vera Sans Mono", "Courier New", Courier, monospace !important;
-	font-weight: normal !important;
-	font-style: normal !important;
-	font-size: 1em !important;
-	min-height: inherit !important; /* For IE8, FF & WebKit */
-	min-height: auto !important; /* For IE7 */
-}
-
-.syntaxhighlighter
-{
-	width: 99% !important; /* 99% fixes IE8 horizontal scrollbar */
-	margin: 1em 0 1em 0 !important;
-	padding: 1px !important; /* adds a little border on top and bottom */
-	position: relative !important;
-}
-
-.syntaxhighlighter .bold 
-{
-	font-weight: bold !important;
-}
-
-.syntaxhighlighter .italic 
-{
-	font-style: italic !important;
-}
-
-.syntaxhighlighter .line
-{
-}
-
-.syntaxhighlighter .no-wrap .line .content
-{
-	white-space: pre !important;
-}
-
-.syntaxhighlighter .line table 
-{
-	border-collapse: collapse !important;
-}
-
-.syntaxhighlighter .line td
-{
-	vertical-align: top !important;
-}
-
-.syntaxhighlighter .line .number
-{
-	width: 3em !important;
-}
-
-.syntaxhighlighter .line .number code
-{
-	width: 2.7em !important;
-	padding-right: .3em !important;
-	text-align: right !important;
-	display: block !important;
-}
-
-.syntaxhighlighter .line .content
-{
-	padding-left: .5em !important;
-}
-
-.syntaxhighlighter .line .spaces
-{
-}
-
-/* Disable border and margin on the lines when no gutter option is set */
-.syntaxhighlighter.nogutter .line .content
-{
-	border-left: none !important;
-}
-
-.syntaxhighlighter .bar
-{
-	display: none !important;
-}
-
-.syntaxhighlighter .bar.show 
-{
-	display: block !important;
-}
-
-.syntaxhighlighter.collapsed .bar
-{
-	display: block !important;
-}
-
-/* Adjust some properties when collapsed */
-
-.syntaxhighlighter.collapsed .lines
-{
-	display: none !important;
-}
-
-.syntaxhighlighter .lines.no-wrap
-{
-	overflow: auto !important;
-	overflow-y: hidden !important;
-}
-
-/* Styles for the toolbar */
-
-.syntaxhighlighter .toolbar
-{
-	position: absolute !important;
-	right: 0px !important;
-	top: 0px !important;
-	font-size: 1px !important;
-	padding: 8px 8px 8px 0 !important; /* in px because images don't scale with ems */
-}
-
-.syntaxhighlighter.collapsed .toolbar
-{
-	font-size: 80% !important;
-	padding: .2em 0 .5em .5em !important;
-	position: static !important;
-}
-
-.syntaxhighlighter .toolbar a.item,
-.syntaxhighlighter .toolbar .item
-{
-	display: block !important;
-	float: left !important;
-	margin-left: 8px !important;
-	background-repeat: no-repeat !important;
-	overflow: hidden !important;
-	text-indent: -5000px !important;
-}
-
-.syntaxhighlighter.collapsed .toolbar .item
-{
-	display: none !important;
-}
-
-.syntaxhighlighter.collapsed .toolbar .item.expandSource
-{
-	background-image: url(magnifier.png) !important;
-	display: inline !important;
-	text-indent: 0 !important;
-	width: auto !important;
-	float: none !important;
-	height: 16px !important;
-	padding-left: 20px !important;
-}
-
-.syntaxhighlighter .toolbar .item.viewSource
-{
-	background-image: url(page_white_code.png) !important;
-}
-
-.syntaxhighlighter .toolbar .item.printSource
-{
-	background-image: url(printer.png) !important;
-}
-
-.syntaxhighlighter .toolbar .item.copyToClipboard
-{
-	text-indent: 0 !important;
-	background: none !important;
-	overflow: visible !important;
-}
-
-.syntaxhighlighter .toolbar .item.about
-{
-	background-image: url(help.png) !important;
-}
-
-/** 
- * Print view.
- * Colors are based on the default theme without background.
- */
-
-.syntaxhighlighter.printing,
-.syntaxhighlighter.printing .line.alt1 .content,
-.syntaxhighlighter.printing .line.alt2 .content,
-.syntaxhighlighter.printing .line.highlighted .number,
-.syntaxhighlighter.printing .line.highlighted.alt1 .content,
-.syntaxhighlighter.printing .line.highlighted.alt2 .content,
-{
-	background: none !important;
-}
-
-/* Gutter line numbers */
-.syntaxhighlighter.printing .line .number
-{
-	color: #bbb !important;
-}
-
-/* Add border to the lines */
-.syntaxhighlighter.printing .line .content
-{
-	color: #000 !important;
-}
-
-/* Toolbar when visible */
-.syntaxhighlighter.printing .toolbar
-{
-	display: none !important;
-}
-
-.syntaxhighlighter.printing a
-{
-	text-decoration: none !important;
-}
-
-.syntaxhighlighter.printing .plain,
-.syntaxhighlighter.printing .plain a
-{ 
-	color: #000 !important;
-}
-
-.syntaxhighlighter.printing .comments,
-.syntaxhighlighter.printing .comments a
-{ 
-	color: #008200 !important;
-}
-
-.syntaxhighlighter.printing .string,
-.syntaxhighlighter.printing .string a
-{
-	color: blue !important; 
-}
-
-.syntaxhighlighter.printing .keyword
-{ 
-	color: #069 !important; 
-	font-weight: bold !important; 
-}
-
-.syntaxhighlighter.printing .preprocessor 
-{ 
-	color: gray !important; 
-}
-
-.syntaxhighlighter.printing .variable 
-{ 
-	color: #a70 !important; 
-}
-
-.syntaxhighlighter.printing .value
-{ 
-	color: #090 !important; 
-}
-
-.syntaxhighlighter.printing .functions
-{ 
-	color: #ff1493 !important; 
-}
-
-.syntaxhighlighter.printing .constants
-{ 
-	color: #0066CC !important; 
-}
-
-.syntaxhighlighter.printing .script
-{
-	font-weight: bold !important;
-}
-
-.syntaxhighlighter.printing .color1,
-.syntaxhighlighter.printing .color1 a
-{ 
-	color: #808080 !important; 
-}
-
-.syntaxhighlighter.printing .color2,
-.syntaxhighlighter.printing .color2 a
-{ 
-	color: #ff1493 !important; 
-}
-
-.syntaxhighlighter.printing .color3,
-.syntaxhighlighter.printing .color3 a
-{ 
-	color: red !important; 
-}