jsus 0.1.0 → 0.1.2

data/CHANGELOG

@@ -1,4 +1,14 @@
-= JsBundler Changelog
+= Jsus Changelog
+
+== Version 0.1.2
+* Removed Bundler class which seemed like totally unneccessary
+* jsus command-line utility now works in single-project mode
+* Some major refactoring, introduced new concepts: Pool, Packager and Container
+* Inserted license text to LICENSE, updated TODO
+
+== Version 0.1.1 (not released)
+* Massive refactoring
+* Moved out packing logic to brand new Packager and Container classes
 
 == Version 0.1.0
 * Initial release

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2010, Mark Abramov (Markiz)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/Manifest

@@ -7,9 +7,12 @@ TODO
 bin/jsus
 jsus.gemspec
 lib/jsus.rb
-lib/jsus/bundler.rb
+lib/jsus/container.rb
 lib/jsus/package.rb
+lib/jsus/packager.rb
+lib/jsus/pool.rb
 lib/jsus/source_file.rb
+lib/jsus/topsortable.rb
 spec/data/Basic/README
 spec/data/Basic/app/javascripts/Orwik/Source/Library/Color.js
 spec/data/Basic/app/javascripts/Orwik/Source/Widget/Input/Input.Color.js
@@ -29,8 +32,12 @@ spec/data/OutsideDependencies/app/javascripts/Orwik/package.yml
 spec/data/bad_test_source_one.js
 spec/data/bad_test_source_two.js
 spec/data/test_source_one.js
-spec/lib/jsus/bundler_spec.rb
+spec/lib/jsus/container_spec.rb
 spec/lib/jsus/package_spec.rb
+spec/lib/jsus/packager_spec.rb
+spec/lib/jsus/pool_spec.rb
 spec/lib/jsus/source_file_spec.rb
+spec/lib/jsus/topsortable_spec.rb
+spec/shared/class_stubs.rb
 spec/spec.opts
 spec/spec_helper.rb

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'rake'
 require 'echoe'
-Echoe.new('jsus', '0.1.0') do |g|
+Echoe.new('jsus', '0.1.2') do |g|
   g.description    = "Packager/compiler for js-files that resolves dependencies and can compile everything into one file, providing all the neccessary meta-info."
   g.url            = "http://github.com/markiz/jsus"
   g.author         = "Markiz, idea by Inviz (http://github.com/Inviz)"

data/TODO

@@ -0,0 +1,5 @@
+* External dependencies mechanism
+* Disallow circular dependencies
+* Package extensions (e.g. package Core.ext that would be able to extend package Core)
+* Rails integration
+* Documentation, RDocs

data/bin/jsus

@@ -3,8 +3,11 @@ require 'rubygems'
 require 'jsus'
 
 unless ARGV.length == 2
-  puts "SYNOPSYS: jsus <input_directory_with_packages> <output_directory_for_packages>"
+  puts "SYNOPSYS: jsus <input_directory_with_package> <output_directory_for_package>"
   exit
 else
-  Jsus::Bundler.new(ARGV[0]).compile(ARGV[1])
+  package = Jsus::Package.new(ARGV[0])
+  package.compile(ARGV[1])
+  package.generate_scripts_info(ARGV[1])
+  package.generate_tree(ARGV[1])
 end

data/jsus.gemspec

@@ -2,17 +2,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jsus}
-  s.version = "0.1.0"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Markiz, idea by Inviz (http://github.com/Inviz)"]
-  s.date = %q{2010-06-03}
+  s.date = %q{2010-06-04}
   s.default_executable = %q{jsus}
   s.description = %q{Packager/compiler for js-files that resolves dependencies and can compile everything into one file, providing all the neccessary meta-info.}
   s.email = %q{markizko@gmail.com}
   s.executables = ["jsus"]
-  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "TODO", "bin/jsus", "lib/jsus.rb", "lib/jsus/bundler.rb", "lib/jsus/package.rb", "lib/jsus/source_file.rb"]
-  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "TODO", "bin/jsus", "lib/jsus.rb", "lib/jsus/bundler.rb", "lib/jsus/package.rb", "lib/jsus/source_file.rb", "spec/data/Basic/README", "spec/data/Basic/app/javascripts/Orwik/Source/Library/Color.js", "spec/data/Basic/app/javascripts/Orwik/Source/Widget/Input/Input.Color.js", "spec/data/Basic/app/javascripts/Orwik/Source/Widget/Input/Input.js", "spec/data/Basic/app/javascripts/Orwik/Source/Widget/Widget.js", "spec/data/Basic/app/javascripts/Orwik/package.yml", "spec/data/OutsideDependencies/README", "spec/data/OutsideDependencies/app/javascripts/Core/Source/Class/Class.Extras.js", "spec/data/OutsideDependencies/app/javascripts/Core/Source/Class/Class.js", "spec/data/OutsideDependencies/app/javascripts/Core/Source/Native/Hash.js", "spec/data/OutsideDependencies/app/javascripts/Core/package.yml", "spec/data/OutsideDependencies/app/javascripts/Orwik/Source/Library/Color.js", "spec/data/OutsideDependencies/app/javascripts/Orwik/Source/Widget/Input/Input.Color.js", "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/bad_test_source_one.js", "spec/data/bad_test_source_two.js", "spec/data/test_source_one.js", "spec/lib/jsus/bundler_spec.rb", "spec/lib/jsus/package_spec.rb", "spec/lib/jsus/source_file_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "jsus.gemspec"]
+  s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README", "TODO", "bin/jsus", "lib/jsus.rb", "lib/jsus/container.rb", "lib/jsus/package.rb", "lib/jsus/packager.rb", "lib/jsus/pool.rb", "lib/jsus/source_file.rb", "lib/jsus/topsortable.rb"]
+  s.files = ["CHANGELOG", "LICENSE", "Manifest", "README", "Rakefile", "TODO", "bin/jsus", "jsus.gemspec", "lib/jsus.rb", "lib/jsus/container.rb", "lib/jsus/package.rb", "lib/jsus/packager.rb", "lib/jsus/pool.rb", "lib/jsus/source_file.rb", "lib/jsus/topsortable.rb", "spec/data/Basic/README", "spec/data/Basic/app/javascripts/Orwik/Source/Library/Color.js", "spec/data/Basic/app/javascripts/Orwik/Source/Widget/Input/Input.Color.js", "spec/data/Basic/app/javascripts/Orwik/Source/Widget/Input/Input.js", "spec/data/Basic/app/javascripts/Orwik/Source/Widget/Widget.js", "spec/data/Basic/app/javascripts/Orwik/package.yml", "spec/data/OutsideDependencies/README", "spec/data/OutsideDependencies/app/javascripts/Core/Source/Class/Class.Extras.js", "spec/data/OutsideDependencies/app/javascripts/Core/Source/Class/Class.js", "spec/data/OutsideDependencies/app/javascripts/Core/Source/Native/Hash.js", "spec/data/OutsideDependencies/app/javascripts/Core/package.yml", "spec/data/OutsideDependencies/app/javascripts/Orwik/Source/Library/Color.js", "spec/data/OutsideDependencies/app/javascripts/Orwik/Source/Widget/Input/Input.Color.js", "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/bad_test_source_one.js", "spec/data/bad_test_source_two.js", "spec/data/test_source_one.js", "spec/lib/jsus/container_spec.rb", "spec/lib/jsus/package_spec.rb", "spec/lib/jsus/packager_spec.rb", "spec/lib/jsus/pool_spec.rb", "spec/lib/jsus/source_file_spec.rb", "spec/lib/jsus/topsortable_spec.rb", "spec/shared/class_stubs.rb", "spec/spec.opts", "spec/spec_helper.rb"]
   s.homepage = %q{http://github.com/markiz/jsus}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Jsus", "--main", "README"]
   s.require_paths = ["lib"]

data/lib/jsus.rb

@@ -3,12 +3,16 @@ require 'pathname'
 require 'rubygems'
 require 'json'
 require 'active_support/ordered_hash'
+require 'active_support/core_ext/module/delegation'
 require 'rgl/adjacency'
 require 'rgl/topsort'
 
+require 'jsus/topsortable'
 require 'jsus/source_file'
+require 'jsus/container'
+require 'jsus/packager'
+require 'jsus/pool'
 require 'jsus/package'
-require 'jsus/bundler'
 
 module Jsus
   # Shortcut for Bundler.new
@@ -16,28 +20,4 @@ module Jsus
     Bundler.new(*args, &block)
   end
 
-  # Topological sort for packages and source files
-  def self.topsort(items)
-    graph = RGL::DirectedAdjacencyGraph.new
-    provides_hash = {}
-    # init vertices
-    items.each do |item|
-      graph.add_vertex(item)
-      item.provides.each do |provides|
-        provides_hash[provides] = item
-      end
-    end
-    # init edges
-    items.each do |item|
-      item.dependencies.each do |dependency|
-        if required_item = provides_hash[dependency]
-          graph.add_edge(required_item, item)
-        end
-      end
-    end
-    result = []
-    graph.topsort_iterator.each { |item| result << item }
-    result
-  end
-
 end

data/lib/jsus/container.rb

@@ -0,0 +1,42 @@
+module Jsus
+  class Container
+    include Topsortable        
+
+    def initialize(*sources)
+      sources.each do |source|
+        self << source
+      end
+    end
+
+    def <<(source)
+      if source
+        if source.kind_of?(Array) || source.kind_of?(Container)
+          source.each {|s| self << s }
+        else
+          sources << source
+          sort!
+        end
+      end
+      self
+    end
+
+    def sources
+      @sources ||= []
+    end
+
+    def sources=(new_value)
+      @sources = new_value
+    end
+
+    def sort!
+      self.sources = topsort(:sources)
+    end
+
+    def inspect
+      "#<#{self.class.name}:#{self.object_id} #{self.sources.inspect}>"
+    end
+
+    # delegate undefined methods to #sources
+    (Array.instance_methods - self.instance_methods).each {|m| delegate m, :to => :sources }
+  end
+end

data/lib/jsus/package.rb

@@ -1,28 +1,31 @@
 module Jsus
   class Package
+    attr_accessor :relative_directory
+    attr_accessor :directory
+    attr_accessor :pool
      # Constructors
-    def initialize(directory)
-      self.relative_directory = Pathname.new(directory).relative_path_from(Pathname.new(".")).to_s
+    def initialize(directory, options = {})
+      self.relative_directory = directory #Pathname.new(directory).relative_path_from(Pathname.new(".")).to_s
       self.directory = File.expand_path(directory)
       self.header = YAML.load_file(File.join(directory, 'package.yml'))
+      self.pool = options[:pool]
       Dir.chdir(directory) do
         files.each do |source|
-          source_files << SourceFile.from_file(source)
+          source_files << SourceFile.from_file(source, :package => self)
         end
       end
-      calculate_requirement_order
     end
 
 
     # Public API
-    attr_accessor :relative_directory
-    attr_accessor :directory
-
-    attr_writer :header
     def header
       @header ||= {}
     end
 
+    def header=(new_header)
+      @header = new_header
+    end
+
     def name
       header["name"] ||= ""
     end
@@ -40,7 +43,7 @@ module Jsus
     end
 
     def files
-      header["files"] = header["sources"] || header["files"] || []
+      header["files"] = header["files"] || header["sources"] || []
     end
 
     alias_method :sources, :files
@@ -55,20 +58,10 @@ module Jsus
 
     def description
       header["description"] ||= ""
-    end
-
-    attr_accessor :required_files
+    end    
 
     def compile(directory = ".")
-      FileUtils.mkdir_p directory
-      Dir.chdir(directory) do
-        File.open(filename, "w") do |resulting_file|
-          required_files.each do |required_file|
-            resulting_file.puts(IO.read(required_file))
-          end
-        end
-        generate_scripts_info(".")
-      end
+      Packager.new(*source_files).pack(File.join(directory, filename))
     end
 
     def generate_tree(directory = ".", filename = "tree.json")
@@ -76,47 +69,45 @@ module Jsus
       result = ActiveSupport::OrderedHash.new
       source_files.each do |source|
         components = File.dirname(source.relative_filename).split(File::SEPARATOR)
+        # deleting source dir by convention
         components.delete("Source")
-        components << File.basename(source.filename, ".js")
         node = result
         components.each do |component|
           node[component] ||= ActiveSupport::OrderedHash.new
           node = node[component]
         end
-        node["desc"] = source.description
-        node["requires"] = source.dependencies
-        node["provides"] = source.provides
-      end
-      Dir.chdir(directory) do
-        File.open(filename, "w") { |resulting_file| resulting_file << JSON.pretty_generate(result) }
+        node[File.basename(source.filename, ".js")] = source.to_hash
       end
+      File.open(File.join(directory, filename), "w") { |resulting_file| resulting_file << JSON.pretty_generate(result) }
+      result
     end
 
     def generate_scripts_info(directory = ".", filename = "scripts.json")
-      Dir.chdir(directory) do
-        result = {}
-        result[name] = {}
-        result[name]["desc"] = description
-        result[name]["requires"] = dependencies
-        result[name]["provides"] = provides
-        File.open(filename, "w") { |resulting_file| resulting_file << JSON.pretty_generate(result) }
-      end
+      FileUtils.mkdir_p directory
+      File.open(File.join(directory, filename), "w") { |resulting_file| resulting_file << JSON.pretty_generate(self.to_hash) }
+      self.to_hash
     end
 
-    protected
 
-    attr_writer :source_files
-    def source_files
-      @source_files ||= []
-      @source_files.compact!
-      @source_files
+    def required_files
+      source_files.map {|s| s.filename }
     end
 
-    def calculate_requirement_order
-      self.source_files = Jsus.topsort(source_files)
-      self.required_files = source_files.map {|f| f.filename}
+    def to_hash
+      {
+        name => {
+          :desc => description,
+          :provides => provides,
+          :requires => dependencies
+        }
+      }
     end
 
 
+    def source_files
+      @source_files ||= Container.new
+    end
+
+    protected
   end
 end

data/lib/jsus/packager.rb

@@ -0,0 +1,26 @@
+module Jsus
+  class Packager
+    attr_accessor :container
+
+    def initialize(*sources)
+      self.container = Container.new(*sources)
+    end
+
+    def sources
+      container.sources
+    end
+
+    def pack(output_file = nil)
+      result = sources.map {|s| s.content }.join("\n")
+
+      if output_file
+        FileUtils.mkdir_p(File.dirname(output_file))
+        File.open(output_file, "w") {|f| f << result }
+      end
+      
+      result
+    end
+
+    
+  end
+end

data/lib/jsus/pool.rb

@@ -0,0 +1,22 @@
+module Jsus
+  class Pool
+    def sources
+      @sources ||= Container.new
+    end
+
+    def lookup(key)
+      @provides_map[key]
+    end
+
+    def <<(source)
+      sources << source
+      @provides_map = sources.inject({}) do |result, source|
+        source.provides(:full => true).each {|p| result[p] = source }
+        result
+      end
+      self
+    end
+
+    (Array.instance_methods - self.instance_methods).each {|m| delegate m, :to => :sources }
+  end
+end

data/lib/jsus/source_file.rb

@@ -3,40 +3,73 @@ module Jsus
     attr_accessor :header
     attr_accessor :relative_filename
     attr_accessor :filename
+    attr_accessor :content
+    attr_accessor :package
     # constructors
 
-    def self.from_file(filename)
+    def initialize(options = {})
+      [:header, :relative_filename, :filename, :content, :package].each do |field|
+        send("#{field}=", options[field]) if options[field]
+      end
+      options[:pool] << self if options[:pool]
+    end
+
+    def self.from_file(filename, options = {})
       if File.exists?(filename)
-        source = File.read(filename) # TODO: read only first several lines of file
+        source = File.read(filename)
         yaml_data = source.match(%r(^/\*\s*(---.*?)\*/)m)
-        if (yaml_data && yaml_data[1] && header = YAML.load(yaml_data[1]))
-          result = new
-          result.header = header
-          result.relative_filename = filename
-          result.filename = File.expand_path(filename)
-          result
+        if (yaml_data && yaml_data[1] && header = YAML.load(yaml_data[1]))          
+          options[:header]            = header
+          options[:relative_filename] = filename
+          options[:filename]          = File.expand_path(filename)
+          options[:content]           = source
+          new(options)
         else
-          # puts "WARNING: file #{filename} has invalid format (should be YAML)"
+          #puts "WARNING: file #{filename} has invalid format (should be YAML)"
           nil
         end
       else
-        # puts "WARNING: file #{filename} does not exist"
+        #puts "WARNING: file #{filename} does not exist"
         nil
       end
     end
 
     # Public API
-    def dependencies
-      header["requires"] ||= []
+    def dependencies(options = {})
+      header["requires"] = [header["requires"] || []].flatten
+      header["requires"].map! {|r| r.gsub(/^\//, "") }
+      if options[:full] && package
+        header["requires"].map {|r| "#{package.name}/#{r}"}
+      else
+        header["requires"]
+      end
     end
+    alias_method :requires, :dependencies
 
-    def provides
-      header["provides"] ||= []
+    def provides(options = {})
+      header["provides"] = [header["provides"] || []].flatten
+      if options[:full] && package
+        header["provides"].map {|p| "#{package.name}/#{p}"}
+      else
+        header["provides"]
+      end
     end
 
     def description
       header["description"] ||= ""
     end
 
+    def to_hash
+      {
+        "desc"     => description,
+        "requires" => dependencies,
+        "provides" => provides
+      }
+    end
+
+    def inspect
+      self.to_hash.inspect
+    end
+
   end
 end

data/lib/jsus/topsortable.rb

@@ -0,0 +1,29 @@
+module Jsus
+  module Topsortable
+    # Topological sort for packages and source files
+    def topsort(to_sort = :items)
+      graph = RGL::DirectedAdjacencyGraph.new
+      provides_hash = {}
+      # init vertices
+      items = self.send(to_sort)
+      items.each do |item|
+        graph.add_vertex(item)
+        item.provides.each do |provides|
+          provides_hash[provides] = item
+        end
+      end
+      # init edges
+      items.each do |item|
+        item.dependencies.each do |dependency|
+          if required_item = provides_hash[dependency]
+            graph.add_edge(required_item, item)
+          end
+        end
+      end
+      result = []
+      graph.topsort_iterator.each { |item| result << item }
+      result
+    end
+
+  end
+end

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

@@ -1,4 +1,4 @@
-name: "core"
+name: "Core"
 exports: "mootools-core.js"
 web: "[mootools.net](http://mootools.net)"
 description: "MooTools, The JavaScript framework"
@@ -7,6 +7,6 @@ copyright: "© [MooTools](http://mootools.net)"
 authors: "[The MooTools development team](http://mootools.net/developers)"
 version: "1.2.4"
 files:
-  - "Source/Source/Class/Class.js"
-  - "Source/Source/Class/Class.Extras.js"
-  - "Source/Source/Native/Hash.js"
+  - "Source/Class/Class.js"
+  - "Source/Class/Class.Extras.js"
+  - "Source/Native/Hash.js"

data/spec/lib/jsus/container_spec.rb

@@ -0,0 +1,56 @@
+require 'spec/spec_helper'
+
+
+describe Jsus::Container do
+  let(:simple_source)         { Source.new(:provides => [0], :dependencies => [],  :content => "// simple") }
+  let(:another_simple_source) { Source.new(:provides => [1], :dependencies => [],  :content => "// simple 2") }
+  let(:dependant_source)      { Source.new(:provides => [3], :dependencies => [0], :content => "// simple 3") }
+
+  let(:simple_container)        { Jsus::Container.new(simple_source, another_simple_source) }
+  let(:container_with_dependency) { Jsus::Container.new(dependant_source, simple_source) }
+
+  describe "initialization" do
+    it "should accept sources as arguments" do
+      simple_container.should have_exactly(2).sources
+      simple_container.sources.should include(simple_source, another_simple_source)
+    end
+  end
+
+  describe "#<<" do
+    it "should allow multiple items via arrays" do
+      container = Jsus::Container.new
+      container << [simple_source, another_simple_source]
+      container.should have_exactly(2).sources
+    end
+
+    it "should allow multiple items via containers" do
+      container = Jsus::Container.new
+      container << Jsus::Container.new(simple_source, another_simple_source)
+      container.should have_exactly(2).sources
+    end
+
+  end
+
+  describe "#sources" do
+    subject { container_with_dependency }
+    it "should always be sorted" do
+      subject.sources.index(simple_source).should < subject.sources.index(dependant_source)
+      subject << another_simple_source
+      subject.sources.index(simple_source).should < subject.sources.index(dependant_source)
+    end
+
+    it "should not allow duplicates" do
+      subject.should have_exactly(2).sources
+      subject << simple_source
+      subject.should have_exactly(2).sources
+      subject << another_simple_source
+      subject.should have_exactly(3).sources
+    end
+
+    it "should not allow nils" do
+      lambda {
+        subject << nil
+      }.should_not raise_error
+    end
+  end
+end

data/spec/lib/jsus/package_spec.rb

@@ -16,6 +16,11 @@ describe Jsus::Package do
         subject.filename.should == "orwik.js"
       end
 
+      it "should pass pool in options" do
+        pool = Object.new
+        Jsus::Package.new(input_dir, :pool => pool).pool.should == pool
+      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")
@@ -29,15 +34,6 @@ describe Jsus::Package do
         subject.directory.should == File.expand_path(input_dir)
         subject.relative_directory.should == input_dir
       end
-
-      it "should set up 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
     end
   end
 
@@ -49,9 +45,11 @@ describe Jsus::Package do
       required_files = Dir["#{input_dir}/**/*.js"].map {|f| IO.read(f) }
       required_files.each {|f| compiled_content.should include(f)}
     end
+  end
 
+  describe "#generate_scripts_info" do
     it "should create scripts.json file containing all the info about the package" do
-      subject.compile(output_dir)
+      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"]
@@ -81,4 +79,15 @@ describe Jsus::Package do
       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
+  end
 end

data/spec/lib/jsus/packager_spec.rb

@@ -0,0 +1,37 @@
+require 'spec/spec_helper'
+
+
+describe Jsus::Packager do 
+  let(:simple_source)         { Source.new(:provides => [0], :dependencies => [],  :content => "// simple") }
+  let(:another_simple_source) { Source.new(:provides => [1], :dependencies => [],  :content => "// simple 2") }
+  let(:dependant_source)      { Source.new(:provides => [3], :dependencies => [0], :content => "// simple 3") }
+
+  let(:simple_package)          { Jsus::Packager.new(simple_source, another_simple_source) }
+  let(:package_with_dependency) { Jsus::Packager.new(dependant_source, simple_source) }
+
+  before(:each) { cleanup }
+  after(:each)  { cleanup }
+
+  describe "initialization" do
+    it "should accept sources as arguments" do
+      simple_package.should have_exactly(2).sources
+      simple_package.sources.should include(simple_source, another_simple_source)
+    end
+  end
+
+  describe "#pack" do
+    subject { Jsus::Packager.new(simple_source) }    
+    it "should concatenate source files" do
+      simple_package.pack.should include(simple_source.content, another_simple_source.content)
+    end
+
+    it "should output to file if given a filename" do
+      simple_package.pack("spec/tmp/test.js")
+      IO.read("spec/tmp/test.js").should include(simple_source.content, another_simple_source.content)
+    end
+
+    it "should resolve dependencies" do
+      package_with_dependency.pack.should == "#{simple_source.content}\n#{dependant_source.content}"
+    end
+  end
+end

data/spec/lib/jsus/pool_spec.rb

@@ -0,0 +1,19 @@
+require 'spec/spec_helper'
+describe Jsus::Pool do
+  let(:package) { Jsus::Package.new("spec/data/OutsideDependencies/app/javascripts/Core") }
+  subject { Jsus::Pool.new }
+
+  before(:each) do
+    subject << package.source_files
+  end
+
+  describe "#lookup" do
+    it "should find a source file providing given full name" do
+      subject.lookup("Core/Hash").should be_kind_of(Jsus::SourceFile)
+    end
+
+    it "should return nil if nothing could be found" do
+      subject.lookup("Core/WTF").should be_nil
+    end
+  end
+end

data/spec/lib/jsus/source_file_spec.rb

@@ -3,6 +3,8 @@ require 'spec/spec_helper'
 describe Jsus::SourceFile do
   before(:each) { cleanup }
   after(:all) { cleanup }
+  let(:package) { Package.new(:name => "Core") }
+  subject { Jsus::SourceFile.from_file("spec/data/OutsideDependencies/app/javascripts/Core/Source/Class/Class.Extras.js", :package => package) }
   context "initialization" do
     context "from file" do
       subject { Jsus::SourceFile.from_file('spec/data/test_source_one.js') }
@@ -23,11 +25,59 @@ 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
         end
       end
     end
+
+    it "should set all available fields from constructor" do
+      source = Jsus::SourceFile.new(:package => 1, :content => 2, :filename => 3,
+                                    :relative_filename => 4, :header => 5)
+      source.package.should == 1
+      source.content.should == 2
+      source.filename.should == 3
+      source.relative_filename.should == 4
+      source.header.should == 5
+    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
+
+  end
+
+  describe "#provides" do
+    it "should return the stuff it provides" do
+      subject.provides.should == ["Chain", "Events", "Options"]
+    end
+
+    it "should prepend package prefix if asked for fully formed provides" do
+      subject.provides(:full => true).should == ["Core/Chain", "Core/Events", "Core/Options"]
+    end
+
+    it "should work well when given single string instead of array" do
+      subject.header["provides"] = "Mash"
+      subject.provides.should == ["Mash"]
+    end
+  end
+
+  describe "#dependencies" do
+    it "should truncate leading slash" do
+      subject.dependencies.should == ["Class"]
+    end
+
+    it "should prepend package prefix if asked for fully formed dependencies" do
+      subject.dependencies(:full => true).should == ["Core/Class"]
+    end
+
+    it "should work well when given single string instead of array" do
+      subject.header["requires"] = "Class"
+      subject.dependencies.should == ["Class"]
+    end
   end
 end

data/spec/lib/jsus/topsortable_spec.rb

@@ -0,0 +1,51 @@
+require 'spec/spec_helper'
+
+class SortableItem
+  attr_accessor :value
+  attr_accessor :dependencies
+  attr_accessor :provides
+  def initialize(value)
+    @value = value
+    @provides = [value]
+  end
+end
+
+class SortableClass
+  include Jsus::Topsortable
+  attr_accessor :items
+end
+
+describe Jsus::Topsortable do
+  subject { SortableClass.new }
+  let(:items) { (0..5).map {|i| SortableItem.new(i) } }
+  let(:topsorted_values) { subject.topsort(:items).map {|item| item.value } }
+  before(:each) do
+    subject.items = items
+  end
+
+  it "should topologically sort items correctly" do
+    items[0].dependencies = [1, 2, 3]
+    items[1].dependencies = [3, 4, 5]
+    items[2].dependencies = [1, 3, 4, 5]
+    items[3].dependencies = []
+    items[4].dependencies = [3, 5]
+    items[5].dependencies = [3]
+    topsorted_values.should == [3, 5, 4, 1, 2, 0]
+  end
+
+  it "should play well with multiple provides case" do
+    items[0].dependencies = [2, 3]
+    items[0].provides     = [0, 10 ,20, 30]
+    items[1].dependencies = [10, 30]
+    items[1].provides     = [1, 21]
+    items[2].dependencies = []
+    items[2].provides     = [2, 32, 42]
+    items[3].dependencies = [42]
+    items[3].provides     = [3, 43, 53]
+    items[4].dependencies = [21]
+    items[4].provides     = [4, 44]
+    items[5].dependencies = [43, 32, 44]
+    items[5].provides     = [5, 55]
+    topsorted_values.should == [2, 3, 0, 1, 4, 5]
+  end
+end

data/spec/shared/class_stubs.rb

@@ -0,0 +1,26 @@
+# Stubs for classes that mimic jsus classes without being actually them
+
+
+class Source
+  attr_accessor :provides
+  attr_accessor :dependencies
+  attr_accessor :content
+
+  def initialize(options = {})
+    options.each do |attr, value|
+      send("#{attr}=", value)
+    end
+  end
+end
+
+
+class Package
+  attr_accessor :name
+
+  def initialize(options = {})
+    options.each do |attr, value|
+      send("#{attr}=", value)
+    end
+  end
+end
+

data/spec/spec_helper.rb

@@ -1,7 +1,9 @@
 require 'lib/jsus'
+Dir["spec/shared/*.rb"].each {|f| require f}
 
 # cleanup compiled stuff
 def cleanup
   `rm -rf spec/data/Basic/public`
   `rm -rf spec/data/OutsideDependencies/public`
+  `rm -rf spec/tmp/`
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Markiz, idea by Inviz (http://github.com/Inviz)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-03 00:00:00 +04:00
+date: 2010-06-04 00:00:00 +04:00
 default_executable: jsus
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -78,9 +78,12 @@ extra_rdoc_files:
 - TODO
 - bin/jsus
 - lib/jsus.rb
-- lib/jsus/bundler.rb
+- lib/jsus/container.rb
 - lib/jsus/package.rb
+- lib/jsus/packager.rb
+- lib/jsus/pool.rb
 - lib/jsus/source_file.rb
+- lib/jsus/topsortable.rb
 files: 
 - CHANGELOG
 - LICENSE
@@ -89,10 +92,14 @@ files:
 - Rakefile
 - TODO
 - bin/jsus
+- jsus.gemspec
 - lib/jsus.rb
-- lib/jsus/bundler.rb
+- lib/jsus/container.rb
 - lib/jsus/package.rb
+- lib/jsus/packager.rb
+- lib/jsus/pool.rb
 - lib/jsus/source_file.rb
+- lib/jsus/topsortable.rb
 - spec/data/Basic/README
 - spec/data/Basic/app/javascripts/Orwik/Source/Library/Color.js
 - spec/data/Basic/app/javascripts/Orwik/Source/Widget/Input/Input.Color.js
@@ -112,12 +119,15 @@ files:
 - spec/data/bad_test_source_one.js
 - spec/data/bad_test_source_two.js
 - spec/data/test_source_one.js
-- spec/lib/jsus/bundler_spec.rb
+- spec/lib/jsus/container_spec.rb
 - spec/lib/jsus/package_spec.rb
+- spec/lib/jsus/packager_spec.rb
+- spec/lib/jsus/pool_spec.rb
 - spec/lib/jsus/source_file_spec.rb
+- spec/lib/jsus/topsortable_spec.rb
+- spec/shared/class_stubs.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- jsus.gemspec
 has_rdoc: true
 homepage: http://github.com/markiz/jsus
 licenses: []

data/lib/jsus/bundler.rb

@@ -1,39 +0,0 @@
-module Jsus
-  class Bundler
-    def initialize(directory)
-      Dir[File.join(directory, "**", "package.yml")].each do |package_name|
-        path = Pathname.new(package_name)
-        Dir.chdir path.parent.parent.to_s do
-          package = Package.new(path.parent.relative_path_from(path.parent.parent).to_s)
-          self.packages << package
-        end
-      end
-      calculate_requirement_order
-    end
-
-
-    attr_writer :packages
-    def packages
-      @packages ||= []
-    end
-
-    attr_accessor :required_files
-
-    def compile(directory)
-      FileUtils.mkdir_p(directory)
-      Dir.chdir directory do
-        packages.each do |package|
-          package.compile(package.relative_directory)
-          package.generate_tree(package.relative_directory)
-        end
-      end
-    end
-
-
-    protected
-    def calculate_requirement_order
-      @packages = Jsus.topsort(packages)
-      @required_files = @packages.map {|p| p.required_files }.flatten
-    end
-  end
-end

data/spec/lib/jsus/bundler_spec.rb

@@ -1,46 +0,0 @@
-require 'spec/spec_helper'
-
-describe Jsus::Bundler do
-  subject { Jsus::Bundler.new(input_dir) }
-  let(:input_dir) { "spec/data/Basic/app/javascripts" }
-  let(:output_dir) { "spec/data/Basic/public/javascripts" }
-  before(:each) { cleanup }
-  after(:all) { cleanup }
-  context "initialization" do
-    context "from a directory" do
-      subject { Jsus::Bundler.new("spec/data/Basic/") }
-      it "should load packages" do
-        subject.packages.map {|p| p.name}.should == ["orwik"]
-        subject.packages.map {|p| p.relative_directory }.should == ["Orwik"]
-      end
-    end
-  end
-
-  describe "#required_files" do
-    it "should return an array with correctly sorted required files" do
-      files = subject.required_files
-      color_index = files.find_index {|f| f =~ /\/Color.js/}
-      input_index = files.find_index {|f| f =~ /\/Input.js/}
-      input_color_index = files.find_index {|f| f =~ /\/Input.Color.js/}
-      color_index.should < input_color_index
-      input_index.should < input_color_index
-    end
-  end
-
-  describe "#compile" do
-    it "should generate scripts.json file with all the dependencies and provides for each package" do
-      subject.compile(output_dir)
-      File.exists?("#{output_dir}/Orwik/scripts.json").should be_true
-    end
-    
-    it "should generate js file for each package" do
-      subject.compile(output_dir)
-      File.exists?("#{output_dir}/Orwik/orwik.js").should be_true
-    end
-
-    it "should generate tree.json file for each package" do
-      subject.compile(output_dir)
-      File.exists?("#{output_dir}/Orwik/tree.json").should be_true
-    end
-  end
-end