userapp 0.1.5 → 0.2.0

data/lib/userapp/client.rb

@@ -25,7 +25,7 @@ module UserApp
 
 		def get_options(*args)
 			if self.options.nil?
-				self.options = UserApp::ClientOptions.get_global().copy()
+				self.options = ClientOptions.get_global().clone()
 			end
 			return self.options
 		end
@@ -62,9 +62,9 @@ module UserApp
 
 				if self.options.throw_errors and is_error_result
 					if result.error_code == 'INVALID_SERVICE'
-						raise InvalidServiceException.new("Service '#{service}' does not exist.")
+						raise InvalidServiceError.new("Service '#{service}' does not exist.")
 					elsif result.error_code == 'INVALID_METHOD'
-						raise InvalidServiceException.new("Method '#{method}' on service '#{service}' does not exist.")
+						raise InvalidServiceError.new("Method '#{method}' on service '#{service}' does not exist.")
 					else
 						raise ServiceError.new(result.error_code, result.message)
 					end

data/lib/userapp/client_options.rb

@@ -4,6 +4,7 @@ module UserApp
 	class ClientOptions
 		@@instance = nil
 
+		attr_accessor :version
 		attr_accessor :app_id
 		attr_accessor :token
 		attr_accessor :base_address
@@ -13,6 +14,7 @@ module UserApp
 		attr_accessor :logger
 
 		def initialize(*args)
+			@version = 1
 			@base_address = 'api.userapp.io'
 			@throw_errors = true
 			@secure = true
@@ -42,10 +44,6 @@ module UserApp
 			end
 		end
 
-		def copy()
-			return ClientOptions.new(self.instance_variables)
-		end
-
 		def self.get_global(*args)
 			if @@instance.nil?
 				@@instance = ClientOptions.new(args)

data/lib/userapp/errors.rb

@@ -2,10 +2,10 @@ module UserApp
 	class Error < Exception
 	end
 
-	class InvalidServiceException < Error
+	class InvalidServiceError < Error
 	end
 
-	class InvalidMethodException < Error
+	class InvalidMethodError < Error
 	end
 
 	class ServiceError < Error

data/lib/userapp/proxy_client.rb

@@ -8,16 +8,13 @@ module UserApp
 		attr_accessor :client
 		attr_accessor :services
 		attr_accessor :service_name
-		attr_accessor :service_version
 
 		def initialize(*args)
 			@services = Hash.new()
-			if (args.length == 2 or args.length == 3) and args[0].is_a?(Client)
+			if args.length == 2 and args[0].is_a?(Client)
 				@client = args[0]
 				@service_name = args[1]
-				@service_version = args.length == 2 ? 1 : args[2]
 			else
-				self.service_version = 1
 				@client = Client.new(*args)
 			end
 		end
@@ -29,24 +26,20 @@ module UserApp
 		def method_missing(method_id, *args)
 			if args.length > 0
 				if self.service_name.nil?
-					raise UserAppError.new("Unable to call method on base service.")
+					raise UserApp::Error.new("Unable to call method on base service.")
 				end
 
-				self.client.call(self.service_version, self.service_name, method_id.to_s(), args[0])
+				self.client.call(self.get_options().version, self.service_name, method_id.to_s(), args[0])
 			else
 				target_service = nil
-				target_version = nil
 
 				if self.services[method_id]
 					return self.services[method_id]
 				end
 
 				if self.service_name.nil? and method_id.length >= 2 and method_id[0] == 'v' and method_id[1, method_id.length-1].match(/\A[0-9]+\Z/)
-					target_version = method_id[1].to_i
-				end
-
-				if target_version.nil?
-					target_version = self.service_version
+					self.get_options().version = method_id[1].to_i
+				else
 					if !self.service_name.nil?
 						target_service = self.service_name.to_s + '.' + method_id.to_s
 					else
@@ -54,7 +47,8 @@ module UserApp
 					end
 				end
 
-				proxy = ProxyClient.new(self.client, target_service, target_version)
+				puts target_service
+				proxy = ProxyClient.new(self.client, target_service)
 				self.services[method_id] = proxy
 
 				return proxy

data/lib/userapp/userapp.rb

@@ -2,10 +2,17 @@ module UserApp
 	class Client
 		require File.expand_path('../client.rb', __FILE__)
 	end
+
 	class ProxyClient
 		require File.expand_path('../proxy_client.rb', __FILE__)
 	end
+
 	class API < ProxyClient
 		require File.expand_path('../api.rb', __FILE__)
 	end
+
+	class Error < Exception; end
+	class InvalidServiceError < Error; end
+	class InvalidMethodError < Error; end
+	class ServiceError < Error; end
 end

data/lib/userapp/version.rb

@@ -1,3 +1,3 @@
 module UserApp
-  VERSION = "0.1.5"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: userapp
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2014-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &9937560 !ruby/object:Gem::Requirement
+  requirement: &15729580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9937560
+  version_requirements: *15729580
 description: User management and authentication for your Ruby app.
 email: robin.orheden@userapp.io
 executables: []