emmy-http 0.1.11 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dfa617e0358d6ec58af123a7d50763b62dcdff5
-  data.tar.gz: 8e7a0ce2e5985c4ab369a9457769c6c299065340
+  metadata.gz: 61c0e927e8a3819fe647cd8c6837495f9c0ed144
+  data.tar.gz: 5b767d81b61759ed37b9b97b13a73474e4d4cd62
 SHA512:
-  metadata.gz: e9a8d1b8fe86fcf0eba9895d960a7518c9f5e47fed3dc0963e54e15535fb45703cc9e1d06e743020a51ded69eb21975972de04e7ece82604b6db9cf3141ea174
-  data.tar.gz: c0b0013eb58b9e6375e69f962faaf299e7cb2b3129118681e93414ddcc88e3708d92e44cdbe5ca70275cf3659197174f621226e5c7091e44af8c5ce95651a32b
+  metadata.gz: 020f95e4484f46c9a4b6c4fea44333904c0b70d8a5b76ed9498aa8a7d2105201ed34969dd2e8cdd101d46a324897c13c787772da14e03bc29783ff68f7a2d5e5
+  data.tar.gz: 32a06da169fbfb4d99bbb38093623f110019e138aa180b19a4704be31dea13cc1abbf54e6c01f453b391922ed325bea1fb158b3a2ebab8ffbd1558b3d15143be

data/lib/emmy_http/model.rb

@@ -12,7 +12,13 @@ module EmmyHttp
 
     module InstanceMethods
       def request
-        @request ||= EmmyHttp::Request.new
+        @request ||= self.class.superclass.respond_to?(:instance) ?
+                     self.class.superclass.instance.request.copy :
+                     EmmyHttp::Request.new
+      end
+
+      def api
+        @api ||= {}
       end
     end
 
@@ -45,16 +51,23 @@ module EmmyHttp
         instance.request.raise_error = flag
       end
 
+      def api
+        instance.api
+      end
+
       alias header headers
 
       EmmyHttp::HTTP_METHODS.each do |name|
         define_method name do |path, as: nil|
-          cdef as.to_s do |*a|
-            instance.var(as.to_s, request(path: path))
-          end
+          instance.api[as] = {path: path}
+          if as
+            cdef as.to_s do |a=nil|
+              instance.var(as.to_s, request(path: path).tap { |r| r.update_attributes(a) if a })
+            end
 
-          cdef "#{as}!" do |*a, &b|
-            send(as, *a, &b)
+            cdef "#{as}!" do |*a, &b|
+              send(as, *a, &b)
+            end
           end
         end
       end

data/lib/emmy_http/request.rb

@@ -11,9 +11,14 @@ module EmmyHttp
         serialize: ->(v) { v.is_a?(Addressable::Template) ? v.pattern : v.to_s }
     dictionary :headers
 
-    attribute  :path    # replace url.path
-    attribute  :query   # replace url.query
-    dictionary :params # params for url template
+    attribute  :path, # replace url.path
+        writer: ->(v) { v.is_a?(String) ? Addressable::Template.new(v) : v },
+        serialize: ->(v) { v.is_a?(Addressable::Template) ? v.pattern : (v ? v.to_s : v) }
+
+    attribute  :query    # replace url.query
+    attribute  :user     # replace url.user
+    attribute  :password # replace url.password
+    dictionary :params   # params for url template
 
     # POST, PUT
     attribute :body    # string, json hash
@@ -36,7 +41,11 @@ module EmmyHttp
         serialize: ->(value) { value.to_s }
 
     def operation
-      @operation ||= EmmyHttp::Operation.new(self, adapter.new)
+      @operation ||= new_operation
+    end
+
+    def new_operation
+      EmmyHttp::Operation.new(self, adapter.new)
     end
 
     alias op operation
@@ -53,6 +62,15 @@ module EmmyHttp
       end
     end
 
+    def real_path
+      return nil unless path
+      if path.is_a?(Addressable::Template)
+        path.expand(params)
+      else
+        Addressable::URI.parse(path.to_s)
+      end
+    end
+
     EmmyHttp::HTTP_METHODS.each do |name|
       self.def name do |a={}|
         update_attributes(a.is_a?(String) ? {url: a} : a)

data/lib/emmy_http/response.rb

@@ -57,17 +57,21 @@ module EmmyHttp
 
     def content
       @content ||= case content_type
-        when 'application/json'
-          begin
-            JSON.parse(body)
-          rescue JSON::ParserError => e
-            raise ParserError, e.to_s
-          end
+      when 'application/json' then json
       else
         nil
       end
     end
 
+    def json(options={})
+      raise RequestError, 'Wrong Content-Type' unless content_type == 'application/json'
+      begin
+        JSON.parse(body, options)
+      rescue JSON::ParserError => e
+        raise ParserError, e.to_s
+      end
+    end
+
     def body?
       !body.empty?
     end

data/lib/emmy_http/version.rb

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

data/spec/emmy_http/model_spec.rb

@@ -18,11 +18,17 @@ describe EmmyHttp::Model do
     post '/post', as: :post_request
   end
 
+  class HTTPSBin < HTTPBin
+    url "https://httpbin.org"
+
+    get '/get',   as: :get_request
+  end
+
   around do |example|
     EmmyMachine.run_block &example
   end
 
-  it "have requests from model" do
+  it "has requests from model" do
     res = {
       get_response: HTTPBin.get_request!,
       post_response: HTTPBin.post_request!(form: {a: 5, b: 6})
@@ -31,4 +37,12 @@ describe EmmyHttp::Model do
     expect(res[:get_response].status).to be(200)
     expect(res[:post_response].status).to be(200)
   end
+
+  it "inherits models" do
+    http_req = HTTPBin.get_request
+    https_req = HTTPSBin.get_request
+    https_req.sync
+    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
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emmy-http
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: '0.2'
 platform: ruby
 authors:
 - inre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-25 00:00:00.000000000 Z
+date: 2015-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: event_object