jsus 0.1.4 → 0.1.5

data/spec/data/Basic/app/javascripts/Orwik/package.yml

@@ -1,4 +1,4 @@
-name: orwik
+name: Orwik
 filename: orwik.js
 web: http://orwik.com
 description: Orwik widgets and essensial things

data/spec/data/Extensions/app/javascripts/Core/Source/Class.js

@@ -0,0 +1,13 @@
+/*
+---
+
+script: Class.js
+
+description: Contains the Class Function for easily creating, extending, and implementing reusable Classes.
+
+license: MIT-style license.
+
+provides: [Class]
+
+...
+*/

data/spec/data/Extensions/app/javascripts/Core/package.yml

@@ -0,0 +1,8 @@
+name: Core
+filename: class.js
+description: Framework base stuff
+license: MIT-Style License, http://mootools.net/license
+copyright: Somebody
+authors: Someone
+sources:
+  - Source/Class.js

data/spec/data/Extensions/app/javascripts/Orwik/Extensions/Class.js

@@ -0,0 +1,16 @@
+/*
+---
+
+script: Class.js
+
+description: Extension for Core/Class
+
+license: MIT-style license
+
+authors:
+- Valerio Proietti
+
+extends: "Core/Class"
+
+...
+*/

data/spec/data/Extensions/app/javascripts/Orwik/package.yml

@@ -0,0 +1,8 @@
+name: Orwik
+filename: orwik.js
+description: Framework extensions
+license: MIT-Style License, http://mootools.net/license
+copyright: Somebody
+authors: Someone
+sources:
+  - Extensions/Class.js

data/spec/data/ExternalDependencies/app/javascripts/Orwik/Source/Test.js

@@ -11,6 +11,7 @@ authors:
 - Valerio Proietti
 requires:
   - Mash/Mash
+  - Class
 provides: [Test]
  
 ...

data/spec/data/ExternalDependencies/app/javascripts/Orwik/package.yml

@@ -1,4 +1,4 @@
-name: orwik
+name: Orwik
 filename: orwik.js
 web: http://orwik.com
 description: Orwik widgets and essensial things

data/spec/data/test_source_one.js

@@ -10,8 +10,11 @@ license: MIT-style license
 authors:
 - Valerio Proietti
 
-provides: [Color]
-
+provides: 
+  - ./Color
+requires: 
+  - ./Class
+extends: Core
 ...
 */
 

data/spec/lib/jsus/package_spec.rb

@@ -24,17 +24,16 @@ describe Jsus::Package do
       end
 
       it "should set provided modules from source files" do
-        subject.provides.should have_exactly(4).items
-        subject.provides.should include("Color", "Input", "Input.Color", "Widget")
+        subject.provides.should have_exactly(4).items        
+        subject.provides_names.should include("Color", "Input", "Input.Color", "Widget")
       end
 
       it "should set up outside dependencies" do
-        subject.dependencies.should == ['core/Class']
+        subject.dependencies_names.should == ['core/Class']
       end
 
-      it "should set directory and relative directory fields" do
+      it "should set directory field" do
         subject.directory.should == File.expand_path(input_dir)
-        subject.relative_directory.should == input_dir
       end
     end
   end
@@ -54,7 +53,7 @@ describe Jsus::Package do
       subject.generate_scripts_info(output_dir)
       File.exists?("#{output_dir}/scripts.json").should be_true
       info = JSON.parse(IO.read("#{output_dir}/scripts.json"))
-      info = info["orwik"]
+      info = info["Orwik"]
       info["provides"].should have_exactly(4).items
       info["provides"].should include("Color", "Widget", "Input", "Input.Color")
     end
@@ -68,7 +67,7 @@ describe Jsus::Package do
         subject.include_dependencies!
         subject.generate_scripts_info(output_dir)
         info = JSON.parse(IO.read("#{output_dir}/scripts.json"))
-        info = info["orwik"]
+        info = info["Orwik"]
         info["provides"].should have_exactly(4).items
         info["provides"].should include("Test", "Hash/Hash", "Class/Class", 'Mash/Mash')
       end
@@ -77,8 +76,8 @@ describe Jsus::Package do
         subject.include_dependencies!
         subject.generate_scripts_info(output_dir)
         info = JSON.parse(IO.read("#{output_dir}/scripts.json"))
-        info = info["orwik"]
-        info["requires"].should == []
+        info = info["Orwik"]
+        info["requires"].should == ["Class"]
       end
     end
   end
@@ -114,6 +113,11 @@ describe Jsus::Package do
      input_index.should < input_color_index
      color_index.should < input_color_index
    end
+
+    it "should not include extensions" do
+      required_files = Jsus::Package.new("spec/data/Extensions/app/javascripts/Orwik").required_files
+      required_files.should be_empty
+    end
   end
 
   describe "#include_dependencies!" do
@@ -130,4 +134,17 @@ describe Jsus::Package do
       end
     end
   end
+
+  describe "#include_extensions!" do
+    let(:lib_dir) { "spec/data/Extensions/app/javascripts" }
+    let(:pool) { Jsus::Pool.new(lib_dir) }
+    subject { Jsus::Package.new("spec/data/Extensions/app/javascripts/Core", :pool => pool) }
+
+    it "should include extensions into source files" do
+      subject.source_files[0].extensions.should be_empty
+      subject.include_extensions!
+      subject.source_files[0].extensions.should have_exactly(1).item
+    end
+
+  end
 end

data/spec/lib/jsus/pool_spec.rb

@@ -34,7 +34,12 @@ describe Jsus::Pool do
 
       it "should add all the source files to pool" do
         subject.should have_exactly(3).sources
-        subject.sources.map {|s| s.provides }.flatten.should include("Mash/Mash", "Hash/Hash", "Class/Class")
+        subject.sources.map {|s| s.provides_names }.flatten.should include("Mash/Mash", "Hash/Hash", "Class/Class")
+      end
+
+      it "should keep track of extensions" do
+        pool = Jsus::Pool.new("spec/data/Extensions/app/javascripts")
+        pool.send(:extensions_map).keys.should include(Jsus::Tag["Core/Class"])
       end
     end
   end
@@ -52,6 +57,10 @@ describe Jsus::Pool do
     it "should return nil if nothing could be found" do
       subject.lookup("Core/WTF").should be_nil
     end
+
+    it "should allow tags" do
+      subject.lookup(Jsus::Tag["Class/Class"]).should == sources[1]
+    end
   end
 
   describe "#lookup_direct_dependencies" do
@@ -62,6 +71,13 @@ describe Jsus::Pool do
     it "should return a container with direct dependencies" do
       subject.lookup_direct_dependencies("Mash/Mash").should be_a(Jsus::Container)
       subject.lookup_direct_dependencies("Mash/Mash").should == [sources[2]]
+      subject.lookup_direct_dependencies(Jsus::Tag["Mash/Mash"]).should be_a(Jsus::Container)
+      subject.lookup_direct_dependencies(Jsus::Tag["Mash/Mash"]).should == [sources[2]]
+    end
+
+    it "should return empty array if pool doesn't contain given source" do
+      subject.lookup_direct_dependencies("Lol/Wtf").should == []
+      subject.lookup_direct_dependencies(Jsus::Tag["Lol/Wtf"]).should == []
     end
   end
 
@@ -72,6 +88,27 @@ describe Jsus::Pool do
 
     it "should return a container with files and dependencies" do
       subject.lookup_dependencies("Mash/Mash").should == [sources[1], sources[2]]
+      subject.lookup_dependencies(Jsus::Tag["Mash/Mash"]).should == [sources[1], sources[2]]
+    end
+
+    it "should return empty array if pool doesn't contain given source" do
+      subject.lookup_dependencies("Lol/Wtf").should == []
+      subject.lookup_dependencies(Jsus::Tag["Caught/Mosh"]).should == []
+    end
+  end
+
+  describe "#lookup_extensions" do
+    let(:input_dir) { "spec/Data/Extensions/app/javascripts" }
+    subject { Jsus::Pool.new(input_dir) }
+
+    it "should return empty array if there's not a single extension for given tag" do
+      subject.lookup_extensions("Core/WTF").should be_empty
+      subject.lookup_extensions(Jsus::Tag["Core/WTF"]).should be_empty
+    end
+
+    it "should return an array with extensions if there are extensions for given tag" do
+      subject.lookup_extensions("Core/Class").should have_exactly(1).item
+      subject.lookup_extensions(Jsus::Tag["Core/Class"]).should have_exactly(1).item
     end
   end
 end

data/spec/lib/jsus/source_file_spec.rb

@@ -9,8 +9,8 @@ describe Jsus::SourceFile do
     context "from file" do
       subject { Jsus::SourceFile.from_file('spec/data/test_source_one.js') }
       it "should parse json header" do
-        subject.dependencies.should == []
-        subject.provides.should == ["Color"]
+        subject.dependencies_names.should == ["Class"]
+        subject.provides_names.should == ["Color"]
         subject.description.should == "A library to work with colors"
       end
 
@@ -25,7 +25,6 @@ describe Jsus::SourceFile do
         end
       end
 
-
       context "when file does not exist" do
         it "should return nil" do
           Jsus::SourceFile.from_file('spec/data/non-existant-file.js').should == nil
@@ -46,51 +45,207 @@ describe Jsus::SourceFile do
       source.header.should            == subject.header
     end
 
-    it "should register package in pool from constructor" do
-      pool = mock("Pool")
-      pool.should_receive("<<").with(instance_of(Jsus::SourceFile))
-      Jsus::SourceFile.new(:pool => pool)
+  end
+
+  context "when no package set, " do
+    subject { Jsus::SourceFile.from_file("spec/data/test_source_one.js") }
+    describe "#package" do
+      it "should return nil" do
+        subject.package.should be_nil
+      end
+    end
+
+    describe "#provides_names" do
+      it "should return names without leading slash in both forms" do
+        subject.provides_names.should == ["Color"]
+        subject.provides_names(:short => true).should == ["Color"]
+      end
+    end
+
+    describe "#dependencies_names" do
+      it "should return names without leading slash in both forms" do
+        subject.dependencies_names.should == ["Class"]
+        subject.dependencies_names(:short => true).should == ["Class"]
+      end
+    end
+    
+    describe "#external_dependencies" do
+      it "should be empty" do
+        subject.external_dependencies.should be_empty
+      end
+    end
+    
+    describe "#external_dependencies_names" do
+      it "should be empty" do
+        subject.external_dependencies_names.should be_empty
+      end
+    end
+  end
+
+  context "when it is in package, " do
+    let(:package) { Jsus::Package.new("spec/data/ExternalDependencies/app/javascripts/Orwik") }
+    subject { package.source_files[0] }
+    describe "#package" do
+      it "should return the package" do
+        subject.package.should == package
+      end
+    end
+
+    describe "#provides_names" do
+      it "should prepend package name by default and when explicitly asked for long form" do
+        subject.provides_names.should == ["Orwik/Test"]
+        subject.provides_names(:short => false).should == ["Orwik/Test"]
+      end
+
+      it "shouldn't prepend package name in short form" do
+        subject.provides_names(:short => true).should == ["Test"]
+      end
+    end
+
+    describe "#dependencies_names" do
+      it "should prepend package names to inner dependencies by default and when explicitly asked for long form" do
+        subject.should have_exactly(2).dependencies_names
+        subject.dependencies_names.should include("Orwik/Class", "Mash/Mash")
+        subject.should have_exactly(2).dependencies_names(:short => false)
+        subject.dependencies_names(:short => false).should include("Orwik/Class", "Mash/Mash")
+      end
+
+      it "should not prepend package names to inner dependencies in short form" do
+        subject.should have_exactly(2).dependencies_names(:short => true)
+        subject.dependencies_names(:short => true).should include("Class", "Mash/Mash")
+      end
+    end
+    
+    describe "#external_dependencies" do
+      it "should include external dependencies" do 
+        subject.should have_exactly(1).external_dependencies
+        subject.external_dependencies.should include(Jsus::Tag["Mash/Mash"])
+      end
+      
+      it "should not include internal dependencies" do
+        subject.external_dependencies.should_not include(Jsus::Tag["Orwik/Class"])
+      end
+    end
+    
+    describe "#external_dependencies_names" do
+      it "should include names of external dependencies" do
+        subject.external_dependencies_names.should include("Mash/Mash")
+      end
+
+      it "should not include names of internal dependencies" do
+        subject.external_dependencies_names.should_not include("Orwik/Class")
+      end
+    end
+    
+  end
+
+  context "when pool is not set, " do
+    subject { Jsus::SourceFile.from_file("spec/data/Extensions/app/javascripts/Core/Source/Class.js", :package => Package.new(:name => "Core")) }
+    describe "#pool" do
+      it "should return nil" do
+        subject.pool.should be_nil
+      end
     end
 
+    describe "#include_extensions!" do
+      it "should do nothing" do
+        lambda {
+          subject.include_extensions!
+        }.should_not change(subject, :extensions)
+      end
+    end
   end
 
-  describe "#provides" do
-    it "should return the stuff it provides in full form" do
-      subject.provides.should == ["Core/Chain", "Core/Events", "Core/Options"]
+  context "when pool is set, " do
+    let(:pool) { Jsus::Pool.new("spec/data/Extensions/app/javascripts") }
+    subject { Jsus::SourceFile.from_file("spec/data/Extensions/app/javascripts/Core/Source/Class.js", :pool => pool, :package => Package.new(:name => "Core")) }
+    describe "#pool" do
+      it "should return the pool" do
+        subject.pool.should == pool
+      end
     end
 
-    it "should cut package prefix if asked for short-formed provides" do
-      subject.provides(:short => true).should == ["Chain", "Events", "Options"]
+    context "and there are extensions for subject in its pool, " do
+      describe "#include_extensions!" do
+        it "should add all extensions to @extensions" do
+          subject.extensions.should be_empty
+          subject.include_extensions!
+          subject.extensions.should have_exactly(1).item
+        end
+      end
     end
 
-    it "should work well when given single string instead of array" do
-      subject.header = {"provides" => "Mash"}
-      subject.provides.should == ["Core/Mash"]
+    context "and there are no extensions for subject in its pool, " do
+      let(:pool) { Jsus::Pool.new }
+      describe "#include_extensions!" do
+        it "should add all extensions to @extensions" do
+          lambda {
+            subject.include_extensions!
+          }.should_not change(subject, :extensions)
+        end
+      end
     end
   end
 
-  describe "#dependencies" do
-    it "should truncate leading slash" do
-      subject.dependencies.should == ["Core/Class"]
+  context "when it is not an extension, " do
+    subject { Jsus::SourceFile.from_file("spec/data/Extensions/app/javascripts/Core/Source/Class.js") }
+
+    describe "#extension?" do
+      it "should return false" do
+        subject.should_not be_an_extension
+      end
     end
+  end
 
-    it "should cut package prefix if asked for short-formed dependencies" do
-      subject.dependencies(:short => true).should == ["Class"]
+  context "when it is an extension, " do
+    subject { Jsus::SourceFile.from_file("spec/data/Extensions/app/javascripts/Orwik/Extensions/Class.js") }
+
+    describe "#extension?" do
+      it "should return true" do
+        subject.should be_an_extension
+      end
     end
+  end
+
+  context "when there are no extensions, " do
+    let(:input_dir) { "spec/data/Extensions/app/javascripts" }
+    subject { Jsus::SourceFile.from_file("#{input_dir}/Core/Source/Class.js")}
 
-    it "should work well when given single string instead of array" do
-      subject.header = { "requires" => "Class" }
-      subject.dependencies.should == ["Core/Class"]
+    describe "#required_files" do
+      it "should have only the filename itself" do
+        subject.required_files.should == [subject.filename]
+      end
     end
+  end
 
-    it "should not truncate package name in short form for external dependencies" do
-      subject.header = { "requires" => "Mash/Mash" }
-      subject.dependencies(:short => true).should == ["Mash/Mash"]
+  context "when there are extensions, " do
+    let(:input_dir) { "spec/data/Extensions/app/javascripts" }
+    let(:extension) { Jsus::SourceFile.from_file("#{input_dir}/Orwik/Extensions/Class.js") }
+    subject { Jsus::SourceFile.from_file("#{input_dir}/Core/Source/Class.js")}
+    let(:initial_content) { subject.content }
+    before(:each) { initial_content; subject.extensions << extension }
+
+    describe "#required_files" do
+      it "should include source_file filename itself" do
+        subject.required_files.should include(subject.filename)
+      end
+
+      it "should include extensions filenames" do
+        subject.required_files.should include(extension.filename)
+      end
+
+      it "should put the subject's filename first" do
+        subject.required_files[0].should == subject.filename
+      end
     end
 
-    it "should not prepend package name in full form for external dependencies" do
-      subject.header = { "requires" => "Mash/Mash" }
-      subject.dependencies.should == ["Mash/Mash"]
+    describe "#content" do
+      it "should have extensions applied to the initial file content" do
+        subject.content.should_not == initial_content
+        subject.content.index(initial_content).should_not be_nil
+        subject.content.index(extension.content).should_not be_nil
+        subject.content.index(initial_content).should < subject.content.index(extension.content)
+      end
     end
   end
 end