jsus 0.1.13 → 0.1.14

data/VERSION

@@ -1 +1 @@
-0.1.13
+0.1.14

data/autotest/discover.rb

@@ -0,0 +1 @@
+Autotest.add_discovery { "rspec2" }

data/bin/jsus

@@ -102,18 +102,39 @@ unless Choice.choices[:docs_classes].empty?
   doc_dir = Choice.choices[:output_directory] + "/docs"
   FileUtils.mkdir_p(doc_dir)
   template = File.dirname(__FILE__) + "/../markup/template.haml"
+  sources_index = {}
   documented_sources.each do |source|
-    content = source.original_content.gsub(/\A\s*\/\*.*?\*\//m, "") # deleting initial comment
+    skipped_lines = 0
+    content = source.original_content.gsub(/\A\s*\/\*.*?\*\//m) {|w| skipped_lines += w.split("\n").size; "" } # deleting initial comment
     annotator = Murdoc::Annotator.new(content, :javascript, :highlight_source => true)
     header = source.header
-    File.open("#{doc_dir}/#{File.basename(source.filename)}.html", "w+") do |f|
-      f.puts Murdoc::Formatter.new(template).render(:paragraphs => annotator.paragraphs, :header => header, :source => source)
+    sources_index[source.package.name] ||= []
+    source_dir = "#{doc_dir}/#{source.package.name}"
+    FileUtils.mkdir_p(source_dir)
+    File.open("#{source_dir}/#{File.basename(source.filename)}.html", "w+") do |f|
+      sources_index[source.package.name] << File.basename(source.filename)
+      f.puts Murdoc::Formatter.new(template).render(:paragraphs => annotator.paragraphs, :header => header, :source => source, :skipped_lines => skipped_lines)
     end
   end
 
   FileUtils.cp(File.dirname(__FILE__) + "/../markup/stylesheet.css", doc_dir)
+
+  # building indices
+  sources_index.each do |pkg, sources_names|
+    source_dir = "#{doc_dir}/#{pkg}"
+    FileUtils.cp("#{doc_dir}/stylesheet.css", source_dir)
+    File.open("#{source_dir}/index.html", "w+") do |f|
+      f.puts Haml::Engine.new(File.read(File.dirname(__FILE__) + "/../markup/index.haml")).render(self, :package => pkg, :sources => sources_names)
+    end
+  end
+
+  # building main index of packages
+  File.open("#{doc_dir}/index.html", "w+") do |f|
+    f.puts Haml::Engine.new(File.read(File.dirname(__FILE__) + "/../markup/packages_index.haml")).render(self, :packages => sources_index.keys)
+  end
 end
 
+
 finish_time = Time.now
 
 

data/jsus.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jsus}
-  s.version = "0.1.13"
+  s.version = "0.1.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Abramov"]
-  s.date = %q{2010-11-23}
+  s.date = %q{2010-11-24}
   s.default_executable = %q{jsus}
   s.description = %q{Javascript packager and dependency resolver}
   s.email = %q{markizko@gmail.com}
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
     "TODO"
   ]
   s.files = [
-    ".autotest",
     ".document",
     ".rspec",
     "CHANGELOG",
@@ -32,6 +31,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "TODO",
     "VERSION",
+    "autotest/discover.rb",
     "bin/jsus",
     "jsus.gemspec",
     "lib/jsus.rb",
@@ -41,6 +41,8 @@ Gem::Specification.new do |s|
     "lib/jsus/pool.rb",
     "lib/jsus/source_file.rb",
     "lib/jsus/tag.rb",
+    "markup/index.haml",
+    "markup/packages_index.haml",
     "markup/stylesheet.css",
     "markup/template.haml",
     "spec/data/Basic/README",
@@ -91,12 +93,12 @@ Gem::Specification.new do |s|
     "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/tag_spec.rb",
+    "spec/jsus/container_spec.rb",
+    "spec/jsus/package_spec.rb",
+    "spec/jsus/packager_spec.rb",
+    "spec/jsus/pool_spec.rb",
+    "spec/jsus/source_file_spec.rb",
+    "spec/jsus/tag_spec.rb",
     "spec/shared/class_stubs.rb",
     "spec/spec_helper.rb"
   ]
@@ -106,12 +108,12 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Javascript packager and dependency resolver}
   s.test_files = [
-    "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/tag_spec.rb",
+    "spec/jsus/container_spec.rb",
+    "spec/jsus/package_spec.rb",
+    "spec/jsus/packager_spec.rb",
+    "spec/jsus/pool_spec.rb",
+    "spec/jsus/source_file_spec.rb",
+    "spec/jsus/tag_spec.rb",
     "spec/shared/class_stubs.rb",
     "spec/spec_helper.rb"
   ]

data/markup/index.haml

@@ -0,0 +1,10 @@
+%html
+  %head
+    %title Index for #{package} documentation
+    %link{:rel => "stylesheet", :href => "stylesheet.css"}
+%body
+  %h1 List of package #{package} contents
+  %ul
+    - sources.each do |source|
+      %li
+        %a{:href => "#{source}.html"}= source

data/markup/packages_index.haml

@@ -0,0 +1,10 @@
+%html
+  %head
+    %title Index for documentation
+    %link{:rel => "stylesheet", :href => "stylesheet.css"}
+%body
+  %h1 List of packages
+  %ul
+    - packages.each do |package|
+      %li
+        %a{:href => "#{package}/index.html"}= package

data/markup/template.haml

@@ -43,5 +43,5 @@
         %figure
           %ol
             - 1.upto(paragraph.source.split("\n").size) do |line|
-              %li #{line + paragraph.starting_line}          
+              %li #{line + paragraph.starting_line + skipped_lines}          
           %code<= paragraph.formatted_source

data/spec/{lib/jsus → jsus}/source_file_spec.rb

@@ -18,6 +18,10 @@ describe Jsus::SourceFile do
         subject.filename.should == File.expand_path("spec/data/test_source_one.js")
       end
 
+      it "should set original_content to file content" do
+        subject.original_content.should == File.read(subject.filename)
+      end
+
       context "when format is invalid" do
         it "should return nil" do
           Jsus::SourceFile.from_file('spec/data/bad_test_source_one.js').should == nil

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 13
-  version: 0.1.13
+  - 14
+  version: 0.1.14
 platform: ruby
 authors: 
 - Mark Abramov
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-23 00:00:00 +03:00
+date: 2010-11-24 00:00:00 +03:00
 default_executable: jsus
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -184,7 +184,6 @@ extra_rdoc_files:
 - README
 - TODO
 files: 
-- .autotest
 - .document
 - .rspec
 - CHANGELOG
@@ -196,6 +195,7 @@ files:
 - Rakefile
 - TODO
 - VERSION
+- autotest/discover.rb
 - bin/jsus
 - jsus.gemspec
 - lib/jsus.rb
@@ -205,6 +205,8 @@ files:
 - lib/jsus/pool.rb
 - lib/jsus/source_file.rb
 - lib/jsus/tag.rb
+- markup/index.haml
+- markup/packages_index.haml
 - markup/stylesheet.css
 - markup/template.haml
 - spec/data/Basic/README
@@ -255,12 +257,12 @@ files:
 - 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/tag_spec.rb
+- spec/jsus/container_spec.rb
+- spec/jsus/package_spec.rb
+- spec/jsus/packager_spec.rb
+- spec/jsus/pool_spec.rb
+- spec/jsus/source_file_spec.rb
+- spec/jsus/tag_spec.rb
 - spec/shared/class_stubs.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -277,7 +279,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1185477459181873182
+      hash: -4334832841709873264
       segments: 
       - 0
       version: "0"
@@ -297,11 +299,11 @@ signing_key:
 specification_version: 3
 summary: Javascript packager and dependency resolver
 test_files: 
-- 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/tag_spec.rb
+- spec/jsus/container_spec.rb
+- spec/jsus/package_spec.rb
+- spec/jsus/packager_spec.rb
+- spec/jsus/pool_spec.rb
+- spec/jsus/source_file_spec.rb
+- spec/jsus/tag_spec.rb
 - spec/shared/class_stubs.rb
 - spec/spec_helper.rb

data/.autotest

@@ -1,22 +0,0 @@
-require 'autotest/growl'
-# $LOAD_PATH.unshift(File.join(File.dirname(File.expand_path(__FILE__)), 'spec' ))
-
-Autotest.add_hook :initialize do |at|
-  at.clear_mappings
-  at.libs = %w[. lib spec].join(File::PATH_SEPARATOR)
-  %w{.svn .hg .git}.each {|exception|at.add_exception(exception)}
-
-  
-  at.add_mapping %r%^spec/(.*)_spec\.rb% do |f, _|
-    f
-  end
-
-  at.add_mapping %r%^lib/(.*)\.rb% do |_, m|
-    possible = File.basename(m[1])
-    dirname  = File.dirname(m[1])
-    at.files_matching(%r%spec/lib/#{possible}_spec\.rb%) + 
-       at.files_matching(%r%spec/lib/#{dirname}/#{possible}_spec\.rb%)
-  end
-  
-
-end