architecture-js 0.1.13 → 0.1.14

data/lib/sprockets/test/test_preprocessor.rb

@@ -0,0 +1,107 @@
+require "test_helper"
+
+class PreprocessorTest < Test::Unit::TestCase
+  def setup
+    @environment  = environment_for_fixtures
+    @preprocessor = Sprockets::Preprocessor.new(@environment)
+  end
+
+  def test_double_slash_comments_that_are_not_requires_should_be_removed_by_default
+    require_file_for_this_test
+    assert_concatenation_does_not_contain_line "// This is a double-slash comment that should not appear in the resulting output file."
+    assert_concatenation_contains_line "/* This is a slash-star comment that should not appear in the resulting output file. */"
+  end
+
+  def test_double_slash_comments_that_are_not_requires_should_be_ignored_when_strip_comments_is_false
+    @preprocessor = Sprockets::Preprocessor.new(@environment, :strip_comments => false)
+    require_file_for_this_test
+    assert_concatenation_contains_line "// This is a double-slash comment that should appear in the resulting output file."
+    assert_concatenation_contains_line "/* This is a slash-star comment that should appear in the resulting output file. */"
+
+    assert_concatenation_contains_line "/* This is multiline slash-star comment"
+    assert_concatenation_contains_line "*  that should appear in the resulting"
+    assert_concatenation_contains_line "*  output file */"
+
+    assert_concatenation_contains_line "This is not a PDoc comment that should appear in the resulting output file."
+  end
+
+  def test_multiline_comments_should_be_removed_by_default
+    require_file_for_this_test
+    assert_concatenation_does_not_contain_line "/**"
+    assert_concatenation_does_not_contain_line " *  This is a PDoc comment"
+    assert_concatenation_does_not_contain_line " *  that should appear in the resulting output file."
+    assert_concatenation_does_not_contain_line "**/"
+  end
+
+  def test_requiring_a_single_file_should_replace_the_require_comment_with_the_file_contents
+    require_file_for_this_test
+    assert_concatenation_contains <<-LINES
+      var before_require;
+      var Foo = { };
+      var after_require;
+    LINES
+  end
+  
+  def test_requiring_a_file_that_does_not_exist_should_raise_an_error
+    assert_raises(Sprockets::LoadError) do
+      require_file_for_this_test
+    end
+  end
+  
+  def test_requiring_the_current_file_should_do_nothing
+    require_file_for_this_test
+    assert_equal "", output_text
+  end
+  
+  def test_requiring_a_file_after_it_has_already_been_required_should_do_nothing
+    require_file_for_this_test
+    assert_concatenation_contains <<-LINES
+      var before_first_require;
+      var Foo = { };
+      var after_first_require_and_before_second_require;
+      var after_second_require;
+    LINES
+  end
+  
+  protected
+    attr_reader :environment, :preprocessor
+    
+    def concatenation
+      preprocessor.concatenation
+    end
+    
+    def output_text
+      preprocessor.concatenation.to_s
+    end
+    
+    def source_lines_matching(line)
+      concatenation.source_lines.select { |source_line| source_line.line.strip == line }
+    end
+    
+    def require_file(location)
+      preprocessor.require(environment.find(location).source_file)
+    end
+    
+    def require_file_for_this_test
+      require_file(file_for_this_test)
+    end
+    
+    def file_for_this_test
+      caller.map { |c| c[/`(.*?)'$/, 1] }.grep(/^test_/).first[5..-1] + ".js"
+    end
+    
+    def assert_concatenation_does_not_contain_line(line)
+      assert source_lines_matching(line).empty?, "Expected #{line.inspect} to not exist"
+    end
+    
+    def assert_concatenation_contains_line(line)
+      assert source_lines_matching(line).any?, "Expected #{line.inspect} to exist"
+    end
+    
+    def assert_concatenation_contains(indented_text)
+      lines = indented_text.split($/)
+      initial_indent  = lines.first[/^\s*/].length
+      unindented_text = lines.map { |line| line[initial_indent..-1] }.join($/)
+      assert output_text[unindented_text]
+    end
+end

data/lib/sprockets/test/test_secretary.rb

@@ -0,0 +1,89 @@
+require "test_helper"
+
+class SecretaryTest < Test::Unit::TestCase
+  def test_load_locations_are_not_expanded_when_expand_paths_is_false
+    secretary = Sprockets::Secretary.new(:root => FIXTURES_PATH)
+    secretary.add_load_location("src/**/", :expand_paths => false)
+    
+    assert_equal [File.join(FIXTURES_PATH, "src/**"), FIXTURES_PATH], 
+                 secretary.environment.load_path.map { |pathname| pathname.absolute_location }
+  end
+  
+  def test_load_locations_are_expanded_when_expand_paths_is_true
+    secretary = Sprockets::Secretary.new(:root => FIXTURES_PATH)
+    secretary.add_load_location("src/**/", :expand_paths => true)
+    
+    assert_equal [File.join(FIXTURES_PATH, "src", "foo"), File.join(FIXTURES_PATH, "src"), FIXTURES_PATH],
+                 secretary.environment.load_path.map { |pathname| pathname.absolute_location }
+  end
+  
+  def test_source_files_are_not_expanded_when_expand_paths_is_false
+    secretary = Sprockets::Secretary.new(:root => FIXTURES_PATH)
+    assert_raises(Sprockets::LoadError) do
+      secretary.add_source_file("src/f*.js", :expand_paths => false)
+    end
+  end
+  
+  def test_source_files_are_expanded_when_expand_paths_is_true
+    secretary = Sprockets::Secretary.new(:root => FIXTURES_PATH)
+    secretary.add_source_file("src/f*.js", :expand_paths => true)
+    
+    assert_equal [File.join(FIXTURES_PATH, "src", "foo.js")],
+                 secretary.preprocessor.source_files.map { |source_file| source_file.pathname.absolute_location }
+  end
+  
+  def test_install_assets_into_empty_directory
+    with_temporary_directory do |temp|
+      secretary = Sprockets::Secretary.new(:root => FIXTURES_PATH, :asset_root => temp)
+      secretary.add_source_file("src/script_with_assets.js")
+
+      assert_equal [], Dir[File.join(temp, "**", "*")]
+      secretary.install_assets
+      assert_equal paths_relative_to(temp, 
+        "images", "images/script_with_assets", "images/script_with_assets/one.png", 
+        "images/script_with_assets/two.png", "stylesheets", "stylesheets/script_with_assets.css"),
+        Dir[File.join(temp, "**", "*")].sort
+    end
+  end
+  
+  def test_install_assets_into_nonexistent_directory
+    with_temporary_directory do |temp|
+      temp = File.join(temp, "assets")
+      secretary = Sprockets::Secretary.new(:root => FIXTURES_PATH, :asset_root => temp)
+      secretary.add_source_file("src/script_with_assets.js")
+
+      assert_equal [], Dir[File.join(temp, "**", "*")]
+      secretary.install_assets
+      assert_equal paths_relative_to(temp, 
+        "images", "images/script_with_assets", "images/script_with_assets/one.png", 
+        "images/script_with_assets/two.png", "stylesheets", "stylesheets/script_with_assets.css"),
+        Dir[File.join(temp, "**", "*")].sort
+    end
+  end
+  
+  def test_install_assets_into_subdirectories_that_already_exist
+    with_temporary_directory do |temp|
+      secretary = Sprockets::Secretary.new(:root => FIXTURES_PATH, :asset_root => temp)
+      secretary.add_source_file("src/script_with_assets.js")
+
+      FileUtils.mkdir_p(File.join(temp, "images", "script_with_assets"))
+      assert_equal paths_relative_to(temp, "images", "images/script_with_assets"), Dir[File.join(temp, "**", "*")]
+      secretary.install_assets
+      assert_equal paths_relative_to(temp, 
+        "images", "images/script_with_assets", "images/script_with_assets/one.png", 
+        "images/script_with_assets/two.png", "stylesheets", "stylesheets/script_with_assets.css"),
+        Dir[File.join(temp, "**", "*")].sort
+    end
+  end
+  
+  def test_secretary_passes_strip_comments_option_through_to_preprocessor
+    secretary = Sprockets::Secretary.new(:root => FIXTURES_PATH, :strip_comments => false)
+    secretary.add_source_file("src/script_with_comments.js")
+    assert_equal content_of_fixture("src/script_with_comments.js"), secretary.concatenation.to_s
+  end
+  
+  protected
+    def paths_relative_to(root, *paths)
+      paths.map { |path| File.join(root, path) }
+    end
+end

data/lib/sprockets/test/test_source_file.rb

@@ -0,0 +1,34 @@
+require "test_helper"
+require "enumerator"
+Enumerator = Enumerable::Enumerator unless defined?(Enumerator) # for 1.9.1 compatibility
+
+class SourceFileTest < Test::Unit::TestCase
+  def setup
+    @environment = environment_for_fixtures
+  end
+  
+  def test_each_source_line
+    source_file_lines = Enumerator.new(source_file("src/foo/bar.js"), :each_source_line).to_a
+    assert_equal content_of_fixture("src/foo/bar.js"), source_file_lines.map { |line| line.line }.join
+    assert_equal 4, source_file_lines.length
+  end
+  
+  def test_find_should_return_pathname_for_file_relative_to_the_current_pathname
+    assert_absolute_location_ends_with "test/fixtures/src/foo/bar.js", source_file("src/foo/foo.js").find("bar.js")
+  end
+  
+  def test_find_should_return_nil_for_nonexistent_file
+    assert_nil source_file("src/foo/foo.js").find("nonexistent.js")
+  end
+  
+  def test_equality_of_source_files
+    assert_equal source_file("src/foo/foo.js"), source_file("src/foo/foo.js")
+    assert_equal source_file("src/foo/foo.js"), source_file("src/foo/../foo/foo.js")
+    assert_not_equal source_file("src/foo/foo.js"), source_file("src/foo.js")
+    assert_not_equal source_file("src/foo/foo.js"), source_file("src/foo/bar.js")
+  end
+  
+  def test_mtime_should_return_now_if_file_does_not_exist
+    assert source_file("src/foo/nonexistent.js").mtime.instance_of?(Time)
+  end
+end

data/lib/sprockets/test/test_source_line.rb

@@ -0,0 +1,89 @@
+require "test_helper"
+
+class SourceLineTest < Test::Unit::TestCase
+  def test_line_that_begins_with_double_slash_should_be_a_comment
+    assert source_line("//").comment?
+    assert source_line("//test").comment?
+    assert source_line("//= require").comment?
+    assert source_line("//= require <foo>").comment?
+    assert source_line(" //").comment?
+    assert source_line("\t//").comment?
+  end
+
+  def test_line_that_begins_a_multiline_comment
+    assert source_line(" /*").begins_multiline_comment?
+    assert source_line(" /**").begins_multiline_comment?
+  end
+
+  def test_line_that_begins_a_pdoc_comment
+    assert !source_line(" /*").begins_pdoc_comment?
+    assert source_line(" /**").begins_pdoc_comment?
+  end
+
+  def test_line_that_ends_a_multiline_comment
+    assert source_line(" */").ends_multiline_comment?
+    assert source_line(" **/").ends_multiline_comment?
+  end
+
+  def test_line_that_ends_a_pdoc_comment
+    assert !source_line(" */").ends_pdoc_comment?
+    assert source_line(" **/").ends_pdoc_comment?
+  end
+
+  def test_line_that_contains_but_does_not_begin_with_double_slash_should_not_be_a_comment
+    assert !source_line("f //").comment?
+    assert !source_line("f //= require <foo>").comment?
+  end
+
+  def test_comment_should_be_extracted_from_comment_lines
+    assert_equal "test", source_line("//test").comment
+    assert_equal " test", source_line("// test").comment
+    assert_equal nil, source_line("f //test").comment
+  end
+  
+  def test_line_that_contains_require_comment_should_be_a_require
+    assert source_line("//= require <foo>").require?
+    assert !source_line("//= require<foo>").require?
+    assert source_line("//= require \"foo\"").require?
+    assert !source_line("//= require <foo> f").require?
+  end
+  
+  def test_require_should_be_extracted_from_require_lines
+    assert_nil source_line("//= require").require
+    assert_equal "<foo>", source_line("//= require <foo>").require
+    assert_equal "<foo>", source_line("//= require   <foo> ").require
+    assert_equal "\"foo\"", source_line("//= require \"foo\"").require
+  end
+
+  def test_line_that_contains_a_provide_comment_should_be_a_provide
+    assert source_line("//= provide \"../assets\"").provide?
+    assert !source_line("//= provide").provide?
+    assert !source_line("//= provide <../assets>").provide?
+  end
+  
+  def test_provide_should_be_extracted_from_provide_lines
+    assert_nil source_line("//= provide").provide
+    assert_equal "../assets", source_line("//= provide \"../assets\"").provide
+  end
+
+  def test_inspect_should_include_source_file_location_and_line_number
+    environment = environment_for_fixtures
+    pathname    = Sprockets::Pathname.new(environment, "/a/b/c.js")
+    source_file = Sprockets::SourceFile.new(environment, pathname)
+    assert_equal "line 25 of #{File.expand_path("/a/b/c.js")}", source_line("hello", source_file, 25).inspect
+  end
+  
+  def test_interpolation_of_constants
+    assert_equal %(var VERSION = "1.0";\n), source_line('var VERSION = "<%= VERSION %>";').to_s("VERSION" => "1.0")
+  end
+  
+  def test_interpolation_of_missing_constant_raises_undefined_constant_error
+    assert_raises(Sprockets::UndefinedConstantError) do
+      source_line('<%= NONEXISTENT %>').to_s("VERSION" => "1.0")
+    end
+  end
+  
+  def test_to_s_should_strip_trailing_whitespace_before_adding_line_ending
+    assert_equal "hello();\n", source_line("hello();     \t  \r\n").to_s({})
+  end
+end

data/spec/fixtures/underscore_template.js

@@ -0,0 +1,5 @@
+_.templateSettings = {
+    evaluate: /<%([\s\S]+?)%>/g,
+    interpolate: /<%=([\s\S]+?)%>/g,
+    escape: /<%-([\s\S]+?)%>/g
+};

data/spec/project_spec.rb

@@ -152,4 +152,26 @@ describe ArchitectureJS::Project do
     end
   end
 
+  context "when compiling underscore template patterns" do
+    before :each do
+      FileUtils.mkdir("#{TMP_DIR}")
+      suppress_output do
+        @project = ArchitectureJS::Project.new({ name: 'myapp' },TMP_DIR)
+        @project.raise_errors = true
+        @project.create
+        FileUtils.cp "#{FIXTURES}/underscore_template.js", "#{TMP_DIR}/src/underscore_template.js"
+      end
+    end
+
+    after :each do
+      FileUtils.rm_rf "#{TMP_DIR}" if File.exists? "#{TMP_DIR}"
+    end
+
+    it 'should compile underscore.js template patterns' do
+      lambda {
+        suppress_output { @project.update }
+      }.should_not raise_error
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: architecture-js
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-17 00:00:00.000000000Z
+date: 2012-02-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &70326752955500 !ruby/object:Gem::Requirement
+  requirement: &70326224495540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.2.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70326752955500
+  version_requirements: *70326224495540
 - !ruby/object:Gem::Dependency
   name: jsmin
-  requirement: &70326752954980 !ruby/object:Gem::Requirement
+  requirement: &70326224495060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70326752954980
-- !ruby/object:Gem::Dependency
-  name: sprockets
-  requirement: &70326752954460 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *70326752954460
+  version_requirements: *70326224495060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70326752953940 !ruby/object:Gem::Requirement
+  requirement: &70326224475980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70326752953940
+  version_requirements: *70326224475980
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70326752953340 !ruby/object:Gem::Requirement
+  requirement: &70326224475380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +54,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70326752953340
+  version_requirements: *70326224475380
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70326752926640 !ruby/object:Gem::Requirement
+  requirement: &70326224474780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +65,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70326752926640
+  version_requirements: *70326224474780
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &70326752926080 !ruby/object:Gem::Requirement
+  requirement: &70326224474200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +76,10 @@ dependencies:
         version: 4.6.2
   type: :development
   prerelease: false
-  version_requirements: *70326752926080
+  version_requirements: *70326224474200
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &70326752925600 !ruby/object:Gem::Requirement
+  requirement: &70326224473720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +87,10 @@ dependencies:
         version: 0.2.16
   type: :development
   prerelease: false
-  version_requirements: *70326752925600
+  version_requirements: *70326224473720
 - !ruby/object:Gem::Dependency
   name: jsmin
-  requirement: &70326752925100 !ruby/object:Gem::Requirement
+  requirement: &70326224473160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326752925100
+  version_requirements: *70326224473160
 - !ruby/object:Gem::Dependency
   name: fssm
-  requirement: &70326752924620 !ruby/object:Gem::Requirement
+  requirement: &70326224472680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,18 +109,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70326752924620
-- !ruby/object:Gem::Dependency
-  name: sprockets
-  requirement: &70326752924120 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 1.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *70326752924120
+  version_requirements: *70326224472680
 description: Architecture.js helps you generate scaffolding, manage third-party packages,
   compile, and compress your application.
 email: daytonn@gmail.com
@@ -160,6 +138,44 @@ files:
 - lib/architecture-js/helpers.rb
 - lib/architecture-js/notification.rb
 - lib/architecture-js/project.rb
+- lib/sprockets/CHANGELOG
+- lib/sprockets/LICENSE
+- lib/sprockets/README.markdown
+- lib/sprockets/lib/sprockets.rb
+- lib/sprockets/lib/sprockets/concatenation.rb
+- lib/sprockets/lib/sprockets/environment.rb
+- lib/sprockets/lib/sprockets/error.rb
+- lib/sprockets/lib/sprockets/pathname.rb
+- lib/sprockets/lib/sprockets/preprocessor.rb
+- lib/sprockets/lib/sprockets/secretary.rb
+- lib/sprockets/lib/sprockets/source_file.rb
+- lib/sprockets/lib/sprockets/source_line.rb
+- lib/sprockets/lib/sprockets/version.rb
+- lib/sprockets/test/fixtures/assets/images/script_with_assets/one.png
+- lib/sprockets/test/fixtures/assets/images/script_with_assets/two.png
+- lib/sprockets/test/fixtures/assets/stylesheets/script_with_assets.css
+- lib/sprockets/test/fixtures/constants.yml
+- lib/sprockets/test/fixtures/double_slash_comments_that_are_not_requires_should_be_ignored_when_strip_comments_is_false.js
+- lib/sprockets/test/fixtures/double_slash_comments_that_are_not_requires_should_be_removed_by_default.js
+- lib/sprockets/test/fixtures/multiline_comments_should_be_removed_by_default.js
+- lib/sprockets/test/fixtures/requiring_a_file_after_it_has_already_been_required_should_do_nothing.js
+- lib/sprockets/test/fixtures/requiring_a_file_that_does_not_exist_should_raise_an_error.js
+- lib/sprockets/test/fixtures/requiring_a_single_file_should_replace_the_require_comment_with_the_file_contents.js
+- lib/sprockets/test/fixtures/requiring_the_current_file_should_do_nothing.js
+- lib/sprockets/test/fixtures/src/constants.yml
+- lib/sprockets/test/fixtures/src/foo.js
+- lib/sprockets/test/fixtures/src/foo/bar.js
+- lib/sprockets/test/fixtures/src/foo/foo.js
+- lib/sprockets/test/fixtures/src/script_with_assets.js
+- lib/sprockets/test/fixtures/src/script_with_comments.js
+- lib/sprockets/test/test_concatenation.rb
+- lib/sprockets/test/test_environment.rb
+- lib/sprockets/test/test_helper.rb
+- lib/sprockets/test/test_pathname.rb
+- lib/sprockets/test/test_preprocessor.rb
+- lib/sprockets/test/test_secretary.rb
+- lib/sprockets/test/test_source_file.rb
+- lib/sprockets/test/test_source_line.rb
 - repository/modjs/plugins/jquery-elements.js
 - spec/.DS_Store
 - spec/architect_spec.rb
@@ -182,6 +198,7 @@ files:
 - spec/fixtures/test_framework.rb
 - spec/fixtures/test_template_options.js
 - spec/fixtures/test_template_two.js
+- spec/fixtures/underscore_template.js
 - spec/fixtures/update.architecture
 - spec/fixtures/update.js
 - spec/generator_spec.rb
@@ -205,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3676949221300696803
+      hash: 2340740664234039827
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: