jasmine 1.3.0 → 1.3.1

data/spec/yaml_config_parser_spec.rb

@@ -0,0 +1,182 @@
+require 'spec_helper'
+
+describe Jasmine::YamlConfigParser do
+  it "src_dir uses current working directory when src dir is blank" do
+    yaml_loader = lambda do |path|
+      if path == "some_path"
+        {"src_dir" => nil}
+      end
+    end
+    parser = Jasmine::YamlConfigParser.new('some_path', 'some_project_root', nil, yaml_loader)
+    parser.src_dir.should == 'some_project_root'
+  end
+
+  it "src_dir returns src_dir if set" do
+    yaml_loader = lambda do |path|
+      if path == "some_path"
+        {"src_dir" => 'some_src_dir'}
+      end
+    end
+    parser = Jasmine::YamlConfigParser.new('some_path', 'some_project_root', nil, yaml_loader)
+    parser.src_dir.should == File.join('some_project_root', 'some_src_dir')
+  end
+
+  it "jasmine_dir returns nil when jasmine dir is blank" do
+    yaml_loader = lambda do |path|
+      if path == "some_path"
+        {"jasmine_dir" => nil}
+      end
+    end
+    parser = Jasmine::YamlConfigParser.new('some_path', 'some_project_root', nil, yaml_loader)
+    parser.jasmine_dir.should be_nil
+  end
+
+  it "jasmine_dir returns jasmine_dir if set" do
+    yaml_loader = lambda do |path|
+      if path == "some_path"
+        {"jasmine_dir" => 'some_jasmine_dir'}
+      end
+    end
+    parser = Jasmine::YamlConfigParser.new('some_path', 'some_project_root', nil, yaml_loader)
+    parser.jasmine_dir.should == File.join('some_project_root', 'some_jasmine_dir')
+  end
+
+  it "spec_dir uses default path when spec dir is blank" do
+    yaml_loader = lambda do |path|
+      if path == "some_path"
+        {"spec_dir" => nil}
+      end
+    end
+    parser = Jasmine::YamlConfigParser.new('some_path', 'some_project_root', nil, yaml_loader)
+    parser.spec_dir.should == File.join('some_project_root', 'spec', 'javascripts')
+  end
+
+  it "spec_dir returns spec_dir if set" do
+    yaml_loader = lambda do |path|
+      if path == "some_path"
+        {"spec_dir" => "some_spec_dir"}
+      end
+    end
+    parser = Jasmine::YamlConfigParser.new('some_path', 'some_project_root', nil, yaml_loader)
+    parser.spec_dir.should == File.join('some_project_root', 'some_spec_dir')
+  end
+
+  it "expands src_file paths" do
+    expander = lambda do |dir, patterns|
+      if (dir == File.join('some_project_root', 'some_src') && patterns == ['some_patterns'])
+        ['expected_results']
+      end
+    end
+    yaml_loader = lambda do |path|
+      if path == "some_path"
+        { 'src_dir' => 'some_src', 'src_files' => ['some_patterns'] }
+      end
+    end
+
+    parser = Jasmine::YamlConfigParser.new('some_path', 'some_project_root', expander, yaml_loader)
+
+    parser.src_files.should == ['expected_results']
+  end
+
+  it "expands stylesheets paths" do
+    expander = lambda do |dir, patterns|
+      if (dir == File.join('some_project_root', 'some_src') && patterns == ['some_patterns'])
+        ['expected_results']
+      end
+    end
+    yaml_loader = lambda do |path|
+      if path == "some_path"
+        { 'src_dir' => 'some_src', 'stylesheets' => ['some_patterns'] }
+      end
+    end
+
+    parser = Jasmine::YamlConfigParser.new('some_path', 'some_project_root', expander, yaml_loader)
+
+    parser.css_files.should == ['expected_results']
+  end
+
+  it "expands spec_file paths" do
+    expander = lambda do |dir, patterns|
+      if (dir == File.join('some_project_root', 'some_spec') && patterns == ['some_patterns'])
+        ['expected_results']
+      end
+    end
+    yaml_loader = lambda do |path|
+      if path == "some_path"
+        { 'spec_dir' => 'some_spec', 'spec_files' => ['some_patterns'] }
+      end
+    end
+
+    parser = Jasmine::YamlConfigParser.new('some_path', 'some_project_root', expander, yaml_loader)
+
+    parser.spec_files.should == ['expected_results']
+  end
+
+  it "expands jasmine_file paths" do
+    expander = lambda do |dir, patterns|
+      if (dir == File.join('some_project_root', 'some_jasmine') && patterns == ['some_patterns'])
+        ['expected_results']
+      end
+    end
+    yaml_loader = lambda do |path|
+      if path == "some_path"
+        { 'jasmine_dir' => 'some_jasmine', 'jasmine_files' => ['some_patterns'] }
+      end
+    end
+
+    parser = Jasmine::YamlConfigParser.new('some_path', 'some_project_root', expander, yaml_loader)
+
+    parser.jasmine_files.should == ['expected_results']
+  end
+
+  it "expands jasmine css file paths" do
+    expander = lambda do |dir, patterns|
+      if (dir == File.join('some_project_root', 'some_jasmine') && patterns == ['some_patterns'])
+        ['expected_results']
+      end
+    end
+    yaml_loader = lambda do |path|
+      if path == "some_path"
+        { 'jasmine_dir' => 'some_jasmine', 'jasmine_css_files' => ['some_patterns'] }
+      end
+    end
+
+    parser = Jasmine::YamlConfigParser.new('some_path', 'some_project_root', expander, yaml_loader)
+
+    parser.jasmine_css_files.should == ['expected_results']
+  end
+
+  it "expands helper paths" do
+    expander = lambda do |dir, patterns|
+      if (dir == File.join('some_project_root', 'some_spec') && patterns == ['some_patterns'])
+        ['expected_results']
+      end
+    end
+    yaml_loader = lambda do |path|
+      if path == "some_path"
+        { 'spec_dir' => 'some_spec', 'helpers' => ['some_patterns'] }
+      end
+    end
+
+    parser = Jasmine::YamlConfigParser.new('some_path', 'some_project_root', expander, yaml_loader)
+
+    parser.helpers.should == ['expected_results']
+  end
+
+  it "doesn't blow up when blank values are passed" do
+    expander = lambda do |dir, patterns|
+      raise 'bad arguments' unless patterns.is_a?(Array)
+      []
+    end
+    yaml_loader = lambda do |path|
+      {}
+    end
+
+    parser = Jasmine::YamlConfigParser.new({}, 'some_project_root', expander, yaml_loader)
+    parser.src_files.should == []
+    parser.spec_files.should == []
+    parser.css_files.should == []
+    parser.helpers.should == []
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jasmine
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -114,17 +114,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 1.3.1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -215,58 +215,63 @@ files:
 - lib/generators/jasmine/install/templates/spec/javascripts/support/jasmine.yml
 - lib/jasmine.rb
 - lib/jasmine/application.rb
+- lib/jasmine/asset_expander.rb
 - lib/jasmine/asset_pipeline_mapper.rb
+- lib/jasmine/asset_pipeline_utility.rb
 - lib/jasmine/base.rb
 - lib/jasmine/command_line_tool.rb
 - lib/jasmine/config.rb
+- lib/jasmine/configuration.rb
+- lib/jasmine/core_configuration.rb
 - lib/jasmine/dependencies.rb
 - lib/jasmine/firebug/firebug-1.6.2.xpi
 - lib/jasmine/firebug/firebug-1.7.0.xpi
 - lib/jasmine/firebug/firebug-license.txt
 - lib/jasmine/firebug/firebug.rb
+- lib/jasmine/javascripts/boot.js
 - lib/jasmine/page.rb
+- lib/jasmine/path_expander.rb
+- lib/jasmine/path_mapper.rb
 - lib/jasmine/railtie.rb
 - lib/jasmine/results.rb
 - lib/jasmine/results_processor.rb
 - lib/jasmine/rspec_formatter.rb
 - lib/jasmine/run.html.erb
 - lib/jasmine/run_specs.rb
-- lib/jasmine/runner_config.rb
 - lib/jasmine/runners/http.rb
 - lib/jasmine/selenium_driver.rb
 - lib/jasmine/server.rb
-- lib/jasmine/sprockets_mapper.rb
 - lib/jasmine/tasks/jasmine.rake
 - lib/jasmine/tasks/jasmine_rails3.rake
 - lib/jasmine/version.rb
+- lib/jasmine/yaml_config_parser.rb
 - lib/rack/jasmine/cache_control.rb
 - lib/rack/jasmine/focused_suite.rb
-- lib/rack/jasmine/redirect.rb
 - lib/rack/jasmine/runner.rb
+- spec/application_integration_spec.rb
 - spec/application_spec.rb
+- spec/asset_expander_spec.rb
 - spec/asset_pipeline_mapper_spec.rb
-- spec/config_spec.rb
+- spec/base_spec.rb
+- spec/configuration_spec.rb
 - spec/dependencies_spec.rb
 - spec/fixture/Rakefile
-- spec/fixture/jasmine.erb.yml
-- spec/fixture/spec/example_spec.js
-- spec/fixture/src/example.js
 - spec/jasmine_command_line_tool_rakeless_spec.rb
 - spec/jasmine_command_line_tool_spec.rb
 - spec/jasmine_pojs_spec.rb
 - spec/jasmine_rails2_spec.rb
 - spec/jasmine_rails3_spec.rb
-- spec/jasmine_self_test_config.rb
 - spec/jasmine_self_test_spec.rb
 - spec/page_spec.rb
+- spec/path_expander_spec.rb
+- spec/path_mapper_spec.rb
 - spec/rack/jasmine/runner_spec.rb
 - spec/results_processor_spec.rb
 - spec/results_spec.rb
 - spec/rspec_formatter_spec.rb
-- spec/runner_config_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
-- spec/sprockets_mapper_spec.rb
+- spec/yaml_config_parser_spec.rb
 homepage: http://pivotal.github.com/jasmine/
 licenses:
 - MIT
@@ -281,12 +286,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2055152305295795874
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2055152305295795874
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -294,27 +305,27 @@ signing_key:
 specification_version: 3
 summary: JavaScript BDD framework
 test_files:
+- spec/application_integration_spec.rb
 - spec/application_spec.rb
+- spec/asset_expander_spec.rb
 - spec/asset_pipeline_mapper_spec.rb
-- spec/config_spec.rb
+- spec/base_spec.rb
+- spec/configuration_spec.rb
 - spec/dependencies_spec.rb
 - spec/fixture/Rakefile
-- spec/fixture/jasmine.erb.yml
-- spec/fixture/spec/example_spec.js
-- spec/fixture/src/example.js
 - spec/jasmine_command_line_tool_rakeless_spec.rb
 - spec/jasmine_command_line_tool_spec.rb
 - spec/jasmine_pojs_spec.rb
 - spec/jasmine_rails2_spec.rb
 - spec/jasmine_rails3_spec.rb
-- spec/jasmine_self_test_config.rb
 - spec/jasmine_self_test_spec.rb
 - spec/page_spec.rb
+- spec/path_expander_spec.rb
+- spec/path_mapper_spec.rb
 - spec/rack/jasmine/runner_spec.rb
 - spec/results_processor_spec.rb
 - spec/results_spec.rb
 - spec/rspec_formatter_spec.rb
-- spec/runner_config_spec.rb
 - spec/server_spec.rb
 - spec/spec_helper.rb
-- spec/sprockets_mapper_spec.rb
+- spec/yaml_config_parser_spec.rb

data/lib/jasmine/runner_config.rb

@@ -1,71 +0,0 @@
-module Jasmine
-  class RunnerConfig
-    def initialize(config = Jasmine::Config.new)
-      @config = config
-    end
-
-    def css_files
-      @config.jasmine_stylesheets + @config.user_stylesheets
-    end
-
-    def jasmine_files
-      @config.jasmine_javascripts
-    end
-
-    def js_files
-      @config.js_files
-    end
-
-    def spec_files
-      @config.spec_files
-    end
-
-    def spec_files_full_paths
-      @config.spec_files_full_paths
-    end
-
-    def spec_path
-      @config.spec_path
-    end
-
-    def spec_dir
-      @config.spec_dir
-    end
-
-    def src_dir
-      @config.src_dir
-    end
-
-    def project_root
-      @config.project_root
-    end
-
-    def root_path
-      @config.root_path
-    end
-
-    def browser
-      ENV["JASMINE_BROWSER"] || 'firefox'
-    end
-
-    def port
-      @config.port
-    end
-
-    def jasmine_server_url
-      "#{@config.jasmine_host}:#{@config.port}/"
-    end
-
-    def src_mapper=(context)
-      @config.src_mapper = context
-    end
-
-    def src_mapper
-      @config.src_mapper
-    end
-
-    def result_batch_size
-      ENV["JASMINE_RESULT_BATCH_SIZE"] ? ENV["JASMINE_RESULT_BATCH_SIZE"].to_i : 50
-    end
-  end
-end

data/lib/jasmine/sprockets_mapper.rb

@@ -1,13 +0,0 @@
-class Jasmine::SprocketsMapper
-  def initialize(context, mount_point = 'assets')
-    @context = context
-    @mount_point = mount_point
-  end
-
-  def files(src_files)
-    src_files.map do |src_file|
-      filename = src_file.gsub(/^assets\//, '').gsub(/\.js$/, '')
-      @context.find_asset(filename).to_a.map(&:logical_path).map(&:to_s)
-    end.flatten.uniq.map{|path| File.join(@mount_point, path).to_s + "?body=true"}
-  end
-end

data/lib/rack/jasmine/redirect.rb

@@ -1,20 +0,0 @@
-module Rack
-  module Jasmine
-
-    class Redirect
-      def initialize(url)
-        @url = url
-      end
-
-      def call(env)
-        [
-          302,
-          { 'Location' => @url },
-          []
-        ]
-      end
-    end
-
-  end
-end
-