emmy-http 0.3.0 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 245c9aadcae6350e5530b83c2b7c4ea26dff32e7
-  data.tar.gz: 64e9aff22e55d02c30098299694b32105121b2e0
+  metadata.gz: c3db217642cc4a19a04b9171fdf5e592a5f67d1e
+  data.tar.gz: dd2065202e52783ca08c454984fcedef72ddecaa
 SHA512:
-  metadata.gz: 5d7c309b72471cba3708b5c5a7e607d6844fdd0cc1d6a51cad68cbfeb359780e93467b11aa03d21967b8d147b953d1d9fecab32d3f84b874db66603b06b95ea2
-  data.tar.gz: 9332f4ce846ef1270d87423850d22371cf66ea41d0951243d0e87383aa13fb9fe7ac439d6cf80cfb20694c73cb7321c5c9c105d4daffb95643601a2029cd46ce
+  metadata.gz: 9548c80f5424446956fa75bcac344e75821f2511c3d8eb9c0ec5c223afd12317ed98d475f35f143f689048627627dbfee1c640827fed49309bdd223d83dbe2cf
+  data.tar.gz: 1a96f6c314de4fd25bd99add9b188b459c1e1b4394db74298194234b441094f880f413d8c243ea553990b80bec2bb1d38a5bbae3ed54e357ed9ff889252f6312

data/emmy-http.gemspec

@@ -12,10 +12,10 @@ end
 Gem::Specification.new do |spec|
   spec.name          = "emmy-http"
   spec.version       = EmmyHttp::VERSION
-  spec.authors       = ["inre"]
+  spec.authors       = ["Maksim V."]
   spec.email         = ["inre.storm@gmail.com"]
-  spec.summary       = %q{EmmyHttp - EventMachine's HTTP Client}
-  #spec.description   = %q{TODO: Write a longer description. Optional.}
+  spec.summary       = %q{Ruby HTTP interface}
+  spec.description   = spec.summary
   spec.homepage      = ""
   spec.license       = "MIT"
 
@@ -24,15 +24,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "event_object",   "~> 0.9"
+  spec.add_dependency "event_object",   "~> 1"
   spec.add_dependency "emmy-machine",   "~> 0.2"
-  spec.add_dependency "fibre",          "~> 0.9"
+  spec.add_dependency "fibre",          "~> 1"
   spec.add_dependency "util_pack",      "~> 0.1"
-  spec.add_dependency "model_pack",     "~> 0.9"
-  spec.add_dependency "addressable",    "~> 2.3"
+  spec.add_dependency "model_pack",     "~> 1"
+  spec.add_dependency "addressable",    "~> 2.5"
 
   spec.add_development_dependency "eventmachine", "~> 1.0"
-  spec.add_development_dependency "bundler",      "~> 1.6"
-  spec.add_development_dependency "rake",         "~> 10.0"
+  spec.add_development_dependency "bundler",      "~> 1.12"
+  spec.add_development_dependency "rake",         "~> 10"
   spec.add_development_dependency "rspec",        "~> 3"
 end

data/lib/emmy_http.rb

@@ -28,7 +28,7 @@ module EmmyHttp
   autoload :Request,       "emmy_http/request"
   autoload :Operation,     "emmy_http/operation"
   autoload :Response,      "emmy_http/response"
-  autoload :Timeout,       "emmy_http/timeout"
+  autoload :Timer,         "emmy_http/timer"
   autoload :Utils,         "emmy_http/utils"
   autoload :Model,         "emmy_http/model"
 

data/lib/emmy_http/model.rb

@@ -61,11 +61,11 @@ module EmmyHttp
         define_method name do |path, as: nil|
           instance.api[as] = {path: path}
           if as
-            cdef as.to_s do |a=nil|
+            define_singleton_method as.to_s do |a=nil|
               request(path: path).tap { |r| r.update_attributes(a) if a }
             end
 
-            cdef "#{as}!" do |*a, &b|
+            define_singleton_method "#{as}!" do |*a, &b|
               send(as, *a, &b).operation
             end
           end

data/lib/emmy_http/operation.rb

@@ -25,8 +25,8 @@ module EmmyHttp
       EmmyMachine.reconnect(*self)
     end
 
-    def sync
-      Fiber.sync do |fiber|
+    def await
+      Fiber.await do |fiber|
         # create connection
         connect
 

data/lib/emmy_http/request.rb

@@ -50,8 +50,8 @@ module EmmyHttp
 
     alias op operation
 
-    def sync
-      operation.sync
+    def await
+      operation.await
     end
 
     def real_url

data/lib/emmy_http/timer.rb

@@ -15,17 +15,6 @@ module EmmyHttp
       end
     end
 
-    def sync
-      Fiber.sync do |fiber|
-        # create connection
-        start
-
-        on :timeout do
-          fiber.resume true
-        end
-      end
-    end
-
     def await
       Fiber.await do |fiber|
         # create connection

data/lib/emmy_http/version.rb

@@ -1,3 +1,3 @@
 module EmmyHttp
-  VERSION = "0.3.0"
+  VERSION = "0.4"
 end

data/spec/emmy_http/model_spec.rb

@@ -25,14 +25,14 @@ describe EmmyHttp::Model do
   end
 
   around do |example|
-    EmmyMachine.run_block &example
+    EmmyMachine.run_once &example
   end
 
   it "has requests from model" do
     res = {
       get_response: HTTPBin.get_request!,
       post_response: HTTPBin.post_request!(form: {a: 5, b: 6})
-    }.sync
+    }.await
 
     expect(res[:get_response].status).to be(200)
     expect(res[:post_response].status).to be(200)
@@ -41,7 +41,7 @@ describe EmmyHttp::Model do
   it "inherits models" do
     http_req = HTTPBin.get_request
     https_req = HTTPSBin.get_request
-    https_req.sync
+    https_req.await
     expect(http_req.real_url.to_s).to eq('http://httpbin.org')
     expect(https_req.real_url.to_s).to eq('https://httpbin.org')
   end

data/spec/emmy_http/response_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 using EventObject
 
 describe EmmyHttp::Response do
-  it "should response filled with chunks" do
+  it "concatinates chunks in body string" do
     subject.data!('hello')
     subject.data!('world')
 

data/spec/emmy_http_spec.rb

@@ -11,16 +11,16 @@ describe EmmyHttp do
   end
 
   around do |example|
-    EmmyMachine.run_block &example
+    EmmyMachine.run_once &example
   end
 
   it "should send HTTP-request with the fake adapter" do
     request = EmmyHttp::Request.new(
       type: 'get',
-      url: 'http://google.com'
+      url: 'http://httpbin.org'
     )
     operation = EmmyHttp::Operation.new(request, FakeAdapter.new)
-    response = operation.sync
+    response = operation.await
 
     expect(response.status).to be 200
     expect(response.headers).to include("Content-Type")
@@ -28,7 +28,7 @@ describe EmmyHttp do
   end
 
   it "should send HTTP-request using the short syntax" do
-    response = request(adapter: FakeAdapter, raise_error: false).get('http://google.com').sync
+    response = request(adapter: FakeAdapter, raise_error: false).get('http://google.com').await
 
     expect(response).to_not be nil
     expect(response.status).to be 200
@@ -39,9 +39,9 @@ describe EmmyHttp do
   it "should send several requests in parallel" do
     req = request(adapter: FakeAdapter, raise_error: false)
     responses = {
-      a: [req.copy.get('http://google.com'), req.copy.get('http://google.com')],
-      b: req.copy.get('http://google.com')
-    }.sync!
+      a: [req.copy.get('http://httpbin.org'), req.copy.get('http://httpbin.org')],
+      b: req.copy.get('http://httpbin.org')
+    }.await!
 
     expect(responses[:a][0].status).to be 200
     expect(responses[:a][1].status).to be 200
@@ -49,8 +49,8 @@ describe EmmyHttp do
   end
 
   it "should be waiting couple seconds" do
-    timeout = EmmyHttp::Timeout.new(2)
-    res = timeout.sync
+    timeout = EmmyHttp::Timer.new(2)
+    res = timeout.await
 
     expect(res).to be true
   end
@@ -58,10 +58,10 @@ describe EmmyHttp do
   it "should pack settings of the request in the Hash/Array structure" do
     request = EmmyHttp::Request.new(
       type: 'get',
-      url: 'http://google.com'
+      url: 'http://httpbin.org'
     )
     request_hash = request.serializable_hash
 
-    expect(request_hash).to include(type: 'get', url: 'http://google.com')
+    expect(request_hash).to include(type: 'get', url: 'http://httpbin.org')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emmy-http
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: '0.4'
 platform: ruby
 authors:
-- inre
+- Maksim V.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: event_object
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: emmy-machine
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: util_pack
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -150,7 +150,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
-description: 
+description: Ruby HTTP interface
 email:
 - inre.storm@gmail.com
 executables: []
@@ -177,7 +177,6 @@ files:
 - lib/emmy_http/utils.rb
 - lib/emmy_http/version.rb
 - spec/emmy_http/model_spec.rb
-- spec/emmy_http/request_spec.rb
 - spec/emmy_http/response_spec.rb
 - spec/emmy_http_spec.rb
 - spec/fakes.rb
@@ -205,12 +204,10 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: EmmyHttp - EventMachine's HTTP Client
+summary: Ruby HTTP interface
 test_files:
 - spec/emmy_http/model_spec.rb
-- spec/emmy_http/request_spec.rb
 - spec/emmy_http/response_spec.rb
 - spec/emmy_http_spec.rb
 - spec/fakes.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/spec/emmy_http/request_spec.rb

@@ -1,5 +0,0 @@
-require "spec_helper"
-using EventObject
-
-describe EmmyHttp::Request do
-end