deckrb 0.2.1 → 0.2.2

data/README.md

@@ -148,6 +148,7 @@ and you'll get a web server running on `http://localhost:4333` serving up a slid
 * PDF
 * rewrite internal links to files and serve them relative to current dir, not slide dir
 * custom `.css`, `.scss`, and `.js` files, which will get imported into all slides
+* support some more extensions https://github.com/imakewebthings/deck.js/wiki
 
 ## TODO (community)
 

data/bin/deck

@@ -3,9 +3,18 @@
 here = File.expand_path(File.dirname(__FILE__))
 $: << File.join(here, '..', 'lib')
 
+require "trollop"
 require "rack"
 require "deck"
 require "deck/rack_app"
+require "deck/version"
+
+options = Trollop.options do
+  version "deck v#{Deck::VERSION}"
+  banner version
+  banner "Usage: deck [options] run [slides]"
+  opt :port, "Specify alternate port", :default => 4333
+end
 
 command = ARGV.shift
 
@@ -21,7 +30,7 @@ when 'build'
     basename ||= File.basename(arg, ".md")
     output_path ||= "#{output_dir}/#{basename}.html"
 
-    slides += Slide.from_file arg  
+    slides += Slide.from_file arg
   end
 
   File.open(output_path, "w") do |file|
@@ -35,7 +44,7 @@ when 'run'
   # Fix Rack bug https://github.com/rack/rack/issues/301
   require 'deck/rack_static_patch'
   
-  port = 4333  # todo: option
+  port = options[:port]
   slide_files = ARGV
   Rack::Handler.default.run Deck::RackApp.build(slide_files), :Port => port
   

data/lib/deck/rack_app.rb

@@ -54,7 +54,7 @@ module Deck
       @file_servers =
         [Rack::File.new("#{::Deck::RackApp.app_root}/public")] +
         @slide_files.map do |slide_file|
-          File.expand_path File.dirname(slide_file) if slide_file.is_a? File
+          File.expand_path File.dirname(slide_file.path) if slide_file.is_a? File
         end.compact.uniq.map do |slide_file_dir|
           Rack::File.new(slide_file_dir)
         end

data/lib/deck/slide.rb

@@ -7,8 +7,9 @@ module Deck
 
   include Deck::Noko
 
-  # todo: test this method
+  # todo: test this method on its own
   def self.from_file markdown_file
+    markdown_file = markdown_file.path if markdown_file.is_a? File   # fix for Ruby 1.8.7
     split File.read(markdown_file)
   end
 

data/lib/deck/version.rb

@@ -1,3 +1,3 @@
 module Deck
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/rack_app_spec.rb

@@ -46,8 +46,13 @@ module Deck
     it "serves up deck.js source files" do
       deckjs_core_path = "deck.js/core/deck.core.js"
       get "/#{deckjs_core_path}"
-      assert { last_response.body ==
-        File.read("#{here}/../public/#{deckjs_core_path}", :encoding => last_response.body.encoding)}
+      path = "#{here}/../public/#{deckjs_core_path}"
+      expected_body = begin
+        File.read(path, :encoding => last_response.body.encoding)
+      rescue NoMethodError  # fix for Ruby 1.8.7
+        File.read(path)
+      end
+      assert { last_response.body == expected_body }
     end
 
     it "finds coderay.css" do

metadata

@@ -1,104 +1,147 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: deckrb
-version: !ruby/object:Gem::Version
-  version: 0.2.1
+version: !ruby/object:Gem::Version 
+  hash: 19
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 2
+  version: 0.2.2
 platform: ruby
-authors:
+authors: 
 - Alex Chaffee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: erector
-  requirement: &70106368069620 !ruby/object:Gem::Requirement
+
+date: 2012-02-29 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3107287963
+        segments: 
+        - 0
+        - 9
+        - 0
+        - pre
+        - 1
         version: 0.9.0.pre1
-  type: :runtime
   prerelease: false
-  version_requirements: *70106368069620
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: &70106368069120 !ruby/object:Gem::Requirement
+  requirement: *id001
+  name: erector
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2'
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        version: "2"
+  prerelease: false
+  requirement: *id002
+  name: redcarpet
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: *70106368069120
-- !ruby/object:Gem::Dependency
+  requirement: *id003
   name: rack
-  requirement: &70106368068740 !ruby/object:Gem::Requirement
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  requirement: *id004
+  name: trollop
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: *70106368068740
-- !ruby/object:Gem::Dependency
+  requirement: *id005
   name: nokogiri
-  requirement: &70106368068280 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: *70106368068280
-- !ruby/object:Gem::Dependency
+  requirement: *id006
   name: coderay
-  requirement: &70106368067860 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: *70106368067860
-- !ruby/object:Gem::Dependency
+  requirement: *id007
   name: json
-  requirement: &70106368067440 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: *70106368067440
-- !ruby/object:Gem::Dependency
+  requirement: *id008
   name: rack-codehighlighter
-  requirement: &70106368067020 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
-  prerelease: false
-  version_requirements: *70106368067020
-description: deck.js (http://imakewebthings.github.com/deck.js) is a JavaScript library
-  for building slide presentations using HTML 5. deck.rb (http://github.com/alexch/deck.rb)
-  builds on top of deck.js, adding some features and letting you focus on your slides,
-  not the HTML infrastructure.
+description: deck.js (http://imakewebthings.github.com/deck.js) is a JavaScript library for building slide presentations using HTML 5. deck.rb (http://github.com/alexch/deck.rb) builds on top of deck.js, adding some features and letting you focus on your slides, not the HTML infrastructure.
 email: alex@stinky.com
-executables:
+executables: 
 - deck
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.md
-files:
+files: 
 - lib/deck/noko.rb
 - lib/deck/rack_app.rb
 - lib/deck/rack_static_patch.rb
@@ -183,35 +226,38 @@ files:
 - bin/deck
 homepage: http://github.com/alexch/deck
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -1853799301992505698
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -1853799301992505698
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Make HTML slide shows; wraps deck.js
-test_files:
+test_files: 
 - spec/javascripts/support/jasmine_config.rb
 - spec/javascripts/support/jasmine_runner.rb
 - spec/rack_app_spec.rb