middleman-jasmine 0.0.3 → 0.1.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+0.1.0
+===
+
+* Configure in #after_configuration block
+* Apply all middleman_sprockets paths to our internal sprockets
+* Expose internal sprockets app with jasmine_sprockets helper
+
 0.0.3
 ===
 

data/README.md

@@ -19,7 +19,8 @@ First run `bundle exec jasmine init` to setup Jasmine.
 
 Then, if you have sprockets installed through [middleman-sprockets](https://github.com/middleman/middleman-sprockets), you can create a spec.js file in spec/javascripts to include all your specs, i.e.
 ```
-  //= require_tree .
+//= require application
+//= require_tree .
 ```
 
 Add the following code to your `config.rb` file:
@@ -31,12 +32,16 @@ Write a spec file under spec/javascripts and hit /jasmine under your Middleman a
 
 You should see the results of the spec pass/fail under Jasmine. 
 
-If you want to include your application.js into the test suite, it is best to do that under jasmine.yml, i.e:
-```yaml
-src_files:
-  - app/javascripts/application.js
+If you add additional paths to sprockets with `append_path` in your `after_configuration` block then you'll most likely need to append the same paths to the Middleman::Jasmine sprockets instance. To do that use the helper `jasmine_sprockets`, i.e.:
+```ruby
+after_configuration do
+  handlebars_path = File.expand_path('../', ::Handlebars::Source.bundled_path)
+  sprockets.append_path(handlebars_path)
+
+  # add Handlebars to Jasmine too
+  jasmine_sprockets.append_path(handlebars_path)
+end
 ```
-That is because the Sprockets instance that compiles the specs uses spec/javascripts as its path to load the js. This causes issues with loading the application via a `//= require application` line.
 
 To configure the extension, use:
 ```

data/lib/middleman/jasmine/extension.rb

@@ -5,21 +5,27 @@ module Middleman
   module Jasmine
     class << self
       def registered(app, options_hash={}, &block)
-        @options = OpenStruct.new(default_options.merge(options_hash))
+        app.send :include, InstanceMethods
 
-        yield @options if block_given?
+        options = OpenStruct.new(default_options.merge(options_hash))
 
-        app.map(@options.jasmine_url) { run ::JasmineSprocketsProxy.new }
-        jasmine_asset_folders.each do |item|
+        yield options if block_given?
+
+        app.map(options.jasmine_url) { run ::JasmineSprocketsProxy.new }
+        jasmine_asset_folders(options.fixtures_dir).each do |item|
           app.map("/#{item}") { run ::JasmineSprocketsProxy.new(item) }
         end
+
+        app.after_configuration do
+          ::JasmineSprocketsProxy.configure(sprockets)
+        end
       end
 
       private
 
-      def jasmine_asset_folders
+      def jasmine_asset_folders(fixtures_dir)
         [
-          "__jasmine__", "__boot__", "__spec__", @options.fixtures_dir
+          "__jasmine__", "__boot__", "__spec__", fixtures_dir
         ]
       end
 
@@ -31,5 +37,11 @@ module Middleman
       end      
     alias :included :registered
     end
+
+    module InstanceMethods
+      def jasmine_sprockets
+        ::JasmineSprocketsProxy.sprockets_app
+      end
+    end
   end
 end

data/lib/middleman/jasmine/jasmine_sprockets_proxy.rb

@@ -3,21 +3,31 @@ require 'jasmine'
 class JasmineSprocketsProxy
   class << self
     def jasmine_app
-      return @@jasmine_app if defined?(@@jasmine_app)
-      Jasmine.load_configuration_from_yaml
-      @@jasmine_app = Jasmine::Application.app(Jasmine.config)
+      @@jasmine_app
     end
 
     def sprockets_app
-      return @@jasmine_app unless defined?(::Sprockets::Environment)
-      return @@sprockets_app if defined?(@@sprockets_app)
-      @@sprockets_app ||= ::Sprockets::Environment.new.tap { |s| s.append_path(Jasmine.config.spec_dir) }
+      @@sprockets_app
+    end
+
+    def configure(middleman_sprockets)
+      Jasmine.load_configuration_from_yaml
+      @@jasmine_app = Jasmine::Application.app(Jasmine.config)
+      @@sprockets_app = 
+        if defined?(::Sprockets::Environment)
+          sprockets = ::Sprockets::Environment.new
+          middleman_sprockets.paths.each do |path|
+            sprockets.append_path(path)
+          end
+          sprockets.append_path(Jasmine.config.spec_dir)
+          sprockets
+        else
+          @@jasmine_app
+        end
     end
   end
-  jasmine_app
-  sprockets_app
 
-  def initialize(path="")
+  def initialize(path="", js_dir="")
     @path = path
     @app  = 
       if setup_for_spec_files?

data/lib/middleman/jasmine/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Jasmine
-    VERSION = "0.0.3"
+    VERSION = "0.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-jasmine
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jasmine