rack-musicindex 0.0.2 → 0.1.0

data/lib/rack/musicindex.rb

@@ -1,4 +1,6 @@
 require 'builder'
+require 'id3lib'
+require 'kconv'
 
 module Rack
   class MusicIndex
@@ -13,37 +15,48 @@ module Rack
     end
 
     def call(env)
-      status, headers, response = @app.call(env)
-
       path_info = env['PATH_INFO']
 
       update_files
 
       if dirs[path_info]
-        headers['Content-Type'] = 'application/xml;charset=utf-8'
-        body = podcast(env)
-        headers["Content-Length"] = body.length.to_s
-        response = [body]
-        status = 200
+        serve_podcast(env)
       elsif static_paths.include?(path_info)
-        body = open(static_paths[path_info], 'rb').read
-        headers["Content-Type"] = 'audio/mpeg'
-        headers["Content-Length"] = body.length.to_s
-        response = [body]
-        status = 200
+        serve_mp3(env)
+      else
+        status, headers, response = @app.call(env)
       end
-
-      [status, headers, response]
     end
 
     private
 
+    def serve_podcast(env)
+      status, headers, response = @app.call(env)
+
+      body = podcast(env)
+      headers['Content-Type'] = 'application/xml;charset=utf-8'
+      headers["Content-Length"] = body.bytesize.to_s
+
+      [200, headers, [body]]
+    end
+
+    def serve_mp3(env)
+      status, headers, response = @app.call(env)
+      path_info = env['PATH_INFO']
+
+      body = open(static_paths[path_info], 'rb').read
+      headers["Content-Type"] = 'audio/mpeg'
+      headers["Content-Length"] = body.bytesize.to_s
+
+      [200, headers, [body]]
+    end
+
     def dirs
       @dirs
     end
 
-    def files(media_dir)
-      @files[media_dir]
+    def files(path)
+      @files[path]
     end
 
     def static_paths
@@ -62,6 +75,29 @@ module Rack
       end
     end
 
+    def id3(filename)
+      value = {}
+      tag = ID3Lib::Tag.new(filename)
+      {
+        :TIT2 => :name,
+        :TPE1 => :artist,
+      }.each do |id, key|
+        frame = tag.frame(id)
+
+        if frame
+          if frame[:textenc] == 1
+            v = Kconv.kconv(frame[:text] , Kconv::UTF8, Kconv::UTF16)
+          else
+            v = frame[:text]
+          end
+        end
+
+        value[key] = v
+      end
+
+      value
+    end
+
     def podcast(env)
       path  = env['PATH_INFO']
       req   = Rack::Request.new(env)
@@ -77,14 +113,23 @@ module Rack
           xml.link url
 
           files.each do |file|
+            tag = id3(file)
+            author = tag[:artist]
             name = ::File.basename(file)
             item_link = url + '/' + name
+
             xml.item do
-              xml.title name
+              xml.title tag[:name] || name
               xml.description name
               xml.link item_link
               xml.guid item_link
               xml.enclosure :url => item_link
+
+              if author
+                xml.author author
+                xml.itunes :author, author
+                xml.itunes :summary, author
+              end
             end
           end
         end

data/lib/rack/musicindex/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Musicindex
-    VERSION = "0.0.2"
+    VERSION = "0.1.0"
   end
 end

data/rack-musicindex.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Rack::Musicindex::VERSION
 
   gem.add_dependency('builder')
+  gem.add_dependency('id3lib-ruby')
   gem.add_development_dependency('rspec', ['~> 2.8.0'])
   gem.add_development_dependency('rake')
   gem.add_development_dependency('sinatra')

data/spec/rack/musicindex_spec.rb

@@ -36,10 +36,12 @@ describe Rack::MusicIndex do
     channel.xpath('description')[0].content.should eql('Generated by Rack::MusicIndex')
 
     items.size.should eql(1)
-    item.xpath('title')[0].content.should eql('test.mp3')
+    item.xpath('title')[0].content.should eql('bar')
     item.xpath('link')[0].content.should eql('http://example.org/foo/test.mp3')
     item.xpath('guid')[0].content.should eql('http://example.org/foo/test.mp3')
     item.xpath('enclosure')[0]['url'].should eql('http://example.org/foo/test.mp3')
+    item.xpath('author')[0].content.should eql('foo')
+    item.xpath('itunes:author')[0].content.should eql('foo')
   end
 
   it 'should reflect file changes without restart' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-musicindex
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: id3lib-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -142,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1861601957607199422
+      hash: -4013197686182090724
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -151,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1861601957607199422
+      hash: -4013197686182090724
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24