jsus 0.3.6 → 0.4.0

data/spec/jsus/tag_spec.rb

@@ -4,59 +4,23 @@ describe Jsus::Tag do
   subject { Jsus::Tag.new("Wtf") }
 
   context "initialization" do
-    it "should set given name" do
-      Jsus::Tag.new("Wtf").name.should == "Wtf"
-    end
-
-    it "should truncate leading slash with optional period (.)" do
-      Jsus::Tag.new("/Class").name.should == "Class"
-    end
-
-    it "should parse package name" do
-      Jsus::Tag.new("Class").package_name.should == ""
-      Jsus::Tag.new("Core/Wtf").package_name.should == "Core"
-      Jsus::Tag.new("Core/Subpackage/Wtf").package_name.should == "Core/Subpackage"
-    end
-
-    it "should allow explicit package setting" do
-      Jsus::Tag.new("Wtf", :package => Package.new(:name => "Core")).name.should == "Core/Wtf"
+    it "should set given full name" do
+      Jsus::Tag.new("Wtf").full_name.should == "Wtf"
+      Jsus::Tag.new("Core/Wtf").full_name.should == "Core/Wtf"
     end
 
-    it "should set external flag if it looks like an external dependency and not given a package option" do
-      Jsus::Tag.new("Core/WTF").should be_external
-    end
-
-    it "should not set external flag if it doesn't look like an external dependency and not given a package option" do
-      Jsus::Tag.new("WTF").should_not be_external
-    end
-
-    it "should set external flag if package from options is not the same as parsed package" do
-      Jsus::Tag.new("Core/WTF", :package => Package.new(:name => "Class")).should be_external
-    end
-
-    it "should not set external flag if package from options is the same as parsed package" do
-      Jsus::Tag.new("Core/WTF", :package => Package.new(:name => "Core")).should_not be_external
-    end
-
-    it "should use implcit package setting whenever possible" do
-      Jsus::Tag.new("Class/Wtf", :package => Package.new(:name => "Core")).name.should == "Class/Wtf"
-    end
-
-    it "should return a given tag if given a tag" do
-      Jsus::Tag.new(subject).should == subject
-    end
-
-    it "should translate mooforge styled names into jsus-styled names" do
-      Jsus::Tag.new("mootools_core/Wtf").should      == Jsus::Tag.new("MootoolsCore/Wtf")
-      Jsus::Tag.new("Effects.Fx/Hello.World").should == Jsus::Tag.new("EffectsFx/Hello.World")
-      Jsus::Tag.new("effects.fx/Wtf").should         == Jsus::Tag.new("EffectsFx/Wtf")
+    it "when given a tag it should return that tag" do
+      tag = Jsus::Tag.new("Wtf")
+      new_tag = Jsus::Tag.new(tag)
+      new_tag.should           == tag
+      new_tag.object_id.should == tag.object_id
     end
   end
 
   describe "#name" do
-    it "should return full name unless asked for a short form" do
-      Jsus::Tag.new("Core/Wtf").name.should == "Core/Wtf"
-      Jsus::Tag.new("Core/Subpackage/Wtf").name.should == "Core/Subpackage/Wtf"
+    it "should return short form of the tag" do
+      Jsus::Tag.new("Core/Wtf").name.should == "Wtf"
+      Jsus::Tag.new("Core/Subpackage/Wtf").name.should == "Wtf"
     end
 
     it "should not add slashes if package name is not set" do
@@ -66,35 +30,26 @@ describe Jsus::Tag do
     it "should strip leading slashes" do
       Jsus::Tag.new("./Wtf").name.should == "Wtf"
     end
-
-    it "should remove package from short form of non-external tags" do
-      tag = Jsus::Tag.new("Core/WTF")
-      tag.external = false
-      tag.name(:short => true).should == "WTF"
-    end
-
   end
 
-  describe ".normalize_name_and_options" do
-    it "should parse name as full name if no options given" do
-      normalized = Jsus::Tag.normalize_name_and_options("Core/Wtf")
-      normalized[:name].should == "Wtf"
-      normalized[:package_name].should == "Core"
+  describe "#namespace" do
+    it "should be nil for empty namespace" do
+      Jsus::Tag.new("Class").namespace.should be_nil
     end
 
-    it "should strip leading slash" do
-      Jsus::Tag.normalize_name_and_options("./Core/Wtf")[:package_name].should == "Core"
-      Jsus::Tag.normalize_name_and_options("./Core/Wtf")[:name].should == "Wtf"
-      Jsus::Tag.normalize_name_and_options("./Wtf")[:name].should == "Wtf"
+    it "should be non-empty for non-empty namespace" do
+      Jsus::Tag.new("Core/Class").namespace.should == "Core"
+      Jsus::Tag.new("Mootools/Core/Class").namespace.should == "Mootools/Core"
     end
+  end
 
-    it "should use given package name whenever no package name can be restored from name" do
-      Jsus::Tag.normalize_name_and_options("Wtf", :package => Package.new(:name => "Core"))[:package_name].should == "Core"
-      Jsus::Tag.normalize_name_and_options("./Wtf", :package => Package.new(:name => "Core"))[:package_name].should == "Core"
+  describe "#==" do
+    it "should translate mooforge styled names into jsus-styled names" do
+      Jsus::Tag.new("mootools_core/Wtf").should      == Jsus::Tag.new("MootoolsCore/Wtf")
     end
 
-    it "should parse name as full name whenever possible" do
-      Jsus::Tag.normalize_name_and_options("Class/Wtf", :package => Package.new(:name => "Core"))[:package_name].should == "Class"
+    it "should distinguish between same name in different namespaces" do
+      Jsus::Tag.new("Mootools/Slick.Finder").should_not == Jsus::Tag.new("Slick/Slick.Finder")
     end
   end
 
@@ -125,4 +80,4 @@ describe Jsus::Tag do
   end
 
 
-end
+end

data/spec/jsus/util/documenter_spec.rb

@@ -28,4 +28,4 @@ describe Jsus::Util::Documenter do
     end
   end
 
-end
+end

data/spec/jsus/util/post_processor/moocompat12_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Jsus::Util::PostProcessor::Moocompat12 do
+  it_should_behave_like "Jsus::Util::Mixins::OperatesOnSources"
+
+  let(:input_dir) { "spec/data/ComplexDependencies" }
+  let(:pool) { Jsus::Pool.new(input_dir) }
+
+  describe "#process" do
+    subject { described_class.new(pool) }
+    let!(:source) { pool.sources.detect {|s| s.source.index("1.2compat") } }
+
+    it "should remove 1.2compat tags" do
+      subject.process.each {|s| s.source.index("1.2compat").should be_nil }
+    end
+
+    it "should not mutate arguments" do
+      source.source.index("1.2compat").should_not be_nil
+      subject.process
+      source.source.index("1.2compat").should_not be_nil
+    end
+  end
+end

data/spec/jsus/util/post_processor/mooltie8_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+describe Jsus::Util::PostProcessor::MooltIE8 do
+  it_should_behave_like "Jsus::Util::Mixins::OperatesOnSources"
+
+  let(:input_dir) { "spec/data/ComplexDependencies" }
+  let(:pool) { Jsus::Pool.new(input_dir) }
+
+  describe "#process" do
+    subject { described_class.new(pool) }
+    let!(:source) { pool.sources.detect {|s| s.source.index("ltIE8") } }
+
+    it "should remove ltIE8 tags" do
+      subject.process.each {|s| s.source.index("ltIE8").should be_nil }
+    end
+
+    it "should not mutate arguments" do
+      source.source.index("ltIE8").should_not be_nil
+      subject.process
+      source.source.index("ltIE8").should_not be_nil
+    end
+  end
+end

data/spec/jsus/util/post_processor/semicolon_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe Jsus::Util::PostProcessor::Semicolon do
+  it_should_behave_like "Jsus::Util::Mixins::OperatesOnSources"
+
+  let(:input_dir) { "spec/data/ComplexDependencies" }
+  let(:pool) { Jsus::Pool.new(input_dir) }
+
+  describe "#process" do
+    subject { described_class.new(pool) }
+
+    it "should add semicolon to the beginning of each file" do
+      subject.process.each {|source| source.source[0,1].should == ";" }
+    end
+
+    it "should not mutate arguments" do
+      subject.process
+      pool.sources.each {|source| source.source[0,1].should_not == ";" }
+    end
+  end
+end

data/spec/jsus/util/post_processors/base_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe Jsus::Util::PostProcessor::Base do
+  it_should_behave_like "Jsus::Util::Mixins::OperatesOnSources"
+  subject { described_class.new }
+end

data/spec/jsus/util/tree_spec.rb

@@ -104,8 +104,8 @@ describe Jsus::Util::Tree do
     end
 
     it "should allow tags for nodes insertion" do
-      subject.insert(Jsus::Tag["hello"], "world")
-      subject.root.children[0].full_path.should == "/hello"
+      subject.insert(Jsus::Tag["Hello"], "world")
+      subject.root.children[0].full_path.should == "/Hello"
       subject.root.children[0].value.should == "world"
     end
   end
@@ -274,4 +274,4 @@ describe Jsus::Util::Tree do
 
   end
 
-end
+end

data/spec/jsus/util/validator/base_spec.rb

@@ -1,10 +1,11 @@
 require 'spec_helper'
 
 describe Jsus::Util::Validator::Base do
-  subject { described_class.new(pool) }
+  it_should_behave_like "Jsus::Util::Mixins::OperatesOnSources"
   let(:input_dir) { "spec/data/ChainDependencies/app/javascripts" }
   let!(:pool) { Jsus::Pool.new(input_dir) }
   context "initialization" do
+    subject { described_class.new(pool) }
     it "should accept pool as the first argument" do
       described_class.new(pool).source_files.should =~ pool.sources.to_a
     end
@@ -23,6 +24,7 @@ describe Jsus::Util::Validator::Base do
   end
 
   describe ".validate" do
+    subject { described_class.new(pool) }
     it "should be the same as calling new + validate" do
       validator = mock
       described_class.should_receive(:new).with([1]).and_return(validator)
@@ -30,4 +32,4 @@ describe Jsus::Util::Validator::Base do
       described_class.validate([1])
     end
   end
-end
+end

data/spec/jsus/util/watcher_spec.rb

@@ -23,10 +23,10 @@ describe Jsus::Util::Watcher do
 
   describe ".watch" do
     let(:watched_file) { "#{directory}/hello.js" }
-    def watch(directory, callback_countdown = 1, &block)
+    def watch(directory, callback_countdown = 1, ignored_dirs = [], &block)
       @main_thread = Thread.current
       @watcher_thread = Thread.new do
-        described_class.watch(directory) do |*args|
+        described_class.watch(directory, ignored_dirs) do |*args|
           yield(*args)
           callback_countdown -= 1
           @main_thread.wakeup if callback_countdown <= 0
@@ -118,5 +118,15 @@ describe Jsus::Util::Watcher do
       stop_watching
       @callback_called.should == true
     end
+
+    it "should ignore ignored dirs" do
+      FileUtils.mkdir_p("#{directory}/output")
+      watch(directory, 1, ["#{directory}/output"]) do
+        @callback_called = true
+      end
+      File.open("#{directory}/output/out.js", "w+") {|f| f.puts "Hello, world" }
+      stop_watching
+      @callback_called.should be_false
+    end
   end
 end

data/spec/shared/mixins_segs.rb

@@ -0,0 +1,38 @@
+shared_examples_for "Jsus::Util::Mixins::OperatesOnSources" do
+  let(:sources) { (0..3).map {|i| Jsus::SourceFile.from_file("spec/data/test_source_one.js") } }
+  it "should respond to source_files, source_files=" do
+    subject.should respond_to(:source_files, :source_files=)
+  end
+
+  describe "#source_files=" do
+    it "should accept array" do
+      subject.source_files = sources
+      subject.source_files.should =~ sources
+    end
+
+    it "should accept container" do
+      container = mock("Container", :to_a => sources)
+      subject.source_files = sources
+      subject.source_files.should =~ sources
+    end
+
+    it "should accept pool" do
+      pool = mock("Pool", :sources => sources)
+      subject.source_files = sources
+      subject.source_files.should =~ sources
+    end
+
+    it "should default to empty array if given anything else" do
+      subject.source_files = nil
+      subject.source_files.should == []
+      subject.source_files = 0
+      subject.source_files.should == []
+    end
+  end
+
+  describe "#source_files" do
+    it "should default with empty array" do
+      subject.source_files.should == []
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -6,6 +6,12 @@ $LOAD_PATH.unshift File.expand_path(File.join(File.dirname(__FILE__), ".."))
 require 'lib/jsus'
 Dir["spec/shared/*.rb"].each {|f| require f}
 
+RSpec.configure do |c|
+  c.filter_run :focus => true
+  c.filter_run_excluding :ignore => true
+  c.run_all_when_everything_filtered = true
+end
+
 # cleanup compiled stuff
 def cleanup
   `rm -rf spec/data/Basic/public`

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jsus
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 6
-  version: 0.3.6
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Mark Abramov
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-18 00:00:00 +04:00
+date: 2011-11-01 00:00:00 +04:00
 default_executable: jsus
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -318,6 +318,7 @@ files:
 - features/command-line/compression.feature
 - features/command-line/extensions.feature
 - features/command-line/external_dependency_resolution.feature
+- features/command-line/generate_includes.feature
 - features/command-line/json_package.feature
 - features/command-line/mooforge_compatibility_layer.feature
 - features/command-line/postproc.feature
@@ -368,16 +369,12 @@ files:
 - features/data/Replacements/Source/Library/Color.js
 - features/data/Replacements/package.yml
 - features/data/compression.min.js
-- features/data/tmp2/package.js
-- features/data/tmp2/scripts.json
-- features/data/tmp2/tree.json
 - features/step_definitions/cli_steps.rb
 - features/support/env.rb
 - jsus.gemspec
 - lib/extensions/rgl.rb
 - lib/jsus.rb
 - lib/jsus/cli.rb
-- lib/jsus/compiler.rb
 - lib/jsus/container.rb
 - lib/jsus/middleware.rb
 - lib/jsus/package.rb
@@ -392,6 +389,13 @@ files:
 - lib/jsus/util/file_cache.rb
 - lib/jsus/util/inflection.rb
 - lib/jsus/util/logger.rb
+- lib/jsus/util/mixins.rb
+- lib/jsus/util/mixins/operates_on_sources.rb
+- lib/jsus/util/post_processor.rb
+- lib/jsus/util/post_processor/base.rb
+- lib/jsus/util/post_processor/moocompat12.rb
+- lib/jsus/util/post_processor/mooltie8.rb
+- lib/jsus/util/post_processor/semicolon.rb
 - lib/jsus/util/tree.rb
 - lib/jsus/util/validator.rb
 - lib/jsus/util/validator/base.rb
@@ -431,8 +435,11 @@ files:
 - spec/data/DependenciesWildcards/app/javascripts/Mash/Source/Mash.js
 - spec/data/DependenciesWildcards/app/javascripts/Mash/package.yml
 - spec/data/Extensions/app/javascripts/Core/Source/Class.js
+- spec/data/Extensions/app/javascripts/Core/Source/Hash.js
+- spec/data/Extensions/app/javascripts/Core/Source/Mash.js
 - spec/data/Extensions/app/javascripts/Core/package.yml
 - spec/data/Extensions/app/javascripts/Orwik/Extensions/Class.js
+- spec/data/Extensions/app/javascripts/Orwik/Extensions/Mash.js
 - spec/data/Extensions/app/javascripts/Orwik/package.yml
 - spec/data/ExternalDependencies/app/javascripts/Orwik/Source/Test.js
 - spec/data/ExternalDependencies/app/javascripts/Orwik/package.yml
@@ -473,9 +480,16 @@ files:
 - spec/data/OutsideDependencies/app/javascripts/Orwik/Source/Widget/Input/Input.js
 - spec/data/OutsideDependencies/app/javascripts/Orwik/Source/Widget/Widget.js
 - spec/data/OutsideDependencies/app/javascripts/Orwik/package.yml
+- spec/data/SimpleSources/dependent_source_one.js
+- spec/data/SimpleSources/replacement_source_one.js
+- spec/data/SimpleSources/simple_source_one.js
+- spec/data/SimpleSources/simple_source_two.js
 - spec/data/bad_test_source_one.js
 - spec/data/bad_test_source_two.js
+- spec/data/extension_1.js
+- spec/data/extension_2.js
 - spec/data/mooforge_quirky_source.js
+- spec/data/replacement.js
 - spec/data/test_source_one.js
 - spec/data/unicode_source.js
 - spec/data/unicode_source_with_bom.js
@@ -492,12 +506,16 @@ files:
 - spec/jsus/util/file_cache_spec.rb
 - spec/jsus/util/inflection_spec.rb
 - spec/jsus/util/logger_spec.rb
+- spec/jsus/util/post_processor/moocompat12_spec.rb
+- spec/jsus/util/post_processor/mooltie8_spec.rb
+- spec/jsus/util/post_processor/semicolon_spec.rb
+- spec/jsus/util/post_processors/base_spec.rb
 - spec/jsus/util/tree_spec.rb
 - spec/jsus/util/validator/base_spec.rb
 - spec/jsus/util/validator/mooforge_spec.rb
 - spec/jsus/util/watcher_spec.rb
 - spec/jsus/util_spec.rb
-- spec/shared/class_stubs.rb
+- spec/shared/mixins_segs.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/jsus/jsus

data/features/data/tmp2/package.js

@@ -1,35 +0,0 @@
-/*
----
-
-script: Color.js
-
-description: A library to work with colors
-
-license: MIT-style license
-
-authors:
-- Valerio Proietti
-
-provides: [Color]
-
-...
-*/
-/*
----
-
-script: Input.Color.js
-
-description: Cool colorpicker for everyone to enjoy
-
-license: MIT-style license
-
-authors:
-- Yaroslaff Fedin
-
-requires:
-- Color
-
-provides: [Input.Color]
-
-...
-*/