tilia-http 4.1.0.8 → 4.2.1

data/lib/tilia/http.rb

@@ -56,9 +56,9 @@ module Tilia
     #   http://tools.ietf.org/html/rfc7231#section-7.1.1.1
     #
     # @param [String] date_string
-    # @return bool|DateTime
+    # @return [Time, nil]
     def self.parse_date(date_string)
-      return false unless date_string
+      return nil if date_string.blank?
 
       # Only the format is checked, valid ranges are checked by strtotime below
       month = '(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)'
@@ -83,7 +83,7 @@ module Tilia
       # allow for space around the string and strip it
       date_string.strip!
 
-      return false unless date_string =~ /^#{http_date}$/
+      return nil unless date_string =~ /^#{http_date}$/
 
       date = Time.zone.parse date_string
 
@@ -112,7 +112,7 @@ module Tilia
 
     # Transforms a DateTime object to a valid HTTP/1.1 Date header value
     #
-    # @param DateTime date_time
+    # @param [Time] date_time
     # @return [String]
     def self.to_date(date_time)
       # We need to clone it, as we don't want to affect the existing
@@ -136,10 +136,10 @@ module Tilia
     # implying that no accept header was sent.
     #
     # @param [String, nil] accept_header_value
-    # @param array available_options
+    # @param [Array<String>] available_options
     # @return [String, nil]
     def self.negotiate_content_type(accept_header_value, available_options)
-      unless accept_header_value
+      if accept_header_value.blank?
         # Grabbing the first in the list.
         return available_options[0]
       end
@@ -223,7 +223,7 @@ module Tilia
     # Parameters are currently discarded. There's no known prefer value that
     # uses them.
     #
-    # @param [String, Array<String>] header
+    # @param [String, Array<String>] input
     # @return array
     def self.parse_prefer(input)
       token = '[!#$%&\'*+\-.^_`~A-Za-z0-9]+'
@@ -287,7 +287,7 @@ $
     #
     # @param [String, Array<String>] values
     # @param [String, Array<String>] values2
-    # @return [String][]
+    # @return [Array<String>]
     def self.header_values(values, values2 = nil)
       values = [values] unless values.is_a?(Array)
       if values2
@@ -313,7 +313,7 @@ $
     # 4. parameters
     #
     # @param [String] str
-    # @return array
+    # @return [Hash, nil]
     def self.parse_mime_type(str)
       parameters = {}
       # If no q= parameter appears, then quality = 1.

data/test/http/message_test.rb

@@ -36,6 +36,30 @@ module Tilia
         assert_equal(body, message.body)
       end
 
+      # It's possible that streams contains more data than the Content-Length.
+      #
+      # The request object should make sure to never emit more than
+      # Content-Length, if Content-Length is set.
+      #
+      # This is in particular useful when respoding to range requests with
+      # streams that represent files on the filesystem, as it's possible to just
+      # seek the stream to a certain point, set the content-length and let the
+      # request object do the rest.
+      def test_long_stream_to_string_body
+        body = StringIO.new
+        body.write('abcdefg')
+        body.seek(2)
+
+        message = MessageMock.new
+        message.body = body
+        message.update_header('Content-Length', '4')
+
+        assert_equal(
+          'cdef',
+          message.body_as_string
+        )
+      end
+
       def test_get_empty_body_stream
         message = MessageMock.new
         body = message.body_as_stream
@@ -154,10 +178,6 @@ module Tilia
 
     class MessageMock
       include Message
-
-      def initialize
-        initialize_message
-      end
     end
   end
 end

data/test/http/url_util_test.rb

@@ -129,7 +129,7 @@ module Tilia
           'foo/'                     => ['', 'foo'],
           '/foo/'                    => ['', 'foo'],
           '/foo'                     => ['', 'foo'],
-          ''                         => [nil, nil],
+          ''                         => ['', ''],
 
           # UTF-8
           "/\xC3\xA0fo\xC3\xB3/bar"  => ["/\xC3\xA0fo\xC3\xB3", 'bar'],

data/tilia-http.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email       = 'tilia@jakobsack.de'
   s.files       = `git ls-files`.split("\n")
   s.homepage    = 'https://github.com/tilia/tilia-http'
-  s.add_runtime_dependency 'activesupport', '~> 4.2'
+  s.add_runtime_dependency 'activesupport', '>= 4.0'
   s.add_runtime_dependency 'typhoeus', '~> 0.8'
   s.add_runtime_dependency 'rchardet', '~>1.6'
   s.add_runtime_dependency 'tilia-event', '~> 2.0'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tilia-http
 version: !ruby/object:Gem::Version
-  version: 4.1.0.8
+  version: 4.2.1
 platform: ruby
 authors:
 - Jakob Sack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -119,6 +119,7 @@ files:
 - examples/asyncclient.rb
 - examples/basicauth.rb
 - examples/client.rb
+- examples/digestauth.rb
 - examples/reverseproxy.rb
 - examples/stringify.rb
 - lib/tilia/http.rb