jsus 0.3.6 → 0.4.0

data/lib/jsus/util/validator/base.rb

@@ -3,36 +3,16 @@ module Jsus
     # Base for any validator class.
     module Validator
       class Base
+        include Mixins::OperatesOnSources
+
         # Constructor accepts pool or array or container and adds every file
         # to its source files set.
         # @param [Jsus::Pool, Jsus::Container, Array] source files to validate
         # @api public
-        def initialize(pool_or_array_or_container)
+        def initialize(pool_or_array_or_container = [])
           self.source_files = pool_or_array_or_container
         end
 
-        # @return [Array] source files for validation
-        # @api public
-        def source_files
-          @source_files ||= []
-        end
-        alias_method :sources, :source_files
-
-        # @param [Jsus::Pool, Jsus::Container, Array] pool_or_array_or_container
-        #    source files for validation
-        # @api public
-        def source_files=(pool_or_array_or_container)
-          case pool_or_array_or_container
-          when Pool
-            @source_files = pool_or_array_or_container.sources.to_a
-          when Array
-            @source_files = pool_or_array_or_container
-          when Container
-            @source_files = pool_or_array_or_container.to_a
-          end
-        end
-        alias_method :sources=, :source_files=
-
         # @return [Boolean] whether or not given sources conform to given set of rules
         # @api public
         def validate

data/lib/jsus/util/watcher.rb

@@ -3,13 +3,14 @@ class Jsus::Util::Watcher
     # Watches input directories and their subdirectories for changes in
     # js source files and package metadata files.
     # @param [String, Array] input_dirs directory or directories to watch
+    # @param [String, Array] ignored_dirs directory or directories to ignore
     # @yield [filename] Callback to trigger on creation / update / removal of
     #        any file in given directories
     # @yieldparam [String] filename Updated filename full path
     # @return [FSSM::Monitor] fssm monitor instance
     # @api public
-    def watch(input_dirs, &callback)
-      new(input_dirs, &callback)
+    def watch(input_dirs, ignored_dirs = [], &callback)
+      new(input_dirs, ignored_dirs, &callback)
     end
   end
 
@@ -17,12 +18,13 @@ class Jsus::Util::Watcher
   # Jsus::Util::Watcher.watch instead.
   # @see .watch
   # @api semipublic
-  def initialize(input_dirs, &callback)
+  def initialize(input_dirs, ignored_dirs = [], &callback)
     require 'fssm'
     @callback = callback
     input_dirs = Array(input_dirs).compact
     @semaphore = Mutex.new
     watcher = self
+    @ignored_dirs = Array(ignored_dirs).map {|dir| File.expand_path(dir) }
     FSSM.monitor do
       input_dirs.each do |dir|
         dir = File.expand_path(dir)
@@ -49,9 +51,9 @@ class Jsus::Util::Watcher
   # @api semipublic
   def watch_callback(base, match)
     Thread.new do
-      run do
-        full_path = File.join(base, match)
-        @callback.call(full_path)
+      full_path = File.join(base, match)
+      unless @ignored_dirs.any? {|dir| full_path.index(dir) == 0 }
+        run { @callback.call(full_path) }
       end
     end
   end # watch_callback

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

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

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

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

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

@@ -5,4 +5,6 @@ license: MIT-Style License, http://mootools.net/license
 copyright: Somebody
 authors: Someone
 sources:
-  - Source/Class.js
+  - Source/Class.js
+  - Source/Hash.js
+  - Source/Mash.js

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

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

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

@@ -5,4 +5,5 @@ license: MIT-Style License, http://mootools.net/license
 copyright: Somebody
 authors: Someone
 sources:
-  - Extensions/Class.js
+  - Extensions/Class.js
+  - Extensions/Mash.js

data/spec/data/OutsideDependencies/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
@@ -6,7 +6,7 @@ license: MIT-Style License, http://mootools.net/license
 copyright: 2008-2010 Yaroslaff Fedin http://orwik.com/people/inviz
 authors: Orwik team, http://developers.orwik.com
 files:
-  - "Source/Widget/Widget.js" 
+  - "Source/Widget/Widget.js"
   - "Source/Widget/Input/Input.js"
   - "Source/Widget/Input/Input.Color.js" #Files are unsorted. Figure out the order please
-  - "Source/Library/Color.js"
+  - "Source/Library/Color.js"

data/spec/data/SimpleSources/dependent_source_one.js

@@ -0,0 +1,15 @@
+/*
+---
+
+script: DependentSourceOne.js
+
+description: Provides Two, requires Zero
+
+license: MIT-style license.
+
+provides: Two
+
+requires: Zero
+
+...
+*/

data/spec/data/SimpleSources/replacement_source_one.js

@@ -0,0 +1,13 @@
+/*
+---
+
+script: ReplacementSourceOne.js
+
+description: Replaces One
+
+license: MIT-style license.
+
+replaces: One
+
+...
+*/

data/spec/data/SimpleSources/simple_source_one.js

@@ -0,0 +1,13 @@
+/*
+---
+
+script: SimpleSourceOnce.js
+
+description: Provides Zero, requires nothing
+
+license: MIT-style license.
+
+provides: Zero
+
+...
+*/

data/spec/data/SimpleSources/simple_source_two.js

@@ -0,0 +1,13 @@
+/*
+---
+
+script: SimpleSourceTwo.js
+
+description: Provides One, requires nothing
+
+license: MIT-style license.
+
+provides: One
+
+...
+*/

data/spec/data/extension_1.js

@@ -0,0 +1,15 @@
+/*
+---
+
+script: ExtensionOne.js
+
+description: Extends Chain
+
+license: MIT-style license.
+
+extends: Core/Chain
+
+...
+*/
+
+var extension_1 = true;

data/spec/data/extension_2.js

@@ -0,0 +1,15 @@
+/*
+---
+
+script: ExtensionTwo.js
+
+description: Extends Chain
+
+license: MIT-style license.
+
+extends: Core/Chain
+
+...
+*/
+
+var extension_2 = true;

data/spec/data/replacement.js

@@ -0,0 +1,15 @@
+/*
+---
+
+script: ChainReplacement.js
+
+description: Replaces Chain
+
+license: MIT-style license.
+
+replaces: Core/Chain
+
+...
+*/
+
+var Chain = "Replaced";

data/spec/jsus/container_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 
 describe Jsus::Container do
-  let(:simple_source)         { Source.new(:provides => [0], :dependencies => [],  :content => "// simple",   :filename => "/home/jsus/simple.js") }
-  let(:another_simple_source) { Source.new(:provides => [1], :dependencies => [],  :content => "// simple 2", :filename => "/home/jsus/other/simple2.js") }
-  let(:dependant_source)      { Source.new(:provides => [3], :dependencies => [0], :content => "// simple 3", :filename => "/home/dependencies/simple3.js") }
-  let(:replacement_source)    { Source.new(:provides => [0,4,6], :dependencies => [], :replaces => 0, :content => "// simple replaced",   :filename => "/home/jsus/simple_replaced.js") }
+  let(:simple_source)         { Jsus::SourceFile.from_file("spec/data/SimpleSources/simple_source_one.js", :namespace => "Test") }
+  let(:another_simple_source) { Jsus::SourceFile.from_file("spec/data/SimpleSources/simple_source_two.js", :namespace => "Test") }
+  let(:dependant_source)      { Jsus::SourceFile.from_file("spec/data/SimpleSources/dependent_source_one.js", :namespace => "Test") }
+  let(:replacement_source)    { Jsus::SourceFile.from_file("spec/data/SimpleSources/replacement_source_one.js", :namespace => "Test") }
   let(:simple_container)        { Jsus::Container.new(simple_source, another_simple_source) }
   let(:container_with_dependency) { Jsus::Container.new(dependant_source, simple_source) }
 
@@ -14,6 +14,12 @@ describe Jsus::Container do
       simple_container.should have_exactly(2).sources
       simple_container.sources.should include(simple_source, another_simple_source)
     end
+
+    it "should not lose data when initialized from another container" do
+      container = Jsus::Container.new(simple_source, replacement_source, another_simple_source)
+      container.to_a.should =~ [simple_source, replacement_source]
+      Jsus::Container.new(container).to_a.should =~ [simple_source, replacement_source]
+    end
   end
 
   describe "#<<" do
@@ -59,19 +65,13 @@ describe Jsus::Container do
     end
 
     it "should generate routes from given root" do
-      subject.required_files("/home/jsus").should == ["simple.js", "../dependencies/simple3.js"]
+      subject.required_files(File.expand_path("spec/data/SimpleSources")).should == [File.basename(simple_source.filename), File.basename(dependant_source.filename)]
     end
   end
 
   context "lazy sorting" do
     subject { container_with_dependency.sort! }
 
-    it "should remove replaced files" do
-      subject << replacement_source
-      subject.should include(replacement_source)
-      subject.should_not include(simple_source)
-    end
-
     it "should only call topsort when it's needed" do
       subject.should_not_receive(:topsort)
       subject.sort!
@@ -82,11 +82,69 @@ describe Jsus::Container do
       subject.should_not_receive(:topsort)
       subject << simple_source
     end
-    
+
     it "should call topsort for kicker methods" do
       subject << simple_source
-      subject.should_receive(:topsort)
+      subject.should_receive(:topsort).and_return([])
       subject.each {|source| }
     end
   end
-end
+
+  context "when extensions are present" do
+    let(:klass) { Jsus::SourceFile.from_file("spec/data/Extensions/app/javascripts/Core/Source/Class.js", :namespace => "Core") }
+    let(:hash) { Jsus::SourceFile.from_file("spec/data/Extensions/app/javascripts/Core/Source/Hash.js", :namespace => "Core") }
+    let(:mash) { Jsus::SourceFile.from_file("spec/data/Extensions/app/javascripts/Core/Source/Mash.js", :namespace => "Core") }
+    let(:sources) { [klass, hash, mash] }
+    let(:klass_ext) { Jsus::SourceFile.from_file("spec/data/Extensions/app/javascripts/Orwik/Extensions/Class.js", :namespace => "Orwik") }
+    let(:mash_ext)  { Jsus::SourceFile.from_file("spec/data/Extensions/app/javascripts/Orwik/Extensions/Mash.js", :namespace => "Orwik") }
+    let(:extensions) { [klass_ext, mash_ext] }
+
+    subject { described_class.new }
+    before(:each) do
+      sources.each {|sf| subject << sf }
+      extensions.each {|sf| subject << sf }
+    end
+
+    it "should return extensions immediately after the sources they extend" do
+      subject.to_a.should =~ sources + extensions
+      subject.to_a.index(klass).should == subject.to_a.index(klass_ext) - 1
+      subject.to_a.index(mash).should == subject.to_a.index(mash_ext) - 1
+    end
+  end
+
+  context "when replacements are present" do
+    let(:source) { Jsus::SourceFile.from_file("spec/data/OutsideDependencies/app/javascripts/Core/Source/Class/Class.Extras.js", :namespace => "Core") }
+    let(:replacement) { Jsus::SourceFile.from_file("spec/data/replacement.js", :namespace => "Test") }
+    subject { described_class.new(source, replacement) }
+
+    it "should only include replacement in the output" do
+      subject.sources.should == [replacement]
+    end
+  end
+
+  describe "#provides" do
+    let(:source) { Jsus::SourceFile.from_file("features/data/Basic/Source/Library/Color.js", :namespace => "Base") }
+    let(:another_source) { Jsus::SourceFile.from_file("features/data/Basic/Source/Widget/Input/Input.Color.js", :namespace => "Base") }
+    subject { described_class.new(source, another_source) }
+
+    it "should include provided tags of all sources" do
+      subject.provides.map {|tag| tag.to_s}.should =~ ["Base/Color", "Base/Input.Color"]
+    end
+  end
+
+  describe "#requires" do
+    let(:source) { Jsus::SourceFile.from_file("features/data/Basic/Source/Library/Color.js", :namespace => "Base") }
+    let(:another_source) { Jsus::SourceFile.from_file("features/data/Basic/Source/Widget/Input/Input.Color.js", :namespace => "Base") }
+    subject { described_class.new(another_source) }
+
+    it "should include required tags of all sources" do
+      subject.provides.map {|tag| tag.to_s}.should =~ ["Base/Input.Color"]
+      subject.requires.map {|tag| tag.to_s}.should =~ ["Base/Color"]
+    end
+
+    it "should exclude tags which are provided by other files" do
+      subject << source
+      subject.requires.map {|tag| tag.to_s}.should == []
+    end
+  end
+end

data/spec/jsus/package_spec.rb

@@ -14,29 +14,26 @@ describe Jsus::Package do
         let(:output_dir) { "spec/data/OutsideDependencies/public/javascripts/Orwik" }
 
         it "should load header from package.yml" do
-          subject.name.should == "orwik"
+          subject.name.should == "Orwik"
           subject.filename.should == "orwik.js"
         end
 
-        it "should pass pool in options and register itself in the pool" do
-          pool = Jsus::Pool.new
-          package = Jsus::Package.new(input_dir, :pool => pool)
-          package.pool.should == pool
-          pool.packages.should include(package)
-        end
-
         it "should set provided modules from source files" do
           subject.provides.should have_exactly(4).items
-          subject.provides_names.should include("Color", "Input", "Input.Color", "Widget")
+          subject.provides.map {|p| p.to_s }.should include("Orwik/Color", "Orwik/Input", "Orwik/Input.Color", "Orwik/Widget")
         end
 
         it "should set up outside dependencies" do
-          subject.dependencies_names.should == ['Core/Class']
+          subject.requires.map {|r| r.to_s}.should =~ ["Core/Class"]
         end
 
         it "should set directory field" do
           subject.directory.should == File.expand_path(input_dir)
         end
+
+        it "should assign source file itself as a package" do
+          subject.source_files.each {|sf| sf.package.should == subject }
+        end
       end
 
       context "with a package.json" do
@@ -45,139 +42,24 @@ describe Jsus::Package do
 
         it "should load header from package.json" do
           subject.name.should == "Sheet"
-          subject.provides_names.should     =~ ["Sheet", "SheetParser.CSS"]
-          subject.dependencies_names.should =~ ["combineRegExp"]
+          subject.provides.map {|p| p.to_s}.should =~ ["Sheet/Sheet", "Sheet/SheetParser.CSS"]
+          subject.requires.map {|r| r.to_s}.should =~ ["Sheet/CombineRegExp"]
         end
 
       end
     end
   end
 
-  describe "#compile" do
-    it "should create a merged js package from given files" do
-      subject.compile(output_dir)
-      File.exists?("#{output_dir}/orwik.js").should be_true
-      compiled_content = IO.read("#{output_dir}/orwik.js")
-      required_files = Dir["#{input_dir}/**/*.js"].map {|f| IO.read(f) }
-      required_files.each {|f| compiled_content.should include(f)}
-    end
-
-    context "when given nil" do
-      it "should not raise errors" do
-        lambda { subject.compile(nil) }.should_not raise_error
-      end
-
-      it "should return a string with compiled content" do
-        compiled_content = subject.compile(nil)
-        required_files = Dir["#{input_dir}/**/*.js"].map {|f| IO.read(f) }
-        required_files.each {|f| compiled_content.should include(f)}
-      end
-    end
-  end
-
-  describe "#generate_scripts_info" do
-    it "should create scripts.json file containing all the info about the 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["provides"].should have_exactly(4).items
-      info["provides"].should include("Color", "Widget", "Input", "Input.Color")
-    end
-
-    context "when external dependencies are included" do
-      let(:lib_dir) { "spec/data/ChainDependencies/app/javascripts" }
-      let(:pool) { Jsus::Pool.new(lib_dir) }
-      subject { Jsus::Package.new("spec/data/ExternalDependencies/app/javascripts/Orwik", :pool => pool) }
-
-      it "should show included external dependencies as provided" do
-        subject.include_dependencies!
-        subject.generate_scripts_info(output_dir)
-        info = JSON.parse(IO.read("#{output_dir}/scripts.json"))
-        info = info["Orwik"]
-        info["provides"].should have_exactly(4).items
-        info["provides"].should include("Test", "Hash/Hash", "Class/Class", 'Mash/Mash')
-      end
-
-      it "should not show included external dependencies as required" 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 == ["Class"]
-      end
-    end
-  end
-
-  describe "#generate_tree" do
-    it "should create a json file containing tree information and dependencies" do
-      subject.generate_tree(output_dir)
-      File.exists?("#{output_dir}/tree.json").should be_true
-      tree = JSON.parse(IO.read("#{output_dir}/tree.json"))
-      tree["Library"]["Color"]["provides"].should == ["Color"]
-      tree["Widget"]["Widget"]["provides"].should == ["Widget"]
-      tree["Widget"]["Input"]["Input"]["requires"].should == ["Widget"]
-      tree["Widget"]["Input"]["Input"]["provides"].should == ["Input"]
-      tree["Widget"]["Input"]["Input.Color"]["requires"].should have_exactly(2).elements
-      tree["Widget"]["Input"]["Input.Color"]["requires"].should include("Input", "Color")
-      tree["Widget"]["Input"]["Input.Color"]["provides"].should == ["Input.Color"]
-    end
-
-    it "should allow different filenames" do
-      subject.generate_tree(output_dir, "structure.json")
-      File.exists?("#{output_dir}/structure.json").should be_true
-      tree = JSON.parse(IO.read("#{output_dir}/structure.json"))
-      tree["Library"]["Color"]["provides"].should == ["Color"]
-    end
-  end
-
   describe "#required_files" do
-   it "should list required files in correct order" do
-     required_files = subject.required_files
-     input_index = required_files.index {|s| s=~ /\/Input.js$/}
-     color_index = required_files.index {|s| s=~ /\/Color.js$/}
-     input_color_index = required_files.index {|s| s=~ /\/Input.Color.js$/}
-     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
-    let(:lib_dir) { "spec/data/ChainDependencies/app/javascripts" }
-    let(:pool) { Jsus::Pool.new(lib_dir) }
-    subject { Jsus::Package.new("spec/data/ExternalDependencies/app/javascripts/Orwik", :pool => pool) }
-
-    it "should include external dependencies into self" do
-      subject.include_dependencies!
-      subject.should have(3).linked_external_dependencies
-      compiled = subject.compile(output_dir)
-      ["Class", "Hash", "Mash"].each do |name|
-        compiled.should include(IO.read("#{lib_dir}/#{name}/Source/#{name}.js"))
-      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
-
   describe "#filename" do
     it "should convert package name to snake_case" do
       subject.filename.should == "orwik.js"
     end
   end
-end
+end