jasmine 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c18046172c97ada9097c6529f12e5f221e633f67
-  data.tar.gz: 1927874c49d3ecfcdec802f008852e972f2196d4
+  metadata.gz: 4ee18d86d8b3bb06460519fe027eb50064fcac2d
+  data.tar.gz: 98da9a88d5ee9e93a6703797a57ebee17825efa2
 SHA512:
-  metadata.gz: 2e2e1330b623fb13f52b1244147e238a05992b6df30924672c159de4ab7680b32f64de3d8d515714b40ecb54fa985a2d1dea5ab52ff5f2a01e331fd021ab1261
-  data.tar.gz: a02891ef5cfcdd7f06d287dcc85fa33b480aa0fb864cb67f6e4e46da03a5999937c9dbf70118d05f76585e12c56e09f1fc5dc0e790e51047ae024f7d42b009ff
+  metadata.gz: 8d9ae229a737da548b810cd2ac167e3678c10c5569551fc346817e9c143826a6eb4dbd98e161a4f757eaa5d7a8d11ec41d0436cc9160693f9db87c5cfab45442
+  data.tar.gz: 89ad800ae3f1752f93f1df68311715ff1e2429e17ea0f5fa9a3114b23f3d002b9c32fbbb7aa0fb20614ce37348ffb0acc033719d7b4b48b256380be85d33d72d

data/Gemfile

@@ -6,7 +6,7 @@ gem 'anchorman', :platform => :mri
 
 # during development, do not release
 if ENV['TRAVIS']
-  gem 'jasmine-core', :git => 'http://github.com/jasmine/jasmine.git', :branch => '3.0-features'
+  gem 'jasmine-core', :git => 'http://github.com/jasmine/jasmine.git'
 else
   gem 'jasmine-core', :path => '../jasmine'
 end

data/jasmine.gemspec

@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '>= 2.5.0'
   s.add_development_dependency 'nokogiri'
 
-  s.add_dependency 'jasmine-core', '3.0.0'
+  s.add_dependency 'jasmine-core', '3.1.0'
   s.add_dependency 'rack', '>= 1.2.1'
   s.add_dependency 'rake'
   s.add_dependency 'phantomjs'

data/lib/jasmine/asset_expander.rb

@@ -1,10 +1,10 @@
 module Jasmine
   class AssetExpander
     def expand(src_dir, src_path)
-      pathname = src_path.gsub(/^\/?assets\//, '').gsub(/\.js$/, '')
+      pathname = src_path.gsub(/^\/?assets\//, '')
 
       asset_bundle.assets(pathname).flat_map { |asset|
-        "/#{asset.gsub(/^\//, '')}?body=true"
+        "/#{asset.gsub(/^\//, '')}"
       }
     end
 
@@ -14,12 +14,16 @@ module Jasmine
 
     def asset_bundle
       return Rails4Or5AssetBundle.new if Jasmine::Dependencies.rails4? || Jasmine::Dependencies.rails5?
-      raise UnsupportedRailsVersion, "Jasmine only supports the asset pipeline for Rails 4 - 5"
+      raise UnsupportedRailsVersion, "Jasmine only supports the asset pipeline for Rails 4. - 5"
     end
 
     class Rails4Or5AssetBundle
       def assets(pathname)
-        context.get_original_assets(pathname)
+        if pathname =~ /\.css$/
+          context.get_stylesheet_assets(pathname.gsub(/\.css$/, ''))
+        else
+          context.get_javascript_assets(pathname.gsub(/\.js$/, ''))
+        end
       end
 
       private
@@ -29,14 +33,31 @@ module Jasmine
       end
 
       module GetOriginalAssetsHelper
-        def get_original_assets(pathname)
-          Array(assets_environment.find_asset(pathname)).map do |processed_asset|
-            case processed_asset.content_type
-            when "text/css"
-              path_to_stylesheet(processed_asset.logical_path, debug: true)
-            when "application/javascript"
-              path_to_javascript(processed_asset.logical_path, debug: true)
+        def get_javascript_assets(pathname)
+          if asset = lookup_debug_asset(pathname, type: :javascript)
+            if asset.respond_to?(:to_a)
+              asset.to_a.map do |a|
+                path_to_javascript(a.logical_path, debug: true)
+              end
+            else
+              Array(path_to_javascript(asset.logical_path, debug: true))
+            end
+          else
+            []
+          end
+        end
+
+        def get_stylesheet_assets(pathname)
+          if asset = lookup_debug_asset(pathname, type: :stylesheet)
+            if asset.respond_to?(:to_a)
+              asset.to_a.map do |a|
+                path_to_stylesheet(a.logical_path, debug: true)
+              end
+            else
+              Array(path_to_stylesheet(asset.logical_path, debug: true))
             end
+          else
+            []
           end
         end
       end

data/lib/jasmine/version.rb

@@ -1,3 +1,3 @@
 module Jasmine
-  VERSION = "3.0.0"
+  VERSION = "3.1.0"
 end

data/release_notes/3.1.0.md

@@ -0,0 +1,18 @@
+# Jasmine Gem 3.1 Release Notes
+
+## Summary
+
+This release updates the jasmine-core dependency to 3.1.0. See the
+[jasmine-core release notes](https://github.com/jasmine/jasmine/blob/master/release_notes/3.1.0.md)
+for more information
+
+## Changes
+
+* Add support for sprockets 4 and source maps
+  - Merges [#296](https://github.com/jasmine/jasmine-gem/issues/296) from @mgodwin
+  - Fixes [#295](https://github.com/jasmine/jasmine-gem/issues/295)
+
+
+------
+
+_Release Notes generated with _[Anchorman](http://github.com/infews/anchorman)_

data/spec/jasmine_rails_spec.rb

@@ -26,7 +26,7 @@ if rails_available?
 
       open('Gemfile', 'a') { |f|
         f.puts "gem 'jasmine', :path => '#{base}'"
-        f.puts "gem 'jasmine-core', :git => 'http://github.com/jasmine/jasmine.git', :branch => '3.0-features'"
+        f.puts "gem 'jasmine-core', :git => 'http://github.com/jasmine/jasmine.git'"
         if RUBY_PLATFORM != 'java' && ENV['RAILS_VERSION'] != 'rails5'
           f.puts "gem 'thin'"
         end
@@ -124,11 +124,11 @@ if rails_available?
 
       run_jasmine_server("JASMINE_CONFIG_PATH=#{css_yaml}") do
         output = Net::HTTP.get(URI.parse('http://localhost:8888/'))
-        expect(output).to match(%r{script src.*/assets/jasmine_examples/Player\.js})
+        expect(output).to match(%r{script src.*/assets/jasmine_examples/Player(\.self-[^\.]+)?\.js})
         expect(output).to match(%r{script src=['"]http://ajax\.googleapis\.com/ajax/libs/jquery/1\.11\.0/jquery\.min\.js})
-        expect(output).to match(%r{script src.*/assets/jasmine_examples/Song\.js})
+        expect(output).to match(%r{script src.*/assets/jasmine_examples/Song(\.self-[^\.]+)?\.js})
         expect(output).to match(%r{script src.*angular_helper\.js})
-        expect(output).to match(%r{<link rel=.stylesheet.*?href=./assets/foo\.css\?.*?>})
+        expect(output).to match(%r{<link rel=.stylesheet.*?href=./assets/foo(\.self-[^\.]+)?\.css\?.*?>})
 
         output = Net::HTTP.get(URI.parse('http://localhost:8888/__spec__/helpers/angular_helper.js'))
         expect(output).to match(/angular\.mock/)
@@ -181,6 +181,53 @@ if rails_available?
       end
     end
 
+    describe 'using sprockets 4' do
+      before :all do
+        FileUtils.cp('Gemfile', 'Gemfile-old')
+        FileUtils.rm 'Gemfile.lock'
+
+        open('Gemfile', 'a') { |f|
+          f.puts "gem 'sprockets', '~> 4.0.0.beta6'"
+          f.flush
+        }
+        Bundler.with_clean_env do
+          bundle_install
+        end
+
+        FileUtils.mkdir_p('app/assets/config')
+
+        open('app/assets/config/manifest.js', 'w') { |f|
+          f.puts "//= link application.js"
+          f.puts "//= link application.css"
+          f.flush
+        }
+      end
+
+      after :all do
+        FileUtils.mv 'Gemfile-old', 'Gemfile'
+        FileUtils.rm 'Gemfile.lock'
+        FileUtils.rm 'app/assets/config/manifest.js'
+        Bundler.with_clean_env do
+          bundle_install
+        end
+      end
+
+      it "serves source mapped assets" do
+        run_jasmine_server do
+          output = Net::HTTP.get(URI.parse('http://localhost:8888/'))
+
+          js_match = output.match %r{script src.*/(assets/application.debug-[^\.]+\.js)}
+
+          expect(js_match).to_not be_nil
+          expect(output).to match(%r{<link rel=.stylesheet.*?href=.*/assets/application.debug-[^\.]+\.css})
+
+          js_path = js_match[1]
+          output = Net::HTTP.get(URI.parse("http://localhost:8888/#{js_path}"))
+          expect(output).to match(%r{//# sourceMappingURL=.*\.map})
+        end
+      end
+    end
+
     def run_jasmine_server(options = "")
       Bundler.with_clean_env do
         begin
@@ -196,6 +243,7 @@ if rails_available?
             puts "someone else is running a server on port 8888"
             expect($?).to be_success
           end
+          yield
         ensure
           Process.kill(:SIGINT, pid)
           begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jasmine
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Gregg Van Hove
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-06 00:00:00.000000000 Z
+date: 2018-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -201,6 +201,7 @@ files:
 - lib/rack/jasmine/focused_suite.rb
 - lib/rack/jasmine/runner.rb
 - release_notes/3.0.md
+- release_notes/3.1.0.md
 - release_notes/v1.2.1.md
 - release_notes/v1.3.2.md
 - release_notes/v2.0.0.md