lib/navigasmic/builders/map_builder.rb in navigasmic-1.0.0 vs lib/navigasmic/builders/map_builder.rb in navigasmic-1.0.1

@@ -2,29 +2,40 @@
   class MapBuilder < Base
     class Configuration < Base::Configuration
 
       attr_accessor :option_namespace
       attr_accessor :wrapper_tag, :group_tag, :item_tag, :label_generator
+      attr_accessor :xmlns, :xmlns_xsi, :schema_location
+      attr_accessor :changefreq, :item_changefreq
 
       def initialize
         # where you want the changefreq and other options to be looked for
         @option_namespace = :map
 
         # tag configurations
         @wrapper_tag = :urlset
         @item_tag = :url
 
+        # xml namespace / schema
+        @xmlns = 'http://www.sitemaps.org/schemas/sitemap/0.9'
+        @xmlns_xsi = 'http://www.w3.org/2001/XMLSchema-instance'
+        @schema_location = 'http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd'
+
+        # misc defaults
+        @changefreq = 'yearly'
+        @item_changefreq = 'yearly'
+
         super
       end
     end
 
     def initialize(context, name, options, &block)
       super
-      @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'
-      @options[:changefreq] ||= 'yearly'
+      @options['xmlns'] ||= @config.xmlns
+      @options['xmlns:xsi'] ||= @config.xmlns_xsi
+      @options['xsi:schemaLocation'] ||= @config.schema_location
+      @options[:changefreq] ||= @config.changefreq
     end
 
     def render
       content_tag(@config.wrapper_tag, capture(&@definition), @options)
     end
@@ -39,11 +50,11 @@
     def item(label, *args, &block)
       options = args.extract_options!
       options = flatten_and_eval_options(options)
       return '' unless visible?(options)
 
-      item = Navigasmic::Item.new(self, label, extract_and_determine_link(label, options, *args), options)
+      item = Navigasmic::Item.new(label, extract_and_determine_link(label, options, *args), visible?(options), options)
 
       concat(capture(&block)) if block_given?
       return '' unless item.link?
 
       concat(structure_for(label, item.link, options))
@@ -53,11 +64,11 @@
 
     def structure_for(label, link, options, &block)
       content = content_tag(:loc, link_for(link, options))
       content << content_tag(:name, label)
       if opts = options.delete(@config.option_namespace)
-        content << content_tag(:changefreq, opts[:changefreq] || 'yearly')
+        content << content_tag(:changefreq, opts[:changefreq] || @config.item_changefreq)
         content << content_tag(:lastmod, opts[:lastmod]) if opts.has_key?(:lastmod)
         content << content_tag(:priority, opt[:priority]) if opts.has_key?(:priority)
       end
 
       content_tag(@config.item_tag, content.html_safe)
@@ -65,11 +76,12 @@
 
     def link_for(link, options)
       host = options.delete(:host) || @context.request.host
       if link.is_a?(Hash)
         link[:host] ||= host
-      else
-        link = "#{@context.request.protocol}#{host}#{@context.request.port}#{link}"
+      elsif link[0] == '/'
+        port = @context.request.port == 80 ? '' : ":#{@context.request.port}"
+        link = "#{@context.request.protocol}#{host}#{port}#{link}"
       end
       url_for(link)
     end
 
   end