takeout 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dc87fd70527056a70cf40eea35d282d148acd4f
-  data.tar.gz: e8df926a3d6df0f27c813d99b08dff72a759e460
+  metadata.gz: 72075d033cab3d057e294b12750acaefa042fa58
+  data.tar.gz: cbdca972755b2ad75c08466c898974533479b39e
 SHA512:
-  metadata.gz: bd7596e61f5e2dc57c4567322b47eaa8b50b17c2cbcc24323b74357fd425bc03017d08dc0a8cc8a29793377bfbb01b3e5e57593fdb8d4a32b05f806ddfea25fa
-  data.tar.gz: 8871654e9b355e8de3001ff3978f8ab2b57ea4f19dcd17ac3dc71b41e51ce189d1de5a86a21c9fb7945711f1aff6a0282ff1e2432910c80066a5d7f1fbcef0ed
+  metadata.gz: 41f37fca4f63f5194d7e037fdb7c03123bceeb879a883e47494884eb87763cf42633c17523953a9792f040ac4d5c5f1d904c5d103c0eff583b1bb71ee519f8b1
+  data.tar.gz: 8f43aaa7f2f4d5388f532fd2c156ad52061de8aa251e29bdcc86a984ddf33f2f3c7a1607176be6300bfd30d424f7e3649fbe0ab744f364be1b5d3237b9df5b5f

data/README.md

@@ -34,26 +34,21 @@ Or install it yourself as:
 
 The first step is to instantiate a client with the URI and given endpoints you would like the gem to create methods for:
 
-    client = Takeout::Client.new(uri: 'testing.com', endpoints: {get: [:test, :test2], post: :test2})
+    client = Takeout::Client.new(uri: 'testing.com')
 
 This can also be done using block format:
    
     client = Takeout::Client.new do |client|
       client.uri = 'testing.com'
-      client.endpoints = {get: [:test, :test2], post: :test2}
     end
     
 From here you can begin calling your api methods! They take on the form ```(request_type)_(endpoint_name)```
-So given the example instantiation our method list would look like:
+So our method list would look like:
 
     client.get_test
     client.get_test2
     client.post_test2
     
-You can at anytime see a list of the methods available to you by running this:
-
-    (client.methods - Object.methods - Takeout::Client.instance_methods(false))
-    
 Results are returned as parsed ruby objects:
 
     client.get_test
@@ -67,7 +62,6 @@ You may do this in either the call or in the client instantiation, however the c
 
     client = Takeout::Client.new do |client|
       client.uri = 'testing.com'
-      client.endpoints = {get: [:test, :test2], post: :test2}
       client.extension = 'json'
     end
     
@@ -81,7 +75,6 @@ To define a schema do so in the instantiation of the client:
 
     client = Takeout::Client.new do |client|
       client.uri = 'testing.com'
-      client.endpoints = {get: [:test, :test2], post: :test2}
       client.schemas = {get: {test: '/{{endpoint}}{% if param %}/required-param-{{param}}{% endif %}'}
     end
     
@@ -101,7 +94,7 @@ SSL is also supported, and is very easy to flip on.
 
 You can either specify ssl when instantiating the object:
 
-    client = Takeout::Client.new(uri: 'testing.com', endpoints: {get: :test}, ssl: true)
+    client = Takeout::Client.new(uri: 'testing.com', ssl: true)
 
 Or you can flip it on once already created:
 
@@ -117,7 +110,6 @@ Takeout also feature full support for headers:
 
     client = Takeout::Client.new do |client|
       client.uri = 'testing.com'
-      client.endpoints = {get: [:test, :test2], post: :test2}
       client.headers = {auth_token: 'asdjhdskjfh23423423'}
     end
 
@@ -132,7 +124,6 @@ Unlike most other features these are simply passed as options to the call:
 
     client = Takeout::Client.new do |client|
       client.uri = 'testing.com'
-      client.endpoints = {get: [:test, :test2], post: :test2}
       client.options = {username: 'user', password: 'pass'}
     end
     

data/lib/takeout/client.rb

@@ -83,8 +83,8 @@ module Takeout
     # @return [Hash] options
     def substitute_template_values(endpoint, request_type, options={})
       # Gets the proper template for the give CUSTOM_SCHEMA string for this endpoint and substitutes value for it based on give options
-      endpoint_templates = @schemas.fetch(request_type, nil)
-      template = endpoint_templates.fetch(endpoint, nil) if endpoint_templates
+      endpoint_templates = @schemas.fetch(request_type.to_sym, nil)
+      template = endpoint_templates.fetch(endpoint.to_sym, nil) if endpoint_templates
 
       if template
         extracted_options, options = extract_template_options(options.merge({endpoint: endpoint}), template)
@@ -123,10 +123,10 @@ module Takeout
           curl.password = options[:password]
         end
 
-        curl.on_success {|response| @parsed_body, @failure = Takeout::Response.new(headers: response.headers, body: Oj.load(response.body_str), response: response), false}
-        curl.on_redirect {|response| @parsed_body, @failure = Takeout::Response.new(headers: response.headers, body: Oj.load(response.body_str), response: response), false}
+        curl.on_success {|response| @parsed_body, @failure = Takeout::Response.new(headers: parse_response_headers(response.head), body: Oj.load(response.body_str), response: response), false}
+        curl.on_redirect {|response| @parsed_body, @failure = Takeout::Response.new(headers: parse_response_headers(response.head), body: Oj.load(response.body_str), response: response), false}
 
-        FAILURES.each { |failure_type| curl.send("on_#{failure_type}") {|response| @parsed_body, @failure = Takeout::Response.new(headers: response.headers, body: Oj.load(response.body_str), response: response), true} }
+        FAILURES.each { |failure_type| curl.send("on_#{failure_type}") {|response| @parsed_body, @failure = Takeout::Response.new(headers: parse_response_headers(response.head), body: Oj.load(response.body_str), response: response), true} }
       end
 
       raise Takeout::EndpointFailureError.new(curl, request_type, @parsed_body) if @failure
@@ -176,6 +176,10 @@ module Takeout
       ssl? ? URI::HTTPS.build(opts) : URI::HTTP.build(opts)
     end
 
+    def parse_response_headers(header_string)
+      header_string.split("\r\n")[1..-1].map {|x| {x.split(': ')[0].to_sym => x.split(': ')[1]} }.reduce({}, :update)
+    end
+
     def method_missing(method_sym, *attributes, &block)
       request_type = method_sym.to_s.scan(/^(?:get|post|put|delete|patch|update)/).first
       request_name = method_sym.to_s.scan(/(?<=_{1}).*/).first

data/lib/takeout/version.rb

@@ -1,3 +1,3 @@
 module Takeout
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
 end

data/takeout.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["kglucas93@gmail.com"]
   spec.summary       = %q{A powerful little tool for generating on-the-fly API clients.}
   spec.description   = %q{}
-  spec.homepage      = "http://github.com/kyelgrantlucas/takeout"
+  spec.homepage      = "http://github.com/kylegrantlucas/takeout"
   spec.license       = "MIT"
   spec.required_ruby_version = '>= 1.9.3'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: takeout
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Kyle Lucas
@@ -165,7 +165,7 @@ files:
 - spec/support/fixtures/post.json
 - spec/support/fixtures/posts.json
 - takeout.gemspec
-homepage: http://github.com/kyelgrantlucas/takeout
+homepage: http://github.com/kylegrantlucas/takeout
 licenses:
 - MIT
 metadata: {}