emmy-http 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70365ac9ad4776b5762ff755c75fdcbd94c7d038
-  data.tar.gz: f83c220fede9f1a9583e1e510da5703c79bf5166
+  metadata.gz: d26296dca8f3723e6a546df57216f76bcac7b0d7
+  data.tar.gz: 703a92886d8d7d49ad9d1d3b23f0aa45fc7a8b27
 SHA512:
-  metadata.gz: a3ef7b3cc76077633ba522cf2e9f629eb166503f18863c92cbea8ddedc20fa8162e7c5c5c363c6bb09a0a4a27e45756331ee5f8c8571485eff2fc25499a0b45a
-  data.tar.gz: f2428aacd6bd3545456e9e1d6532147e1b2ff6b042c8682fd971dd147d986cb0792c6c39d590e4a6f3fc59ec309e231d523fd9109befee712bfb27fe16ba6142
+  metadata.gz: 7ba57901437a6bf3168f8e9eed31f9782f97adae2ec1a02597bd070b96502e34a6e0023e8a678d6773a619cc4886f4cf1b36dfef14927f8f2d2c73b9da68e6d0
+  data.tar.gz: f99f6ac836f5be0312df16339a0f0d5d482a1d1c34ec83af52c11b702e77043578252bf867792343686e42e7dcc4168c7031ddd34dcd45f52da9130ac4c12745

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in emmy-http.gemspec
 gemspec
+
+gem 'emmy-machine'

data/emmy-http.gemspec

@@ -6,9 +6,9 @@ require 'emmy_http/version'
 Gem::Specification.new do |spec|
   spec.name          = "emmy-http"
   spec.version       = EmmyHttp::VERSION
-  spec.authors       = ["che"]
-  spec.email         = ["chelovekov@gmail.com"]
-  spec.summary       = %q{Emmy Http}
+  spec.authors       = ["inre"]
+  spec.email         = ["inre.storm@gmail.com"]
+  spec.summary       = %q{EmmyHttp is a  }
   #spec.description   = %q{TODO: Write a longer description. Optional.}
   spec.homepage      = ""
   spec.license       = "MIT"
@@ -18,9 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "emmy-machine", "~> 0.1"
+  #spec.add_dependency "emmy-machine", "~> 0.1"
   spec.add_dependency "fibre", "~> 0.9.3"
-  spec.add_dependency "model_pack", "~> 0.9"
+  spec.add_dependency "util_pack", "~> 0.1"
+  spec.add_dependency "model_pack", "~> 0.9.6"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/emmy_http.rb

@@ -1,15 +1,18 @@
 require "model_pack"
 require "emmy_http/version"
+require "forwardable"
 
 module EmmyHttp
   class ConnectionError < StandardError; end
   class TimeoutError < ConnectionError; end
 
   autoload :Adapter,   "emmy_http/adapter"
-  autoload :Timeouts,  "emmy_http/request/timeouts"
-  autoload :SSL,       "emmy_http/request/ssl"
+  autoload :Timeouts,  "emmy_http/client/timeouts"
+  autoload :Proxy,     "emmy_http/client/proxy"
+  autoload :SSL,       "emmy_http/client/ssl"
   autoload :Request,   "emmy_http/request"
   autoload :Operation, "emmy_http/operation"
   autoload :Response,  "emmy_http/response"
   autoload :Timeout,   "emmy_http/timeout"
+  autoload :Utils,     "emmy_http/utils"
 end

data/lib/emmy_http/adapter.rb

@@ -1,11 +1,11 @@
 module EmmyHttp
-  class Adapter
-    attr_accessor :delegate
-
-    %w(status headers body setup to_a).each do |method|
+  module Adapter
+    %w(delegate= to_a).each do |method|
       define_method method do
         raise 'method not implemented'
       end
     end
+
+    #<<<
   end
 end

data/lib/emmy_http/client/proxy.rb

@@ -0,0 +1,11 @@
+module EmmyHttp
+  class Proxy
+    include ModelPack::Document
+
+    attribute :type
+    attribute :host
+    attribute :port
+    attribute :username
+    attribute :password
+  end
+end

data/lib/emmy_http/{request → client}/ssl.rb

@@ -4,6 +4,7 @@ module EmmyHttp
 
     attribute :private_key_file
     attribute :cert_chain_file
+    attribute :ssl_version, default: :TLSv1
     attribute :verify_peer, predicate: true
   end
 end

data/lib/emmy_http/model.rb

@@ -0,0 +1,20 @@
+#
+# class Google
+#   include EmmyHttp::Model
+#   adapter EmmyExtends::EmHttpRequest
+#   default EmmyHttp::Request.new(
+#     type: "post",
+#     headers: {
+#       'Content-Type' => 'application/json'
+#     }
+#   )
+# end
+#
+# google = Google.new(url: 'http://google.com')
+# response = google.sync
+
+module EmmyHttp
+  module Model
+
+  end
+end

data/lib/emmy_http/operation.rb

@@ -10,11 +10,10 @@ module EmmyHttp
     events :init, :head, :success, :error
 
     def initialize(request, adapter)
-      @request = request
-      @adapter = adapter
+      raise "invalid adapter" if adapter.nil? || !adapter.respond_to?(:to_a) || !adapter.respond_to?(:delegate=)
+      @request          = request
+      @adapter          = adapter
       @adapter.delegate = self
-      @response = Response.new
-      setup
     end
 
     def connect
@@ -26,11 +25,23 @@ module EmmyHttp
         # create connection
         connect
 
+        on :init do |connection|
+          # update connection
+          @connection = connection
+        end
+
+        on :head do |response, operation, conn|
+          # set response
+          @response = response
+        end
+
         on :success do |response, operation, conn|
+          # return response
           fiber.resume response
         end
 
         on :error do |error, operation, conn|
+          # return error as exception
           fiber.leave ConnectionError, error.to_s
         end
       end
@@ -42,13 +53,13 @@ module EmmyHttp
 
     def serializable_hash
       {
-        request: request && request.serializable_hash,
+        request:  request.serializable_hash,
         response: response && response.serializable_hash
       }
     end
 
     private
-
+=begin
     def setup
       adapter.setup
 
@@ -57,19 +68,20 @@ module EmmyHttp
       end
 
       on :head do |operation, conn|
+        @response = request.response_class.new
         response.headers = operation.adapter.headers
       end
 
       on :success do |response, operation, conn|
         response.status = operation.adapter.status
-        response.body = operation.adapter.body
+        response.body   = operation.adapter.body
       end
 
       on :error do |error, operation, conn|
         response.status = operation.adapter.status
       end
     end
-
+=end
     #<<<
   end
 end

data/lib/emmy_http/request.rb

@@ -1,25 +1,59 @@
 module EmmyHttp
   class Request
     include ModelPack::Document
+    extend Forwardable
+
+    #def_delegator :operation, :sync, :init, :head, :success, :error, :init!, :head!, :success!, :error!, :to_a
 
     attribute :type, default: "get" # word *method* reserved in ruby
     attribute :url,
         writer: ->(url) { url.is_a?(URI) ? url : URI.parse(url) },
         serialize: ->(value) { value.to_s }
     dictionary :headers
-    attribute :body, default: ""
-    attribute :connect_timeout, default: 5
-    attribute :inactivity_timeout, default: 30
-    object :timeouts, class_name: Timeouts
+
+    attribute :query   # replace url.query
+    # POST, PUT
+    attribute :body    # string, json hash
+    attribute :form    # hash form
+    attribute :file    # path
+
+    attribute :keep_alive, predicate: true
+    attribute :redirects, default: 6
+
+    object :timeouts, class_name: Timeouts, default: Timeouts
     object :ssl, class_name: SSL
+    object :proxy, class_name: Proxy
+
+    attribute :adapter,
+        writer:    ->(class_name) { class_name.is_a?(String) ? constantize(class_name) : class_name },
+        serialize: ->(value) { value.to_s }
+=begin
+    attribute :response_class,
+        writer:    ->(class_name) { class_name.is_a?(String) ? constantize(class_name) : class_name },
+        serialize: ->(value) { value.to_s }
+
+    def initialize
+      @response_class = Response
+    end
+=end
+    def operation
+      @operation ||= EmmyHttp::Operation.new(self, adapter)
+    end
+
+    def sync
+      operation.sync
+    end
 
     # FIXME: move to model_pack
     def ssl?
       !!ssl
     end
 
-    def timeouts
-      @timeouts ||= Timeouts.new
+    private
+
+    def constantize(class_name)
+      return nil unless /\A(?:::)?([A-Z]\w*(?:::[A-Z]\w*)*)\z/ =~ class_name
+      Object.module_eval("::#{$1}", __FILE__, __LINE__)
     end
 
     #<<<

data/lib/emmy_http/response.rb

@@ -3,22 +3,41 @@ module EmmyHttp
     include ModelPack::Document
 
     attribute  :status
-    dictionary :headers, writer: -> (head) { convert_headers(head) }
+    dictionary :headers, writer: -> (head) { EmmyHttp::Utils.convert_headers(head) }
     attribute  :body
 
-    def to_a
-      [status, headers, body]
+    def reset
+      @status  = 0
+      @headers = {}
+      @body    = nil
+    end
+
+    def chunked_encoding?
+      headers['Transfer-Encoding'] =~ /chunked/i
+    end
+
+    def keepalive?
+      headers['Keep-Alive'] =~ /keep-alive/i
+    end
+
+    def compressed?
+      headers['Content-Encoding'] =~ /gzip|compressed|deflate/i
     end
 
-    # CONTENT_TYPE becomes Content-Type
-    def convert_headers(headers)
-      {}.tap do |result|
-        headers.each do |k, v|
-          words = k.split("_")
-          key = words.map { |w| w.downcase.capitalize }.join("-")
-          result[key] = v
-        end
-      end
+    def location
+      headers['Location']
+    end
+
+    def content_length
+      headers['Content-Length'].to_i
+    end
+
+    def redirection?
+      300 <= status && 400 > status
+    end
+
+    def to_a
+      [status, headers, body]
     end
 
     #<<<

data/lib/emmy_http/utils.rb

@@ -0,0 +1,13 @@
+module EmmyHttp
+  module Utils
+    extend self
+
+    # CONTENT_TYPE becomes Content-Type
+  def convert_headers(headers)
+      headers.inject({}) { |h, (k, v)|
+        h[k.split(/[_-]/).map { |w| w.downcase.capitalize }.join('-')] = v; h
+      }
+    end
+
+  end
+end

data/lib/emmy_http/version.rb

@@ -1,3 +1,3 @@
 module EmmyHttp
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/spec/emmy_http_spec.rb

@@ -17,24 +17,11 @@ describe EmmyHttp do
     extend self
   end
 
-  class FakeAdapter < EmmyHttp::Adapter
+  class FakeAdapter
+    attr_accessor :delegate
+    include EmmyHttp::Adapter
     using EventObject
 
-    def status
-      200
-    end
-
-    def headers
-      {'CONTENT_TYPE' => 'text/html'}
-    end
-
-    def body
-      "OK"
-    end
-
-    def setup
-    end
-
     def initialize_connection
       self.delegate.init! delegate
     end
@@ -42,7 +29,11 @@ describe EmmyHttp do
     def connected(conn)
       # replace request with timer
       EventMachine.add_timer(0) do
-        self.delegate.head!(delegate, conn)
+        response = EmmyHttp::Response.new
+        response.headers = {'CONTENT_TYPE' => 'text/html'}
+        response.status  = 200
+        self.delegate.head!(response, delegate, conn)
+        response.body = "OK"
         self.delegate.success!(delegate.response, delegate, conn)
       end
     end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: emmy-http
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
-- che
+- inre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: emmy-machine
+  name: fibre
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.9.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.9.3
 - !ruby/object:Gem::Dependency
-  name: fibre
+  name: util_pack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: model_pack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: 0.9.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -96,13 +96,12 @@ dependencies:
         version: '3'
 description: 
 email:
-- chelovekov@gmail.com
+- inre.storm@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -110,13 +109,16 @@ files:
 - lib/emmy_http.rb
 - lib/emmy_http/adapter.rb
 - lib/emmy_http/backend.rb
+- lib/emmy_http/client/proxy.rb
+- lib/emmy_http/client/ssl.rb
+- lib/emmy_http/client/timeouts.rb
+- lib/emmy_http/model.rb
 - lib/emmy_http/operation.rb
 - lib/emmy_http/request.rb
-- lib/emmy_http/request/ssl.rb
-- lib/emmy_http/request/timeouts.rb
 - lib/emmy_http/response.rb
 - lib/emmy_http/server/options.rb
 - lib/emmy_http/timeout.rb
+- lib/emmy_http/utils.rb
 - lib/emmy_http/version.rb
 - pkg/emmy-http-0.1.0.gem
 - pkg/emmy-http-0.1.1.gem
@@ -142,10 +144,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
-summary: Emmy Http
+summary: EmmyHttp is a
 test_files:
 - spec/emmy_http_spec.rb
 - spec/spec_helper.rb

data/Gemfile.lock

@@ -1,42 +0,0 @@
-PATH
-  remote: .
-  specs:
-    emmy-http (0.1.2)
-      emmy-machine (~> 0.1)
-      fibre (~> 0.9.3)
-      model_pack (~> 0.9)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    diff-lcs (1.2.5)
-    emmy-machine (0.1.6)
-      eventmachine (~> 1.0.3)
-      fibre (~> 0.9)
-    event_object (0.9.0)
-    eventmachine (1.0.3)
-    fibre (0.9.6)
-      event_object (~> 0.9)
-    model_pack (0.9.3)
-    rake (10.3.2)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.0)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.6)
-  emmy-http!
-  rake (~> 10.0)
-  rspec (~> 3)