amber-kit 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b2b0cde2d48a5f894ed730b36260d428de273da
-  data.tar.gz: df73ca4d62fb83e44fde411594a1d451a3448dbe
+  metadata.gz: abb5d6f5194b5bcc43b59ae0fe579bc79e343535
+  data.tar.gz: e0b86813cc0a55e49d0da869671cc1401885a86f
 SHA512:
-  metadata.gz: d0e02a5aa95e3fbfd6d2cf492fc333b9673a20c565e16452a99b711c3943343ac03f30279ef4bc65b30f2aa21131264bb602136d92afc858380f36f48d627d5c
-  data.tar.gz: b2c3db8bcb7203822e8f9604a7f288a35c7a082fb825372128ad651b8718d92e0eb8be1180d3ca1d79c56d2c4734ba779c59fd739c696fe04e699b432c20fb8f
+  metadata.gz: '018de9241807b73a26e98dc1bf0f4f8019c3e459ee83bfd79991582e8829f5735eabdfbe8ae4f42c70b5b95a80ffb4b6dfd668b7ea4ee1e2b9bd8772d4dbbfa4'
+  data.tar.gz: 1f44b60554f41266fd0e84069504302203cce62fc520424368e2f9468ac3c0fed8d5e711ab38bc53d15b6b8d0eb48e0e7a8bb31770eb78b7833966112d5e1ac3

data/amber.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "amber-kit"
-  s.version = "0.0.1"
+  s.version = "0.0.3"
   s.authors = ["Jakit"]
   s.date = "2017-06-03"
   s.summary = "A glitter network toolkit"

data/lib/amber/http/request.rb

@@ -1,5 +1,5 @@
 class Amber::Http::Request < Amber::Http
-  attr_reader :method, :url, :query, :protocol, :body
+  attr_reader :method, :url, :query, :protocol, :body, :body_raw_data
   
   GET = "GET"
   POST = "POST"
@@ -22,8 +22,6 @@ class Amber::Http::Request < Amber::Http
 
     self.receive_header
 
-    # p @header
-
     if @header.has_key?("Content-Length")
       content_length = @header["Content-Length"].to_i
 
@@ -33,7 +31,6 @@ class Amber::Http::Request < Amber::Http
     end
 
     # p @body_raw_data
-
     # p @body
 
     return true
@@ -43,16 +40,14 @@ class Amber::Http::Request < Amber::Http
     last_token = ""
     data = ""
 
-    Timeout::timeout(30) {
-      while buffer = @socket.recv_nonblock(1)
-        if last_token == "\r" && buffer == "\n"
-          break
-        end
-
-        data << buffer
-        last_token = buffer
+    while buffer = @socket.recv(1)
+      if last_token == "\r" && buffer == "\n"
+        break
       end
-    }
+
+      data << buffer
+      last_token = buffer
+    end
     
     self.parse_request(data)
   end
@@ -98,8 +93,21 @@ class Amber::Http::Request < Amber::Http
     query_info.each do |query_info_item|
       query_item = query_info_item.split "="
       if query_item.length == 2
-        query_item_key = query_item[0]
-        query_item_value = query_item[1]
+        query_item_key = URI.decode query_item[0]
+        query_item_value = URI.decode query_item[1]
+        if query_item_key.index "[]"
+          pure_query_item_key = query_item_key.gsub '[]', ''
+          if query_item_key.match /^\w+\[\]$/
+            query_value = @query[pure_query_item_key]
+            if query_value.is_a? Array
+              query_value.push query_item_value
+            else
+              query_value = [query_item_value]
+            end
+            @query[pure_query_item_key] = query_value
+            next
+          end
+        end
         @query[query_item_key] = query_item_value
       end
     end
@@ -113,7 +121,7 @@ class Amber::Http::Request < Amber::Http
     last_token = ""
     data = ""
 
-    while buffer = @socket.recv_nonblock(1)
+    while buffer = @socket.recv(1)
       if last_token == "\r" && buffer == "\n"
         break
       end
@@ -140,7 +148,11 @@ class Amber::Http::Request < Amber::Http
   end
 
   def receive_body(size)
-    data = @socket.recv(size)
+    data = ""
+    while data.length < size
+      data << @socket.read(1)
+    end
+    # data = @socket.recv(size)
     self.parse_body(data)
   end
 
@@ -149,7 +161,6 @@ class Amber::Http::Request < Amber::Http
 
     if @header.has_key?("Content-Type")
       content_type = @header["Content-Type"]
-
       if content_type.include? "application/x-www-form-urlencoded"
         self.parse_form_body(data)
       elsif content_type.include? "multipart/form-data"

data/lib/amber/server.rb

@@ -1,7 +1,7 @@
 class Amber::Server
   attr_accessor :port, :host, :base
 
-  def initialize(port = 3001, host = '127.0.0.1')
+  def initialize(port = 3001, host = '0.0.0.0')
     @port = port
     @host = host
     @server_socket

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amber-kit
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Jakit