fixed build process

johnny · Dec 3, 2012 · c1bf8df · c1bf8df
1 parent 087b2b9
commit c1bf8df
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 11 deletions.
diff --git a/Gemfile b/Gemfile
@@ -11,7 +11,7 @@ gem 'em-websocket'
 gem 'guard-livereload'
 gem 'rack-livereload'
 
-gem 'rack-coderay'
+gem 'rack-coderay', :git => 'https://github.com/johnny/rack-coderay.git'
 
 gem 'therubyracer'
 gem 'closure-compiler'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,3 +1,12 @@
+GIT
+  remote: https://github.com/johnny/rack-coderay.git
+  revision: d777e04aedf5287786d0afab3d5b84a5a466a37f
+  specs:
+    rack-coderay (0.2.0)
+      coderay (>= 0.8.312)
+      hpricot (>= 0.8.1)
+      rack (>= 1.0.0)
+
 GIT
   remote: https://github.com/johnny/sass-twitter-bootstrap.git
   revision: 06795315e0476e1f64c991d6686a21c16c68423e
@@ -107,10 +116,6 @@ GEM
       method_source (~> 0.8)
       slop (~> 3.3.1)
     rack (1.4.1)
-    rack-coderay (0.2.0)
-      coderay (>= 0.8.312)
-      hpricot (>= 0.8.1)
-      rack (>= 1.0.0)
     rack-livereload (0.3.8)
       rack
     rack-protection (1.2.0)
@@ -174,7 +179,7 @@ DEPENDENCIES
   guard-livereload
   hpricot
   middleman (>= 3)
-  rack-coderay
+  rack-coderay!
   rack-livereload
   rdiscount
   rspec

diff --git a/TODO b/TODO
@@ -11,7 +11,10 @@
     - [X] better extensibility
       - [X] hook into toHTML (for conversion of uris in markupText)
       - [X] hook after fromHTML
-    - [ ] fix specs in chrome
+    - [-] specs in chrome
+      - [X] fix most
+      - [ ] fix editor synch specs
+      - [ ] spec uri normalization
     - [ ] improve editor closing
       - [ ] write data attributes (otherwise a datamode change will not save)
     - [-] better editor loading

diff --git a/config.rb b/config.rb
@@ -62,11 +62,15 @@ def textarea(name)
 if development?
   require 'rack-livereload'
   use Rack::LiveReload,
-  :source => :vendored
+  :source => :vendored,
+  :ignore => [ %r{/doc} ]
+end
+map "/doc" do
+  run Rack::Directory.new(Dir.pwd + "/source/doc")
 end
 
 require 'rack/coderay'
-use Rack::Coderay, "//pre[@lang]"
+use Rack::Coderay, "//pre[@lang]", :ignore => [ %r{/doc} ]
 
 # Hack to fix haml output
 class Rack::Coderay::Parser

diff --git a/source/selenium.html.haml b/source/selenium.html.haml
@@ -1,4 +1,4 @@
-= haml :'dev.html'
+= partial :'dev.html'
 
 - content_for :bottom do
   = javascript_include_tag "test/support/testHelper"

diff --git a/source/test_joined.html.haml b/source/test_joined.html.haml
@@ -1 +1 @@
-= haml :"test_runner.html"
+= partial :"test_runner.html"
diff --git a/vendor/cache/rack-coderay-0.2.0.gem b/vendor/cache/rack-coderay-0.2.0.gem