funky-simplehttp 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6471a61784877b5b5181c19ed5e00a7f2e697d36
-  data.tar.gz: 54ee42512ad74400de15481c39948ff8fff5764d
+  metadata.gz: 91eb1f2def5e71aa35240632d575ecbff9071f3c
+  data.tar.gz: 6feb16d0852cf57f3f813b81135285b459033919
 SHA512:
-  metadata.gz: c37138213a86276f4254676aee4df50c8522981bc422cdcbc2a62d348475aa74b78f6446593b0451367340d24b66bc70c4db169fd9a5e1d647f950e273888874
-  data.tar.gz: 57a0d1e595a556efe7e466e9eb094c530402b82bc106be167e7f68cb473d9be2f365d6bc9012fa21160cc2e3998c1e65f2a8f55ab78e41363277618593d08284
+  metadata.gz: 2880c6336480feab81bde1c999f46b10d63fc9048902e7fcbfcd75ec4566a07295216886b9dfcb0233cabdc003901460a5cbf4c600cffa73b0d4b1e574e038fc
+  data.tar.gz: 323180e1ad0f4d3d5450f44dda266355bdb4cc466d6d710ae38f21e0337520209c47b76b85abd4bdbbf0c2c4d44715a397b6faaa0e20d09502833a83aca90115

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
+gem 'da_funk', '~> 1.3'
+
 gemspec

data/Gemfile.lock

@@ -1,17 +1,37 @@
 PATH
   remote: .
   specs:
-    funky-simplehttp (0.4.4)
+    funky-simplehttp (0.5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    rake (10.4.2)
+    archive-zip (0.10.0)
+      io-like (~> 0.3.0)
+    cloudwalk_handshake (0.12.0)
+    da_funk (1.3.1)
+      archive-zip (~> 0.5)
+      bundler
+      cloudwalk_handshake
+      funky-emv
+      posxml_parser
+      rake
+    funky-emv (0.15.0)
+      funky-tlv (~> 0.2)
+    funky-tlv (0.2.3)
+    io-like (0.3.0)
+    posxml_parser (1.1.0)
+      funky-emv (~> 0.3)
+    rake (12.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.7)
+  bundler
+  da_funk (~> 1.3)
   funky-simplehttp!
-  rake (~> 10.0)
+  rake
+
+BUNDLED WITH
+   1.16.1

data/Rakefile

@@ -1,36 +1,10 @@
 require 'rake'
-#require "bundler/gem_tasks"
+require 'fileutils'
+require 'bundler/setup'
 
-SIMPLEHTTP_ROOT = File.dirname(File.expand_path(__FILE__))
-SIMPLEHTTP_OUT  = File.join(SIMPLEHTTP_ROOT, "out", "funky-simplehttp.mrb")
+Bundler.require(:default)
 
-task :default => :build
-
-task :check do
-  if ENV["MRBC"].nil?
-    if system("type cloudwalk > /dev/null 2>&1 ")
-      ENV["MRBC"] = "env cloudwalk compile"
-    elsif system("type mrbc > /dev/null 2>&1 ")
-      ENV["MRBC"] = "env mrbc"
-    else
-      puts "$MRBC isn't set or mrbc/cloudwalk isn't on $PATH"
-      exit 0
-    end
-  end
-end
-
-desc "Compile simplehttp to mrb"
-task :build => :check do
-  sh "mkdir -p #{File.join(SIMPLEHTTP_ROOT, "out")}"
-  if ENV["MRBC"]
-    sh "#{ENV["MRBC"]} -g -o #{SIMPLEHTTP_OUT} #{File.join(SIMPLEHTTP_ROOT, "lib", "funky-simplehttp.rb")} "
-  else
-    sh "env mrbc -g -o #{SIMPLEHTTP_OUT} #{File.join(SIMPLEHTTP_ROOT, "lib", "funky-simplehttp.rb")} "
-  end
+DaFunk::RakeTask.new do |t|
+  t.mrbc  = "cloudwalk compile"
+  t.mruby = "cloudwalk run -b"
 end
-
-desc "Clobber/Clean"
-task :clean => :check do
-  sh "mkdir -p out"
-  sh "rm -f #{SIMPLEHTTP_OUT}"
-end

data/funky-simplehttp.gemspec

@@ -1,7 +1,7 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'funky-simplehttp.rb'
+require 'version.rb'
 
 Gem::Specification.new do |spec|
   spec.name          = "funky-simplehttp"
@@ -12,11 +12,12 @@ Gem::Specification.new do |spec|
   spec.description   = "Minimal HTTP implementation"
   spec.homepage      = "http://github.com/cloudwalkio/funky-simplehttp"
   spec.license       = "MIT"
-  spec.files         = `git ls-files -z`.split("\x0") << "out/funky-simplehttp.mrb"
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.files         = %w(.gitignore Gemfile Gemfile.lock README.md Rakefile funky-simplehttp.gemspec lib/version.rb out/funky-simplehttp/main.mrb)
+  spec.executables   = []
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = '>= 1.9.3'
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "rake"
 end

data/lib/version.rb

@@ -0,0 +1,5 @@
+class SimpleHttp
+  def self.version
+    "0.5.0"
+  end
+end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: funky-simplehttp
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Thiago Scalone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2018-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 description: Minimal HTTP implementation
 email:
 - thiago@scalone.com.br
@@ -45,14 +45,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
 - funky-simplehttp.gemspec
-- lib/funky-simplehttp.rb
-- out/funky-simplehttp.mrb
+- lib/version.rb
+- out/funky-simplehttp/main.mrb
 homepage: http://github.com/cloudwalkio/funky-simplehttp
 licenses:
 - MIT
@@ -63,19 +63,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Simplehttp
 test_files: []
-has_rdoc: 

data/lib/funky-simplehttp.rb

@@ -1,255 +0,0 @@
-class SimpleHttp
-  DEFAULTPORT = 80
-  DEFAULTHTTPSPORT = 443
-  HTTP_VERSION = "HTTP/1.0"
-  DEFAULT_ACCEPT = "*/*"
-  SEP = "\r\n"
-
-  def self.version
-    "0.4.4"
-  end
-
-  attr_accessor :socket, :socket_tcp, :support_fiber
-
-  def socket_class_exist?
-      c = Module.const_get("TCPSocket")
-      c.is_a?(Class)
-  rescue
-      return false
-  end
-
-  def uv_module_exist?
-      c = Module.const_get("UV")
-      c.is_a?(Module)
-  rescue
-      return false
-  end
-
-  def initialize(schema, address, port = nil)
-    @use_socket = false
-    @use_uv = false
-    if socket_class_exist?
-      @use_socket = true
-    end
-
-    if uv_module_exist?
-      @use_uv = true
-    end
-    @uri = {}
-    if @use_socket
-      # nothing
-    elsif @use_uv
-      ip = ""
-      UV::getaddrinfo(address, "http") do |x, info|
-        if info
-          ip = info.addr
-        end
-      end
-      UV::run()
-      @uri[:ip] = ip
-    else
-      raise "Not found Socket Class or UV Module"
-    end
-    @uri[:schema] = schema
-    @uri[:address] = address
-    if schema == "https"
-      @uri[:port] = port ? port.to_i : DEFAULTHTTPSPORT
-    else
-      @uri[:port] = port ? port.to_i : DEFAULTPORT
-    end
-    self
-  end
-
-  def address; @uri[:address]; end
-  def port; @uri[:port]; end
-
-  def get(path = "/", req = nil)
-    request("GET", path, req)
-  end
-
-  def post(path = "/", req = nil)
-    request("POST", path, req)
-  end
-
-  # private
-  def request(method, path, req)
-    @uri[:path] = path
-    if @uri[:path].nil?
-      @uri[:path] = "/"
-    elsif @uri[:path][0] != "/"
-      @uri[:path] = "/" + @uri[:path]
-    end
-    request_header = create_request_header(method.upcase.to_s, req)
-    response_text = send_request(request_header)
-    SimpleHttpResponse.new(response_text)
-  end
-
-  def read_fiber
-    response_text = ""
-    loop do
-      return "" if (@socket_tcp.nil? || @socket_tcp.closed?)
-      usleep(10000)
-      if (available = socket.bytes_available) > 0
-        usleep(10000)
-        t = socket.read(available)
-        usleep(10000)
-        break if t.nil?
-        response_text << t
-      end
-      finish = Fiber.yield(false)
-      if finish
-        return response_text
-      end
-    end
-    response_text
-  end
-
-  def read_normal
-    response_text = ""
-    while (t = socket.read(1024))
-      response_text += t
-    end
-    response_text
-  end
-
-  def support_fiber?
-    @support_fiber
-  end
-
-  def send_request(request_header)
-    response_text = ""
-    if @socket
-      socket.write(request_header)
-      if support_fiber?
-        response_text = read_fiber
-      else
-        response_text = read_normal
-      end
-    elsif @use_socket
-      @socket = TCPSocket.new(@uri[:address], @uri[:port])
-      if @uri[:schema] == "https"
-        entropy = PolarSSL::Entropy.new
-        ctr_drbg = PolarSSL::CtrDrbg.new entropy
-        ssl = PolarSSL::SSL.new
-        ssl.set_endpoint PolarSSL::SSL::SSL_IS_CLIENT
-        ssl.set_rng ctr_drbg
-        ssl.set_socket socket
-        ssl.handshake
-        ssl.write request_header
-        while chunk = ssl.read(2048)
-          response_text += chunk
-        end
-        ssl.close_notify
-        socket.close
-        ssl.close
-      else
-        socket.write(request_header)
-        while (t = socket.read(1024))
-          response_text += t
-        end
-        socket.close
-      end
-    elsif @use_uv
-      socket = UV::TCP.new()
-      socket.connect(UV.ip4_addr(@uri[:ip].sin_addr, @uri[:port])) do |x|
-        if x == 0
-          socket.write(request_header) do |x|
-            socket.read_start do |b|
-              response_text += b.to_s
-            end
-          end
-        else
-          socket.close()
-        end
-      end
-      UV::run()
-    else
-      raise "Not found Socket Class or UV Module"
-    end
-    response_text
-  end
-
-  def create_request_header(method, req)
-    req = {}  unless req
-    str = ""
-    body   = ""
-    str += sprintf("%s %s %s", method, @uri[:path], HTTP_VERSION) + SEP
-    header = {}
-    req.each do |key,value|
-      header[key.capitalize] = value
-    end
-    header["Host"] = @uri[:address]  unless header.keys.include?("Host")
-    header["Accept"] = DEFAULT_ACCEPT  unless header.keys.include?("Accept")
-    header["Connection"] = "close"
-    if header["Body"]
-      body = header["Body"]
-      header.delete("Body")
-    end
-    if method == "POST" && (not header.keys.include?("content-length".capitalize))
-        header["Content-Length"] = (body || '').length
-    end
-    header.keys.sort.each do |key|
-      str += sprintf("%s: %s", key, header[key]) + SEP
-    end
-    str + SEP + body
-  end
-
-  class SimpleHttpResponse
-    SEP = SimpleHttp::SEP
-    def initialize(response_text)
-      @response = {}
-      @headers = {}
-      if response_text.empty?
-        @response["header"] = nil
-      elsif response_text.include?(SEP + SEP)
-        @response["header"], @response["body"] = response_text.split(SEP + SEP, 2)
-      else
-        @response["header"] = response_text
-      end
-      parse_header
-      self
-    end
-
-    def [](key); @response[key]; end
-    def []=(key, value);  @response[key] = value; end
-
-    def header; @response['header']; end
-    def headers; @headers; end
-    def body; @response['body']; end
-    def status; @response['status']; end
-    def code; @response['code']; end
-    def date; @response['date']; end
-    def content_type; @response['content-type']; end
-    def content_length; @response['content-length']; end
-
-    def each(&block)
-      if block
-        @response.each do |k,v| block.call(k,v) end
-      end
-    end
-    def each_name(&block)
-      if block
-        @response.each do |k,v| block.call(k) end
-      end
-    end
-
-    # private
-    def parse_header
-      return unless @response["header"]
-      h = @response["header"].split(SEP)
-      if h[0].include?("HTTP/1")
-        @response["status"] = h[0].split(" ", 2).last
-        @response["code"]   = h[0].split(" ", 3)[1].to_i
-      end
-      h.each do |line|
-        if line.include?(": ")
-          k,v = line.split(": ")
-          @response[k.downcase] = v
-          @headers[k.downcase] = v
-        end
-      end
-    end
-  end
-end
-
-