rack-musicindex 0.1.1 → 0.2.0

data/lib/rack/musicindex.rb

@@ -21,7 +21,7 @@ module Rack
 
       if dirs[path_info]
         serve_podcast(env)
-      elsif static_paths.include?(path_info)
+      elsif static_paths.include?(URI.unescape(path_info))
         serve_mp3(env)
       else
         status, headers, response = @app.call(env)
@@ -33,22 +33,26 @@ module Rack
     def serve_podcast(env)
       status, headers, response = @app.call(env)
 
+      method = env['REQUEST_METHOD']
       body = podcast(env)
+
       headers['Content-Type'] = 'application/xml;charset=utf-8'
       headers["Content-Length"] = body.bytesize.to_s
 
-      [200, headers, [body]]
+      [200, headers, method == 'GET' ? [body] : []]
     end
 
     def serve_mp3(env)
       status, headers, response = @app.call(env)
-      path_info = env['PATH_INFO']
 
+      method = env['REQUEST_METHOD']
+      path_info = URI.unescape(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]]
+      [200, headers, method == 'GET' ? [body] : []]
     end
 
     def dirs
@@ -103,7 +107,7 @@ module Rack
       req   = Rack::Request.new(env)
       url   = req.url
       files = files(path)
-      xml   = ::Builder::XmlMarkup.new
+      xml   = ::Builder::XmlMarkup.new(:indent => 2)
 
       xml.instruct! :xml, :version => '1.0'
       xml.rss :version => "2.0", 'xmlns:itunes' => 'http://www.itunes.com/dtds/podcast-1.0.dtd' do
@@ -116,7 +120,7 @@ module Rack
             tag = id3(file)
             author = tag[:artist]
             name = ::File.basename(file)
-            item_link = url + '/' + name
+            item_link = URI.escape(url + '/' + name)
 
             xml.item do
               xml.title tag[:name] || name
@@ -128,7 +132,6 @@ module Rack
               if author
                 xml.author author
                 xml.itunes :author, author
-                xml.itunes :summary, author
               end
             end
           end

data/lib/rack/musicindex/version.rb

@@ -1,5 +1,5 @@
 module Rack
   module Musicindex
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/spec/rack/musicindex_spec.rb

@@ -37,9 +37,9 @@ describe Rack::MusicIndex do
 
     items.size.should eql(1)
     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('link')[0].content.should eql('http://example.org/foo/test%20foo.mp3')
+    item.xpath('guid')[0].content.should eql('http://example.org/foo/test%20foo.mp3')
+    item.xpath('enclosure')[0]['url'].should eql('http://example.org/foo/test%20foo.mp3')
     item.xpath('author')[0].content.should eql('foo')
     item.xpath('itunes:author')[0].content.should eql('foo')
   end
@@ -68,10 +68,10 @@ describe Rack::MusicIndex do
   end
 
   it 'should return mp3' do
-    get '/foo/test.mp3'
+    get '/foo/test%20foo.mp3'
 
     last_response.should be_ok
     last_response['Content-Type'].should eql('audio/mpeg')
-    last_response.body.should eql(open(fixture('/foo/test.mp3'), 'rb').read)
+    last_response.body.should eql(open(fixture('/foo/test foo.mp3'), 'rb').read)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-musicindex
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -140,7 +140,7 @@ files:
 - lib/rack/musicindex.rb
 - lib/rack/musicindex/version.rb
 - rack-musicindex.gemspec
-- spec/fixtures/foo/test.mp3
+- spec/fixtures/foo/test foo.mp3
 - spec/rack/musicindex_spec.rb
 - spec/spec_helper.rb
 - spec/test_app.rb
@@ -158,7 +158,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2911717557310018387
+      hash: -1489195418899785487
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2911717557310018387
+      hash: -1489195418899785487
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -175,7 +175,7 @@ signing_key:
 specification_version: 3
 summary: A Rack middleware to publish directries containing media files as podcast
 test_files:
-- spec/fixtures/foo/test.mp3
+- spec/fixtures/foo/test foo.mp3
 - spec/rack/musicindex_spec.rb
 - spec/spec_helper.rb
 - spec/test_app.rb