rack-app 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3304681bebb6b2cf1f17d467c56de917705dcef
-  data.tar.gz: b1ce48173f17fad8673d9ade0f62c155e3db230b
+  metadata.gz: a4fd38db32ac4c1f0c5cf3508fe5c6334d821e17
+  data.tar.gz: c80bad21912abd9d75f001dd5c852ce5d56cbd79
 SHA512:
-  metadata.gz: e3c61fe0d4bd45eb0e430e1eb20ca0d5792994246a5bfe7089d443495f2be79506b3543a7627c50151203728b6e0e1e88b09118bb515cc8de9329edaca9f180e
-  data.tar.gz: d05b9441214071df709ada06ae70f42397911db5071a95a7f583a3934131c47bda92fa03c537dd4733fca62038eb469bba82a00d720338c348026c786c0cee13
+  metadata.gz: 060ec6750c13c76716e5e4dd9cf7102aef908b35bd7fd2674b54739ccd68b0020deb04cc83de2c3df80596cd401fac1b4a0c35895201eb3a7777f9cae0fa1bba
+  data.tar.gz: 10eded51b03e212224e094cc95856c63b03ac0a5df994f285142e870adfb55de05d88c4a6a81cf6da54a1cabc08db22f40ff83f76500209ba273d1adc9a70269

data/VERSION

@@ -1 +1 @@
-2.2.0
+2.3.0

data/lib/rack/app/instance_methods/upload.rb

@@ -2,8 +2,9 @@ module Rack::App::InstanceMethods::Upload
 
   def serve_file(file_path)
     raw_rack_resp = Rack::App::FileServer.serve_file(request.env, file_path)
+    response.status = raw_rack_resp[0]
     response.headers.merge!(raw_rack_resp[1])
-    response.body = raw_rack_resp.last
+    response.body = raw_rack_resp[2]
     return nil
   end
 

data/lib/rack/app/test.rb

@@ -2,6 +2,8 @@ require 'uri'
 require 'rack/app'
 module Rack::App::Test
 
+  require 'rack/app/test/utils'
+
   def self.included(klass)
     klass.__send__(:extend,SpecHelpers)
   end
@@ -40,109 +42,16 @@ module Rack::App::Test
     define_method(request_method) do |properties|
       properties ||= Hash.new
       url = properties.delete(:url)
-      request_env = request_env_by(request_method, url, properties)
-      rack_app.call(request_env).last
-    end
-  end
-
-  def format_properties(properties)
-    raise('use hash format such as params: {"key" => "value"} or headers with the same concept') unless properties.is_a?(Hash)
-    properties[:params] ||= {}
-    properties[:headers]||= {}
-
-    properties
-  end
-
-  def request_env_by(request_method, url, raw_properties)
-
-    properties = format_properties(raw_properties)
-    additional_headers = properties[:headers].reduce({}) { |m, (k, v)| m.merge("HTTP_#{k.to_s.gsub('-', '_').upcase}" => v.to_s) }
-
-
-    payload = raw_properties.delete(:payload)
-
-    io = case payload
-
-           when IO
-             payload
+      request_env = Rack::App::Test::Utils.request_env_by(request_method, url, properties)
+      raw_response = rack_app.call(request_env)
 
-           when String
-             StringIO.new(payload.to_s)
-
-           else
-             StringIO.new('')
-
-         end
-
-    additional_headers["rack.input"]= ::Rack::Lint::InputWrapper.new(io)
-
-    {
-        "REMOTE_ADDR" => "192.168.56.1",
-        "REQUEST_METHOD" => request_method.to_s.upcase,
-        "REQUEST_PATH" => url,
-        "REQUEST_URI" => url,
-        "PATH_INFO" => url,
-        "SERVER_PROTOCOL" => "HTTP/1.1",
-        "CONTENT_LENGTH" => "0",
-        "CONTENT_TYPE" => "application/x-www-form-urlencoded",
-        "SERVER_NAME" => "hds-dev.ett.local",
-        "SERVER_PORT" => "80",
-        "QUERY_STRING" => encode_www_form(properties[:params].to_a),
-        "HTTP_VERSION" => "HTTP/1.1",
-        "HTTP_USER_AGENT" => "spec",
-        "HTTP_HOST" => "spec.local",
-        "HTTP_ACCEPT_ENCODING" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
-        "HTTP_ACCEPT" => "*/*",
-        "HTTP_CONNECTION" => "close"
-    }.merge(additional_headers)
-
-  end
-
-  def encode_www_form(enum)
-    enum.map do |k, v|
-      if v.nil?
-        encode_www_form_component(k)
-      elsif v.respond_to?(:to_ary)
-        v.to_ary.map do |w|
-          str = encode_www_form_component(k)
-          unless w.nil?
-            str << '='
-            str << encode_www_form_component(w)
-          end
-        end.join('&')
-      else
-        str = encode_www_form_component(k)
-        str << '='
-        str << encode_www_form_component(v)
+      body = []
+      raw_response[2].each do |e|
+        body << e
       end
-    end.join('&')
-  end
-
-  TBLENCWWWCOMP_ = {} # :nodoc:
-  256.times do |i|
-    TBLENCWWWCOMP_['%%%02X' % i] = i.chr
-  end
-  TBLENCWWWCOMP_[' '] = '+'
-  TBLENCWWWCOMP_.freeze
-  TBLDECWWWCOMP = {} # :nodoc:
-  256.times do |i|
-    h, l = i>>4, i&15
-    TBLDECWWWCOMP[i.chr]= '%%%X%X' % [h, l]
-    TBLDECWWWCOMP[i.chr]= '%%%X%X' % [h, l]
-    TBLDECWWWCOMP[i.chr]= '%%%x%X' % [h, l]
-    TBLDECWWWCOMP[i.chr]= '%%%X%x' % [h, l]
-    TBLDECWWWCOMP[i.chr]= '%%%x%x' % [h, l]
-  end
-  TBLDECWWWCOMP['+'] = ' '
-  TBLDECWWWCOMP.freeze
-
-  def encode_www_form_component(str)
-    str = str.to_s.dup
 
-    TBLENCWWWCOMP_.each do |from,to|
-      str.gsub!(from,to)
+      return Rack::Response.new(body,raw_response[0],raw_response[1])
     end
-    str
   end
 
 end

data/lib/rack/app/test/utils.rb

@@ -0,0 +1,103 @@
+module Rack::App::Test::Utils
+  extend self
+
+  def format_properties(properties)
+    raise('use hash format such as params: {"key" => "value"} or headers with the same concept') unless properties.is_a?(Hash)
+    properties[:params] ||= {}
+    properties[:headers]||= {}
+
+    properties
+  end
+
+  def request_env_by(request_method, url, raw_properties)
+
+    properties = format_properties(raw_properties)
+    additional_headers = properties[:headers].reduce({}) { |m, (k, v)| m.merge("HTTP_#{k.to_s.gsub('-', '_').upcase}" => v.to_s) }
+
+    payload = raw_properties.delete(:payload)
+
+    io = case payload
+
+           when IO
+             payload
+
+           when String
+             StringIO.new(payload.to_s)
+
+           else
+             StringIO.new('')
+
+         end
+
+    additional_headers["rack.input"]= ::Rack::Lint::InputWrapper.new(io)
+
+    {
+        "REMOTE_ADDR" => "192.168.56.1",
+        "REQUEST_METHOD" => request_method.to_s.upcase,
+        "REQUEST_PATH" => url,
+        "REQUEST_URI" => url,
+        "PATH_INFO" => url,
+        "SERVER_PROTOCOL" => "HTTP/1.1",
+        "CONTENT_LENGTH" => "0",
+        "CONTENT_TYPE" => "application/x-www-form-urlencoded",
+        "SERVER_NAME" => "hds-dev.ett.local",
+        "SERVER_PORT" => "80",
+        "QUERY_STRING" => encode_www_form(properties[:params].to_a),
+        "HTTP_VERSION" => "HTTP/1.1",
+        "HTTP_USER_AGENT" => "spec",
+        "HTTP_HOST" => "spec.local",
+        "HTTP_ACCEPT_ENCODING" => "gzip;q=1.0,deflate;q=0.6,identity;q=0.3",
+        "HTTP_ACCEPT" => "*/*",
+        "HTTP_CONNECTION" => "close"
+    }.merge(additional_headers)
+
+  end
+
+  def encode_www_form(enum)
+    enum.map do |k, v|
+      if v.nil?
+        encode_www_form_component(k)
+      elsif v.respond_to?(:to_ary)
+        v.to_ary.map do |w|
+          str = encode_www_form_component(k)
+          unless w.nil?
+            str << '='
+            str << encode_www_form_component(w)
+          end
+        end.join('&')
+      else
+        str = encode_www_form_component(k)
+        str << '='
+        str << encode_www_form_component(v)
+      end
+    end.join('&')
+  end
+
+  TBLENCWWWCOMP_ = {} # :nodoc:
+  256.times do |i|
+    TBLENCWWWCOMP_['%%%02X' % i] = i.chr
+  end
+  TBLENCWWWCOMP_[' '] = '+'
+  TBLENCWWWCOMP_.freeze
+  TBLDECWWWCOMP = {} # :nodoc:
+  256.times do |i|
+    h, l = i>>4, i&15
+    TBLDECWWWCOMP[i.chr]= '%%%X%X' % [h, l]
+    TBLDECWWWCOMP[i.chr]= '%%%X%X' % [h, l]
+    TBLDECWWWCOMP[i.chr]= '%%%x%X' % [h, l]
+    TBLDECWWWCOMP[i.chr]= '%%%X%x' % [h, l]
+    TBLDECWWWCOMP[i.chr]= '%%%x%x' % [h, l]
+  end
+  TBLDECWWWCOMP['+'] = ' '
+  TBLDECWWWCOMP.freeze
+
+  def encode_www_form_component(str)
+    str = str.to_s.dup
+
+    TBLENCWWWCOMP_.each do |from,to|
+      str.gsub!(from,to)
+    end
+    str
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-app
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Adam Luzsi
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -114,6 +114,7 @@ files:
 - lib/rack/app/singleton_methods/route_handling.rb
 - lib/rack/app/singleton_methods/utility.rb
 - lib/rack/app/test.rb
+- lib/rack/app/test/utils.rb
 - lib/rack/app/utils.rb
 - lib/rack/app/version.rb
 - rack-app.gemspec