deas 0.43.1 → 0.43.2

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA512: 
-  metadata.gz: a7ed98879ce4a9d86af5566709fe01be46427628d0baebc35c26ac81e2f40dfa7f898c44fcd9300786ef6428386aea84cd196bd94fe5368b226b7575cc05250c
-  data.tar.gz: 4ddcc49f557e452abdae183b326c70b9e3fbef06a22aa74d3888d2daceec2864911caa45f9cb1869d1dd7b3b9f3272b9d9d16327bdcb7a845ca1db3f2eb1509d
+  data.tar.gz: e403a802075f89ab829566ba256b79221a10273f3fdb20d21ae58f66fda70085cd5cdf0b712137be474a9231fb497a81ef189bf55385e7973f181f244b6ce602
+  metadata.gz: 9e005de9f5cec15678ebf7143e411feeb1c12052475db54835098d6f76caf5bb899f38bda57f78cf2134d0ea67aaa34d060bffc88955e443f66bbbf501f25b63
 SHA1: 
-  metadata.gz: efa732131bcecfd7712c8f4dfce268c51f78063f
-  data.tar.gz: ca2a30817b98efa05ee407d93c5626b3c236873a
+  data.tar.gz: 63474eca3289942ca6056204b8f8e7a88cf584b4
+  metadata.gz: b114e09b539e8dae5b65dbbd9b37d600bf2ac05d

data/deas.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency("assert-rack-test", ["~> 1.0.4"])
 
   gem.add_dependency("much-plugin", ["~> 0.2.0"])
-  gem.add_dependency("rack",        ["~> 1.6.4"])
+  gem.add_dependency("rack",        ["~> 1.1"])
   gem.add_dependency("sinatra",     ["~> 1.2"])
 
 end

data/lib/deas/runner.rb

@@ -188,7 +188,7 @@ module Deas
       def initialize(value)
         @value = if value.is_a?(::Array)
           value.map{ |i| self.class.new(i).value }
-        elsif Rack::Utils.params_hash_type?(value)
+        elsif self.hash_type?(value)
           value.inject({}){ |h, (k, v)| h[k.to_s] = self.class.new(v).value; h }
         elsif self.file_type?(value)
           value
@@ -201,6 +201,14 @@ module Deas
         raise NotImplementedError
       end
 
+      def hash_type?(value)
+        # this supports older Rack versions (that don't have
+        # Utils#params_hash_type?)
+        ( Rack::Utils.respond_to?('params_hash_type?') &&
+          Rack::Utils.params_hash_type?(value)
+        ) || value.kind_of?(::Hash)
+      end
+
     end
 
     class SendFileBody
@@ -215,7 +223,7 @@ module Deas
         @path_name = path_name
 
         file_size = @path_name.size? || Rack::Utils.bytesize(path_name.read)
-        ranges = Rack::Utils.byte_ranges(env, file_size)
+        ranges = byte_ranges(env, file_size)
         if ranges.nil? || ranges.empty? || ranges.length > 1
           # No ranges or multiple ranges are not supported
           @range         = 0..file_size-1
@@ -262,6 +270,16 @@ module Deas
         self.range_end      == other_body.range_end
       end
 
+      private
+
+      def byte_ranges(env, file_size)
+        if Rack::Utils.respond_to?('byte_ranges')
+          Rack::Utils.byte_ranges(env, file_size)
+        else
+          nil
+        end
+      end
+
     end
 
   end

data/lib/deas/version.rb

@@ -1,3 +1,3 @@
 module Deas
-  VERSION = "0.43.1"
+  VERSION = "0.43.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: deas
 version: !ruby/object:Gem::Version 
-  version: 0.43.1
+  version: 0.43.2
 platform: ruby
 authors: 
 - Kelly Redding
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-11-08 00:00:00 Z
+date: 2017-04-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: assert
@@ -49,7 +49,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.6.4
+        version: "1.1"
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Handler-based web framework powered by Sinatra