middleman-jasmine 0.0.1 → 0.0.3

data/CHANGELOG.md

@@ -0,0 +1,15 @@
+0.0.3
+===
+
+* Only use one Sprockets instance
+* Support for fixtures loading from a :fixtures_dir option
+* Fix for not using Sprockets
+
+0.0.2
+===
+Yanked
+
+0.0.1
+===
+
+* Initial support for Jasmime

data/README.md

@@ -31,6 +31,18 @@ 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
+```
+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:
+```
+  activate: :jasmine, fixtures_dir: "spec/javascripts/fixtures", jasmine_url: "/jasmine"
+```
+
 ## Contributing
 
 1. Fork it

data/lib/middleman/jasmine/extension.rb

@@ -5,11 +5,11 @@ module Middleman
   module Jasmine
     class << self
       def registered(app, options_hash={}, &block)
-        options = OpenStruct.new(default_options.merge(options_hash))
+        @options = OpenStruct.new(default_options.merge(options_hash))
 
-        yield options if block_given?
+        yield @options if block_given?
 
-        app.map(options.jasmine_url) { run ::JasmineSprocketsProxy.new }
+        app.map(@options.jasmine_url) { run ::JasmineSprocketsProxy.new }
         jasmine_asset_folders.each do |item|
           app.map("/#{item}") { run ::JasmineSprocketsProxy.new(item) }
         end
@@ -18,12 +18,15 @@ module Middleman
       private
 
       def jasmine_asset_folders
-        %w(__jasmine__ __boot__ __spec__)
+        [
+          "__jasmine__", "__boot__", "__spec__", @options.fixtures_dir
+        ]
       end
 
       def default_options
         {
-          jasmine_url: "/jasmine"
+          jasmine_url: "/jasmine",
+          fixtures_dir: "spec/javascripts/fixtures"
         }        
       end      
     alias :included :registered

data/lib/middleman/jasmine/jasmine_sprockets_proxy.rb

@@ -7,14 +7,21 @@ class JasmineSprocketsProxy
       Jasmine.load_configuration_from_yaml
       @@jasmine_app = Jasmine::Application.app(Jasmine.config)
     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) }
+    end
   end
   jasmine_app
+  sprockets_app
 
   def initialize(path="")
     @path = path
     @app  = 
       if setup_for_spec_files?
-        sprockets_app
+        self.class.sprockets_app
       else
         self.class.jasmine_app
       end
@@ -27,17 +34,12 @@ class JasmineSprocketsProxy
 
   private
 
-  def sprockets_app
-    return self.class.jasmine_app unless defined?(::Sprockets::Environment)
-    @sprockets_app ||= ::Sprockets::Environment.new.tap { |s| s.append_path(Jasmine.config.spec_dir) }
-  end
-
   def setup_for_spec_files?
     @path == "__spec__"
   end
 
   def serving_spec_via_sprockets?
-    setup_for_spec_files? && !!@sprockets_app && @sprockets_app.is_a?(::Sprockets::Environment)
+    setup_for_spec_files? && defined?(@@sprockets_app)
   end
 end
 

data/lib/middleman/jasmine/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-jasmine
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -83,6 +83,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md