jasmine-multi_json 1.3.1.1 → 1.3.2.1

data/README.markdown

@@ -53,8 +53,6 @@ This uses Selenium to launch a browser and run the Jasmine suite. Then it uses R
 Customize `spec/javascripts/support/jasmine.yml` to enumerate the source files, stylesheets, and spec files you would like the Jasmine runner to include.
 You may use dir glob strings.
 
-For more complex configuration (e.g., port number), edit `spec/javascripts/support/jasmine_config.rb` file directly.
-
 ## Note about the CI task and RSpec
 
 This gem requires RSpec for the `jasmine:ci` rake task to work. But this gem does not explicitly *depend* on any version of the RSpec gem.

data/generators/jasmine/jasmine_generator.rb

@@ -14,6 +14,7 @@ class JasmineGenerator < Rails::Generator::Base
 
     m.directory "spec/javascripts/support"
     m.file "spec/javascripts/support/jasmine-rails.yml", "spec/javascripts/support/jasmine.yml"
+    m.file "spec/javascripts/support/jasmine_helper.rb", "spec/javascripts/support/jasmine_helper.rb"
     m.readme "INSTALL"
 
     m.directory "lib/tasks"

data/generators/jasmine/templates/spec/javascripts/support/jasmine.yml

@@ -72,3 +72,17 @@ src_dir:
 # spec_dir: spec/javascripts
 #
 spec_dir:
+
+# spec_helper
+#
+# Ruby file that Jasmine server will require before starting.
+# Returned relative to your root path
+# Default spec/support/jasmine_helper.rb
+#
+# EXAMPLE:
+#
+# spec_helper: spec/support/jasmine_helper.rb
+#
+spec_helper: spec/support/jasmine_helper.rb
+
+

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

@@ -0,0 +1,11 @@
+#Use this file to set/override Jasmine configuration options
+#You can remove it if you don't need it.
+#This file is loaded *after* jasmine.yml is interpreted.
+#
+#Example: using a different boot file.
+#Jasmine.configure do |config|
+#   config.boot_dir = '/absolute/path/to/boot_dir'
+#   config.boot_files = lambda { ['/absolute/path/to/boot_dir/file.js'] }
+#end
+#
+

data/jasmine.gemspec

@@ -67,6 +67,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'multi_json'
   s.add_development_dependency 'nokogiri'
 
+  s.add_development_dependency 'anchorman'
+
   s.add_dependency 'jasmine-core', "~> 1.3.1"
   s.add_dependency 'rack', '~> 1.0'
   s.add_dependency 'rspec', '>= 1.3.1'

data/lib/generators/jasmine/install/USAGE

@@ -6,6 +6,4 @@ Example:
 
     This will create:
         spec/javascripts/support/jasmine.yml
-        spec/javascripts/support/jasmine_config.rb
-        spec/javascripts/support/jasmine_runner.rb
         spec/javascripts/helpers/.gitkeep

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

@@ -0,0 +1,11 @@
+#Use this file to set/override Jasmine configuration options
+#You can remove it if you don't need it.
+#This file is loaded *after* jasmine.yml is interpreted.
+#
+#Example: using a different boot file.
+#Jasmine.configure do |config|
+#   @config.boot_dir = '/absolute/path/to/boot_dir'
+#   @config.boot_files = lambda { ['/absolute/path/to/boot_dir/file.js'] }
+#end
+#
+

data/lib/jasmine/asset_expander.rb

@@ -10,9 +10,8 @@ module Jasmine
       bundled_asset = @bundled_asset_factory.call(pathname, 'js')
       return nil unless bundled_asset
 
-      base_asset = "#{bundled_asset.pathname.to_s.gsub(/#{src_dir}/, '')}?body=true"
-      bundled_asset.to_a.inject([base_asset]) do |assets, asset|
-        assets << "/#{@asset_path_for.call(asset).gsub(/^\//, '')}?body=true"
+      bundled_asset.to_a.map do |asset|
+        "/#{@asset_path_for.call(asset).gsub(/^\//, '')}?body=true"
       end.flatten
     end
   end

data/lib/jasmine/command_line_tool.rb

@@ -36,23 +36,18 @@ module Jasmine
         copy_unless_exists('jasmine-example/spec/PlayerSpec.js', 'spec/javascripts/PlayerSpec.js')
         copy_unless_exists('jasmine-example/spec/SpecHelper.js', 'spec/javascripts/helpers/SpecHelper.js')
 
-        rails_tasks_dir = dest_path('lib/tasks')
-        if File.exist?(rails_tasks_dir)
-          copy_unless_exists('lib/tasks/jasmine.rake')
-          copy_unless_exists('spec/javascripts/support/jasmine-rails.yml', 'spec/javascripts/support/jasmine.yml')
-        else
-          copy_unless_exists('spec/javascripts/support/jasmine.yml')
-          require 'rake'
-          write_mode = 'w'
-          if File.exist?(dest_path('Rakefile'))
-            load dest_path('Rakefile')
-            write_mode = 'a'
-          end
+        copy_unless_exists('spec/javascripts/support/jasmine.yml')
+        copy_unless_exists('spec/javascripts/support/jasmine_helper.rb')
+        require 'rake'
+        write_mode = 'w'
+        if File.exist?(dest_path('Rakefile'))
+          load dest_path('Rakefile')
+          write_mode = 'a'
+        end
 
-          unless Rake::Task.task_defined?('jasmine')
-            File.open(dest_path('Rakefile'), write_mode) do |f|
-              f.write("\n" + File.read(template_path('lib/tasks/jasmine.rake')))
-            end
+        unless Rake::Task.task_defined?('jasmine')
+          File.open(dest_path('Rakefile'), write_mode) do |f|
+            f.write("\n" + File.read(template_path('lib/tasks/jasmine.rake')))
           end
         end
         File.open(template_path('INSTALL'), 'r').each_line do |line|

data/lib/jasmine/config.rb

@@ -1,4 +1,5 @@
 module Jasmine
+  require 'yaml'
   require 'erb'
   def self.configure(&block)
     block.call(self.config)
@@ -21,7 +22,6 @@ module Jasmine
     @config.boot_files = lambda { core_config.boot_files }
     @config.jasmine_files = lambda { core_config.js_files }
     @config.jasmine_css_files = lambda { core_config.css_files }
-
     @config.add_rack_path(jasmine_path, lambda { Rack::File.new(config.jasmine_dir) })
     @config.add_rack_path(boot_path, lambda { Rack::File.new(config.boot_dir) })
     @config.add_rack_path(spec_path, lambda { Rack::File.new(config.spec_dir) })
@@ -79,6 +79,7 @@ module Jasmine
         config.src_dir = yaml_config.src_dir
         config.spec_dir = yaml_config.spec_dir
       end
+      require yaml_config.spec_helper if File.exist?(yaml_config.spec_helper)
     end
   end
 

data/lib/jasmine/selenium_driver.rb

@@ -1,4 +1,5 @@
 module Jasmine
+  require 'multi_json'
   class SeleniumDriver
     def initialize(browser, http_address)
       require 'selenium-webdriver'

data/lib/jasmine/version.rb

@@ -1,3 +1,3 @@
 module Jasmine
-  VERSION = "1.3.1.1"
+  VERSION = "1.3.2.1"
 end

data/lib/jasmine/yaml_config_parser.rb

@@ -46,6 +46,10 @@ module Jasmine
       @path_expander.call(src_dir, loaded_yaml['stylesheets'] || [])
     end
 
+    def spec_helper
+      File.join(@pwd, loaded_yaml['spec_helper'] || File.join('spec', 'javascripts', 'support', 'jasmine_helper.rb'))
+    end
+
     private
     def loaded_yaml
       @yaml_loader.call(@path)

data/{RELEASE_NOTES.markdown → release_notes/v1.2.1.md}

@@ -1,4 +1,4 @@
-#1.2.1
+# Jasmine Gem v1.2.1
 
 * asset manifests following the Rails defaults are included as individual src files
 * Fix regression that required Jasmine restart to find new src/spec files

data/release_notes/v1.3.2.md

@@ -0,0 +1,32 @@
+# Jasmine Gem v1.3.2
+
+## Summary
+
+This release removes some pre-1.3 cruft in documentation regarding the old configuration files. Also fixes the JSON/YAML require bug.
+
+Best approach is to delete your Jasmine support files and clean out jasmine from your Rakefile and call `jasmine init` again.
+
+## Changes
+
+* Removed incorrect asset_path mapping
+    * Including `asset_file` (the manifest) fails if asset file is itself templated (erb, coffee), or if asset file uses `require_self`.
+    * Use `require_self` if it is necessary to include javascript inside of a Sprockets manifest file (like `application.js`)
+    * SHA: [be9851192e78ffe635087e5583b15ebe683dc0d9](http://github.com/pivotal/jasmine-gem/commit/be9851192e78ffe635087e5583b15ebe683dc0d9)
+* Load `jasmine_helper` after configuring from yaml
+    * Allows users opportunity to add a `Jasmine.configure` block that overrides/augments `jasmine.yml` settings
+    * File defaults to `specs/javascript/support/jasmine_helper.rb` but is configurable from `jasmine.yml`
+    * *Only* processed if using `jasmine.yml` (which default rake tasks will do if `jasmine.yml` exists).
+	* SHA: [63e8d46556a421cbb3b511b52cd8c2188d72b9db](http://github.com/pivotal/jasmine-gem/commit/63e8d46556a421cbb3b511b52cd8c2188d72b9db)
+* Rails generators should be used for Rails installs
+    * SHA: [5d1d500fdc2462951de901513f2aacc5286f20c1](http://github.com/pivotal/jasmine-gem/commit/5d1d500fdc2462951de901513f2aacc5286f20c1)
+* Fix reference error of YAML and JSON
+    * Merge pull request #119 from kozy4324
+    * SHA: [442135f648970fcaf5e4163a672a78fbea65e118](http://github.com/pivotal/jasmine-gem/commit/442135f648970fcaf5e4163a672a78fbea65e118)
+* Removed references in docs to pre-1.3 files that are no longer used
+    * Merged pull request #132 from levent
+    * Merged pull request #129 from mcolyer
+    * Merged pull request #130 from mcolyer
+
+------
+
+_Release Notes generated with [Anchorman](http://github.com/infews/anchorman)_

data/spec/asset_expander_spec.rb

@@ -22,8 +22,7 @@ describe Jasmine::AssetExpander do
 
     expander = Jasmine::AssetExpander.new(bundled_asset_getter, asset_path_getter)
     expanded_assets = expander.expand('/some_src_dir', 'asset_file')
-    expanded_assets.should == ['/asset_file?body=true',
-                               '/asset1_path?body=true',
+    expanded_assets.should == ['/asset1_path?body=true',
                                '/asset2_path?body=true']
   end
 

data/spec/yaml_config_parser_spec.rb

@@ -41,6 +41,26 @@ describe Jasmine::YamlConfigParser do
     parser.jasmine_dir.should == File.join('some_project_root', 'some_jasmine_dir')
   end
 
+  it "spec_helper returns default helper path when spec_helper is blank" do
+    yaml_loader = lambda do |path|
+      if path == "some_path"
+        {"spec_helper" => nil}
+      end
+    end
+    parser = Jasmine::YamlConfigParser.new('some_path', 'some_project_root', nil, yaml_loader)
+    parser.spec_helper.should == 'some_project_root/spec/javascripts/support/jasmine_helper.rb'
+  end
+
+  it "spec_helper returns spec_helper if set" do
+    yaml_loader = lambda do |path|
+      if path == "some_path"
+        {"spec_helper" => 'some_spec_helper.rb'}
+      end
+    end
+    parser = Jasmine::YamlConfigParser.new('some_path', 'some_project_root', nil, yaml_loader)
+    parser.spec_helper.should == 'some_project_root/some_spec_helper.rb'
+  end
+
   it "spec_dir uses default path when spec dir is blank" do
     yaml_loader = lambda do |path|
       if path == "some_path"

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 3
+  - 2
   - 1
-  - 1
-  version: 1.3.1.1
+  version: 1.3.2.1
 platform: ruby
 authors: 
 - Rajan Agaskar
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-04 00:00:00 +01:00
+date: 2013-03-18 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,9 +99,21 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: jasmine-core
+  name: anchorman
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: jasmine-core
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -111,11 +123,11 @@ dependencies:
         - 1
         version: 1.3.1
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -124,11 +136,11 @@ dependencies:
         - 0
         version: "1.0"
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -138,11 +150,11 @@ dependencies:
         - 1
         version: 1.3.1
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: selenium-webdriver
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -152,7 +164,7 @@ dependencies:
         - 3
         version: 0.1.3
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id011
 description: Test your JavaScript without any framework dependencies, in any environment, and with a nice descriptive syntax.
 email: jasmine-js@googlegroups.com
 executables: 
@@ -170,7 +182,6 @@ files:
 - MIT.LICENSE
 - README.markdown
 - RELEASE.markdown
-- RELEASE_NOTES.markdown
 - Rakefile
 - bin/jasmine
 - generators/jasmine/jasmine_generator.rb
@@ -183,6 +194,7 @@ files:
 - generators/jasmine/templates/lib/tasks/jasmine.rake
 - generators/jasmine/templates/spec/javascripts/support/jasmine-rails.yml
 - generators/jasmine/templates/spec/javascripts/support/jasmine.yml
+- generators/jasmine/templates/spec/javascripts/support/jasmine_helper.rb
 - jasmine.gemspec
 - lib/generators/jasmine/examples/USAGE
 - lib/generators/jasmine/examples/examples_generator.rb
@@ -194,6 +206,7 @@ files:
 - lib/generators/jasmine/install/install_generator.rb
 - lib/generators/jasmine/install/templates/spec/javascripts/helpers/.gitkeep
 - lib/generators/jasmine/install/templates/spec/javascripts/support/jasmine.yml
+- lib/generators/jasmine/install/templates/spec/javascripts/support/jasmine_helper.rb
 - lib/jasmine.rb
 - lib/jasmine/application.rb
 - lib/jasmine/asset_expander.rb
@@ -229,6 +242,8 @@ files:
 - lib/rack/jasmine/cache_control.rb
 - lib/rack/jasmine/focused_suite.rb
 - lib/rack/jasmine/runner.rb
+- release_notes/v1.2.1.md
+- release_notes/v1.3.2.md
 - spec/application_integration_spec.rb
 - spec/application_spec.rb
 - spec/asset_expander_spec.rb