takeout 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c60e6c0a2597c9408cb008b699eb6041f0b570b
-  data.tar.gz: a307dba4655560c5300245209a579b870d325ac9
+  metadata.gz: b5d8d5f83e93d1ddd98f7b0694a53ba366aff5da
+  data.tar.gz: 8d36b86cac6fe3019f26ccd74a1e98345fb9a6c3
 SHA512:
-  metadata.gz: 1efad110835409cdbcf6a108b74d54cfab63aefd8aecc44193e3b81681712e4938498871b6b7edbd3557a6349319f0e204d24574e1e4320ab9041dc371eebb62
-  data.tar.gz: c82eb479e740e6645f3672295099f39e73a81079b4f249b7800b1c629663a8e518639baf8179d30135ed73aa7de68fe02db318f142fd899ae3756e419b0d3583
+  metadata.gz: aa2ac9b5812224c26fae12ae3915ae715995bf918e3ae2a4a2c277aec15b60704c0f8631070a58d9f8f7af47575d258ac552ad34d03e954739783ec8af049be4
+  data.tar.gz: b4d30288f0b2b5324fdb81091ee74bbcd6299a909032bae53c6a2dd35f41afd6444ec7b78714f3513c3fb0222decce1607233417f2b9f8e93932891926a3338f

data/lib/takeout/client.rb

@@ -1,3 +1,4 @@
+require 'takeout/core/ext/nil_class'
 module Takeout
   class Client
     require 'curb'
@@ -5,6 +6,7 @@ module Takeout
     require 'uri'
     require 'erb'
     require 'liquid'
+    require 'active_support/core_ext/hash'
 
     # @return [Boolean] a boolean specifying whether or not to run curl with teh verbose setting
     attr_accessor :debug
@@ -32,7 +34,9 @@ module Takeout
     attr_accessor :endpoint_prefix
 
     # A constant specifying the kind of event callbacks and if they should or should not raise an error
-    CALLBACKS = {failure: true, missing: true, redirect: false, success: false}
+    CALLBACKS = {failure: true, missing: true}
+    
+    JSON_REQUEST_BODY = [:put, :post]
 
     # The main client initialization method.
     # ==== Attributes
@@ -115,7 +119,8 @@ module Takeout
     end
 
     def perform_curl_request(request_type, request_url, options=nil, headers=nil)
-      curl = Curl.send(request_type, request_url.to_s, options) do |curl|
+      body = JSON_REQUEST_BODY.include?(request_type.to_sym) ? Oj.dump(options.deep_stringify_keys!) : options
+      curl = Curl.send(request_type, request_url.to_s, body) do |curl|
         curl.verbose = true if @debug
         curl.headers = headers if headers
 
@@ -125,12 +130,12 @@ module Takeout
           curl.password = options[:password]
         end
 
-        CALLBACKS.each { |callback_type,failure| curl.send("on_#{callback_type}") {|response| @parsed_body, @failure = Takeout::Response.new(headers: parse_response_headers(response.head), body: Oj.load(response.body_str), response: response), failure} }
+        CALLBACKS.each { |callback_type,failure| curl.send("on_#{callback_type}") {|response| @failure = failure}}
       end
 
       raise Takeout::EndpointFailureError.new(curl, request_type, @parsed_body) if @failure
 
-      return @parsed_body
+      return Takeout::Response.new(headers: parse_response_headers(curl.head), body: Oj.load(curl.body_str), response: curl)
     end
 
 
@@ -178,7 +183,7 @@ module Takeout
     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)
+      header_string.split("\r\n")[1..-1].map {|x| {x.split(': ')[0].to_sym => x.split(': ')[1]} }.reduce({}, :update) if header_string && !header_string.empty?
     end
 
     def method_missing(method_sym, *attributes, &block)

data/lib/takeout/core/ext/nil_class.rb

@@ -0,0 +1,9 @@
+class NilClass
+  def to_sym
+    self
+  end
+  
+  def deep_stringify_keys!
+    self
+  end
+end

data/lib/takeout/version.rb

@@ -1,3 +1,3 @@
 module Takeout
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/takeout.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "oj"
   spec.add_runtime_dependency "curb", "~> 0.8.8"
   spec.add_runtime_dependency "liquid"
+  spec.add_runtime_dependency "activesupport"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "sinatra"
   spec.add_development_dependency "webmock"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: takeout
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Kyle Lucas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -155,6 +169,7 @@ files:
 - lib/.DS_Store
 - lib/takeout.rb
 - lib/takeout/client.rb
+- lib/takeout/core/ext/nil_class.rb
 - lib/takeout/endpoint_failure_error.rb
 - lib/takeout/response.rb
 - lib/takeout/version.rb
@@ -194,3 +209,4 @@ test_files:
 - spec/support/fake_test_api.rb
 - spec/support/fixtures/post.json
 - spec/support/fixtures/posts.json
+has_rdoc: