mislav-hanna 0.1.3 → 0.1.4

data/Manifest

@@ -1,19 +1,19 @@
-hanna.gemspec
 bin/hanna
-README.markdown
-Manifest
-lib/hanna/template_page_patch.rb
+hanna.gemspec
+lib/hanna/hanna.rb
 lib/hanna/rdoc_version.rb
-lib/hanna/template_helpers.rb
-lib/hanna/template_files/method_list.haml
-lib/hanna/template_files/styles.sass
+lib/hanna/rdoctask.rb
 lib/hanna/template_files/class_index.haml
-lib/hanna/template_files/layout.haml
+lib/hanna/template_files/file_index.haml
 lib/hanna/template_files/index.haml
+lib/hanna/template_files/layout.haml
+lib/hanna/template_files/method_list.haml
 lib/hanna/template_files/page.haml
 lib/hanna/template_files/sections.haml
-lib/hanna/template_files/file_index.haml
-lib/hanna/rdoctask.rb
-lib/hanna/hanna.rb
+lib/hanna/template_files/styles.sass
+lib/hanna/template_helpers.rb
+lib/hanna/template_page_patch.rb
 lib/hanna.rb
+Manifest
 Rakefile
+README.markdown

data/Rakefile

@@ -6,7 +6,7 @@ require File.join(File.dirname(__FILE__), "lib/hanna/rdoc_version")
 require 'echoe'
 
 Echoe.new('hanna') do |p|
-  p.version = '0.1.3'
+  p.version = '0.1.4'
   
   p.summary = "An RDoc template that rocks"
   p.description = "Hanna is an RDoc template that scales. It's implemented in Haml, making its source clean and maintainable. It's built with simplicity, beauty and ease of browsing in mind."
@@ -20,4 +20,5 @@ Echoe.new('hanna') do |p|
   p.runtime_dependencies = []
   p.runtime_dependencies << ['rdoc', Hanna::RDOC_VERSION_REQUIREMENT]
   p.runtime_dependencies << ['haml', '~> 2.0']
+  p.runtime_dependencies << ['rake', '~> 0.8.2']
 end

data/bin/hanna

@@ -35,7 +35,7 @@ require 'rdoc/rdoc'
 
 options = []
 
-options << '-T' << 'hanna/hanna.rb'
+options << '-T' << 'hanna'
 options << '--inline-source' << '--charset=UTF-8'
 
 if ARGV.first == '--gems'

data/hanna.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Hanna-0.1.3
+# Gem::Specification for Hanna-0.1.4
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: hanna
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
 autorequire: 
 bindir: bin
 
-date: 2008-09-19 00:00:00 -04:00
+date: 2008-09-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,6 +35,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "2.0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.8.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
   type: :development
@@ -53,41 +63,41 @@ extensions: []
 
 extra_rdoc_files: 
 - bin/hanna
-- README.markdown
-- lib/hanna/template_page_patch.rb
+- lib/hanna/hanna.rb
 - lib/hanna/rdoc_version.rb
-- lib/hanna/template_helpers.rb
-- lib/hanna/template_files/method_list.haml
-- lib/hanna/template_files/styles.sass
+- lib/hanna/rdoctask.rb
 - lib/hanna/template_files/class_index.haml
-- lib/hanna/template_files/layout.haml
+- lib/hanna/template_files/file_index.haml
 - lib/hanna/template_files/index.haml
+- lib/hanna/template_files/layout.haml
+- lib/hanna/template_files/method_list.haml
 - lib/hanna/template_files/page.haml
 - lib/hanna/template_files/sections.haml
-- lib/hanna/template_files/file_index.haml
-- lib/hanna/rdoctask.rb
-- lib/hanna/hanna.rb
+- lib/hanna/template_files/styles.sass
+- lib/hanna/template_helpers.rb
+- lib/hanna/template_page_patch.rb
 - lib/hanna.rb
+- README.markdown
 files: 
-- hanna.gemspec
 - bin/hanna
-- README.markdown
-- Manifest
-- lib/hanna/template_page_patch.rb
+- hanna.gemspec
+- lib/hanna/hanna.rb
 - lib/hanna/rdoc_version.rb
-- lib/hanna/template_helpers.rb
-- lib/hanna/template_files/method_list.haml
-- lib/hanna/template_files/styles.sass
+- lib/hanna/rdoctask.rb
 - lib/hanna/template_files/class_index.haml
-- lib/hanna/template_files/layout.haml
+- lib/hanna/template_files/file_index.haml
 - lib/hanna/template_files/index.haml
+- lib/hanna/template_files/layout.haml
+- lib/hanna/template_files/method_list.haml
 - lib/hanna/template_files/page.haml
 - lib/hanna/template_files/sections.haml
-- lib/hanna/template_files/file_index.haml
-- lib/hanna/rdoctask.rb
-- lib/hanna/hanna.rb
+- lib/hanna/template_files/styles.sass
+- lib/hanna/template_helpers.rb
+- lib/hanna/template_page_patch.rb
 - lib/hanna.rb
+- Manifest
 - Rakefile
+- README.markdown
 has_rdoc: false
 homepage: http://github.com/mislav/hanna
 post_install_message: 

data/lib/hanna/hanna.rb

@@ -19,7 +19,7 @@ module RDoc::Generator::HTML::HANNA
       content = names.inject('') { |all, name| all << File.read(File.join(dir, name)) }
       extension = names.first =~ /\.(\w+)$/ && $1
 
-      Hanna::TemplateHelpers.with_no_warnings do
+      Hanna::TemplateHelpers.silence_warnings do
         case extension
         when 'sass'
           Sass::Engine.new(content)

data/lib/hanna/rdoctask.rb

@@ -1,17 +1,15 @@
 require 'hanna/rdoc_version'
-
 require 'rake'
 require 'rake/rdoctask'
 
 Rake::RDocTask.class_eval do
   # don't allow it
-  undef :external=
-    
+  undef :external=, :template=
+  
   # Create the tasks defined by this task lib.
   def define
-    unless @template and @template != 'html'
-      @template = 'hanna'
-    end
+    @template = 'hanna'
+    
     # inline source and UTF-8 are defaults:
     options << '--inline-source' unless options.include? '--inline-source' or options.include? '-S'
     options << '--charset=UTF-8' if options.grep(/^(--charset\b|-c\b)/).empty?
@@ -31,13 +29,13 @@ Rake::RDocTask.class_eval do
       
     directory @rdoc_dir
     task name => [rdoc_target]
-    file rdoc_target => @rdoc_files + [$rakefile] do
+    file rdoc_target => @rdoc_files + [Rake.application.rakefile] do
       rm_r @rdoc_dir rescue nil
       Hanna::require_rdoc
       require 'rdoc/rdoc'
       
       RDoc::RDoc.new.document(option_list + @rdoc_files)
     end
-    self
+    return self
   end
 end

data/lib/hanna/template_files/styles.sass

@@ -16,6 +16,7 @@ body
   :margin 0
   :padding 0
   :background white
+  :color black
     
 #wrapper
   :min-height 100%
@@ -246,15 +247,18 @@ div.header
     :padding 0 0 .5em .5em
 
 #context
-  :font-size 85%
-  :padding-left 1.5em
   :border-top 1px dashed silver
   :margin-top 1em
+  :margin-bottom 1em
   h2
     :color #333
     :font = "bold small-caps 1.3em" !title_font
     :margin .5em 0 .1em 0
-    
+
+#section
+  h3
+    :margin-top 1em
+
 #methods
   h3
     :font = "small-caps 1.2em" !title_font

data/lib/hanna/template_helpers.rb

@@ -17,11 +17,9 @@ module Hanna
       end
     end
 
-    #
     # We need to suppress warnings before calling into HAML because
     # HAML has lots of uninitialized instance variable accesses.
-    #
-    def with_no_warnings
+    def silence_warnings
       save = $-w
       $-w = false
       
@@ -31,7 +29,7 @@ module Hanna
         $-w = save
       end
     end
-    module_function :with_no_warnings
+    module_function :silence_warnings
 
     def debug(text)
       "<pre>#{h YAML::dump(text)}</pre>"

data/lib/hanna/template_page_patch.rb

@@ -5,25 +5,23 @@ RDoc::TemplatePage.class_eval do
   include Hanna::TemplateHelpers
   
   # overwrite the original method
-  alias :old_write_html_on :write_html_on # suppresses a warning
+  alias :old_write_html_on :write_html_on # suppresses the overwrite warning
   def write_html_on(io, values)
     result = @templates.reverse.inject(nil) do |previous, template|
       case template
-        when Haml::Engine
-          with_no_warnings do
-            template.to_html(get_binding, :values => values) { previous }
-          end
-        when Sass::Engine
-          with_no_warnings do
-            template.to_css
-          end
-        when String
-          ERB.new(template).result(get_binding(values){ previous })
-        when nil
-          previous
-        else
-          raise "don't know how to handle a template of class '#{template.class.name}'"
+      when Haml::Engine
+        silence_warnings do
+          template.to_html(get_binding, :values => values) { previous }
         end
+      when Sass::Engine
+        silence_warnings { template.to_css }
+      when String
+        ERB.new(template).result(get_binding(values){ previous })
+      when nil
+        previous
+      else
+        raise "don't know how to handle a template of class '#{template.class.name}'"
+      end
     end
 
     io.write result

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: mislav-hanna
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
 autorequire: 
 bindir: bin
 cert_chain: 
-date: 2008-09-18 21:00:00 -07:00
+date: 2008-09-21 21:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,6 +31,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "2.0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.8.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: echoe
   type: :development
@@ -49,41 +59,41 @@ extensions: []
 
 extra_rdoc_files: 
 - bin/hanna
-- README.markdown
-- lib/hanna/template_page_patch.rb
+- lib/hanna/hanna.rb
 - lib/hanna/rdoc_version.rb
-- lib/hanna/template_helpers.rb
-- lib/hanna/template_files/method_list.haml
-- lib/hanna/template_files/styles.sass
+- lib/hanna/rdoctask.rb
 - lib/hanna/template_files/class_index.haml
-- lib/hanna/template_files/layout.haml
+- lib/hanna/template_files/file_index.haml
 - lib/hanna/template_files/index.haml
+- lib/hanna/template_files/layout.haml
+- lib/hanna/template_files/method_list.haml
 - lib/hanna/template_files/page.haml
 - lib/hanna/template_files/sections.haml
-- lib/hanna/template_files/file_index.haml
-- lib/hanna/rdoctask.rb
-- lib/hanna/hanna.rb
+- lib/hanna/template_files/styles.sass
+- lib/hanna/template_helpers.rb
+- lib/hanna/template_page_patch.rb
 - lib/hanna.rb
+- README.markdown
 files: 
-- hanna.gemspec
 - bin/hanna
-- README.markdown
-- Manifest
-- lib/hanna/template_page_patch.rb
+- hanna.gemspec
+- lib/hanna/hanna.rb
 - lib/hanna/rdoc_version.rb
-- lib/hanna/template_helpers.rb
-- lib/hanna/template_files/method_list.haml
-- lib/hanna/template_files/styles.sass
+- lib/hanna/rdoctask.rb
 - lib/hanna/template_files/class_index.haml
-- lib/hanna/template_files/layout.haml
+- lib/hanna/template_files/file_index.haml
 - lib/hanna/template_files/index.haml
+- lib/hanna/template_files/layout.haml
+- lib/hanna/template_files/method_list.haml
 - lib/hanna/template_files/page.haml
 - lib/hanna/template_files/sections.haml
-- lib/hanna/template_files/file_index.haml
-- lib/hanna/rdoctask.rb
-- lib/hanna/hanna.rb
+- lib/hanna/template_files/styles.sass
+- lib/hanna/template_helpers.rb
+- lib/hanna/template_page_patch.rb
 - lib/hanna.rb
+- Manifest
 - Rakefile
+- README.markdown
 has_rdoc: false
 homepage: http://github.com/mislav/hanna
 post_install_message: