nanoc3 3.0.2 → 3.0.3

data/NEWS.rdoc

@@ -1,5 +1,17 @@
 = nanoc News
 
+== 3.0.3
+
+* The Blogging helper now properly handles item reps without paths
+* The relativize_paths filter now only operates inside tags
+* The autocompiler now handles escaped paths
+* The link_to and tagging helpers now output escaped HTML
+* Fixed played_at attribute assignment in Last.fm data source for tracks
+  playing now and added a now_playing attribute [Nicky Peeters]
+* The filesystem_* data sources can now handle dots in identifiers
+* Required enumerator to make sure #enum_with_index always works
+* Array#stringify_keys now properly recurses
+
 == 3.0.2
 
 * Children-only identifier patterns no longer erroneously also match parent

data/lib/nanoc3.rb

@@ -3,7 +3,7 @@
 module Nanoc3
 
   # The current nanoc version.
-  VERSION = '3.0.2'
+  VERSION = '3.0.3'
 
 end
 

data/lib/nanoc3/base/compiler.rb

@@ -177,7 +177,7 @@ module Nanoc3
 
       # Write if rep is routed
       rep.write unless rep.raw_path.nil?
-
+    ensure
       # Stop
       Nanoc3::NotificationCenter.post(:visit_ended,       rep.item)
       Nanoc3::NotificationCenter.post(:compilation_ended, rep)

data/lib/nanoc3/base/core_ext/array.rb

@@ -2,15 +2,17 @@
 
 module Nanoc3::ArrayExtensions
 
+  # Returns a new array where all items' keys are recursively converted to symbols by calling #symbolize_keys.
   def symbolize_keys
     inject([]) do |array, element|
       array + [ element.respond_to?(:symbolize_keys) ? element.symbolize_keys : element ]
     end
   end
 
+  # Returns a new array where all items' keys are recursively converted to strings by calling #stringify_keys.
   def stringify_keys
     inject([]) do |array, element|
-      array + [ element.respond_to?(:stringify_keys) ? element.symbolize_keys : element ]
+      array + [ element.respond_to?(:stringify_keys) ? element.stringify_keys : element ]
     end
   end
 

data/lib/nanoc3/data_sources/delicious.rb

@@ -32,6 +32,7 @@ module Nanoc3::DataSources
       @items ||= begin
         require 'json'
         require 'time'
+        require 'enumerator'
 
         # Get data
         @http_client ||= Nanoc3::Extra::CHiCk::Client.new

data/lib/nanoc3/data_sources/filesystem_combined.rb

@@ -90,9 +90,9 @@ module Nanoc3::DataSources
 
         # Get actual identifier
         if filename =~ /\/index\.[^\/]+$/
-          identifier = filename.sub(/^content/, '').sub(/index\.[^\/]+$/, '') + '/'
+          identifier = filename.sub(/^content/, '').sub(/index\.[^\/\.]+$/, '') + '/'
         else
-          identifier = filename.sub(/^content/, '').sub(/\.[^\/]+$/, '') + '/'
+          identifier = filename.sub(/^content/, '').sub(/\.[^\/\.]+$/, '') + '/'
         end
 
         # Get mtime
@@ -110,9 +110,9 @@ module Nanoc3::DataSources
 
         # Get actual identifier
         if filename =~ /\/index\.[^\/]+$/
-          identifier = filename.sub(/^layouts/, '').sub(/index\.[^\/]+$/, '') + '/'
+          identifier = filename.sub(/^layouts/, '').sub(/index\.[^\/\.]+$/, '') + '/'
         else
-          identifier = filename.sub(/^layouts/, '').sub(/\.[^\/]+$/, '') + '/'
+          identifier = filename.sub(/^layouts/, '').sub(/\.[^\/\.]+$/, '') + '/'
         end
 
         # Get mtime

data/lib/nanoc3/data_sources/filesystem_compact.rb

@@ -208,7 +208,9 @@ module Nanoc3::DataSources
     # '.rej' or '.bak')
     def content_filename_for_meta_filename(meta_filename)
       # Find all files
-      filenames = Dir[meta_filename.sub(/\.yaml$/, '.*')]
+    	base_filename = File.basename(meta_filename, '.yaml')
+    	dirname       = File.dirname(meta_filename)
+    	filenames     = Dir.entries(dirname).select { |f| f =~ /#{base_filename}\.[^.]+$/ }.map { |f| "#{dirname}/#{f}" }
 
       # Reject meta files
       filenames.reject! { |f| f =~ /\.yaml$/ }

data/lib/nanoc3/data_sources/last_fm.rb

@@ -36,6 +36,7 @@ module Nanoc3::DataSources
         require 'json'
         require 'time'
         require 'uri'
+        require 'enumerator'
 
         # Check configuration
         if self.config[:username].nil?
@@ -80,6 +81,16 @@ module Nanoc3::DataSources
 
           # Build data
           content = ''
+
+          # Handle track dates
+          if raw_item['@attr'] && raw_item['@attr']['nowplaying'] == 'true'
+            track_played_at = Time.now
+            now_playing = true
+          else
+            played_at = Time.parse(raw_item['date']['#text'])
+            now_playing = false
+          end
+          
           attributes = {
             :name      => raw_item['name'],
             :artist    => {
@@ -87,7 +98,8 @@ module Nanoc3::DataSources
               :url       => raw_artist_info['url']
             },
             :url       => raw_item['url'],
-            :played_at => Time.parse(raw_item['date']['#text'])
+            :played_at => track_played_at,
+            :now_playing => now_playing
           }
           identifier = "/#{i}/"
           mtime = nil

data/lib/nanoc3/data_sources/last_fm.rb.orig

@@ -0,0 +1,104 @@
+# encoding: utf-8
+
+module Nanoc3::DataSources
+
+  # Nanoc3::DataSources::LastFM provides data about recently played tracks
+  # from from a single Last.fm user as items (Nanoc3::Item instances).
+  #
+  # The configuration must have a "username" attribute containing the username
+  # of the account from which to fetch the data, and an "api_key" attribute
+  # containing the API key (which can be obtained from the Last.fm site).
+  #
+  # The items returned by this data source will be mounted at {root}/{id},
+  # where +id+ is a sequence number that is not necessarily unique for this
+  # bookmark (because delicious.com unfortunately does not provide unique IDs
+  # for each track).
+  #
+  # The items returned by this data source will have the following attributes:
+  #
+  # +:name+:: The name of the track.
+  #
+  # +played_at+:: The timestamp when the track was played (a Time instance).
+  #
+  # +url+:: The Last.fm URL corresponding to the track (a String instance).
+  #
+  # +artist+:: A hash containing information about the track's artist.
+  #
+  # The +artist+ hash consists of the following keys:
+  #
+  # +name+:: The name of the artist.
+  #
+  # +url+:: The Last.fm URL corresponding to the artist (a String instance).
+  class LastFM < Nanoc3::DataSource
+
+    def items
+      @items ||= begin
+        require 'json'
+        require 'time'
+        require 'uri'
+        require 'enumerator'
+
+        # Check configuration
+        if self.config[:username].nil?
+          raise RuntimeError, "LastFM data source requires a username in the configuration"
+        end
+        if self.config[:api_key].nil?
+          raise RuntimeError, "LastFM data source requires an API key in the configuration"
+        end
+
+        # Get data
+        @http_client ||= Nanoc3::Extra::CHiCk::Client.new
+        status, headers, data = *@http_client.get(
+          'http://ws.audioscrobbler.com/2.0/' +
+            '?method=user.getRecentTracks' +
+            '&format=json' +
+            '&user=' + URI.escape(self.config[:username]) +
+            '&api_key=' + URI.escape(self.config[:api_key])
+        )
+
+        # Parse as JSON
+        parsed_data = JSON.parse(data)
+        raw_items = parsed_data['recenttracks']['track']
+
+        # Convert to items
+        raw_items.enum_with_index.map do |raw_item, i|
+          # Get artist data
+          artist_status, artist_headers, artist_data = *@http_client.get(
+            'http://ws.audioscrobbler.com/2.0/' +
+              '?method=artist.getInfo' +
+              '&format=json' +
+              (
+                raw_item['artist']['mbid'].empty? ?
+                '&artist=' + URI.escape(raw_item['artist']['#text']) :
+                '&mbid=' + URI.escape(raw_item['artist']['mbid'])
+              ) +
+              '&api_key=' + URI.escape(self.config[:api_key])
+          )
+
+          # Parse as JSON
+          parsed_artist_data = JSON.parse(artist_data)
+          raw_artist_info = parsed_artist_data['artist']
+
+          # Build data
+          content = ''
+          attributes = {
+            :name      => raw_item['name'],
+            :artist    => {
+              :name      => raw_artist_info['name'],
+              :url       => raw_artist_info['url']
+            },
+            :url       => raw_item['url'],
+            :played_at => Time.parse(raw_item['date']['#text'])
+          }
+          identifier = "/#{i}/"
+          mtime = nil
+
+          # Build item
+          Nanoc3::Item.new(content, attributes, identifier, mtime)
+        end
+      end
+    end
+
+  end
+
+end

data/lib/nanoc3/data_sources/twitter.rb

@@ -22,6 +22,7 @@ module Nanoc3::DataSources
       @item ||= begin
         require 'json'
         require 'time'
+        require 'enumerator'
 
         # Get data
         @http_client ||= Nanoc3::Extra::CHiCk::Client.new

data/lib/nanoc3/extra/auto_compiler.rb

@@ -27,7 +27,7 @@ module Nanoc3::Extra
         build_site
 
         # Find rep
-        path = env['PATH_INFO']
+        path = Rack::Utils::unescape(env['PATH_INFO'])
         reps = site.items.map { |i| i.reps }.flatten
         rep = reps.find { |r| r.path == path }
 

data/lib/nanoc3/filters/relativize_paths.rb

@@ -13,8 +13,8 @@ module Nanoc3::Filters
       # Filter
       case params[:type]
       when :html
-        content.gsub(/(src|href)=(['"]?)(\/.+?)\2([ >])/) do
-          $1 + '=' + $2 + relative_path_to($3) + $2 + $4
+        content.gsub(/(<[^>]+\s+(src|href))=(['"]?)(\/.+?)\3([ >])/) do
+          $1 + '=' + $3 + relative_path_to($4) + $3 + $5
         end
       when :css
         content.gsub(/url\((['"]?)(\/.+?)\1\)/) do

data/lib/nanoc3/helpers/blogging.rb

@@ -173,6 +173,10 @@ module Nanoc3::Helpers
 
         # Add articles
         sorted_relevant_articles.each do |a|
+          # Get URL
+          url = url_for(a)
+          next if url.nil?
+
           xml.entry do
             # Add primary attributes
             xml.id        atom_tag_for(a)
@@ -183,7 +187,7 @@ module Nanoc3::Helpers
             xml.updated   a.mtime.to_iso8601_time
 
             # Add link
-            xml.link(:rel => 'alternate', :href => url_for(a))
+            xml.link(:rel => 'alternate', :href => url)
 
             # Add content
             summary = excerpt_proc.call(a)
@@ -204,7 +208,12 @@ module Nanoc3::Helpers
         raise RuntimeError.new('Cannot build Atom feed: site configuration has no base_url')
       end
 
-      @site.config[:base_url] + (item[:custom_path_in_feed] || item.reps[0].path)
+      # Get path
+      path = item[:custom_path_in_feed] || item.reps[0].path
+      return nil if path.nil?
+
+      # Build URL
+      @site.config[:base_url] + path
     end
 
     # Returns the URL of the feed. It will return the custom feed URL if set,

data/lib/nanoc3/helpers/link_to.rb

@@ -44,7 +44,7 @@ module Nanoc3::Helpers
       end
 
       # Create link
-      "<a #{attributes}href=\"#{path}\">#{text}</a>"
+      "<a #{attributes}href=\"#{h path}\">#{text}</a>"
     end
 
     # Creates a HTML link using link_to, except when the linked item is the

data/lib/nanoc3/helpers/tagging.rb

@@ -13,6 +13,9 @@ module Nanoc3::Helpers
   #   include Nanoc3::Helpers::Tagging
   module Tagging
 
+    require 'nanoc3/helpers/html_escape'
+    include Nanoc3::Helpers::HTMLEscape
+
     # Returns a formatted list of tags for the given item as a string. Several
     # parameters allow customization:
     #
@@ -50,7 +53,7 @@ module Nanoc3::Helpers
     # +base_url+:: The URL to which the tag will be appended to construct the
     #              link URL. This URL must have a trailing slash.
     def link_for_tag(tag, base_url)
-      %[<a href="#{base_url}#{tag}" rel="tag">#{tag}</a>]
+      %[<a href="#{h base_url}#{h tag}" rel="tag">#{h tag}</a>]
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nanoc3
 version: !ruby/object:Gem::Version 
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors: 
 - Denis Defreyne
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-07 00:00:00 +01:00
+date: 2010-01-07 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -73,6 +73,7 @@ files:
 - lib/nanoc3/data_sources/filesystem_common.rb
 - lib/nanoc3/data_sources/filesystem_compact.rb
 - lib/nanoc3/data_sources/last_fm.rb
+- lib/nanoc3/data_sources/last_fm.rb.orig
 - lib/nanoc3/data_sources/twitter.rb
 - lib/nanoc3/data_sources.rb
 - lib/nanoc3/extra/auto_compiler.rb