matryoshka 0.0.1 → 0.0.2

data/Manifest

@@ -15,4 +15,5 @@ templates/image.jpg
 templates/index.html
 templates/proxy/index.html
 templates/test/about.html
+templates/test/header.html
 templates/test/index.html

data/Rakefile

@@ -3,9 +3,10 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('matryoshka', '0.0.1') do |p|
-  p.description    = "Rack middleware for parsing html templates."
-  p.url            = "http://samsm.com/"
+Echoe.new('matryoshka', '0.0.2') do |p|
+  p.summary        = "Rack middleware for parsing html templates."
+  p.description    = "Matryoshka is a system for parsing html templates. It merges files based on their position in directories."
+  p.url            = "http://matryoshka.samsm.com/"
   p.author         = "Sam Schenkman-Moore"
   p.email          = "samsm@samsm.com"
   p.ignore_pattern = ["tmp/*", "script/*"]

data/config.ru

@@ -2,6 +2,7 @@
 require 'rubygems'
 require 'rack'
 require 'lib/matryoshka'
+require 'ruby-debug'
 
 use Rack::ShowExceptions
 run Matryoshka.new

data/lib/matryoshka/document/html/merge.rb

@@ -7,6 +7,8 @@ class Matryoshka::Document::Html::Merge
       {:id=>:replace},
       {:before_id=>:before},
       {:after_id=>:append},
+      {:single_tag => :replace},
+      {:header_tag => :end_of_tag},
       {:default=>:end_of_tag}
   ]
   
@@ -38,7 +40,6 @@ class Matryoshka::Document::Html::Merge
     methodologies.each do |methodology|
       methodology.each_pair do |find_method, merge_technique|
         # puts "#{@@round} - Doing #{find_method}:#{merge_technique} on #{additional.to_html[0..50].gsub(/\n/,'')}"
-        # debugger if @@round < 2
         if (mergeable? and corresponding_match(find_method))
           send merge_technique
           return original
@@ -86,12 +87,6 @@ class Matryoshka::Document::Html::Merge
         self.class.new(corresponding,elem,methodologies).run
       end
     end
-    
-  rescue
-    puts '*' * 75
-    puts "#{@@round} - Rescuing: #{additional.class} cannot be children'd"
-    puts "#{@@round} - #{additional}"
-    # debugger
   end
   
   def remerge_original_children
@@ -170,11 +165,7 @@ class Matryoshka::Document::Html::Merge
   end
   
   def nochildren
-    #    Fails on Hpricot::Docs
-    #    
-    #    if original.class == Hpricot::Doc
-    #      return false
-    #    end
+    return original.at('*') unless original.children
     original.children.each do |child|
       if child.class == Hpricot::Elem
         return false
@@ -193,6 +184,15 @@ class Matryoshka::Document::Html::Merge
     original
   end
   
+  def header_tag
+    ['link', 'meta','script'].include?(additional.name) and original.at('head')
+  end
+  
+  # For when there can be only one of a tag
+  def single_tag
+    ['title','head','body'].include?(additional.name) and original.at(additional.name)
+  end
+  
   def mergeable?
     acceptable_classes_for_merging = [Hpricot::Elem, Hpricot::Doc]
     acceptable_classes_for_merging.include? additional.class

data/matryoshka.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{matryoshka}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Schenkman-Moore"]
-  s.date = %q{2009-11-04}
-  s.description = %q{Rack middleware for parsing html templates.}
+  s.date = %q{2009-11-05}
+  s.description = %q{Matryoshka is a system for parsing html templates. It merges files based on their position in directories.}
   s.email = %q{samsm@samsm.com}
   s.extra_rdoc_files = ["lib/matryoshka.rb", "lib/matryoshka/answer.rb", "lib/matryoshka/data.rb", "lib/matryoshka/document.rb", "lib/matryoshka/document/delegate.rb", "lib/matryoshka/document/html.rb", "lib/matryoshka/document/html/merge.rb", "lib/matryoshka/document/unknown.rb", "lib/matryoshka/external.rb"]
-  s.files = ["Manifest", "Rakefile", "config.ru", "lib/matryoshka.rb", "lib/matryoshka/answer.rb", "lib/matryoshka/data.rb", "lib/matryoshka/document.rb", "lib/matryoshka/document/delegate.rb", "lib/matryoshka/document/html.rb", "lib/matryoshka/document/html/merge.rb", "lib/matryoshka/document/unknown.rb", "lib/matryoshka/external.rb", "public/README", "templates/image.jpg", "templates/index.html", "templates/proxy/index.html", "templates/test/about.html", "templates/test/index.html", "matryoshka.gemspec"]
-  s.homepage = %q{http://samsm.com/}
+  s.files = ["Manifest", "Rakefile", "config.ru", "lib/matryoshka.rb", "lib/matryoshka/answer.rb", "lib/matryoshka/data.rb", "lib/matryoshka/document.rb", "lib/matryoshka/document/delegate.rb", "lib/matryoshka/document/html.rb", "lib/matryoshka/document/html/merge.rb", "lib/matryoshka/document/unknown.rb", "lib/matryoshka/external.rb", "public/README", "templates/image.jpg", "templates/index.html", "templates/proxy/index.html", "templates/test/about.html", "templates/test/header.html", "templates/test/index.html", "matryoshka.gemspec"]
+  s.homepage = %q{http://matryoshka.samsm.com/}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Matryoshka"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{matryoshka}

data/templates/test/header.html

@@ -0,0 +1,5 @@
+<div id="content">
+  <p>This tests the header replacement rules.</p>
+  <p>One should be able to replace the title and add stylesheets/javascript</p>
+</div>
+<title>New title</title>

data/templates/test/index.html

@@ -3,6 +3,5 @@
 </div>>
 
 <div rel="external" href="http://samsm.com/">
-  <div id="test"></div>
-  <ul rel="selector" href="ul"></ul>
+  <dl rel="selector" href="dl"></dl>
 </div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: matryoshka
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Sam Schenkman-Moore
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 -05:00
+date: 2009-11-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: Rack middleware for parsing html templates.
+description: Matryoshka is a system for parsing html templates. It merges files based on their position in directories.
 email: samsm@samsm.com
 executables: []
 
@@ -56,10 +56,11 @@ files:
 - templates/index.html
 - templates/proxy/index.html
 - templates/test/about.html
+- templates/test/header.html
 - templates/test/index.html
 - matryoshka.gemspec
 has_rdoc: true
-homepage: http://samsm.com/
+homepage: http://matryoshka.samsm.com/
 licenses: []
 
 post_install_message: