fnando-glue 0.0.4 → 0.0.5

data/README.markdown

@@ -23,6 +23,13 @@ Just run `glue /some/path` to generate your site skeleton.
 
 [TODO: Write more about it]
 
+RUNNING TESTS
+-------------
+
+Install the <http://github.com/fnando/rspec-hpricot-matchers> gem.
+
+Then run `rake spec` or just `rake`.
+
 TODO
 ----
 

data/Rakefile

@@ -1,5 +1,6 @@
 require "rake"
 require File.dirname(__FILE__) + "/lib/glue"
+require "spec/rake/spectask"
 
 PKG_FILES = %w(Rakefile glue.gemspec README.markdown) + Dir["{bin,lib,templates}/**/*"]
 
@@ -74,3 +75,8 @@ namespace :gem do
     system "rm *.gem"
   end
 end
+
+task :default => :spec
+Spec::Rake::SpecTask.new do |t|
+  t.spec_opts = ["-c", "-f s"]
+end

data/glue.gemspec

@@ -47,7 +47,7 @@ Gem::Specification.new do |s|
  "templates/style.sass"]
   s.authors = ["Nando Vieira"]
   s.required_rubygems_version = ">= 0"
-  s.version = "0.0.4"
+  s.version = "0.0.5"
   s.has_rdoc = true
   s.email = ["fnando.vieira@gmail.com"]
 end

data/lib/glue.rb

@@ -1,5 +1,5 @@
 module Glue
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end
 
 # add glue lib to load path

data/lib/glue/template/feed.rb

@@ -17,12 +17,12 @@ module Glue
         
         # instantiate builder
         xml = Builder::XmlMarkup.new(:target => file, :indent => 2)
-        xml.instruct! :xml, :version => "1.1", :encoding => "UTF-8"
+        xml.instruct! :xml, :version => "1.0", :encoding => "UTF-8"
         
         feed_opts = {
           "xmlns" => "http://www.w3.org/2005/Atom",
           "xml:lang" => config[:site][:language],
-          "xml:base" => "http://www.example.org"
+          "xml:base" => config[:site][:base_url]
         }
         
         xml.feed(feed_opts) do
@@ -30,10 +30,15 @@ module Glue
           xml.id config[:site][:base_url]
           
           # set title
-          xml.title config[:site][:title]
+          xml.title { xml.cdata! config[:site][:title] }
           
           # set description
-          xml.subtitle config[:site][:description]
+          xml.subtitle { xml.cdata! config[:site][:description] }
+          
+          # set author
+          xml.author do
+            xml.name { xml.cdata! config[:site][:title] }
+          end
           
           # set link to site
           xml.link(:href => config[:site][:base_url])
@@ -47,15 +52,12 @@ module Glue
           # add generator info
           xml.generator("Glue", :uri => "http://github.com/fnando/glue", :version => Glue::VERSION)
           
-          # set language
-          xml.language config[:site][:language]
-          
           filtered_items.each do |options|
             url = File.join(config[:site][:base_url], options[:path])
             
             xml.entry do
-              xml.title options[:title]
-              xml.summary options[:description]
+              xml.title { xml.cdata! options[:title] }
+              xml.summary { xml.cdata! options[:description] }
               xml.updated options[:updated_at].xmlschema
               xml.link :rel => "alternate", :type => "text/html", :href => url
               xml.id url

data/lib/glue/template/helper.rb

@@ -2,16 +2,30 @@ module Glue
   module Template
     class Helper
       def config
-        @config ||= YAML.load_file(GLUE_ROOT + "/config/glue.yml")
+        @config ||= Glue::Config.new
       end
       
-      def url_for(path)
-        uri = URI.parse(config["base_url"])
+      def feed_tag
+        haml '%link{"href" => url_for("feed.xml", :full => true), "rel" => "alternate", "title" => config[:site][:title], "type" => "application/atom+xml"}'
+      end
+      
+      def url_for(path, options={})
+        uri = URI.parse(config[:site][:base_url])
+        
+        host = uri.scheme + "://" + uri.host
+        host << ":#{uri.port}" unless (uri.scheme == "http" && uri.port == 80) || (uri.scheme == "https" && uri.port == 443)
+        
         base_path = uri.path.chomp("/")
         
-        path = File.join(base_path, path)
-        path << ".html" if config["use_extension"] && base_path !~ /\.html$/
-        path
+        parts = []
+        parts << host if options[:full]
+        parts << base_path
+        parts << path
+        
+        url = File.join(*parts)
+        
+        url << ".html" if config[:site][:friendly_url] == false && url !~ /\.[a-z0-9]+$/
+        url
       end
       
       def markdown(text)

data/templates/main.haml

@@ -10,6 +10,7 @@
     %meta{"http-equiv" => "last-update", "content" => last_update}
     %link{"rel" => "shortcut icon", "href" => "/favicon.ico", "type" => "image/x-icon"}
     %link{"rel" => "stylesheet", "href" => "/stylesheets/style.css", "type" => "text/css"}
+    = feed_tag
     
   %body{"id" => id}
     #page

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fnando-glue
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Nando Vieira