dropcaster 0.0.4 → 0.0.5.rc1

data/lib/dropcaster/item.rb

@@ -1,47 +1,28 @@
-require 'mp3info'
-require 'digest/sha1'
-
-module Dropcaster
-  class Item < DelegateClass(Hash)
-    include HashKeys
-
-    def initialize(file_path, options = nil)
-      super(Hash.new)
-
-      Mp3Info.open(file_path){|mp3info|
-        self[:file_name] = Pathname.new(File.expand_path(file_path)).relative_path_from(Pathname.new(Dir.pwd)).cleanpath.to_s
-        self[:tag] = mp3info.tag
-        self[:tag2] = mp3info.tag2
-        self[:duration] = mp3info.length
-      }
-
-      self[:file_size] = File.new(self.file_name).stat.size
-      self[:uuid] = Digest::SHA1.hexdigest(File.read(self.file_name))
-
-      unless self.tag2.TDR.blank?
-        self[:pub_date] = DateTime.parse(self.tag2.TDR)
-      else
-        Dropcaster.logger.info("#{file_path} has no pub date set, using the file's modification time")
-        self[:pub_date] = DateTime.parse(File.new(self.file_name).mtime.to_s)
-      end
-
-      # Remove iTunes normalization crap (if configured)
-      if options && options[:strip_itunes_private]
-        Dropcaster.logger.info("Removing iTunes' private normalization information from comments")
-        self.tag2.COM.delete_if{|comment|
-          comment =~ /^( [0-9A-F]{8}){10}$/
-        }
-      end
-
-      # Convert lyrics frame into a hash, keyed by the three-letter language code
-      if tag2.ULT
-        lyrics_parts = tag2.ULT.split(0.chr)
-
-        if lyrics_parts && 3 == lyrics_parts.size
-          self.lyrics = Hash.new
-          self.lyrics[lyrics_parts[1]] = lyrics_parts[2]
-        end
-      end
-    end
-  end
-end
+require 'mp3info'
+require 'digest/sha1'
+
+module Dropcaster
+  class Item
+    attr_reader :file_name, :tag, :tag2, :duration, :file_size, :uuid, :pub_date, :pub_date, :lyrics
+    attr_accessor :artist, :image_url, :url, :keywords
+
+    def initialize(file_path, options = nil)
+      Mp3Info.open(file_path){|mp3info|
+        @file_name = Pathname.new(File.expand_path(file_path)).relative_path_from(Pathname.new(Dir.pwd)).cleanpath.to_s
+        @tag = mp3info.tag
+        @tag2 = mp3info.tag2
+        @duration = mp3info.length
+      }
+
+      @file_size = File.new(@file_name).stat.size
+      @uuid = Digest::SHA1.hexdigest(File.read(file_name))
+
+      unless tag2.TDR.blank?
+        @pub_date = DateTime.parse(tag2.TDR)
+      else
+        Dropcaster.logger.info("#{file_path} has no pub date set, using the file's modification time")
+        @pub_date = DateTime.parse(File.new(file_name).mtime.to_s)
+      end
+    end
+  end
+end

data/lib/dropcaster/log_formatter.rb

@@ -1,9 +1,9 @@
-require 'logger'
-
-module Dropcaster
-  class LogFormatter < Logger::Formatter
-    def call(severity, time, program_name, message)
-      "#{severity}: #{message}\n"
-    end
-  end
-end
+require 'logger'
+
+module Dropcaster
+  class LogFormatter < Logger::Formatter
+    def call(severity, time, program_name, message)
+      "#{severity}: #{message}\n"
+    end
+  end
+end

data/lib/dropcaster/version.rb

@@ -0,0 +1,3 @@
+module Dropcaster
+  VERSION = '0.0.5.rc1'
+end

data/lib/dropcaster.rb

@@ -1,30 +1,28 @@
-$:.unshift File.dirname(__FILE__)
-
-require 'bundler/setup'
-require 'delegate'
-require 'yaml'
-require 'active_support/core_ext/date_time/conversions'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/module/attribute_accessors'
-require 'logger'
-require 'active_support/core_ext/logger'
-
-require 'dropcaster/errors'
-require 'dropcaster/log_formatter'
-require 'dropcaster/hashkeys'
-require 'dropcaster/channel'
-require 'dropcaster/item'
-require 'dropcaster/channel_file_locator'
-
-module Dropcaster
-  VERSION = File.read(File.join(File.dirname(__FILE__), *%w[.. VERSION]))
-  CHANNEL_YML = 'channel.yml'
-  
-  mattr_accessor :logger
-  
-  unless @@logger
-    @@logger = Logger.new(STDERR)
-    @@logger.level = Logger::WARN
-    @@logger.formatter = LogFormatter.new
-  end
-end
+$:.unshift File.dirname(__FILE__)
+
+require 'bundler/setup'
+require 'yaml'
+require 'active_support/core_ext/date_time/conversions'
+require 'active_support/core_ext/object/blank'
+require 'active_support/core_ext/module/attribute_accessors'
+
+require 'logger'
+require 'active_support/core_ext/logger'
+
+require 'dropcaster/errors'
+require 'dropcaster/log_formatter'
+require 'dropcaster/channel'
+require 'dropcaster/item'
+require 'dropcaster/channel_file_locator'
+
+module Dropcaster
+  CHANNEL_YML = 'channel.yml'
+
+  mattr_accessor :logger
+
+  unless @@logger
+    @@logger = Logger.new(STDERR)
+    @@logger.level = Logger::WARN
+    @@logger.formatter = LogFormatter.new
+  end
+end

data/templates/channel.html.erb

@@ -1,43 +1,45 @@
-<!DOCTYPE html>
-<html lang="<%= h(language) %>">
-<head>
-	<meta charset="utf-8"/>
-	<title><%= h(title) %></title>
-	<meta name="generator" content="Dropcaster <%= Dropcaster::VERSION%>"/>
-  <% unless copyright.blank? %>
-	<meta name="copyright" content="<%= h(copyright) %>"/>
-  <% end %>
-  <link rel="canonical" href="<%= h(url) %>"/>
-</head>
-
-<body id="home">
-	<h1><%= h(title) %></h1>
-	<% unless subtitle.blank? %>
-  <h2><%= h(subtitle) %></h2>
-  <% end %>
-  
-  <% unless image_url.blank? %>
-  <img src="<%= image_url %>"/>
-  <% end %>
-  <p><%= h(description) %></p>
-
-  <h1>Episodes</h1>
-  <% items.each{|item| %>
-    <div class="item" id="<%= h(item.uuid) %>">
-      <h1><%= item.tag.title || item.tag2.TIT2%></h1>
-    <% unless item.tag2.SUBTITLE.blank? %>
-      <h2><%= h(item.tag2.SUBTITLE) %></h2>
-    <% end %>
-    <% unless item.tag2.TT3.blank? %>
-      <p><%= h(item.tag2.TT3) %></p>
-    <% end %>
-      <img src="<%= item.image_url %>"/>
-      <p>Download: <a href="<%= item.url %>">MP3</a> (<%= humanize_time(item.duration.to_i) %>, <%= humanize_size(item.file_size) %>)</p>
-      <p>Published <%= h(item.pub_date.to_formatted_s(:rfc822)) %></p>
-    <% unless item.keywords.blank? %>
-      <p><%= h(item.keywords) %></p>
-    <% end %>
-    </div>
-  <% } %>
-</body>
-</html>
+<!DOCTYPE html>
+<html lang="<%= h(language) %>">
+<head>
+	<meta charset="utf-8"/>
+	<title><%= h(title) %></title>
+	<meta name="generator" content="Dropcaster <%= Dropcaster::VERSION%>"/>
+	<meta name="keywords" content="<%= keywords.map{|k| h(k)}.join(', ') %>"/>
+  <% unless copyright.blank? %>
+	<meta name="copyright" content="<%= h(copyright) %>"/>
+  <% end %>
+  <link rel="canonical" href="<%= h(url) %>"/>
+  <link rel="alternate" type="application/rss+xml" title="<%= h(title) %> Podcast Feed" href="<%= h(url) %>">
+</head>
+
+<body id="home">
+	<h1><%= h(title) %></h1>
+	<% unless subtitle.blank? %>
+  <h2><%= h(subtitle) %></h2>
+  <% end %>
+  
+  <% unless image_url.blank? %>
+  <img src="<%= image_url %>"/>
+  <% end %>
+  <p><%= h(description) %></p>
+
+  <h1>Episodes</h1>
+  <% items.each{|item| %>
+    <div class="item" id="<%= h(item.uuid) %>">
+      <h1><%= item.tag.title || item.tag2.TIT2%></h1>
+    <% unless item.tag2.SUBTITLE.blank? %>
+      <h2><%= h(item.tag2.SUBTITLE) %></h2>
+    <% end %>
+    <% unless item.tag2.TT3.blank? %>
+      <p><%= h(item.tag2.TT3) %></p>
+    <% end %>
+      <img src="<%= item.image_url %>"/>
+      <p>Download: <a href="<%= item.url %>">MP3</a> (<%= humanize_time(item.duration.to_i) %>, <%= humanize_size(item.file_size) %>)</p>
+      <p>Published <%= h(item.pub_date.to_formatted_s(:rfc822)) %></p>
+    <% unless item.keywords.blank? %>
+      <p><%= item.keywords.map{|k| h(k)}.join(',') %></p>
+    <% end %>
+    </div>
+  <% } %>
+</body>
+</html>

data/templates/channel.rss.erb

@@ -1,64 +1,65 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This file generated by Dropcaster <%= Dropcaster::VERSION%> -->
-<rss xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd" version="2.0">
-  <channel>
-    <title><%= h(title) %></title>
-    <link><%= h(url) %></link>
-    <description><%= h(description) %></description>
-    <itunes:summary><%= h(description) %></itunes:summary>
-    <% unless language.blank? %>
-    <language><%= h(language) %></language>
-    <% end %>
-    <% unless copyright.blank? %>
-    <copyright><%= h(copyright) %></copyright>
-    <% end %>
-    <% unless subtitle.blank? %>
-    <itunes:subtitle><%= h(subtitle) %></itunes:subtitle>
-    <% end %>
-    <% unless author.blank? %>
-    <itunes:author><%= h(author) %></itunes:author>
-    <% end %>
-    <% unless owner.nil? %>
-    <itunes:owner>
-      <itunes:name><%= h(owner[:name]) %></itunes:name>
-      <itunes:email><%= h(owner[:email]) %></itunes:email>
-    </itunes:owner>
-    <% end %>
-    <% unless image_url.blank? %>
-    <itunes:image href="<%= image_url %>"/>
-    <% end %>
-  <% categories.each{|category| %>
-    <% if category.respond_to?(:each_line) %>
-    <itunes:category text="<%= h(category) %>"/>
-    <% else %>
-    <itunes:category text="<%= h(category.first) %>">
-      <itunes:category text="<%= h(category.last) %>"/>
-    </itunes:category>
-    <% end %>
-  <% } unless categories.blank? %>
-  <% unless explicit.blank? %>
-    <itunes:explicit><%= h(explicit) %></itunes:explicit>
-  <% end %>
-	<generator>Dropcaster <%= Dropcaster::VERSION%></generator>
-  <% items.each{|item| %>
-    <item>
-      <title><%= item.tag.title || item.tag2.TIT2%></title>
-      <itunes:author><%= h(item.tag2.TP1 || item.tag2.TPE1) %></itunes:author>
-    <% unless item.tag2.SUBTITLE.blank? %>
-      <itunes:subtitle><%= h(item.tag2.SUBTITLE) %></itunes:subtitle>
-    <% end %>
-    <% unless item.tag2.TT3.blank? %>
-      <itunes:summary><%= h(item.tag2.TT3) %></itunes:summary>
-    <% end %>
-      <itunes:image href="<%= item.image_url %>"/>
-      <enclosure url="<%= item.url %>" length="<%= item.file_size %>" type="audio/mp3"/>
-      <guid isPermaLink="false"><%= h(item.uuid) %></guid>
-      <pubDate><%= h(item.pub_date.to_formatted_s(:rfc822)) %></pubDate>
-      <itunes:duration><%= item.duration.to_i %></itunes:duration>
-    <% unless item.keywords.blank? %>
-      <itunes:keywords><%= h(item.keywords) %></itunes:keywords>
-    <% end %>
-    </item>
-  <% } %>
-  </channel>
-</rss>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- This file generated by Dropcaster <%= Dropcaster::VERSION %> -->
+<rss xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd" version="2.0">
+  <channel>
+    <title><%= h(title) %></title>
+    <link><%= h(url) %></link>
+    <description><%= h(description) %></description>
+    <itunes:summary><%= h(description) %></itunes:summary>
+    <% unless language.blank? %>
+    <language><%= h(language) %></language>
+    <% end %>
+    <% unless copyright.blank? %>
+    <copyright><%= h(copyright) %></copyright>
+    <% end %>
+    <% unless subtitle.blank? %>
+    <itunes:subtitle><%= h(subtitle) %></itunes:subtitle>
+    <% end %>
+    <% unless author.blank? %>
+    <itunes:author><%= h(author) %></itunes:author>
+    <% end %>
+    <% unless owner.nil? %>
+    <itunes:owner>
+      <itunes:name><%= h(owner[:name]) %></itunes:name>
+      <itunes:email><%= h(owner[:email]) %></itunes:email>
+    </itunes:owner>
+    <% end %>
+    <% unless image_url.blank? %>
+    <itunes:image href="<%= image_url %>"/>
+    <% end %>
+  <% categories.each{|category| %>
+    <% if category.respond_to?(:each_line) %>
+    <itunes:category text="<%= h(category) %>"/>
+    <% else %>
+    <itunes:category text="<%= h(category.first) %>">
+      <itunes:category text="<%= h(category.last) %>"/>
+    </itunes:category>
+    <% end %>
+  <% } unless categories.blank? %>
+  <% unless explicit.blank? %>
+    <itunes:explicit><%= h(explicit) %></itunes:explicit>
+  <% end %>
+	<generator>Dropcaster <%= Dropcaster::VERSION%></generator>
+	<% unless keywords.blank? %>
+    <itunes:keywords><%= keywords.map{|k| h(k)}.join(',') %></itunes:keywords>
+  <% end %>
+  <% items.each{|item| %>
+    <item>
+      <title><%= item.tag.title || item.tag2.TIT2%></title>
+      <itunes:author><%= h(item.tag2.TP1 || item.tag2.TPE1) %></itunes:author>
+    <% unless item.tag2.TT3.blank? %>
+      <itunes:subtitle><%= h(truncate(item.tag2.TT3, 50)) %></itunes:subtitle>
+      <itunes:summary><%= h(item.tag2.TT3) %></itunes:summary>
+    <% end %>
+      <itunes:image href="<%= item.image_url %>"/>
+      <enclosure url="<%= item.url %>" length="<%= item.file_size %>" type="audio/mp3"/>
+      <guid isPermaLink="false"><%= h(item.uuid) %></guid>
+      <pubDate><%= h(item.pub_date.to_formatted_s(:rfc822)) %></pubDate>
+      <itunes:duration><%= item.duration.to_i %></itunes:duration>
+    <% unless item.keywords.blank? %>
+      <itunes:keywords><%= item.keywords.map{|k| h(k)}.join(',') %></itunes:keywords>
+    <% end %>
+    </item>
+  <% } %>
+  </channel>
+</rss>

data/test/extensions/windows.rb

@@ -1,12 +1,12 @@
-# Returns true if we run on a windows platform
-#
-# Sample:
-#
-#  puts "Windows" if Kernel.is_windows?
-#
-# http://snippets.dzone.com/posts/show/2112
-#
-def Kernel.is_windows?
-  processor, platform, *rest = RUBY_PLATFORM.split("-")
-  platform == 'mingw32'
-end
+# Returns true if we run on a windows platform
+#
+# Sample:
+#
+#  puts "Windows" if Kernel.is_windows?
+#
+# http://snippets.dzone.com/posts/show/2112
+#
+def Kernel.is_windows?
+  processor, platform, *rest = RUBY_PLATFORM.split("-")
+  platform == 'mingw32'
+end

data/test/fixtures/channel.yml

@@ -1,15 +1,16 @@
-:title: All About Everything
-:subtitle: A show about everything
-:url: http://www.example.com/podcasts/everything/
-:language: en-us
-:copyright: © 2011 John Doe and Family
-:author: John Doe
-:description: All About Everything is a show about everything. Each week we dive into any subject known to man and talk about it as much as we can. Look for our Podcast in the iTunes Store!
-:owner:
-  :name: John Doe
-  :email: john.doe@example.com
-:image_url: AllAboutEverything.jpg
-:categories: 
-  - [Technology, Gadgets]
-  - TV & Film
-:explicit: No
+:title: All About Everything
+:subtitle: A show about everything
+:url: http://www.example.com/podcasts/everything/
+:language: en-us
+:copyright: © 2011 John Doe and Family
+:author: John Doe
+:description: All About Everything is a show about everything. Each week we dive into any subject known to man and talk about it as much as we can. Look for our Podcast in the iTunes Store!
+:owner:
+  :name: John Doe
+  :email: john.doe@example.com
+:image_url: AllAboutEverything.jpg
+:keywords: [bumm, zack, return] 
+:categories: 
+  - [Technology, Gadgets]
+  - TV & Film
+:explicit: No

data/test/fixtures/test_template.json.erb

@@ -1,40 +1,40 @@
-{  
-  "generator" : {
-    "name" : "Dropcaster",
-    "version" : "<%= Dropcaster::VERSION%>"
-  },
-  "channel" : {
-    "title" : "<%= title %>",
-    "link" : "<%= url %>",
-    "description" : "<%= description %>",
-    "language" : "<%= language %>",
-    "copyright" : "<%= copyright %>",
-    "subtitle" : "<%= subtitle %>",
-    "author" : "<%= author %>",
-    "owner" : {
-      "name" : "<%= owner[:name] %>",
-      "email" : "<%= owner[:email] %>"
-    },
-    "image" : "<%= image_url %>",
-    "categories": ["<% categories.join('\",\"') %>"],
-    "explicit" : "<%= explicit %>",
-    "items" : [<% items.collect{|item| %>{
-        "title" : "<%= item.tag.title || item.tag2.TIT2 %>",
-        "author" : "<%= item.tag2.TP1 || item.tag2.TPE1 %>",
-        "subtitle" : "<%= item.tag2.SUBTITLE %>",
-        "summary" : "<%= item.tag2.TT3 %>",
-        "image" : "<%= item.image_url %>",
-        "enclosure" : {
-          "url" : "<%= item.url %>",
-          "length" : "<%= item.file_size %>",
-          "type" : "audio/mp3"
-        },
-        "guid" : "<%= item.uuid %>",
-        "pubDate" : "<%= item.pub_date.to_formatted_s(:rfc822) %>",
-        "duration" : "<%= item.duration.to_i %>",
-        "keywords" : "<%= item.keywords %>"
-     }
-<% }.join(',') %>
-    ]
-  }
-}
+{  
+  "generator" : {
+    "name" : "Dropcaster",
+    "version" : "<%= Dropcaster::VERSION%>"
+  },
+  "channel" : {
+    "title" : "<%= title %>",
+    "link" : "<%= url %>",
+    "description" : "<%= description %>",
+    "language" : "<%= language %>",
+    "copyright" : "<%= copyright %>",
+    "subtitle" : "<%= subtitle %>",
+    "author" : "<%= author %>",
+    "owner" : {
+      "name" : "<%= owner[:name] %>",
+      "email" : "<%= owner[:email] %>"
+    },
+    "image" : "<%= image_url %>",
+    "categories": ["<% categories.join('\",\"') %>"],
+    "explicit" : "<%= explicit %>",
+    "items" : [<% items.collect{|item| %>{
+        "title" : "<%= item.tag.title || item.tag2.TIT2 %>",
+        "author" : "<%= item.tag2.TP1 || item.tag2.TPE1 %>",
+        "subtitle" : "<%= item.tag2.SUBTITLE %>",
+        "summary" : "<%= item.tag2.TT3 %>",
+        "image" : "<%= item.image_url %>",
+        "enclosure" : {
+          "url" : "<%= item.url %>",
+          "length" : "<%= item.file_size %>",
+          "type" : "audio/mp3"
+        },
+        "guid" : "<%= item.uuid %>",
+        "pubDate" : "<%= item.pub_date.to_formatted_s(:rfc822) %>",
+        "duration" : "<%= item.duration.to_i %>",
+        "keywords" : "<%= item.keywords %>"
+     }
+<% }.join(',') %>
+    ]
+  }
+}

data/test/helper.rb

@@ -1,14 +1,10 @@
-require 'rubygems'
-require 'test/unit'
-require 'dropcaster'
-
-$:.unshift File.join(File.dirname(__FILE__), *%w[.. test unit])
-$:.unshift File.join(File.dirname(__FILE__), *%w[.. test extensions])
-
-require 'windows'
-
-module DropcasterTest
-  FIXTURES_DIR = File.join(File.dirname(__FILE__), 'fixtures')
-  FIXTURE_ITUNES_MP3 = File.join(FIXTURES_DIR, 'iTunes.mp3')
-  NS_ITUNES = "itunes:http://www.itunes.com/dtds/podcast-1.0.dtd"
-end
+require 'minitest/autorun'
+require 'dropcaster'
+
+require_relative 'extensions/windows'
+
+module DropcasterTest
+  FIXTURES_DIR = File.join(File.dirname(__FILE__), 'fixtures')
+  FIXTURE_ITUNES_MP3 = File.join(FIXTURES_DIR, 'iTunes.mp3')
+  NS_ITUNES = "itunes:http://www.itunes.com/dtds/podcast-1.0.dtd"
+end