heel 3.1.1 → 3.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3399d8178f772d4ee49f04043572be6d9f70d2fd
+  data.tar.gz: f34d5119b094801f39bd47f00791b415e97555a1
+SHA512:
+  metadata.gz: 919208df9a5929ad044a896529055c9e15f1af077c50dcd20c805f10145c15f8f964adf16742cc954c435ca5eb3206b8f5e8cba3efe64c578f93ded918250d70
+  data.tar.gz: d1cb4ed0a1de12646c370eaa8629ed9a5d27619dd17a0ebd6b3996f23294f3a54016a1cf9a57c8e03945b446cb5eb873f5c0ee4386cc8222236bcf7e445d8099

data/HISTORY.md

@@ -1,16 +1,19 @@
 # Changelog
 
+## Version 3.1.2 - 2013-10-16
+* Fix usage of Mime::Types [#12](https://github.com/copiousfreetime/heel/issues/12) [#13](https://github.com/copiousfreetime/heel/issues/13)
+
 ## Version 3.1.1 - 2013-09-29
-* Fix request logging [#10]
+* Fix request logging [#10](https://github.com/copiousfreetime/heel/issues/10)
 
 ## Version 3.1.0 - 2013-07-07
 * Update dependencies
-* Switch to template contributed by brianflanagan [#8]
-* Add support for multiple independent heel servers [#9]
+* Switch to template contributed by brianflanagan [#8](https://github.com/copiousfreetime/heel/issues/8)
+* Add support for multiple independent heel servers [#9](https://github.com/copiousfreetime/heel/issues/9)
 
 ## Version 3.0.2 - 2013-03-13
 
-* Fix generated pages to say they are utf-8 [#4]
+* Fix generated pages to say they are utf-8 [#4](https://github.com/copiousfreetime/heel#4)
 * Fix formatting of usage section of documentation
 * Update dependencies
 * Convert to RDoc 4.0

data/Rakefile

@@ -8,9 +8,9 @@ This.homepage = "http://github.com/copiousfreetime/#{ This.name }"
 
 This.ruby_gemspec do |spec|
   spec.add_runtime_dependency( 'puma'      , '~> 2.0' )
-  spec.add_runtime_dependency( 'mime-types', '~> 1.23')
+  spec.add_runtime_dependency( 'mime-types', '~> 1.25')
   spec.add_runtime_dependency( 'launchy'   , '~> 2.3' )
-  spec.add_runtime_dependency( 'coderay'   , '~> 1.0' )
+  spec.add_runtime_dependency( 'coderay'   , '~> 1.1' )
 
   spec.add_development_dependency( 'rake'     , '~> 10.1')
   spec.add_development_dependency( 'minitest' , '~> 5.0' )

data/lib/heel.rb

@@ -4,7 +4,7 @@
 #++
 
 module Heel
-  VERSION = '3.1.1'
+  VERSION = '3.1.2'
 end
 
 require 'heel/configuration'

data/lib/heel/mime_map.rb

@@ -37,25 +37,21 @@ module Heel
       # if any other mime types are needed, add them directly via the
       # mime-types calls.
       def additional_mime_types
-        @additional_mime_types ||= [
-          # [ content-type , [ array, of, filename, extentions] ]
-          ["images/svg+xml", ["svg"]],
-          ["video/x-flv", ["flv"]],
-          ["application/x-shockwave-flash", ["swf"]],
-          ["text/plain", ["rb", "rhtml", "md", "markdown"]],
+        [
+          MIME::Type.new( 'text/plain' ) {  |t| t.extensions = %w[ rb rdoc rhtml md markdown ] },
         ]
       end
     end
 
     def initialize
       MimeMap.additional_mime_types.each do |mt|
-        if MIME::Types[mt.first].size == 0 then
-          type = MIME::Type.from_array(mt)
-          MIME::Types.add(type)
+        existing_type = MIME::Types[mt]
+        if existing_type.empty? then
+          MIME::Types.add(mt)
         else
-          type = MIME::Types[mt.first].first
-          mt[1].each do |ext|
-            type.extensions << ext unless type.extensions.include?(ext)
+          type = existing_type.first
+          mt.extensions.each do |ext|
+            type.extensions << ext unless type.extensions.include?( ext )
           end
           # have to reindex if new extensions added
           MIME::Types.index_extensions(type)
@@ -70,7 +66,7 @@ module Heel
     # returns the mime type of the file at a given pathname
     #
     def mime_type_of(f)
-      MIME::Types.of(f).first || default_mime_type
+      MIME::Types.of(f).last || default_mime_type
     end
 
     # return the icon name for a particular mime type

data/spec/directory_indexer_spec.rb

@@ -31,4 +31,17 @@ describe Heel::DirectoryIndexer do
     @indexer.mime_map.must_be_instance_of(Heel::MimeMap)
   end
 
+  [ { :ext => 'svg', :type => 'image/svg+xml' },
+    { :ext => 'flv', :type => 'video/x-flv' },
+    { :ext => 'swf', :type => 'application/x-shockwave-flash' } ].each do |m|
+      it "finds #{m[:ext]} extension in the map as #{m[:type]}" do
+        @indexer.mime_map.mime_type_of( "test.#{m[:ext]}" ).must_equal m[:type]
+      end
+    end
+
+  %w[ md markdown rdoc rb rhtml ].each do |ext|
+    it "finds #{ext} in the map as text/plain" do
+      @indexer.mime_map.mime_type_of( "test.#{ext}" ).must_equal "text/plain"
+    end
+  end
 end

data/spec/rackapp_spec.rb

@@ -26,7 +26,7 @@ describe Heel::RackApp do
     res = @request.get("/lib/heel.rb?highlighting=off")
     res.must_be :ok?
     res.body.size.must_equal File.size("lib/heel.rb")
-    res['Content-Type'].must_equal "application/x-ruby"
+    res['Content-Type'].must_equal "text/plain"
   end
 
   it "should return a 405 if given a non-GET request" do

data/tasks/default.rake

@@ -31,7 +31,7 @@ namespace :develop do
   # Create a Gemfile that just references the gemspec
   file 'Gemfile' => :gemspec do
     File.open( "Gemfile", "w+" ) do |f|
-      f.puts 'source :rubygems'
+      f.puts 'source "https://rubygems.org/"'
       f.puts 'gemspec'
     end
   end
@@ -54,8 +54,8 @@ begin
   require 'rake/testtask'
   Rake::TestTask.new( :test ) do |t|
     t.ruby_opts    = %w[ -w -rubygems ]
-    t.libs         = %w[ lib spec ]
-    t.pattern      = "spec/**/*_spec.rb"
+    t.libs         = %w[ lib spec test ]
+    t.pattern      = "{test,spec}/**/{test_*,*_spec}.rb"
   end
 
   task :test_requirements

data/tasks/this.rb

@@ -25,7 +25,7 @@ class ThisProject
   #
   # Yields self
   def initialize(&block)
-    @exclude_from_manifest = %r/\.(git|DS_Store)|^(doc|coverage|pkg|tmp)|Gemfile*|\.(gemspec|swp|jar|bundle|so|rvmrc)$|~$/
+    @exclude_from_manifest = %r/\.(git|DS_Store)|^(doc|coverage|pkg|tmp|Gemfile(\.lock)?)|^[^\/]+\.gemspec|\.(swp|jar|bundle|so|rvmrc)$|~$/
     @gemspecs              = Hash.new
     yield self if block_given?
   end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: heel
 version: !ruby/object:Gem::Version
-  version: 3.1.1
-  prerelease: 
+  version: 3.1.2
 platform: ruby
 authors:
 - Jeremy Hinegardner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-30 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,23 +27,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '1.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '1.25'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,23 +55,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,12 +104,11 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.0'
-description: ! 'Heel is a small static web server for use when you need a quick web
+description: 'Heel is a small static web server for use when you need a quick web
   server for a directory.  Once the server is running, heel will use (http://rubygems.org/gems/launchy/)
   to open your browser at the URL of your document root. Heel is built using (http://rack.github.com)
   and (http://puma.io)     % heel     Launching your browser...     Puma 1.6.3 starting...     *
@@ -192,6 +177,7 @@ files:
 homepage: http://github.com/copiousfreetime/heel
 licenses:
 - BSD
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -201,22 +187,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Heel is a small static web server for use when you need a quick web server
   for a directory.  Once the server is running, heel will use [launchy](http://rubygems.org/gems/launchy/)
   to open your browser at the URL of your document root.