jasmine-headless-webkit 0.9.0.rc1 → 0.9.0.rc.2

data/.gitignore

@@ -16,3 +16,4 @@ _site/
 jhw.*.html
 coverage/
 tmp/
+cache dir/

data/Gemfile

@@ -15,7 +15,6 @@ gem 'guard-cucumber'
 require 'rbconfig'
 case RbConfig::CONFIG['host_os']
 when /darwin/
-  gem 'rb-fsevent'
 when /linux/
   gem 'libnotify'
 end

data/Rakefile

@@ -14,7 +14,7 @@ require 'jasmine/headless/task'
 
 Jasmine::Headless::Task.new
 
-PLATFORMS = %w{1.8.7 1.9.2 ree 1.9.3}
+PLATFORMS = %w{1.9.2 1.9.3}
 
 def rvm_bundle(command = '')
   Bundler.with_clean_env do

data/ext/jasmine-webkit-specrunner/common.pri

@@ -1,7 +1,6 @@
 TEMPLATE = app
 CONFIG -= app_bundle
 QMAKE_INFO_PLIST = Info.plist
-QMAKESPEC = macx-g++
 QT += network webkit
 
 SOURCES = Page.cpp Runner.cpp

data/jasmine-headless-webkit.gemspec

@@ -20,9 +20,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency 'jasmine-core', '~> 1.1'
+  s.add_runtime_dependency 'jasmine-core'
   s.add_runtime_dependency 'coffee-script'
   s.add_runtime_dependency 'rainbow'
-  s.add_runtime_dependency 'multi_json'
-  s.add_runtime_dependency 'sprockets', '~> 2'
+  s.add_runtime_dependency 'multi_json', '>= 1.2.0'
+  s.add_runtime_dependency 'sprockets'
+  s.add_runtime_dependency 'sprockets-vendor_gems'
 end
+

data/lib/jasmine/headless/cacheable_action.rb

@@ -54,7 +54,11 @@ module Jasmine::Headless
     end
 
     def cache_file
-      @cache_file ||= File.expand_path(File.join(self.class.cache_dir, self.class.cache_type, file)) + '.js'
+      @cache_file ||= File.expand_path(relative_cache_file) + '.js'
+    end
+
+    def relative_cache_file
+      File.join(self.class.cache_dir, self.class.cache_type, file.gsub(Dir.pwd + '/', ''))
     end
 
     def fresh?

data/lib/jasmine/headless/files_list.rb

@@ -4,6 +4,7 @@ require 'multi_json'
 require 'set'
 require 'sprockets'
 require 'sprockets/engines'
+require 'sprockets-vendor_gems'
 
 module Jasmine::Headless
   class FilesList
@@ -11,33 +12,12 @@ module Jasmine::Headless
 
     class << self
       def asset_paths
-        return @asset_paths if @asset_paths
-
-        require 'rubygems'
-
-        raise StandardError.new("A newer version of Rubygems is required to use vendored assets. Please upgrade.") if !Gem::Specification.respond_to?(:each)
-
-        @asset_paths = []
-
-        Gem::Specification.each { |gemspec| @asset_paths += get_paths_from_gemspec(gemspec) }
-
-        @asset_paths
-      end
-
-      def get_paths_from_gemspec(gemspec)
-        %w{vendor lib app}.collect do |dir|
-          path = File.join(gemspec.gem_dir, dir, "assets/javascripts")
-
-          if File.directory?(path) && !@asset_paths.include?(path)
-            path
-          else
-            nil
-          end
-        end.compact
+        @asset_paths ||= Sprockets.find_gem_vendor_paths(:for => 'javascripts')
       end
 
       def reset!
         @asset_paths = nil
+        @registered_engines = {}
 
         # register haml-sprockets and handlebars_assets if it's available...
         %w{haml-sprockets handlebars_assets}.each do |library|
@@ -56,16 +36,20 @@ module Jasmine::Headless
           end
         end
 
-        # ...and unregister ones we don't want/need
-        Sprockets.instance_eval do
-          EXCLUDED_FORMATS.each do |extension|
-            register_engine ".#{extension}", Jasmine::Headless::NilTemplate
-          end
+        @sprockets_environment = nil
+      end
+
+      def registered_engines
+        @registered_engines ||= {}
+      end
+
+      def register_engine(file_extension, template_class)
+        registered_engines[file_extension] = template_class
+      end
 
-          register_engine '.coffee', Jasmine::Headless::CoffeeTemplate
-          register_engine '.js', Jasmine::Headless::JSTemplate
-          register_engine '.css', Jasmine::Headless::CSSTemplate
-          register_engine '.jst', Jasmine::Headless::JSTTemplate
+      def register_engines!
+        registered_engines.each do |file_extension, template_class|
+          Sprockets.register_engine file_extension, template_class
         end
       end
 
@@ -95,11 +79,21 @@ module Jasmine::Headless
       @required_files = UniqueAssetList.new
       @potential_files_to_filter = []
 
+      register_engines!
+
       load_initial_assets
 
       use_config if config?
     end
 
+    def register_engines!
+      begin
+        require spec_helper
+      rescue LoadError
+      end
+      self.class.register_engines!
+    end
+
     def load_initial_assets
       self.class.default_files.each do |file|
         begin
@@ -148,6 +142,19 @@ module Jasmine::Headless
       search_paths.each { |path| @sprockets_environment.append_path(path) }
 
       @sprockets_environment.unregister_postprocessor('application/javascript', Sprockets::SafetyColons)
+
+      # ...and unregister ones we don't want/need
+      @sprockets_environment.instance_eval do
+        EXCLUDED_FORMATS.each do |extension|
+          register_engine ".#{extension}", Jasmine::Headless::NilTemplate
+        end
+
+        register_engine '.coffee', Jasmine::Headless::CoffeeTemplate
+        register_engine '.js', Jasmine::Headless::JSTemplate
+        register_engine '.css', Jasmine::Headless::CSSTemplate
+        register_engine '.jst', Jasmine::Headless::JSTTemplate
+      end
+
       @sprockets_environment
     end
 
@@ -248,7 +255,8 @@ module Jasmine::Headless
     end
 
     def expanded_dir(path)
-      Dir[path].find_all { |file|
+      file_list = Dir.glob(path).sort
+      file_list.find_all { |file|
         file[extension_filter] && !alert_if_bad_format?(file)
       }.collect {
         |file| File.expand_path(file)
@@ -308,5 +316,17 @@ module Jasmine::Headless
         end
       end
     end
+
+    def spec_helper
+      File.join(spec_dir, "helpers", "spec_helper")
+    end
+  end
+end
+
+module Jasmine::Headless
+  extend self
+
+  def register_engine(file_extension, template_class)
+    Jasmine::Headless::FilesList.register_engine(file_extension, template_class)
   end
 end

data/lib/jasmine/headless/spec_file_analyzer.rb

@@ -33,11 +33,11 @@ module Jasmine::Headless
     end
 
     def serialize(data)
-      MultiJson.encode(data)
+      MultiJson.dump(data)
     end
 
     def unserialize(data)
-      MultiJson.decode(data)
+      MultiJson.load(data)
     end
   end
 end

data/lib/jasmine/headless/version.rb

@@ -1,5 +1,5 @@
 module Jasmine
   module Headless
-    VERSION = "0.9.0.rc1"
+    VERSION = "0.9.0.rc.2"
   end
 end

data/skel/template.html.erb

@@ -6,7 +6,7 @@
     <script type="text/javascript" src="<%= Jasmine::Headless.root.join('vendor/assets/javascripts/prolog.js') %>"></script>
     <%= files.join("\n") %>
     <script type="text/javascript">
-      if (window.JHW) { HeadlessReporterResult.specLineNumbers = <%= MultiJson.encode(spec_lines) %>; }
+      if (window.JHW) { HeadlessReporterResult.specLineNumbers = <%= MultiJson.dump(spec_lines) %>; }
     </script>
   </head>
   <body>
@@ -35,14 +35,18 @@
             }
           }
 
+          var location = window.location.href;
+
           var getLastModified = function(callback) {
             var http = new XMLHttpRequest();
             var header;
 
-            http.open('HEAD', window.location.href, false);
+            http.open('HEAD', location, true);
 
             http.onreadystatechange = function() {
-              callback(http.getResponseHeader('Last-Modified'));
+              if(http.readyState === http.DONE) {
+                callback(http.getResponseHeader('Last-Modified'));
+              }
             };
             http.send();
           }

data/spec/lib/jasmine/headless/cacheable_action_spec.rb

@@ -95,5 +95,28 @@ describe Jasmine::Headless::CacheableAction do
       end
     end
   end
+
+  describe '#relative_cache_file' do
+    context 'file is an absolute windows file' do
+      let(:current_path) { 'C:/path' }
+      let(:filename) { "file.coffee" }
+      let(:windows_path) { File.join(current_path, filename) }
+      let(:cache_dir) { 'cache dir' }
+      let(:cache_type) { 'cache type' }
+
+      before do
+        cache_object.stubs(:file).returns(windows_path)
+
+        described_class.stubs(:cache_dir).returns(cache_dir)
+        described_class.stubs(:cache_type).returns(cache_type)
+
+        Dir.stubs(:pwd).returns(current_path)
+      end
+
+      subject { cache_object.relative_cache_file }
+
+      it { should == File.join(cache_dir, cache_type, filename) }
+    end
+  end
 end
 

data/spec/lib/jasmine/headless/files_list_spec.rb

@@ -5,50 +5,6 @@ require 'coffee-script'
 describe Jasmine::Headless::FilesList do
   let(:files_list) { described_class.new }
 
-  describe '.get_paths_from_gemspec' do
-    include FakeFS::SpecHelpers
-
-    let(:gem_dir) { "dir" }
-    let(:gemspec) { stub(:gem_dir => gem_dir) }
-
-    let(:paths) do
-      %w{vendor lib app}.collect do |dir|
-        File.join(gem_dir, dir, 'assets/javascripts')
-      end
-    end
-
-    before do
-      paths.each { |path| FileUtils.mkdir_p path }
-
-      described_class.instance_variable_set(:@asset_paths, [])
-    end
-
-    subject { described_class.get_paths_from_gemspec(gemspec) }
-
-    it { should =~ paths }
-  end
-
-  describe '.asset_paths' do
-    include FakeFS::SpecHelpers
-
-    let(:dir_one) { 'dir_one' }
-    let(:dir_two) { 'dir_two' }
-
-    let(:gem_one) { stub(:gem_dir => dir_one) }
-    let(:gem_two) { stub(:gem_dir => dir_two) }
-
-    before do
-      described_class.instance_variable_set(:@asset_paths, nil)
-      FileUtils.mkdir_p File.join(dir_two, 'vendor/assets/javascripts')
-
-      Gem::Specification.stubs(:_all).returns([gem_one, gem_two])
-    end
-
-    it 'should return all matching gems with vendor/assets/javascripts directories' do
-      described_class.asset_paths.should == [ File.join(dir_two, 'vendor/assets/javascripts') ]
-    end
-  end
-
   describe '#initialize' do
     before do
       described_class.any_instance.stubs(:load_initial_assets)
@@ -218,6 +174,21 @@ describe Jasmine::Headless::FilesList do
         files_list.files.any? { |file| file['.erb'] }.should be_false
       end
     end
+
+    describe "#register_engine!" do
+
+      before(:each) do
+        Jasmine::Headless::FilesList.reset!
+      end
+
+      it "should register code added via configure blocks" do
+        template_class = mock()
+        described_class.register_engine ".foo", template_class
+        Sprockets.expects(:register_engine).with(".foo", template_class)
+        described_class.new
+      end
+
+    end
   end
 end
 

data/vendor/assets/javascripts/intense.coffee

@@ -11,16 +11,16 @@ window.Intense = {
   methods:
     foreground: (color) ->
       if Intense.useColors
-        "\033[3#{Intense.colors[color]}m#{this}\033[0m"
+        '\x1b' + "[3#{Intense.colors[color]}m#{this}" + '\x1b' + "[0m"
       else
         this
     bright: ->
       if Intense.useColors
-        "\033[1m#{this}\033[0m"
+        '\x1b' + "[1m#{this}" + '\x1b' + "[0m"
       else
         this
   useColors: true
-  moveBack: (count = 1) -> "\033[#{count}D"
+  moveBack: (count = 1) -> '\x1b' + "[#{count}D"
 }
 
 for method, code of Intense.methods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine-headless-webkit
 version: !ruby/object:Gem::Version
-  version: 0.9.0.rc1
+  version: 0.9.0.rc.2
   prerelease: 6
 platform: ruby
 authors:
@@ -11,22 +11,27 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-27 00:00:00.000000000Z
+date: 2012-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jasmine-core
-  requirement: &2173103220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2173103220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-script
-  requirement: &2173102780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +39,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2173102780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &2173102280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,29 +55,60 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2173102280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &2173101720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2173101720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &2173101000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2173101000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sprockets-vendor_gems
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Run Jasmine specs headlessly
 email:
 - john@coswellproductions.com
@@ -305,7 +346,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1533041134193199304
+      hash: 4192446100369998967
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -314,7 +355,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: jasmine-headless-webkit
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Run Jasmine specs headlessly in a WebKit browser