kounta_rest 0.1.3 → 0.1.4

data/lib/kounta/company.rb

@@ -36,7 +36,7 @@ module Kounta
 
 		def initialize(hash={})
 			if hash.empty?
-				response = client.perform({:companies => "me"}, :get)
+				response = client.perform({:companies => "me"}, :get).parsed
 				super(response)
 			else
 				super(hash)

data/lib/kounta/resource.rb

@@ -61,10 +61,8 @@ module Kounta
 
 		def save!
 			response = new? ? client.perform(resource_path, :post, {:body => to_hash}) : client.perform(resource_path, :put, {:body => to_hash})
-			if response
-				response.each_pair do |k,v|
-					self[k] = v
-				end
+			response.parsed.each_pair do |k,v|
+				self[k] = v
 			end
 			self
 		end

data/lib/kounta/rest/client.rb

@@ -26,9 +26,12 @@ module Kounta
 			end
 
 			def perform(url_hash, request_method, options={})
+				options[:headers] ||= {}
+				options[:headers].merge!(Kounta::REQUEST_HEADERS)
+
 				begin
-					log("#{request_method}: #{Kounta::SITE_URI}#{path_from_hash(url_hash)}.#{FORMAT.to_s} (#{Oj.dump(options[:body], mode: :compat)})")
-					response = @conn.request(request_method, "#{path_from_hash(url_hash)}.#{FORMAT.to_s}", options.merge(REQUEST_HEADERS))
+					log("#{request_method}: #{Kounta::SITE_URI}#{path_from_hash(url_hash)}.#{FORMAT.to_s}")
+					response = @conn.request(request_method, "#{path_from_hash(url_hash)}.#{FORMAT.to_s}", options)
 				rescue OAuth2::Error => ex
 					if ex.message.include? 'The access token provided has expired'
 						log(ex.message)
@@ -37,17 +40,29 @@ module Kounta
 					end
 					raise Kounta::Errors::APIError.new(ex.message)
 				end
-				
-				log("Response: #{response.parsed}")
-				response.parsed
+
+				response
 			end
 
 			def objects_from_response(klass, request_method, url_hash, options={})
-				perform(url_hash, request_method, options).map { |response| klass.new(response) }
+				response = perform(url_hash, request_method, options)
+				page_count = response.headers["x-pages"].to_i
+
+				if page_count > 1
+					results = []
+					page_count.times { |page_number|
+						response = perform(url_hash, request_method, options.merge!(:headers => {'X-Page' => (page_number).to_s}))
+						results = results + response.parsed
+					}
+					results.map { |item| klass.new(item) }
+				else
+					response.parsed.map { |item| klass.new(item) }
+				end
 			end
 
 			def object_from_response(klass, request_method, url_hash, options={})
-				klass.new( perform(url_hash, request_method, options) )
+				response = perform(url_hash, request_method, options)
+				klass.new(response.parsed)
 			end
 
 			private

data/lib/kounta/version.rb

@@ -1,3 +1,3 @@
 module Kounta
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kounta_rest
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-13 00:00:00.000000000 Z
+date: 2013-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler