acceptable 0.2.2 → 0.2.3

data/README.rdoc

@@ -1,4 +1,4 @@
-=== DESCRIPTION:
+== DESCRIPTION:
 
 Provides definitive support for Accept-* headers, strictly compliant with RFC 2616.
 Includes negotiation algorithms for Media-Types, Charsets and Content-Codings.
@@ -14,40 +14,73 @@ Also realizes perfectionistic LanguageTags support with basic/extended filtering
 
 == EXAMPLES:
 
-=== Media
+=== Helpers:
 
-  env = Rack::MockRequest.env_for('/','HTTP_ACCEPT' => 'text/plain;q=0,text/*')
-  request = Request.new(env)
-  p request.accept_media?('text/css') #=> true
-  p request.accept_media?('text/plain') #=> false
-  p request.accept_media?('video/quicktime') #=> false
+  env = Rack::MockRequest.env_for('/',
+    'HTTP_ACCEPT'           => 'text/*;q=0.8,text/x-json;q=0.8,text/html;p=whatever,image/png;q=0.2',
+    'HTTP_ACCEPT_LANGUAGE'  => 'de-de,sl-nedis',
+    'HTTP_ACCEPT_CHARSET'   => 'utf-8;q=0.9,iso-8859-5;q=0.8'
+    )
 
-  env = Rack::MockRequest.env_for('/','HTTP_ACCEPT' => 'text/*;q=0.8,text/x-json;q=0.8,text/html;p=whatever')
-  request = Request.new(env)
-  p request.preferred_media_from('text/css','text/html') #=> "text/css"
-  p request.preferred_media_from('text/x-json','text/html;p=whatever') #=> "text/html;p=whatever"
-  p request.preferred_media_from('text/x-json','text/html;p=Whatever') #=> "text/x-json" #parameter values are case-sensitive.
+  request = Rack::Acceptable::Request.new(env)
 
-=== LanguageTags
+==== Media:
+
+  request.accept_media?('text/css') #=> true
+  request.accept_media?('text/plain') #=> true
+  request.accept_media?('image/jpeg') #=> false
+  request.accept_media?('image/png') #=> true
+  request.accept_media?('video/quicktime') #=> false
+
+  request.preferred_media_from('text/css','text/html') #=> "text/css"
+  request.preferred_media_from('text/x-json','text/html;p=whatever') #=> "text/html;p=whatever"
+  request.preferred_media_from('text/x-json','text/html;p=Whatever') #=> "text/x-json" #parameter values are case-sensitive.
+
+==== Languages:
+
+  request.accept_language?("de-de") #=> true
+  request.accept_language?("de-DE") #=> true
+  request.accept_language?("de-Latn-de") #=> true
+  request.accept_language?("de-Latf-DE") #=> true
+  request.accept_language?("de-DE-x-goethe") #=> true
+  request.accept_language?("de-Latn-DE-1996") #=> true
+  request.accept_language?("de-Deva-DE") #=> true
+
+  request.accept_language?("de") #=> false
+  request.accept_language?("de-x-DE") #=> false
+  request.accept_language?("de-Deva") #=> false
+
+  request.accept_language?("sl-nedis") #=> true
+  request.accept_language?("sl-Latn-nedis") #=> true
+  request.accept_language?("sl-rozaj") #=> false
+
+==== Charsets:
+
+  request.accept_charset?("utf-8") #=> # true
+  request.accept_charset?("iso-8859-1") #=> # true
+
+  request.preferred_charset_from("utf-8","iso-8859-5") #=> # "utf-8"
+  request.preferred_charset_from("utf-8","iso-8859-1") #=> # "iso-8859-1"
+
+=== LanguageTags:
 
   langtag = Rack::Acceptable::LanguageTag.parse('SL-LATN-ROZAJ')
 
-  p langtag.variants #=> ["rozaj"]
-  p langtag.script #=> "Latn"
+  langtag.variants #=> ["rozaj"]
+  langtag.script #=> "Latn"
 
   # basic filtering (RFC 4647)
-  p langtag.has_prefix?('sl-Latn') #=> true
-  p langtag.matched_by_basic_range?('sl-Latn') #=> true
-  p langtag.has_prefix?('sl-Latn-ro') #=> false
-  p langtag.has_prefix?('sl') #=> true
+  langtag.has_prefix?('sl-Latn') #=> true
+  langtag.matched_by_basic_range?('sl-Latn') #=> true
+  langtag.has_prefix?('sl-Latn-ro') #=> false
+  langtag.has_prefix?('sl') #=> true
 
   # extended filtering (RFC 4647)
-  p langtag.matched_by_extended_range?('*') #=> true
-  p langtag.matched_by_extended_range?('sl-*') #=> true
-  p langtag.matched_by_extended_range?('*-Latn') #=> true
-  p langtag.matched_by_extended_range?('sl-rozaj') #=> true
-  p langtag.matched_by_extended_range?('sl-nedis') #=> false
-
+  langtag.matched_by_extended_range?('*') #=> true
+  langtag.matched_by_extended_range?('sl-*') #=> true
+  langtag.matched_by_extended_range?('*-Latn') #=> true
+  langtag.matched_by_extended_range?('sl-rozaj') #=> true
+  langtag.matched_by_extended_range?('sl-nedis') #=> false
 
 == INSTALLATION:
 

data/lib/rack/acceptable.rb

@@ -13,6 +13,9 @@ module Rack #:nodoc:
 
     # request and mixins
     autoload :Headers         , 'rack/acceptable/mixin/headers'
+    autoload :Encodings       , 'rack/acceptable/mixin/encodings'
+    autoload :Charsets        , 'rack/acceptable/mixin/charsets'
+    autoload :Languages       , 'rack/acceptable/mixin/languages'
     autoload :Media           , 'rack/acceptable/mixin/media'
     autoload :Request         , 'rack/acceptable/request'
 

data/lib/rack/acceptable/language_tag.rb

@@ -39,6 +39,7 @@ module Rack #:nodoc:
       }.freeze
 
       attr_accessor :primary, :extlang, :script, :region, :variants, :extensions, :privateuse
+      attr_reader :length
 
       #--
       # RFC 5646, sec. 2.2.2:
@@ -51,7 +52,7 @@ module Rack #:nodoc:
       # always remain, invalid.
       #++
 
-      language    = '([a-z]{2,8}|[a-z]{2,3}(?:-[a-z]{3})?)'
+      language    = '([a-z]{2,8}|[a-z]{2,3}(?:-[a-z]{3}){0,3})'
       script      = '(?:-([a-z]{4}))?'
       region      = '(?:-([a-z]{2}|\d{3}))?'
       variants    = '(?:-[a-z\d]{5,8}|-\d[a-z\d]{3})*'
@@ -66,14 +67,14 @@ module Rack #:nodoc:
 
       class << self
 
-        # Checks if the +String+ passed could be treated as 'privateuse' Language-Tag.
+        # Checks if the +String+ passed represents a 'privateuse' Language-Tag.
         # Works case-insensitively.
         #
         def privateuse?(tag)
           PRIVATEUSE_REGEX === tag
         end
 
-        # Checks if the +String+ passed represents a 'grandgathered' Language-Tag.
+        # Checks if the +String+ passed represents a 'grandfathered' Language-Tag.
         # Works case-insensitively.
         #
         def grandfathered?(tag)
@@ -81,13 +82,13 @@ module Rack #:nodoc:
         end
 
         # ==== Parameters
-        # langtag<String>:: The Language-Tag snippet.
+        # langtag<String>:: The LangTag snippet.
         #
         # ==== Returns
         # Array or nil::
-        #   It returns +nil+, when the Language-Tag passed:
+        #   It returns +nil+, when the snipped passed:
         #   * does not conform the Language-Tag ABNF (malformed)
-        #   * grandfathered
+        #   * represents a 'grandfathered' Language-Tag
         #   * starts with 'x' singleton ('privateuse').
         #
         #   Otherwise you'll get an +Array+ with:
@@ -112,7 +113,7 @@ module Rack #:nodoc:
           region      = $3
           variants    = $4.split(Utils::HYPHEN_SPLITTER)[1..-1]
 
-          primary, extlang = primary.split(Utils::HYPHEN_SPLITTER) if primary.include?(Const::HYPHEN)
+          primary, *extlang = primary.split(Utils::HYPHEN_SPLITTER) if primary.include?(Const::HYPHEN)
           script.capitalize! if script
           region.upcase! if region
 
@@ -130,17 +131,10 @@ module Rack #:nodoc:
       # Checks if self has a variant passed.
       # Works case-insensitively.
       #
-      # ==== Notes
-      # *Destructively* downcases current set of variants, if necessary.
-      # Just note, that variants are case-insensitive, and 'convenient' form
-      # of the Languge-Tag assumes they're in 'lowercase' notation.
-      #
       def has_variant?(variant)
         return false unless @variants
-        @variants.include?(variant) || begin
-          @variants.map { |v| v.downcase! }
-          @variants.include?(variant.downcase)
-        end
+        v = variant.downcase
+        @variants.any? { |var| v == var || v == var.downcase }
       end
 
       # Checks if self has a singleton passed.
@@ -174,6 +168,20 @@ module Rack #:nodoc:
 
       attr_reader :tag # the most recent 'build' of tag
 
+      # Returns the number of subtags in self.
+      # Does *not* perform validation or recomposition.
+      #
+      def length
+        length =  1 #@primary
+        length += @extlang.length if @extlang
+        length += 1 if @script
+        length += 1 if @region
+        length += @variants.length if @variants
+        @extensions.each { |_,e| length += e.length+1 } if @extensions # length += @extenstions.to_a.flatten.length if @extensions
+        length += @privateuse.length+1 if @privateuse
+        length
+      end
+
       def nicecased
         recompose   # we could not conveniently format malformed or invalid tags
         @nicecased  #.dup #uuuuugh
@@ -181,7 +189,7 @@ module Rack #:nodoc:
 
       def to_a
         ary = [@primary]
-        ary << @extlang if @extlang
+        ary.concat @extlang if @extlang
         ary << @script if @script
         ary << @region if @region
         ary.concat @variants if @variants
@@ -218,7 +226,8 @@ module Rack #:nodoc:
       #   de-Deva ('Deva' not equal to 'DE')
       #++
 
-      # Checks if the *extended* Language-Range passed matches self.
+      # Checks if the *extended* Language-Range (in the shortest notation)
+      # passed matches self.
       def matched_by_extended_range?(range)
         recompose
         subtags = @composition.split(Const::HYPHEN)
@@ -324,16 +333,16 @@ module Rack #:nodoc:
 
       # ==== Parameters
       # thing<String, optional>::
-      #   The Language-Tag snippet
+      #   The LangTag snippet
       #
       # ==== Returns
       # +self+
       #
       # ==== Raises
       # ArgumentError::
-      #   The Language-Tag composition:
+      #   The snippet passed:
       #   * does not conform the Language-Tag ABNF (malformed)
-      #   * grandfathered
+      #   * represents a 'grandfathered' Language-Tag
       #   * starts with 'x' singleton ('privateuse').
       #   * contains duplicate variants
       #   * contains duplicate singletons
@@ -359,7 +368,7 @@ module Rack #:nodoc:
           components  = $'.split(Utils::HYPHEN_SPLITTER)
           components.shift
 
-          @primary, @extlang = @primary.split(Utils::HYPHEN_SPLITTER) if @primary.include?(Const::HYPHEN)
+          @primary, *@extlang = @primary.split(Utils::HYPHEN_SPLITTER) if @primary.include?(Const::HYPHEN)
 
           @script.capitalize! if @script
           @region.upcase! if @region

data/lib/rack/acceptable/mixin/charsets.rb

@@ -0,0 +1,55 @@
+require 'rack/acceptable/utils'
+
+module Rack #:nodoc:
+  module Acceptable #:nodoc:
+    module Charsets
+
+      # ==== Returns
+      # An Array with wildcards / *downcased* Charsets and
+      # associated quality factors (qvalues). Default qvalue is 1.0.
+      #
+      # ==== Raises
+      # ArgumentError::
+      #   Syntax of the Accept-Charset request-header is bad.
+      #   For example, one of Charsets is not a 'token',
+      #   one of quality factors is malformed etc.
+      #
+      def acceptable_charsets
+        Utils.parse_header(
+          env[Const::ENV_HTTP_ACCEPT_CHARSET].to_s.downcase,
+          Utils::HTTP_ACCEPT_TOKEN_REGEX)
+      rescue
+        raise ArgumentError,
+        "Malformed Accept-Charset header: #{env[Const::ENV_HTTP_ACCEPT_CHARSET].inspect}"
+      end
+
+      # Checks if the Charset (as a +String+) passed acceptable.
+      # Works case-insensitively.
+      #
+      def accept_charset?(chs)
+        chs = chs.downcase
+        return true if (accepts = acceptable_charsets).empty?
+        if ch = accepts.assoc(chs) || accepts.assoc(Const::WILDCARD)
+          ch.last > 0
+        else
+          chs == Const::ISO_8859_1
+        end
+      rescue
+        false
+      end
+
+      # Detects the best Charset.
+      # Works case-insensitively.
+      #
+      def negotiate_charset(*things)
+        things.map!{|t| t.downcase}
+        Utils.detect_best_charset(things, acceptable_charsets)
+      end
+
+      alias :preferred_charset_from :negotiate_charset
+
+    end
+  end
+end
+
+# EOF

data/lib/rack/acceptable/mixin/encodings.rb

@@ -0,0 +1,30 @@
+require 'rack/acceptable/utils'
+
+module Rack #:nodoc:
+  module Acceptable #:nodoc:
+    module Encodings
+
+      # ==== Returns
+      # An Array with wildcards / *downcased* Content-Codings
+      # and associated quality factors (qvalues). Default qvalue is 1.0.
+      #
+      # ==== Raises
+      # ArgumentError::
+      #   Syntax of the Accept-Encoding request-header is bad.
+      #   For example, one of Content-Codings is not a 'token',
+      #   one of quality factors is malformed etc.
+      #
+      def acceptable_encodings
+        Utils.parse_header(
+          env[Const::ENV_HTTP_ACCEPT_ENCODING].to_s.downcase,
+          Utils::HTTP_ACCEPT_TOKEN_REGEX)
+      rescue
+        raise ArgumentError,
+        "Malformed Accept-Encoding header: #{env[Const::ENV_HTTP_ACCEPT_ENCODING].inspect}"
+      end
+
+    end
+  end
+end
+
+# EOF

data/lib/rack/acceptable/mixin/headers.rb

@@ -1,84 +1,14 @@
-require 'rack/acceptable/utils'
+require 'rack/acceptable/mixin/charsets'
+require 'rack/acceptable/mixin/encodings'
+require 'rack/acceptable/mixin/languages'
+require 'rack/acceptable/mixin/media'
 
 module Rack #:nodoc:
   module Acceptable #:nodoc:
     module Headers
 
-      # ==== Returns
-      # An Array with wildcards / *downcased* Content-Codings
-      # and associated quality factors (qvalues). Default qvalue is 1.0.
-      #
-      # ==== Raises
-      # ArgumentError::
-      #   Syntax of the Accept-Encoding request-header is bad.
-      #   For example, one of Content-Codings is not a 'token',
-      #   one of quality factors is malformed etc.
-      #
-      def acceptable_encodings
-        Utils.parse_header(
-          env[Const::ENV_HTTP_ACCEPT_ENCODING].to_s.downcase,
-          Utils::HTTP_ACCEPT_TOKEN_REGEX)
-      rescue
-        raise ArgumentError,
-        "Malformed Accept-Encoding header: #{env[Const::ENV_HTTP_ACCEPT_ENCODING].inspect}"
-      end
-
-      # ==== Returns
-      # An Array with wildcards / *downcased* Charsets and
-      # associated quality factors (qvalues). Default qvalue is 1.0.
-      #
-      # ==== Raises
-      # ArgumentError::
-      #   Syntax of the Accept-Charset request-header is bad.
-      #   For example, one of Charsets is not a 'token',
-      #   one of quality factors is malformed etc.
-      #
-      def acceptable_charsets
-        Utils.parse_header(
-          env[Const::ENV_HTTP_ACCEPT_CHARSET].to_s.downcase,
-          Utils::HTTP_ACCEPT_TOKEN_REGEX)
-      rescue
-        raise ArgumentError,
-        "Malformed Accept-Charset header: #{env[Const::ENV_HTTP_ACCEPT_CHARSET].inspect}"
-      end
-
-      # ==== Returns
-      # An Array with wildcards / Language-Tags (as +Strings+)
-      # and associated quality factors (qvalues). Default qvalue is 1.0.
-      #
-      # ==== Raises
-      # ArgumentError::
-      #   Syntax of the Accept-Language request-header is bad.
-      #   For example, one of Language-Ranges is not in a RFC 'Language-Range'
-      #   pattern, one of quality factors is malformed etc.
-      #
-      # ==== Notes
-      # * It uses {Extended Language-Range pattern}[http://tools.ietf.org/html/rfc4647#section-2.2].
-      # * It does *not* perform 'convenient transformations' (downcasing of primary tags etc).
-      #   In other words, it parses Accept-Language header in unpretentious manner.
-      #
-      def acceptable_language_ranges
-        Utils.parse_header(
-          env[Const::ENV_HTTP_ACCEPT_LANGUAGE].to_s,
-          Utils::HTTP_ACCEPT_LANGUAGE_REGEX)
-      rescue
-        raise ArgumentError,
-        "Malformed Accept-Language header: #{env[Const::ENV_HTTP_ACCEPT_LANGUAGE].inspect}"
-      end
-
-      # ==== Returns
-      # An Array with Media-Ranges (as +Strings+) / wildcards and
-      # associated qvalues. Default qvalue is 1.0.
-      #
-      # ==== Raises
-      # ArgumentError::
-      #   There's a malformed qvalue in header.
-      #
-      def acceptable_media_ranges
-        Utils.extract_qvalues(env[Const::ENV_HTTP_ACCEPT].to_s)
-      rescue
-        raise ArgumentError,
-        "Malformed Accept header: #{env[Const::ENV_HTTP_ACCEPT].inspect}"
+      def self.included(mod)
+        mod.send :include, Charsets, Encodings, Languages, Media
       end
 
     end

data/lib/rack/acceptable/mixin/languages.rb

@@ -0,0 +1,46 @@
+require 'rack/acceptable/language_tag'
+
+module Rack #:nodoc:
+  module Acceptable #:nodoc:
+    module Languages
+
+      # ==== Returns
+      # An Array with wildcards / Language-Tags (as +Strings+)
+      # and associated quality factors (qvalues). Default qvalue is 1.0.
+      #
+      # ==== Raises
+      # ArgumentError::
+      #   Syntax of the Accept-Language request-header is bad.
+      #   For example, one of Language-Ranges is not in a RFC 'Language-Range'
+      #   pattern, one of quality factors is malformed etc.
+      #
+      # ==== Notes
+      # * It uses {Extended Language-Range pattern}[http://tools.ietf.org/html/rfc4647#section-2.2].
+      # * It does *not* perform 'convenient transformations' (downcasing of primary tags etc).
+      #   In other words, it parses Accept-Language header in unpretentious manner.
+      #
+      def acceptable_language_ranges
+        Utils.parse_header(
+          env[Const::ENV_HTTP_ACCEPT_LANGUAGE].to_s,
+          Utils::HTTP_ACCEPT_LANGUAGE_REGEX)
+      rescue
+        raise ArgumentError,
+        "Malformed Accept-Language header: #{env[Const::ENV_HTTP_ACCEPT_LANGUAGE].inspect}"
+      end
+
+      # Checks if the Language-Tag (as a +String+ or
+      # +Rack::Acceptable::LanguageTag+) passed acceptable.
+      # Works case-insensitively.
+      #
+      def accept_language?(tag)
+        langtag = LanguageTag.parse(tag)
+        acceptable_language_ranges.any? { |l,q| q > 0 && langtag.matched_by_extended_range?(l) }
+      rescue
+        false
+      end
+
+    end
+  end
+end
+
+# EOF

data/lib/rack/acceptable/mixin/media.rb

@@ -4,6 +4,21 @@ module Rack #:nodoc:
   module Acceptable #:nodoc:
     module Media
 
+      # ==== Returns
+      # An Array with Media-Ranges (as +Strings+) / wildcards and
+      # associated qvalues. Default qvalue is 1.0.
+      #
+      # ==== Raises
+      # ArgumentError::
+      #   There's a malformed qvalue in header.
+      #
+      def acceptable_media_ranges
+        Utils.extract_qvalues(env[Const::ENV_HTTP_ACCEPT].to_s)
+      rescue
+        raise ArgumentError,
+        "Malformed Accept header: #{env[Const::ENV_HTTP_ACCEPT].inspect}"
+      end
+
       # ==== Returns
       # An Array with *completely* parsed MIME-Types (incl. qvalues
       # and accept-extensions; see Rack::Acceptable::MIMETypes).
@@ -17,16 +32,13 @@ module Rack #:nodoc:
       #   or, at last, one of MIME-Types has malformed qvalue.
       #
       def acceptable_media
-        @_acceptable_media ||= begin
-          header = env[Const::ENV_HTTP_ACCEPT].to_s
-          header.split(Utils::COMMA_SPLITTER).map! { |entry| MIMETypes.parse_mime_type(entry) }
-        end
+        header = env[Const::ENV_HTTP_ACCEPT].to_s
+        header.split(Utils::COMMA_SPLITTER).map! { |entry| MIMETypes.parse_mime_type(entry) }
       end
 
       # Checks if the MIME-Type passed acceptable.
       def accept_media?(thing)
-        qvalue = MIMETypes.weigh_mime_type(thing, acceptable_media).first
-        qvalue > 0
+        MIMETypes.weigh_mime_type(thing, acceptable_media).first > 0
       rescue
         false
       end

data/lib/rack/acceptable/request.rb

@@ -1,28 +1,18 @@
 require 'rack/request'
 require 'rack/acceptable/mixin/headers'
-require 'rack/acceptable/mixin/media'
 
 module Rack #:nodoc:
   module Acceptable #:nodoc:
     class Request < Rack::Request
+
       include Rack::Acceptable::Headers
-      include Rack::Acceptable::Media
 
-      def acceptable_charsets
-        @_acceptable_charsets ||= super
+      def acceptable_media
+        @_acceptable_media ||= super
       end
 
-      def accept_charset?(chs)
-        chs = chs.downcase
-        accepts = acceptable_charsets
-        return true if accepts.empty?
-        if ch = accepts.assoc(chs) || accepts.assoc(Const::WILDCARD)
-          ch.last > 0
-        else
-          chs == Const::ISO_8859_1
-        end
-      rescue
-        false
+      def acceptable_charsets
+        @_acceptable_charsets ||= super
       end
 
       def accept_content?(content_type)

data/lib/rack/acceptable/utils.rb

@@ -23,8 +23,8 @@ module Rack #:nodoc:
       if RUBY_VERSION < '1.9.1'
 
         PAIR_SPLITTER       = /\=/.freeze
-        HYPHEN_SPLITTER     = /-/
-        COMMA_SPLITTER      = /,/
+        HYPHEN_SPLITTER     = /-/.freeze
+        COMMA_SPLITTER      = /,/.freeze
         SEMICOLON_SPLITTER  = /;/.freeze
 
       else
@@ -211,6 +211,7 @@ module Rack #:nodoc:
       # use of digits anywhere in the 'language-range' (see [RFC2616errata]).
       #++
 
+      # TODO: move to LanguageTag or Languages
       HTTP_ACCEPT_LANGUAGE_REGEX = /^\s*(\*|[a-z]{1,8}(?:-[a-z\d]{1,8}|-\*)*)#{Utils::QUALITY_PATTERN}\s*$/io.freeze
 
       def normalize_header(header)

data/lib/rack/acceptable/version.rb

@@ -1,6 +1,6 @@
 module Rack #:nodoc:
   module Acceptable #:nodoc:
-    VERSION = '0.2.2'
+    VERSION = '0.2.3'
   end
 end
 

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acceptable
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - SSDany
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-17 00:00:00 +04:00
+date: 2010-07-01 00:00:00 +04: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: 23
         segments: 
         - 1
         - 0
@@ -47,11 +50,14 @@ files:
 - README.rdoc
 - lib/rack/acceptable/const.rb
 - lib/rack/acceptable/language_tag.rb
+- lib/rack/acceptable/middleware/fake_accept.rb
 - lib/rack/acceptable/middleware/formats.rb
 - lib/rack/acceptable/middleware/provides.rb
-- lib/rack/acceptable/middleware/fake_accept.rb
 - lib/rack/acceptable/mimetypes.rb
+- lib/rack/acceptable/mixin/charsets.rb
+- lib/rack/acceptable/mixin/encodings.rb
 - lib/rack/acceptable/mixin/headers.rb
+- lib/rack/acceptable/mixin/languages.rb
 - lib/rack/acceptable/mixin/media.rb
 - lib/rack/acceptable/request.rb
 - lib/rack/acceptable/utils.rb
@@ -68,23 +74,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: acceptable
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: HTTP Accept parsers for Rack.