middleman 2.0.0 → 2.0.0.1

data/features/sprockets.feature

@@ -3,4 +3,9 @@ Feature: Sprockets
   Scenario: Sprockets require
     Given the Server is running at "test-app"
     When I go to "/javascripts/sprockets_base.js"
+    Then I should see "sprockets_sub_function"
+    
+  Scenario: Sprockets require with custom :js_dir
+    Given the Server is running at "sprockets-app"
+    When I go to "/library/javascripts/sprockets_base.js"
     Then I should see "sprockets_sub_function"

data/fixtures/sprockets-app/config.rb

@@ -0,0 +1 @@
+set :js_dir, "library/javascripts"

data/fixtures/sprockets-app/source/library/javascripts/sprockets_base.js

@@ -0,0 +1,5 @@
+//= require "sprockets_sub"
+
+function base() {
+  
+}

data/fixtures/sprockets-app/source/library/javascripts/sprockets_sub.js

@@ -0,0 +1,3 @@
+function sprockets_sub_function() {
+  
+}

data/lib/middleman/core_extensions/sprockets.rb

@@ -2,12 +2,15 @@ require "sprockets"
   
 module Middleman::CoreExtensions::Sprockets
   class << self
-    def registered(app)      
+    def registered(app)
       app.set :js_compressor, false
-      
-      app.map "/#{app.js_dir}" do
-        run JavascriptEnvironment.new(app)
+
+      app.after_configuration do
+        app.map "/#{app.js_dir}" do
+          run JavascriptEnvironment.new(app)
+        end
       end
+      
       # app.map "/#{app.css_dir}" do
       #   run StylesheetEnvironment.new(app)
       # end

data/lib/middleman/templates/local.rb

@@ -1,6 +1,6 @@
 module Middleman
   def self.templates_path
-    File.join(`cd ~ && pwd`.chomp, ".middleman")
+    File.join(File.expand_path("~/"), ".middleman")
   end
 end
 
@@ -17,4 +17,4 @@ end
 Dir[File.join(Middleman.templates_path, "*")].each do |dir|
   next unless File.directory?(dir)
   Middleman::Templates.register(File.basename(dir).to_sym, Middleman::Templates::Local)
-end
+end

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.0"
+  VERSION = "2.0.0.1"
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 109
   prerelease: 
   segments: 
   - 2
   - 0
   - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.0.1
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-08 00:00:00 Z
+date: 2011-08-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -458,6 +459,9 @@ files:
 - fixtures/relative-app/config.rb
 - fixtures/relative-app/source/images/blank.gif
 - fixtures/relative-app/source/stylesheets/relative_assets.css.sass
+- fixtures/sprockets-app/config.rb
+- fixtures/sprockets-app/source/library/javascripts/sprockets_base.js
+- fixtures/sprockets-app/source/library/javascripts/sprockets_sub.js
 - fixtures/test-app/config.rb
 - fixtures/test-app/data/test.yml
 - fixtures/test-app/source/_partial.haml
@@ -687,6 +691,9 @@ test_files:
 - fixtures/relative-app/config.rb
 - fixtures/relative-app/source/images/blank.gif
 - fixtures/relative-app/source/stylesheets/relative_assets.css.sass
+- fixtures/sprockets-app/config.rb
+- fixtures/sprockets-app/source/library/javascripts/sprockets_base.js
+- fixtures/sprockets-app/source/library/javascripts/sprockets_sub.js
 - fixtures/test-app/config.rb
 - fixtures/test-app/data/test.yml
 - fixtures/test-app/source/_partial.haml