rack-accept 0.4.2 → 0.4.3

data/CHANGES

@@ -1,3 +1,7 @@
+## 0.4.3 / July 29, 2010
+
+  * Added support for Ruby 1.9.2
+
 ## 0.4 / April 5, 2010
 
   * Added support for media type queries with multiple range parameters

data/README

@@ -23,6 +23,7 @@ Using RubyGems:
 From a local copy:
 
     $ git clone git://github.com/mjijackson/rack-accept.git
+    $ cd rack-accept
     $ rake package && sudo rake install
 
 Usage
@@ -99,8 +100,8 @@ Four-letter Words
 
   Spec: http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html
   Code: http://github.com/mjijackson/rack-accept
-  Docs: http://mjijackson.github.com/rack-accept
   Bugs: http://github.com/mjijackson/rack-accept/issues
+  Docs: http://mjijackson.com/rack-accept
 
 License
 -------

data/Rakefile

@@ -3,9 +3,6 @@ require 'rake/testtask'
 
 task :default => :test
 
-CLEAN.include %w< doc/api doc/*.html doc/*.css >
-CLOBBER.include %w< dist >
-
 # TESTS #######################################################################
 
 Rake::TestTask.new(:test) do |t|
@@ -14,26 +11,13 @@ end
 
 # DOCS ########################################################################
 
-desc "Generate HTML documentation (in doc)"
-task :doc => FileList['doc/*.markdown'] do |t|
-  require 'erb' unless defined?(ERB)
-  require 'rdiscount' unless defined?(RDiscount)
-  layout = ERB.new(File.read('doc/assets/layout.html.erb'), 0, '%<>')
-  t.prerequisites.each do |path|
-    source = File.read(path)
-    content = Markdown.new(source, :smart).to_html
-    output = layout.result(binding)
-    File.open(path.sub('.markdown', '.html'), 'w') {|io| io.write(output) }
-  end
-  cp 'doc/assets/style.css', 'doc'
-end
-
-desc "Generate API documentation (in doc/api)"
+desc "Generate API documentation"
 task :api => FileList['lib/**/*.rb'] do |t|
-  rm_rf 'doc/api'
+  output_dir = ENV['OUTPUT_DIR'] || 'api'
+  rm_rf output_dir
   sh((<<-SH).gsub(/[\s\n]+/, ' ').strip)
   hanna
-    --op doc/api
+    --op #{output_dir}
     --promiscuous
     --charset utf8
     --fmt html
@@ -46,6 +30,8 @@ task :api => FileList['lib/**/*.rb'] do |t|
   SH
 end
 
+CLEAN.include 'api'
+
 # PACKAGING & INSTALLATION ####################################################
 
 if defined?(Gem)
@@ -79,3 +65,5 @@ if defined?(Gem)
     sh "gem push #{package('.gem')}"
   end
 end
+
+CLOBBER.include 'dist'

data/doc/index.markdown

@@ -21,6 +21,7 @@ Using [RubyGems][rubygems]:
 From a local copy:
 
     $ git clone git://github.com/mjijackson/rack-accept.git
+    $ cd rack-accept
     $ rake package && sudo rake install
 
 [rfc]: http://www.w3.org/Protocols/rfc2616/rfc2616.html

data/doc/license.markdown

@@ -1,7 +1,7 @@
 License
 -------
 
-Copyright 2010 Michael J. I. Jackson
+Copyright 2010 Michael Jackson
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/rack/accept.rb

@@ -4,7 +4,7 @@ require 'rack'
 #
 # http://mjijackson.com/rack-accept
 module Rack::Accept
-  VERSION = [0, 4, 2]
+  VERSION = [0, 4, 3]
 
   # Returns the current version of Rack::Accept as a string.
   def self.version

data/lib/rack/accept/charset.rb

@@ -1,12 +1,10 @@
 module Rack::Accept
-
   # Represents an HTTP Accept-Charset header according to the HTTP 1.1
   # specification, and provides several convenience methods for determining
   # acceptable character sets.
   #
   # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.2
   class Charset
-
     include Header
 
     # The name of this header.
@@ -34,6 +32,5 @@ module Rack::Accept
         a == '*' ? 1 : (b == '*' ? -1 : 0)
       }
     end
-
   end
 end

data/lib/rack/accept/context.rb

@@ -1,8 +1,6 @@
 module Rack::Accept
-
   # Implements the Rack middleware interface.
   class Context
-
     # This error is raised when the server is not able to provide an acceptable
     # response.
     class AcceptError < StandardError; end
@@ -65,6 +63,5 @@ module Rack::Accept
         raise AcceptError unless values.any? {|v| header.accept?(v) }
       end
     end
-
   end
 end

data/lib/rack/accept/encoding.rb

@@ -1,12 +1,10 @@
 module Rack::Accept
-
   # Represents an HTTP Accept-Encoding header according to the HTTP 1.1
   # specification, and provides several convenience methods for determining
   # acceptable content encodings.
   #
   # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.3
   class Encoding
-
     include Header
 
     # The name of this header.
@@ -34,6 +32,5 @@ module Rack::Accept
         a == '*' ? 1 : (b == '*' ? -1 : 0)
       }
     end
-
   end
 end

data/lib/rack/accept/header.rb

@@ -1,10 +1,8 @@
 module Rack::Accept
-
   # Contains methods that are useful for working with Accept-style HTTP
   # headers. The MediaType, Charset, Encoding, and Language classes all mixin
   # this module.
   module Header
-
     # Parses the value of an Accept-style request header into a hash of
     # acceptable values and their respective quality factors (qvalues). The
     # +join+ method may be used on the resulting hash to obtain a header
@@ -145,6 +143,5 @@ module Rack::Accept
     end
 
     include PublicInstanceMethods
-
   end
 end

data/lib/rack/accept/language.rb

@@ -1,12 +1,10 @@
 module Rack::Accept
-
   # Represents an HTTP Accept-Language header according to the HTTP 1.1
   # specification, and provides several convenience methods for determining
   # acceptable content languages.
   #
   # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.4
   class Language
-
     include Header
 
     # The name of this header.
@@ -32,6 +30,5 @@ module Rack::Accept
         a == '*' ? -1 : (b == '*' ? 1 : a.length <=> b.length)
       }.reverse
     end
-
   end
 end

data/lib/rack/accept/media_type.rb

@@ -1,12 +1,10 @@
 module Rack::Accept
-
   # Represents an HTTP Accept header according to the HTTP 1.1 specification,
   # and provides several convenience methods for determining acceptable media
   # types.
   #
   # http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.1
   class MediaType
-
     include Header
 
     # The name of this header.
@@ -58,6 +56,5 @@ module Rack::Accept
       parsed = parse_range_params(params)
       parsed == parsed.merge(parse_range_params(match))
     end
-
   end
 end

data/lib/rack/accept/request.rb

@@ -1,12 +1,10 @@
 require 'rack/request'
 
 module Rack::Accept
-
   # A container class for convenience methods when Rack::Accept is used on the
   # request level as Rack middleware. Instances of this class also manage a
   # lightweight cache of various header instances to speed up execution.
   class Request < Rack::Request
-
     attr_reader :env
 
     def initialize(env)
@@ -88,6 +86,5 @@ module Rack::Accept
     def best_language(values)
       language.best_of(values)
     end
-
   end
 end

data/lib/rack/accept/response.rb

@@ -1,10 +1,8 @@
 require 'rack/response'
 
 module Rack::Accept
-
   # The base class for responses issued by Rack::Accept.
   class Response < Rack::Response
-
     # Marks this response as being unacceptable and clears the response body.
     #
     # Note: The HTTP spec advises servers to respond with an "entity" that
@@ -16,6 +14,5 @@ module Rack::Accept
       self.body = []
       header['Content-Length'] = '0'
     end
-
   end
 end

data/rack-accept.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'rack-accept'
-  s.version = '0.4.2'
-  s.date = '2010-05-04'
+  s.version = '0.4.3'
+  s.date = '2010-07-29'
 
   s.summary = 'HTTP Accept* for Ruby/Rack'
   s.description = 'HTTP Accept, Accept-Charset, Accept-Encoding, and Accept-Language for Ruby/Rack'
@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
 
   s.require_paths = %w< lib >
 
-  s.files = Dir['lib/**/*.rb'] +
+  s.files = Dir['doc/**/*'] +
+    Dir['lib/**/*.rb'] +
     Dir['test/*.rb'] +
-    Dir['doc/**/*'] +
     %w< CHANGES rack-accept.gemspec Rakefile README >
 
   s.test_files = s.files.select {|path| path =~ /^test\/.*_test.rb/ }

data/test/charset_test.rb

@@ -1,7 +1,6 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class CharsetTest < Test::Unit::TestCase
-
   C = Rack::Accept::Charset
 
   def test_qvalue
@@ -41,5 +40,4 @@ class CharsetTest < Test::Unit::TestCase
     assert_equal('iso-8859-1', c.best_of(%w< iso-8859-1 utf-8 >))
     assert_equal(nil, c.best_of(%w< utf-8 >))
   end
-
 end

data/test/context_test.rb

@@ -1,7 +1,6 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class ContextTest < Test::Unit::TestCase
-
   def media_types; Proc.new {|c| c.media_types = %w< text/html > } end
   def charsets;    Proc.new {|c| c.charsets = %w< iso-8859-5 > }   end
   def encodings;   Proc.new {|c| c.encodings = %w< gzip > }        end
@@ -55,5 +54,4 @@ class ContextTest < Test::Unit::TestCase
     request('HTTP_ACCEPT_LANGUAGE' => 'jp', &languages)
     assert_equal(406, status)
   end
-
 end

data/test/encoding_test.rb

@@ -1,7 +1,6 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class EncodingTest < Test::Unit::TestCase
-
   E = Rack::Accept::Encoding
 
   def test_qvalue
@@ -27,5 +26,4 @@ class EncodingTest < Test::Unit::TestCase
     assert_equal('identity', e.best_of(%w< identity compress >))
     assert_equal(nil, e.best_of(%w< zip >))
   end
-
 end

data/test/header_test.rb

@@ -1,7 +1,6 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class HeaderTest < Test::Unit::TestCase
-
   H = Rack::Accept::Header
 
   def test_parse_and_join
@@ -61,5 +60,4 @@ class HeaderTest < Test::Unit::TestCase
     assert_equal(0, H.normalize_qvalue(0))
     assert_equal(0.5, H.normalize_qvalue(0.5))
   end
-
 end

data/test/language_test.rb

@@ -1,7 +1,6 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class LanguageTest < Test::Unit::TestCase
-
   L = Rack::Accept::Language
 
   def test_qvalue
@@ -33,5 +32,4 @@ class LanguageTest < Test::Unit::TestCase
     assert_equal('en-us', l.best_of(%w< en-us en-au >))
     assert_equal(nil, l.best_of(%w< da >))
   end
-
 end

data/test/media_type_test.rb

@@ -1,7 +1,6 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class MediaTypeTest < Test::Unit::TestCase
-
   M = Rack::Accept::MediaType
 
   def test_qvalue
@@ -43,5 +42,4 @@ class MediaTypeTest < Test::Unit::TestCase
     m = M.new('text/*;q=0.5;a=42')
     assert_equal(0.5, m.qvalue('text/plain'))
   end
-
 end

data/test/request_test.rb

@@ -1,7 +1,6 @@
-require File.dirname(__FILE__) + '/helper'
+require File.expand_path('../helper', __FILE__)
 
 class RequestTest < Test::Unit::TestCase
-
   R = Rack::Accept::Request
 
   def test_media_type
@@ -58,5 +57,4 @@ class RequestTest < Test::Unit::TestCase
     assert(request.language?('en-gb'))
     assert(!request.language?('da'))
   end
-
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-accept
 version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 4
-  - 2
-  version: 0.4.2
+  - 3
+  version: 0.4.3
 platform: ruby
 authors: 
 - Michael Jackson
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-04 00:00:00 -06:00
+date: 2010-07-29 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 4
@@ -34,9 +37,11 @@ dependencies:
   name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -52,6 +57,9 @@ extra_rdoc_files:
 - CHANGES
 - README
 files: 
+- doc/index.markdown
+- doc/license.markdown
+- doc/usage.markdown
 - lib/rack/accept/charset.rb
 - lib/rack/accept/context.rb
 - lib/rack/accept/encoding.rb
@@ -69,11 +77,6 @@ files:
 - test/language_test.rb
 - test/media_type_test.rb
 - test/request_test.rb
-- doc/assets/layout.html.erb
-- doc/assets/style.css
-- doc/index.markdown
-- doc/license.markdown
-- doc/usage.markdown
 - CHANGES
 - rack-accept.gemspec
 - Rakefile
@@ -93,23 +96,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: HTTP Accept* for Ruby/Rack

data/doc/assets/layout.html.erb

@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-
-<html lang="en">
-
-<head>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8">
-    <title>Rack::Accept</title>
-    <link rel="stylesheet" href="style.css" type="text/css" media="all">
-</head>
-
-<body>
-    <div id="wrapper">
-        <div id="header">
-            <h1>rack-accept</h1>
-            <ul>
-                <li><a href="api/index.html">API</a></li>
-                <li><a href="http://github.com/mjijackson/rack-accept/issues">Bugs</a></li>
-                <li><a href="http://github.com/mjijackson/rack-accept">Code</a></li>
-                <li><a href="usage.html">Usage</a></li>
-                <li><a href="index.html">Home</a></li>
-            </ul>
-        </div>
-        <div id="content"><%= content %></div>
-        <div id="footer">
-            <p><a href="license.html" rel="license">Copyright</a> &copy; 2010 <a href="http://mjijackson.com/about" rel="me author">Michael J. I. Jackson</a></p>
-        </div>
-    </div>
-</body>
-
-</html>

data/doc/assets/style.css

@@ -1,79 +0,0 @@
-body {
-  background-color: #EEEEEE;
-  color: #333333;
-  font-family: "HelveticaNeue-Light","Helvetica Neue Light","Helvetica Neue",sans-serif;
-  font-size: 14px;
-  line-height: 1.5;
-  font-weight: 300;
-  margin: 25px 25px 50px;
-}
-a {
-  color: inherit;
-  text-decoration: none;
-  background-color: #FDFDFD;
-  padding: 3px 5px;
-}
-a:hover {
-  color: #666666;
-}
-h1, h2, h3 {
-  font-weight: 300;
-}
-h1 {
-  font-size: 32px;
-}
-h1, h2, h3, p, pre, ul, ol {
-  margin: 0 0 18px 0;
-}
-ol, ul {
-  padding-left: 36px;
-}
-li {
-  margin: 0;
-  padding: 0;
-}
-code {
-  font-size: 12px;
-  font-family: Menlo, monospace;
-}
-pre {
-  background-color: #FDFDFD;
-  padding: 4px 0 4px 6px;
-  line-height: 1.2;
-}
-strong {
-  font-weight: bold;
-}
-::selection {
-  background: rgba(200,200,200,0.5);
-}
-::-moz-selection {
-  background: rgba(200,200,200,0.5);
-}
-#wrapper {
-  position: relative;
-  width: 600px;
-  margin: 0 auto;
-}
-#header {
-  margin-bottom: 36px;
-}
-#header ul {
-  position: absolute;
-  top: 14px;
-  right: 0;
-  list-style-type: none;
-}
-#header ul li {
-  float: right;
-  margin-left: 10px;
-}
-#content {
-  min-height: 400px;
-}
-#footer {
-  margin-top: 36px;
-  text-align: right;
-  font-size: 12px;
-  color: #999999;
-}