navigasmic 0.2.0 → 0.3.0

data/README.textile

@@ -196,8 +196,60 @@ h3. ERB
 
 h3. XML
 
+The XML Builder isn't hashed out completely, but it more or less generates google sitemap style xml.  I don't know if the format is entirely correct in terms of nesting (it would make sense if it is), and I'd invite anyone who would like to hash it out more to do so.
+
+*Simple Usage Using Builder*
+
+<pre>
+  xml.instruct! :xml, :version => '1.0', :encoding => 'UTF-8'
+  semantic_navigation :primary, :builder => Navigasmic::XmlNavigationBuilder do |n|
+    n.group 'Media' do
+      n.item 'Image Gallery', :link => {:controller => 'media/images', :action => 'index'}
+      n.item 'Videos', :link => {:controller => 'media/videos'}, :changefreq => 'monthly'
+    end
+	end
+</pre>
+  ...produces...
+<pre>
+  <?xml version="1.0" encoding="UTF-8"?>
+  <urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
+    <urlset>
+      <url>
+        <loc>http://host:port/media/images</loc>
+        <changefreq>yearly</changefreq>
+      </url>
+      <url>
+        <loc>http://host:port/media/videos</loc>
+        <changefreq>monthly</changefreq>
+      </url>
+    </urlset>
+  </urlset>
+</pre>
+
+*Simple Usage Using HAML*
+
+<pre>
+  - semantic_navigation :primary, :builder => Navigasmic::XmlNavigationBuilder, :changefreq => 'daily' do |n|
+    = n.item 'Image Gallery', :link => {:controller => 'media/images', :action => 'index'}
+    = n.item 'Videos', :link => {:controller => 'media/videos'}, :changefreq => 'monthly'
+</pre>
+  ...produces...
+<pre>
+  <urlset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
+    <url>
+      <loc>http://host:port/media/images</loc>
+      <changefreq>daily</changefreq>
+    </url>
+    <url>
+      <loc>http://host:port/media/videos</loc>
+      <changefreq>monthly</changefreq>
+    </url>
+  </urlset>
+</pre>
+
+Tip: You can check the template_format and use the XML Builder when it's :xml, and the HTML Builder if not.
 <pre>
-...Still working on the xml builder...
+  :builder => template_format == :xml ? Navigasmic::XmlNavigationBuilder : nil
 </pre>
 
 h3. Other

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/builders/xml_builder.rb

@@ -1,36 +1,36 @@
 module Navigasmic
   class XmlNavigationBuilder
 
-    @@classnames = {
-      :with_group => 'with-group',
-      :disabled => 'disabled',
-      :highlighted => 'highlighted'
-    }
+    @@wrapper_tag = :urlset
+    @@group_tag = :urlset
+    @@item_tag = :url
 
-    attr_accessor :template, :name, :items
+    attr_accessor :template, :name, :items, :host
 
     def initialize(template, name, options = {}, &proc)
       @template, @name, @items = template, name.to_s, []
-      render(options.delete(:html), &proc)
+      @host = options[:host] || "http://#{template.request.host_with_port}"
+      @changefreq = options[:changefreq] || 'yearly'
+      render(options.delete(:xml), &proc)
     end
 
     def render(options, &proc)
       buffer = template.capture(self, &proc)
-      template.concat(template.content_tag(:ol, buffer, options))
+
+      options ||= {}
+      options['xmlns'] ||= 'http://www.sitemaps.org/schemas/sitemap/0.9'
+      options['xmlns:xsi'] ||= 'http://www.w3.org/2001/XMLSchema-instance'
+      options['xsi:schemaLocation'] ||= 'http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd'
+
+      template.concat(template.content_tag(@@wrapper_tag, buffer, options))
     end
 
     def group(label = nil, options = {}, &proc)
       raise ArgumentError, "Missing block" unless block_given?
 
-      options[:html] ||= {}
-      options[:html][:class] = template.add_class(options[:html][:class], @@classnames[:with_group])
-      options[:html][:id] ||= label.to_s.gsub(/\s/, '_').underscore
-
       buffer = template.capture(self, &proc)
-      group = template.content_tag(:ol, buffer)
-      label = label_for_group(label) unless label.blank?
-
-      template.content_tag(:li, label.to_s + group, options.delete(:html))
+      template.concat(template.content_tag(@@group_tag, buffer))
+      ''
     end
 
     def item(label, options = {}, &proc)
@@ -38,24 +38,13 @@ module Navigasmic
 
       item = NavigationItem.new(label, options, template)
 
-      options[:html] ||= {}
-      options[:html][:id] ||= label.to_s.gsub(/\s/, '_').underscore
-
-      options[:html][:class] = template.add_class(options[:html][:class], @@classnames[:disabled]) if item.disabled?
-      options[:html][:class] = template.add_class(options[:html][:class], @@classnames[:highlighted]) if item.highlighted?(template.request.path, template.params)
-
-      label = label_for_item(label)
-      label = template.link_to(label, item.link) unless item.link.empty?
-
-      template.content_tag(:li, label + buffer, options.delete(:html))
-    end
-
-    def label_for_group(label)
-      template.content_tag(:span, label.to_s)
-    end
-
-    def label_for_item(label)
-      template.content_tag(:span, label.to_s)
+      contents = template.content_tag(:loc, @host + template.url_for(item.link))
+      contents << template.content_tag(:changefreq, options[:changefreq] || @changefreq)
+      contents << template.content_tag(:lastmod, options[:lastmod]) if options[:lastmod]
+      contents << template.content_tag(:priority, options[:priority]) if options[:priority]
+      
+      template.concat(template.content_tag(@@item_tag, contents + buffer, options.delete(:xml)))
+      ''
     end
 
   end

data/lib/navigasmic.rb

@@ -1,6 +1,6 @@
 # coding: utf-8
-require File.join(File.dirname(__FILE__), *%w[builders html_builder])
-require File.join(File.dirname(__FILE__), *%w[builders xml_builder])
+require 'builders/html_builder'
+require 'builders/xml_builder'
 
 module Navigasmic #:nodoc:
 
@@ -41,7 +41,7 @@ module Navigasmic #:nodoc:
       options[:html][:class] = add_class(options[:html][:class], 'semantic-navigation')
       options[:html][:id] ||= name.to_s.underscore
 
-      builder = options[:builder] || HtmlNavigationBuilder
+      builder = options.delete(:builder) || HtmlNavigationBuilder
       builder.new(@template, name, options, &proc)
     end
 

data/navigasmic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{navigasmic}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Jackson"]
-  s.date = %q{2010-02-06}
+  s.date = %q{2010-02-08}
   s.description = %q{Semantic navigation; a semantic way to build beautifully simple navigation structures in Rails.}
   s.email = %q{jejacks0n@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: navigasmic
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Jeremy Jackson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-06 00:00:00 -07:00
+date: 2010-02-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency