emmy-http 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05594b33af30c50c3901325534fb2fbd5fb011b1
-  data.tar.gz: 3569e0ba991cd322c232c939a8a574a344836bc3
+  metadata.gz: 8dfa617e0358d6ec58af123a7d50763b62dcdff5
+  data.tar.gz: 8e7a0ce2e5985c4ab369a9457769c6c299065340
 SHA512:
-  metadata.gz: 49a503bfb5485e215e05ca6fb5e136b9285efd681c22841a7cb7cd0a82d37d8312779d09ac573c197a25af1646650a8818c58a17ef7197459b518b3076177c06
-  data.tar.gz: c57e79bc762c45e9e9845c3b77bea6a0a5f764336570f4831263d5b88962d9939b3fd6aceb4426dfc645f70ff974930c08b41ba9cfedd6c89e6566d5b1d7c00d
+  metadata.gz: e9a8d1b8fe86fcf0eba9895d960a7518c9f5e47fed3dc0963e54e15535fb45703cc9e1d06e743020a51ded69eb21975972de04e7ece82604b6db9cf3141ea174
+  data.tar.gz: c0b0013eb58b9e6375e69f962faaf299e7cb2b3129118681e93414ddcc88e3708d92e44cdbe5ca70275cf3659197174f621226e5c7091e44af8c5ce95651a32b

data/emmy-http.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "fibre", "~> 0.9.3"
   spec.add_dependency "util_pack", "~> 0.1"
   spec.add_dependency "model_pack", "~> 0.9.6"
+  spec.add_dependency "addressable", ">= 2.3.8"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/emmy_http.rb

@@ -1,4 +1,5 @@
-require "uri"
+require "addressable/uri"
+require 'addressable/template'
 require "model_pack"
 require "emmy_http/version"
 require "forwardable"
@@ -9,6 +10,8 @@ module EmmyHttp
   class RequestError < HttpError; end
   class ConnectionError < HttpError; end
   class TimeoutError < HttpError; end
+  class EncoderError < HttpError; end
+  class DecoderError < HttpError; end
 
   HTTP_METHODS = %w(get head delete put post patch options)
 

data/lib/emmy_http/request.rb

@@ -5,14 +5,15 @@ module EmmyHttp
 
     #def_delegator :operation, :sync, :init, :head, :success, :error, :init!, :head!, :success!, :error!, :to_a
 
-    attribute :type, default: "GET" # word *method* reserved in ruby
+    attribute :type, default: "GET" # word *method* reserved in ruby objects
     attribute :url,
-        writer: ->(url) { url.is_a?(URI) ? url : URI.parse(url) },
-        serialize: ->(value) { value.to_s }
+        writer: ->(v) { v.is_a?(String) ? Addressable::Template.new(v) : v },
+        serialize: ->(v) { v.is_a?(Addressable::Template) ? v.pattern : v.to_s }
     dictionary :headers
 
-    attribute :path    # replace url.path
-    attribute :query   # replace url.query
+    attribute  :path    # replace url.path
+    attribute  :query   # replace url.query
+    dictionary :params # params for url template
 
     # POST, PUT
     attribute :body    # string, json hash
@@ -20,9 +21,11 @@ module EmmyHttp
     attribute :json    # serializable hash/object to json
     attribute :file    # path
 
-    attribute :keep_alive, predicate: true
-    attribute :redirects, default: 6
-    attribute :raise_error, predicate: true, default: true
+    attribute :keep_alive, predicate: true                 # keep connection alive
+    attribute :encoding, default: true, predicate: true    # encode request
+    attribute :decoding, default: true, predicate: true    # decode response
+    attribute :redirects, default: 6                       # max redirects to follow
+    attribute :raise_error, predicate: true, default: true # raise error or return nil
 
     object :timeouts, class_name: Timeouts, default: Timeouts
     object :ssl, class_name: SSL
@@ -42,6 +45,14 @@ module EmmyHttp
       operation.sync
     end
 
+    def real_url
+      if url.is_a?(Addressable::Template)
+        url.expand(params)
+      else
+        Addressable::URI.parse(url.to_s)
+      end
+    end
+
     EmmyHttp::HTTP_METHODS.each do |name|
       self.def name do |a={}|
         update_attributes(a.is_a?(String) ? {url: a} : a)
@@ -49,10 +60,6 @@ module EmmyHttp
       end
     end
 
-    def ssl?
-      ssl || url.scheme == 'https' || url.port == 443
-    end
-
     private
 
     def error(message)

data/lib/emmy_http/response.rb

@@ -68,6 +68,10 @@ module EmmyHttp
       end
     end
 
+    def body?
+      !body.empty?
+    end
+
     def redirection?
       300 <= status && 400 > status
     end

data/lib/emmy_http/version.rb

@@ -1,3 +1,3 @@
 module EmmyHttp
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

data/spec/emmy_http/request_spec.rb

@@ -2,13 +2,4 @@ require "spec_helper"
 using EventObject
 
 describe EmmyHttp::Request do
-  it "ssl flag" do
-    req1 = EmmyHttp::Request.new(url: 'http://httpbin.org')
-    req2 = EmmyHttp::Request.new(url: 'https://httpbin.org')
-    req3 = EmmyHttp::Request.new(url: 'http://httpbin.org:443')
-
-    expect(req1.ssl?).to eq false
-    expect(req2.ssl?).to eq true
-    expect(req3.ssl?).to eq true
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emmy-http
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - inre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: event_object
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.6
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement