hyperdrive 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b5a8dba0ecc2580c9ab5880da0499cd5a9bcd8e
-  data.tar.gz: 8746e9594475c4297e69e2e3852d8e1bd33aeb03
+  metadata.gz: e22db453e52f148ae6c1783abf43b7c59fc3989e
+  data.tar.gz: cd4d43dfb872603d09bf25e8072b165e9ce84c16
 SHA512:
-  metadata.gz: 07610251fb906637c086757dfd289c35413d4abaa79d3c676898deb14c10ed829a0a75322b2ce435dd09cd9e429b93e5c2fc2533477f17d33e9e7178b159bc35
-  data.tar.gz: edde3f5f65a6f0157f1c538be9b938d3500d92455025d1a843283ff5544a4c9a4fbd2efdb034b9851d7ae0d7b9c4fd2a6f5f2bccba06653fa911a350bbaba30b
+  metadata.gz: b3864057077ca0543eee1b87640ef8c91c2fc5cc1956f1c316f71cfb63bd9815b7eae1e04155452485546d4f0062fca1e084627ea296ded32426d0fa1168fdcc
+  data.tar.gz: 5379f7f0f77b54543c4c5c6bcad223a6ff73fa184894510f46b8e51a2be1f54316ea267ef9f05bf29762396826cc12c1f0505227239dfc4d64382c5dda4dcaaa

data/.travis.yml

@@ -1,14 +1,14 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.1.2
-  - 1.9.3
-  - jruby-head
-  - rbx-2
+- 2.1.2
+- 1.9.3
+- jruby-head
+- rbx-2
 matrix:
   allow_failures:
-    - rvm: rbx-2
-    - rvm: jruby-head
+  - rvm: rbx-2
+  - rvm: jruby-head
 env:
   global:
     secure: Tl3oBsBZRI5bMrtNH5mtTDvSTlTxNbsKaAnQ7KQ2KMyiH/eHolOSIbUYB9NB3GRMC6XSyFShRCaYPA/ET36HI+Jw3PFT/XADdiOdFqlk6VyJEUPznNQ1nlp8AsyNn+IexZXIl8DdqmZxGHlY6YKDbQV/U1v+FeW8X5j3TLN1mcw=
@@ -16,4 +16,4 @@ before_install: gem install bundler
 notifications:
   slack:
     rooms:
-      secure: iJbgfjVMSUb1+oTyMbQ5XPbNLcrgczXW06diPa1Q9NOsVO3XsAdNqt8bBRFYGKszJsXTV2XCxv7qf7Sf8uXfqWdWnqy1KyZ17aLTfpa7pSr1DwT4Q8lZ9tLFycIvyzl2gVU8k+ele35KN+J4OTTc1Mq3Gznabl5MINyElmA9zhU=
+      secure: jj875pnk9aOooLPRNNbmZEu5mMdvsoYpM+9mSInx4bGRTWYj3OsONbJ2q+Sj2EeB+C9adNabEhlVDJqPFD3475ol2Fsp5+1m24wK/a9gWjoU41ya2NPB1OUZBcos56mQFAPrAWKZhalJFp5YaNPjvKFXMiHbveoIRvZV4SniM58=

data/lib/hyperdrive/middleware/charset.rb

@@ -9,7 +9,7 @@ module Hyperdrive
 
       def call(env)
         unless %w(OPTIONS TRACE).include? env['REQUEST_METHOD']
-          charset = Rack::Accept::Charset.new(env['HTTP_ACCEPT_CHARSET'])
+          charset = Rack::Accept::Charset.new(env['HTTP_ACCEPT_CHARSET'] || '*')
           Hyperdrive::Utils.enforce_charset!(charset, env['hyperdrive.params'])
         end
         @app.call(env)

data/lib/hyperdrive/utils.rb

@@ -25,7 +25,8 @@ module Hyperdrive
     end
 
     def self.enforce_charset!(charset, params)
-      encoding = charset.value == '*' ? 'UTF-8' : find_encoding(charset.value)
+      encoding = find_encoding(charset)
+      raise Hyperdrive::Errors::NotAcceptable.new(charset.value) unless encoding.is_a? Encoding
       params.each_value do |value|
         value.encode!(encoding) if value.is_a? String
       end
@@ -33,12 +34,16 @@ module Hyperdrive
 
     private
 
-    def self.find_encoding(charset_value)
-      begin
-        Encoding.find(charset_value)
-      rescue
-        raise Hyperdrive::Errors::NotAcceptable.new(charset_value)
+    def self.find_encoding(charset)
+      return Encoding.find('UTF-8') if charset.value == '*'
+      values = charset.sort(charset.values)
+      values.each do |value|
+        begin
+          break Encoding.find(value)
+        rescue
+          next
+        end
       end
     end
   end
-end
+end

data/lib/hyperdrive/version.rb

@@ -1,3 +1,3 @@
 module Hyperdrive
-  VERSION = "0.0.22"
+  VERSION = "0.0.23"
 end

data/spec/hyperdrive/middleware/charset_spec.rb

@@ -3,7 +3,6 @@
 require 'spec_helper'
 
 describe Hyperdrive::Middleware::Charset do
-
   def app
     inner_app = ->(env) { [200, {}, [env['hyperdrive.params']]] }
     Hyperdrive::Middleware::Charset.new(inner_app)
@@ -19,4 +18,10 @@ describe Hyperdrive::Middleware::Charset do
     post '/', @params, @env.merge('hyperdrive.params' => @params)
     last_response.body.must_equal "{:id=>\"1001\", :name=>\"John Connor\"}"
   end
+
+  it "will enforce a default charset if accept-charset is not present" do
+    @env.delete('HTTP_ACCEPT_CHARSET')
+    post '/', @params, @env.merge('hyperdrive.params' => @params)
+    last_response.body.must_equal "{:id=>\"1001\", :name=>\"John Connor\"}"
+  end
 end

data/spec/hyperdrive/utils_spec.rb

@@ -58,9 +58,21 @@ describe Hyperdrive::Utils do
     end
 
     it 'raises an exception for an invalid encoding' do
-      encoding = Rack::Accept::Charset.new('nonsense')
+      encoding = Rack::Accept::Charset.new('nonsense, more-nonsense;q=0.8')
       -> { Hyperdrive::Utils.enforce_charset!(encoding, @params) }
         .must_raise Hyperdrive::Errors::NotAcceptable
     end
+
+    it 'enforces the best charset' do
+      encoding = Rack::Accept::Charset.new('unicode-1-1;q=0.8, iso-8859-5')
+      Hyperdrive::Utils.enforce_charset!(encoding, @params)
+      @params[:name].encoding.must_equal Encoding.find('iso-8859-5')
+    end
+
+    it 'enforces the best, supported charset' do
+      encoding = Rack::Accept::Charset.new('nonsense, nonsense;q=0.9, utf-8;q=0.8')
+      Hyperdrive::Utils.enforce_charset!(encoding, @params)
+      @params[:name].encoding.must_equal Encoding.find('utf-8')
+    end
   end
 end

data/spec/spec_helper.rb

@@ -34,7 +34,6 @@ module Hyperdrive
         'HTTP_ACCEPT' => 'application/vnd.hyperdrive.things+hal+json',
         'HTTP_ACCEPT_CHARSET' => 'UTF-8',
         'hyperdrive.accept' => Rack::Accept::MediaType.new('HTTP_ACCEPT' => 'application/vnd.hyperdrive.things+hal+json;q=0.8'),
-        'hyperdrive.accept_charset' => Rack::Accept::Charset.new('HTTP_ACCEPT_CHARSET' => 'UTF-8'),
         'hyperdrive.resource' => hyperdrive.resources[:things],
         'hyperdrive.media_type' => 'application/vnd.hyperdrive.things+hal+json'
       }
@@ -56,7 +55,6 @@ module Hyperdrive
         'hyperdrive.media_type' => 'application/vnd.hyperdrive.things+hal+json'
       }
       default_env.merge!('hyperdrive.accept' => Rack::Accept::MediaType.new(default_env['HTTP_ACCEPT']))
-      default_env.merge!('hyperdrive.accept_charset' => Rack::Accept::Charset.new(default_env['HTTP_ACCEPT_CHARSET']))
       default_env.merge!('hyperdrive.resource' => resource) if resource
       default_env
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyperdrive
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - StyleSeek Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: linguistics