jasmine 2.0.1 → 2.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4732e45628348b1813f0ab0cb8447712b39d4735
+  data.tar.gz: 86dcdc538721f1516ab60f1f90479b7dedba815e
+SHA512:
+  metadata.gz: 97a4435aa04f9b71ef50a863ba13f61a15031e0333ee6b73edc6c50b2e3490e28ce18e4da5a7df50ba4acdcac46b8fdbb609111b5db6b31af9ce89d1506893b2
+  data.tar.gz: 2bad0156b8d5c7e4a975aa0d8b2d01622e1e95c604a6eba7c78f86158fc2de5f4e8139bcd67ce0693a3d1744b9dec65918e3265fe69cc95a6be9104923baa827

data/.travis.yml

@@ -3,6 +3,7 @@ script: "if [ $PERFORMANCE_SPECS ];then bundle exec rake performance_specs --tra
 rvm:
   - "1.9.3"
   - "2.0.0"
+  - "2.1.1"
   - "jruby"
   - "rbx-2"
 

data/README.markdown

@@ -43,7 +43,7 @@ For Continuous Integration environments, add this task to the project build step
 
 This uses PhantomJS to load and run the Jasmine suite. 
 
-Please note that PhantomJS will be auto-installed by the [phantomjs-gem][phantomjs-gem] at the first `rake jasmine:ci` run. If you have a PhantomJS somewhere on your path, it won't install.
+Please note that PhantomJS will be auto-installed by the [phantomjs-gem][phantomjs-gem] at the first `rake jasmine:ci` run. If you have a matching PhantomJS version somewhere on your path, it won't install. You can disable automatic installation altogether (and use the PhantomJS on your path) via the config helper.
 
 [phantomjs-gem]: https://github.com/colszowka/phantomjs-gem#phantomjs-as-a-rubygem
 

data/lib/generators/jasmine/install/templates/spec/javascripts/support/jasmine_helper.rb

@@ -8,4 +8,8 @@
 #   config.boot_files = lambda { ['/absolute/path/to/boot_dir/file.js'] }
 #end
 #
-
+#Example: prevent PhantomJS auto install, uses PhantomJS already on your path.
+#Jasmine.configure do |config|
+#   config.prevent_phantomjs_auto_install = true
+#end
+#

data/lib/jasmine.rb

@@ -8,7 +8,6 @@ jasmine_files = ['base',
                  'command_line_tool',
                  'page',
                  'path_mapper',
-                 'asset_bundle',
                  'asset_pipeline_mapper',
                  'asset_expander',
                  'result',

data/lib/jasmine/asset_expander.rb

@@ -1,18 +1,66 @@
 module Jasmine
   class AssetExpander
-    def initialize(bundled_asset_factory)
-      @bundled_asset_factory = bundled_asset_factory
-    end
-
     def expand(src_dir, src_path)
       pathname = src_path.gsub(/^\/?assets\//, '').gsub(/\.js$/, '')
-      bundled_asset = bundled_asset_factory.new(pathname)
-      bundled_asset.assets.map do |asset|
+
+      asset_bundle.assets(pathname).flat_map { |asset|
         "/#{asset.gsub(/^\//, '')}?body=true"
-      end.flatten
+      }
     end
 
     private
-    attr_reader :bundled_asset_factory
+
+    UnsupportedRailsVersion = Class.new(StandardError)
+
+    def asset_bundle
+      return Rails3AssetBundle.new if Jasmine::Dependencies.rails3?
+      return Rails4AssetBundle.new if Jasmine::Dependencies.rails4?
+      raise UnsupportedRailsVersion, "Jasmine only supports the asset pipeline for Rails 3 or 4"
+    end
+
+    class Rails3AssetBundle
+      def assets(pathname)
+        context.asset_paths.asset_for(pathname, nil).to_a.map do |path|
+          context.asset_path(path)
+        end
+      end
+
+      private
+
+      def context
+        @context ||= get_asset_context
+      end
+
+      def get_asset_context
+        context = ::Rails.application.assets.context_class
+        context.extend(::Sprockets::Helpers::IsolatedHelper)
+        context.extend(::Sprockets::Helpers::RailsHelper)
+      end
+    end
+
+    class Rails4AssetBundle
+      def assets(pathname)
+        context.get_original_assets(pathname)
+      end
+
+      private
+
+      def context
+        @context ||= ActionView::Base.new.extend(GetOriginalAssetsHelper)
+      end
+
+      module GetOriginalAssetsHelper
+        def get_original_assets(pathname)
+          assets_environment.find_asset(pathname).to_a.map do |processed_asset|
+            case processed_asset.content_type
+            when "text/css"
+              path_to_stylesheet(processed_asset.logical_path)
+            when "application/javascript"
+              path_to_javascript(processed_asset.logical_path)
+            end
+          end
+        end
+      end
+    end
   end
 end

data/lib/jasmine/config.rb

@@ -32,6 +32,9 @@ module Jasmine
       @config.add_rack_path(spec_path, lambda {
         sprockets_spec_env = Sprockets::Environment.new
         sprockets_spec_env.append_path @config.spec_dir
+        Rails.application.assets.paths.each do |path|
+          sprockets_spec_env.append_path(path)
+        end
         sprockets_spec_env
       })
     else
@@ -50,7 +53,7 @@ module Jasmine
 
     if Jasmine::Dependencies.use_asset_pipeline?
       @config.add_path_mapper(lambda { |config|
-        asset_expander = Jasmine::AssetExpander.new(Jasmine::AssetBundle.factory)
+        asset_expander = Jasmine::AssetExpander.new
         Jasmine::AssetPipelineMapper.new(config, asset_expander.method(:expand))
       })
       # In order to have asset helpers like asset_path and image_path, we need to require 'action_view/base'.  This
@@ -70,7 +73,7 @@ module Jasmine
       })
     end
 
-    @config.runner = lambda { |formatter, jasmine_server_url| Jasmine::Runners::PhantomJs.new(formatter, jasmine_server_url, 50) }
+    @config.runner = lambda { |formatter, jasmine_server_url| Jasmine::Runners::PhantomJs.new(formatter, jasmine_server_url, 50, @config.prevent_phantom_js_auto_install) }
   end
 
   def self.config

data/lib/jasmine/configuration.rb

@@ -9,10 +9,12 @@ module Jasmine
     attr_accessor :spec_format
     attr_accessor :runner
     attr_accessor :rack_options
+    attr_accessor :prevent_phantom_js_auto_install
+    attr_reader :rack_apps
 
     def initialize()
       @rack_paths = {}
-      @apps = []
+      @rack_apps = []
       @path_mappers = []
       @jasmine_css_files = lambda { [] }
       @css_files = lambda { [] }
@@ -50,12 +52,8 @@ module Jasmine
       @rack_paths[path] = rack_app_lambda
     end
 
-    def rack_apps
-      [] + @apps
-    end
-
     def add_rack_app(app, *args, &block)
-      @apps << {
+      @rack_apps << {
           :app => app,
           :args => args,
           :block => block

data/lib/jasmine/formatters/multi.rb

@@ -6,19 +6,11 @@ module Jasmine
       end
 
       def format(results)
-        go(:format, results)
+        @formatters.each { |formatter| formatter.format(results) }
       end
 
       def done
-        go(:done)
-      end
-
-      private
-
-      def go(method, *args)
-        (@formatters || []).each do |formatter|
-          formatter.public_send(method, *args)
-        end
+        @formatters.each(&:done)
       end
     end
   end

data/lib/jasmine/runners/phantom_js.rb

@@ -3,14 +3,15 @@ require 'phantomjs'
 module Jasmine
   module Runners
     class PhantomJs
-      def initialize(formatter, jasmine_server_url, result_batch_size)
+      def initialize(formatter, jasmine_server_url, result_batch_size, prevent_phantom_js_auto_install)
         @formatter = formatter
         @jasmine_server_url = jasmine_server_url
         @result_batch_size = result_batch_size
+        @prevent_phantom_js_auto_install = prevent_phantom_js_auto_install
       end
 
       def run
-        command = "#{Phantomjs.path} '#{File.join(File.dirname(__FILE__), 'phantom_jasmine_run.js')}' #{jasmine_server_url} #{result_batch_size}"
+        command = "#{phantom_js_path} '#{File.join(File.dirname(__FILE__), 'phantom_jasmine_run.js')}' #{jasmine_server_url} #{result_batch_size}"
         IO.popen(command) do |output|
           output.each do |line|
             if line =~ /^jasmine_result/
@@ -24,12 +25,16 @@ module Jasmine
         formatter.done
       end
 
+      def phantom_js_path
+        prevent_phantom_js_auto_install ? 'phantomjs' : Phantomjs.path
+      end
+
       def boot_js
         File.expand_path('phantom_boot.js', File.dirname(__FILE__))
       end
 
       private
-      attr_reader :formatter, :jasmine_server_url, :result_batch_size
+      attr_reader :formatter, :jasmine_server_url, :result_batch_size, :prevent_phantom_js_auto_install
     end
   end
 end

data/lib/jasmine/tasks/jasmine.rake

@@ -1,3 +1,19 @@
+if Rake.application.tasks.any? {|t| t.name == 'jasmine/ci' }
+  message = <<-EOF
+
+                        WARNING
+Detected that jasmine rake tasks have been loaded twice.
+This will cause the 'rake jasmine:ci' and 'rake jasmine' tasks to fail.
+
+To fix this problem, you should ensure that you only load 'jasmine/tasks/jasmine.rake'
+once. This should be done for you automatically if you installed jasmine's rake tasks
+with either 'jasmine init' or 'rails g jasmine:install'.
+
+
+EOF
+  raise Exception.new(message)
+end
+
 namespace :jasmine do
   task :configure do
     require 'jasmine/config'

data/lib/jasmine/version.rb

@@ -1,3 +1,3 @@
 module Jasmine
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/spec/configuration_spec.rb

@@ -141,6 +141,14 @@ describe Jasmine::Configuration do
     end
   end
 
+  describe 'prevent phantomjs auto install' do
+    it 'returns value if set' do
+      config = Jasmine::Configuration.new()
+      config.prevent_phantom_js_auto_install = true
+      config.prevent_phantom_js_auto_install.should == true
+    end
+  end
+
   describe 'jasmine ports' do
     it 'returns new CI port and caches return value' do
       config = Jasmine::Configuration.new()

data/spec/jasmine_rails_spec.rb

@@ -37,6 +37,7 @@ if Jasmine::Dependencies.rails_available?
         f.puts "gem 'rubysl', :platform => :rbx"
         f.puts "gem 'racc', :platform => :rbx"
         f.puts "gem 'thin'" unless RUBY_PLATFORM == 'java'
+        f.puts "gem 'angularjs-rails'"
         f.flush
       }
 
@@ -117,6 +118,11 @@ if Jasmine::Dependencies.rails_available?
         f.flush
       }
 
+      open('spec/javascripts/helpers/angular_helper.js', 'w') { |f|
+        f.puts "//= require angular-mocks"
+        f.flush
+      }
+
       css_yaml = custom_jasmine_config('css') do |jasmine_config|
         jasmine_config['src_files'] = %w[assets/application.js http://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js]
         jasmine_config['stylesheets'] = ['assets/application.css']
@@ -141,7 +147,11 @@ if Jasmine::Dependencies.rails_available?
           output.should match(%r{script src.*/assets/jasmine_examples/Player\.js})
           output.should match(%r{script src=['"]http://ajax\.googleapis\.com/ajax/libs/jquery/1\.11\.0/jquery\.min\.js})
           output.should match(%r{script src.*/assets/jasmine_examples/Song\.js})
+          output.should match(%r{script src.*angular_helper\.js})
           output.should match(%r{<link rel=.stylesheet.*?href=./assets/foo\.css\?.*?>})
+
+          output = Net::HTTP.get(URI.parse('http://localhost:8888/__spec__/helpers/angular_helper.js'))
+          output.should match(/angular\.mock/)
         ensure
           Process.kill(:SIGINT, pid)
           begin

data/spec/lib/jasmine/formatters/multi_spec.rb

@@ -6,9 +6,17 @@ describe Jasmine::Formatters::Multi do
     formatter2 = double(:formatter2)
     multi = Jasmine::Formatters::Multi.new([formatter1, formatter2])
 
-    formatter1.should_receive(:format)
-    formatter2.should_receive(:format)
-    multi.format(nil)
+    results1 = double(:results1)
+
+    formatter1.should_receive(:format).with(results1)
+    formatter2.should_receive(:format).with(results1)
+    multi.format(results1)
+
+    results2 = double(:results1)
+
+    formatter1.should_receive(:format).with(results2)
+    formatter2.should_receive(:format).with(results2)
+    multi.format(results2)
 
     formatter1.should_receive(:done)
     formatter2.should_receive(:done)

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine
 version: !ruby/object:Gem::Version
-  version: 2.0.1
-  prerelease: 
+  version: 2.0.2
 platform: ruby
 authors:
 - Rajan Agaskar
@@ -11,92 +10,81 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jasmine-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,7 +92,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -112,49 +99,43 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: phantomjs
   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: Test your JavaScript without any framework dependencies, in any environment,
@@ -189,7 +170,6 @@ files:
 - lib/generators/jasmine/install/templates/spec/javascripts/support/jasmine_helper.rb
 - lib/jasmine.rb
 - lib/jasmine/application.rb
-- lib/jasmine/asset_bundle.rb
 - lib/jasmine/asset_expander.rb
 - lib/jasmine/asset_pipeline_mapper.rb
 - lib/jasmine/base.rb
@@ -251,34 +231,27 @@ files:
 homepage: http://pivotal.github.com/jasmine/
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1868816023203409385
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1868816023203409385
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: JavaScript BDD framework
 test_files:
 - spec/application_integration_spec.rb

data/lib/jasmine/asset_bundle.rb

@@ -1,68 +0,0 @@
-module Jasmine
-
-  class AssetBundle
-    def self.factory
-      if Jasmine::Dependencies.rails3?
-        return Rails3AssetBundle
-      end
-      if Jasmine::Dependencies.rails4?
-        return Rails4AssetBundle
-      end
-    end
-
-    class RailsAssetBundle
-      def initialize(pathname)
-        @pathname = pathname
-      end
-
-      private
-
-      attr_reader :pathname
-    end
-
-    class Rails3AssetBundle < RailsAssetBundle
-
-      def assets
-        context = get_asset_context
-        context.asset_paths.asset_for(pathname, nil).to_a.map do |path|
-          context.asset_path(path)
-        end
-      end
-
-      private
-      def get_asset_context
-        context = ::Rails.application.assets.context_class
-        context.extend(::Sprockets::Helpers::IsolatedHelper)
-        context.extend(::Sprockets::Helpers::RailsHelper)
-      end
-    end
-
-    class Rails4AssetBundle < RailsAssetBundle
-
-      def assets
-        context.get_original_assets(pathname)
-      end
-
-      private
-      def context
-        return @context if @context
-        @context = ActionView::Base.new
-        @context.instance_eval do
-          def get_original_assets(pathname)
-            assets_environment.find_asset(pathname).to_a.map do |processed_asset|
-              case processed_asset.content_type
-              when "text/css"
-                path_to_stylesheet(processed_asset.logical_path)
-              when "application/javascript"
-                path_to_javascript(processed_asset.logical_path)
-              end
-            end
-          end
-        end
-        @context
-
-      end
-    end
-  end
-
-end