kiik-api 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e7ffc528b6f4d1485fa33fb1a22f594ee0d94e8
-  data.tar.gz: 1d792e7ae88496a52cb0278eee1328191e892f47
+  metadata.gz: e1928ec5fdddfe6440469a3de2bcf50963694dac
+  data.tar.gz: b634864088e68a781a945b6c0dd6aa8114a6043c
 SHA512:
-  metadata.gz: b2975f6e9d5acecee753f6ccb2a7b87109e04ca4557cf25254298c4376c0342bca9b457617589d0ebaf72d840ac3b532b68689344b64d88fd614ec32012fe3ba
-  data.tar.gz: bc43f2109bffceeaeb26560dc14f3b43f8d0566562dfad4b83165e9ed3d75273d6b2d82a152995ec181c9f6edad99d4b527faabb3951f6608c24fe8580a5abda
+  metadata.gz: 97828038a43c69b829f2d61c3eb403e50cf987ab304fe5c7362db3d3659c341913a4122503f2e98ba2adcdf6c846573d71f734042e89dcf8c5a0a09896ec5136
+  data.tar.gz: 77167f69cfe54bcea633ceb8555c98e37abf4706224950334d75e7443ef6f9545860532193c57208c4f8b7fedbc56d0b9da3467864db500d24e8c9ea7075dd0f

data/lib/kiik-api.rb

@@ -23,10 +23,10 @@ require 'kiik/wallet/transaction'
 module Kiik
   # set a default
 
-  class << self  
+  class << self
     attr_accessor :config_path
   end
- 
+
   def self.config
     @config ||= load_config
   end
@@ -36,8 +36,8 @@ module Kiik
     @wallet.api
   end
 
-  def self.load_config  
-    
+  def self.load_config
+
     if @config_path.nil?
       if defined?(Rails)
         @config_path = Rails.root.join('config','kiik.yml')
@@ -49,7 +49,7 @@ module Kiik
     unless File.file?(config_path)
       raise NotConfigured.new("The #{config_path} config file is missing.")
     end
- 
+
     cfg = YAML.load_file(config_path)
     raise NoAuthorizationTokenProvided.new("You will need a authorization token to perform request on kiik api") if cfg[:token].nil?
     cfg

data/lib/kiik/cacert.pem

@@ -53,46 +53,27 @@ EvrRI5YPv5wN8nlFUzeaVi/oVxBw9u6JDEmJmsEj9cIqzEHPIqtlbreUgm0vQF9Y
 huNMrUnjl1nOG5srztxl1Asoa06ERlFE9zMILViXIa4=
 -----END CERTIFICATE-----
 -----BEGIN CERTIFICATE-----
-MIIERTCCA66gAwIBAgIQM2VQCHmtc+IwueAdDX+skTANBgkqhkiG9w0BAQUFADCB
-zjELMAkGA1UEBhMCWkExFTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJ
-Q2FwZSBUb3duMR0wGwYDVQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UE
-CxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhh
-d3RlIFByZW1pdW0gU2VydmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNl
-cnZlckB0aGF3dGUuY29tMB4XDTA2MTExNzAwMDAwMFoXDTIwMTIzMDIzNTk1OVow
-gakxCzAJBgNVBAYTAlVTMRUwEwYDVQQKEwx0aGF3dGUsIEluYy4xKDAmBgNVBAsT
-H0NlcnRpZmljYXRpb24gU2VydmljZXMgRGl2aXNpb24xODA2BgNVBAsTLyhjKSAy
-MDA2IHRoYXd0ZSwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MR8wHQYD
-VQQDExZ0aGF3dGUgUHJpbWFyeSBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEArKDw+4BZ1JzHpM+doVlzCRBFDA0sbmjxbFtIaElZN/wLMxnC
-d3/MEC2VNBzm600JpxzSuMmXNgK3idQkXwbAzESUlI0CYm/rWt0RjSiaXISQEHoN
-vXRmL2o4oOLVVETrHQefB7pv7un9Tgsp9T6EoAHxnKv4HH6JpOih2HFlDaNRe+68
-0iJgDblbnd+6/FFbC6+Ysuku6QToYofeK8jXTsFMZB7dz4dYukpPymgHHRydSsbV
-L5HMfHFyHMXAZ+sy/cmSXJTahcCbv1N9Kwn0jJ2RH5dqUsveCTakd9h7h1BE1T5u
-KWn7OUkmHgmlgHtALevoJ4XJ/mH9fuZ8lx3VnQIDAQABo4HCMIG/MA8GA1UdEwEB
-/wQFMAMBAf8wOwYDVR0gBDQwMjAwBgRVHSAAMCgwJgYIKwYBBQUHAgEWGmh0dHBz
-Oi8vd3d3LnRoYXd0ZS5jb20vY3BzMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQU
-e1tFz6/Oy3r9MZIaarbzRutXSFAwQAYDVR0fBDkwNzA1oDOgMYYvaHR0cDovL2Ny
-bC50aGF3dGUuY29tL1RoYXd0ZVByZW1pdW1TZXJ2ZXJDQS5jcmwwDQYJKoZIhvcN
-AQEFBQADgYEAhKhMyT4qvJrizI8LsiV3xGGJiWNa1KMVQNT7Xj+0Q+pjFytrmXSe
-Cajd1FYVLnp5MV9jllMbNNkV6k9tcMq+9oKp7dqFd8x2HGqBCiHYQZl/Xi6Cweiq
-95OBBaqStB+3msAHF/XLxrRMDtdW3HEgdDjWdMbWj2uvi42gbCkLYeA=
------END CERTIFICATE-----
------BEGIN CERTIFICATE-----
-MIIDJzCCApCgAwIBAgIBATANBgkqhkiG9w0BAQQFADCBzjELMAkGA1UEBhMCWkEx
-FTATBgNVBAgTDFdlc3Rlcm4gQ2FwZTESMBAGA1UEBxMJQ2FwZSBUb3duMR0wGwYD
-VQQKExRUaGF3dGUgQ29uc3VsdGluZyBjYzEoMCYGA1UECxMfQ2VydGlmaWNhdGlv
-biBTZXJ2aWNlcyBEaXZpc2lvbjEhMB8GA1UEAxMYVGhhd3RlIFByZW1pdW0gU2Vy
-dmVyIENBMSgwJgYJKoZIhvcNAQkBFhlwcmVtaXVtLXNlcnZlckB0aGF3dGUuY29t
-MB4XDTk2MDgwMTAwMDAwMFoXDTIwMTIzMTIzNTk1OVowgc4xCzAJBgNVBAYTAlpB
-MRUwEwYDVQQIEwxXZXN0ZXJuIENhcGUxEjAQBgNVBAcTCUNhcGUgVG93bjEdMBsG
-A1UEChMUVGhhd3RlIENvbnN1bHRpbmcgY2MxKDAmBgNVBAsTH0NlcnRpZmljYXRp
-b24gU2VydmljZXMgRGl2aXNpb24xITAfBgNVBAMTGFRoYXd0ZSBQcmVtaXVtIFNl
-cnZlciBDQTEoMCYGCSqGSIb3DQEJARYZcHJlbWl1bS1zZXJ2ZXJAdGhhd3RlLmNv
-bTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0jY2aovXwlue2oFBYo847kkE
-VdbQ7xwblRZH7xhINTpS9CtqBo87L+pW46+GjZ4X9560ZXUCTe/LCaIhUdib0GfQ
-ug2SBhRz1JPLlyoAnFxODLz6FVL88kRu2hFKbgifLy3j+ao6hnO2RlNYyIkFvYMR
-uHM/qgeN9EJN50CdHDcCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG
-9w0BAQQFAAOBgQAmSCwWwlj66BZ0DKqqX1Q/8tfJeGBeXm43YyJ3Nn6yF8Q0ufUI
-hfzJATj/Tb7yFkJD57taRvvBxhEf8UqwKEbJw8RCfbz6q1lu1bdRiBHjpIUZa4JM
-pAwSremkrj/xw0llmozFyD4lt5SZu5IycQfwhl7tUCemDaYj+bvLpgcUQg==
+MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCB
+qTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
+Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
+MDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNV
+BAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3MDAwMDAwWhcNMzYw
+NzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5j
+LjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYG
+A1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
+IG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsoPD7gFnUnMekz52hWXMJEEUMDSxuaPFs
+W0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ1CRfBsDMRJSUjQJib+ta
+3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGcq/gcfomk
+6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6
+Sk/KaAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94J
+NqR32HuHUETVPm4pafs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XP
+r87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUFAAOCAQEAeRHAS7ORtvzw6WfU
+DW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeEuzLlQRHAd9mz
+YJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
+xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2
+/qxAeeWsEG89jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/
+LHbTY5xZ3Y+m4Q6gLkH3LpVHz7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7
+jVaMaA==
 -----END CERTIFICATE-----

data/lib/kiik/client.rb

@@ -2,10 +2,10 @@ module Kiik
 
   class Client
 
-		attr_reader :site
+    attr_reader :site
     attr_accessor :token, :options
 
-		def initialize(token, options={}, &block)
+    def initialize(token, options={}, &block)
       opts = options.dup
       @token = token
       @site = opts.delete(:site)
@@ -15,7 +15,7 @@ module Kiik
                   :max_redirects    => 5,
                   :raise_errors     => true}.merge(opts)
       @options[:connection_opts][:ssl] = ssl if ssl
-		end
+    end
 
     def site=(value)
       @connection = nil
@@ -41,7 +41,7 @@ module Kiik
       connection.response :logger, ::Logger.new($stdout) if ENV['OAUTH_DEBUG'] == 'true'
 
       url = connection.build_url(url, opts[:params]).to_s
-      
+
       Kiik::Logger.info(url)
 
       response = connection.run_request(verb, url, opts[:body], authorization_header(opts[:headers])) do |req|

data/lib/kiik/errors.rb

@@ -1,10 +1,10 @@
 module Kiik
-	
-	class NotConfigured < Exception 
-	end
-	
-	class NoAuthorizationTokenProvided < Exception 
-	end
+
+  class NotConfigured < Exception
+  end
+
+  class NoAuthorizationTokenProvided < Exception
+  end
 
   class TypeNotSupported < Exception
   end
@@ -12,7 +12,7 @@ module Kiik
   class MethodNotAllowedForType < Exception
   end
 
-	class Error < StandardError
+  class Error < StandardError
     attr_reader :response, :code, :description
 
     # standard error values include:

data/lib/kiik/logger.rb

@@ -1,5 +1,5 @@
 module Kiik
-	class Logger
+  class Logger
     def self.info(msg)
       puts "Kiik::INFO: #{msg}"
     end

data/lib/kiik/version.rb

@@ -1,3 +1,3 @@
 module Kiik
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
 end

data/lib/kiik/wallet.rb

@@ -1,12 +1,12 @@
 module Kiik
 
-	class Wallet
+  class Wallet
     attr_reader :token, :site, :version
     attr_accessor :logger, :options
 
     def initialize(token,options={})
-      @site = 'https://wallet.kiik.com.br'
-      @version = 'v1'
+      @site = options.delete(:url) || 'https://wallet.kiik.com.br'
+      @version = options.delete(:version) || 'v1'
       @token = token
       @ca_file = options.delete(:ca_file) || default_ca_file
       @logger = options.delete(:logger) || Kiik::Logger

data/lib/kiik/wallet/client.rb

@@ -1,122 +1,125 @@
 module Kiik
-	class Wallet
-		class Client
-
-   		ALLOWED_TYPES = {
-   			:client => [ :create, :detail ],
-   			:user => [ :create ],
-   			:creditcard => [ :create, :detail ],
-   			:transaction => [ :create ]
-   		}
-
-			attr_reader :name, :id, :secret, :access_token, :email
-
-			def initialize(wallet,options)
-				@id = options[:api_id]
-				@name = options[:name]
-				@email = options[:email]
-				@secret = options[:api_secret]
-				@access_token = options[:access_token]
-				@wallet = wallet
-				@base_uri = '/clients/#{id}'
-			end
-
-			def token
-				@wallet.token
-			end
-
-			def client
-				@wallet.client
-			end
-
-	    def use_token(new_token,&block)
-	      @wallet.client.token = new_token
-	      block.call(self)
-	      @wallet.client.token =  @wallet.token
-	    end
-
-			def detail(type,options={},&block)
-				allow(type,:detail)
-
-				case type
-				when :client
-					request(:get, base_uri,{}, &block)
-				when :creditcard
-					token = options.delete(:token)
-					card.detail(token,options,&block)
-				end
-
-			end
-
-			def list(type,options={},&block)
-				allow(type,:list)
-
-				case type
-				when :creditcard
-					token = options.delete(:token)
-					card.list(token,&block)
-				end
-
-			end
-
-			def set_secret(secret,&block)
-				request(:put, base_uri, { :client => { :api_secret => secret } },&block)
-			end
-
-			def create(type, options={},&block)
-				allow(type,:create)
-
-				token = options.delete(:token)	
-				case type
-				when :user
-					user.create(options,&block)
-				when :creditcard
-					card.create(token,options,&block)
-				when :transaction
-					transaction.create(token,options.delete(:credit_card),options,&block)
-				end
-			end
-
-			def user
-				@user ||= Kiik::Wallet::User.new(self)
-			end
-
-			def card
-				@card ||= Kiik::Wallet::Creditcard.new(self)
-			end
-
-			def transaction
-				@transaction ||= Kiik::Wallet::Transaction.new(self)
-			end
-
-			def request(verb, uri, params = {}, &block)
-				response = @wallet.client.request(verb, "/#{@wallet.version}#{uri}", request_params(params))
-
-				if block_given?
-					yield(response.parsed)
-				else
-					response.parsed
-				end
-			end
-
-			private
-				def allow(type,method)
-					raise TypeNotSupported.new("The #{type} is not supported by this api") if !ALLOWED_TYPES.include?(type)
-					raise MethodNotAllowedForType.new("This type: #{type} don't allow this method.") if !ALLOWED_TYPES[type].include?(method)
-				end
-
-				def request_params(params={})
-					p = { 
-						:params => {},
-						:body => params.to_json,
-						:headers => {
-							'Accept' => 'application/json',
-							'Content-type' => 'application/json'
-						}
-					}
-					p
-				end
-
-		end
-	end
+    class Wallet
+        class Client
+
+        ALLOWED_TYPES = {
+            :client => [ :create, :detail ],
+            :user => [ :create ],
+            :creditcard => [ :create, :detail ],
+            :transaction => [ :create ]
+        }
+
+            attr_reader :name, :id, :secret, :access_token, :email
+
+            def initialize(wallet,options)
+                @id = options[:api_id]
+                @name = options[:name]
+                @email = options[:email]
+                @secret = options[:api_secret]
+                @access_token = options[:access_token]
+                @wallet = wallet
+                @base_uri = '/clients/#{id}'
+            end
+
+            def token
+                @wallet.token
+            end
+
+            def client
+                @wallet.client
+            end
+
+        def use_token(new_token,&block)
+          @wallet.client.token = new_token
+          begin
+            block.call(self)
+          ensure
+            @wallet.client.token =  @wallet.token
+          end
+        end
+
+            def detail(type,options={},&block)
+                allow(type,:detail)
+
+                case type
+                when :client
+                    request(:get, base_uri,{}, &block)
+                when :creditcard
+                    token = options.delete(:token)
+                    card.detail(token,options,&block)
+                end
+
+            end
+
+            def list(type,options={},&block)
+                allow(type,:list)
+
+                case type
+                when :creditcard
+                    token = options.delete(:token)
+                    card.list(token,&block)
+                end
+
+            end
+
+            def set_secret(secret,&block)
+                request(:put, base_uri, { :client => { :api_secret => secret } },&block)
+            end
+
+            def create(type, options={},&block)
+                allow(type,:create)
+
+                token = options.delete(:token)
+                case type
+                when :user
+                    user.create(options,&block)
+                when :creditcard
+                    card.create(token,options,&block)
+                when :transaction
+                    transaction.create(token,options.delete(:credit_card),options,&block)
+                end
+            end
+
+            def user
+                @user ||= Kiik::Wallet::User.new(self)
+            end
+
+            def card
+                @card ||= Kiik::Wallet::Creditcard.new(self)
+            end
+
+            def transaction
+                @transaction ||= Kiik::Wallet::Transaction.new(self)
+            end
+
+            def request(verb, uri, params = {}, &block)
+                response = @wallet.client.request(verb, "/#{@wallet.version}#{uri}", request_params(params))
+
+                if block_given?
+                    yield(response.parsed)
+                else
+                    response.parsed
+                end
+            end
+
+            private
+                def allow(type,method)
+                    raise TypeNotSupported.new("The #{type} is not supported by this api") if !ALLOWED_TYPES.include?(type)
+                    raise MethodNotAllowedForType.new("This type: #{type} don't allow this method.") if !ALLOWED_TYPES[type].include?(method)
+                end
+
+                def request_params(params={})
+                    p = { 
+                        :params => {},
+                        :body => params.to_json,
+                        :headers => {
+                            'Accept' => 'application/json',
+                            'Content-type' => 'application/json'
+                        }
+                    }
+                    p
+                end
+
+        end
+    end
 end

data/lib/kiik/wallet/creditcard.rb

@@ -1,43 +1,43 @@
 module Kiik
-	class Wallet
-		class Creditcard
-
-			def initialize(client)
-				@client = client
-				@base_uri = '/cards'
-			end
-
-			def create(token,options={},&block)
-				params = { 
-					:card => { 
-						:name => options[:name],
-						:number => options[:number], 
-						:expiration_month => options[:expiration_month], 
-						:expiration_year => options[:expiration_year] 
-					}
-				}
-
-				request(token,:post,@base_uri,params,&block)
-			end
-
-			def list(token,&block)
-				request(token,:get,@base_uri,{},&block)
-			end
-
-			def get(token,id,&block)
-				request(token,:get,"#{@base_uri}/#{id}",{},&block)
-			end
-
-			def detail(token,id,&block)
-				request(token,:get,"#{@base_uri}/#{id}/details",{},&block)
-			end
-
-			private
-				def request(token,verb,url,params,&block)
-					proc = Proc.new { |client| client.request(verb,url,params,&block) }
-					@client.use_token(token, &proc)
-				end
-
-		end
-	end
+    class Wallet
+        class Creditcard
+
+            def initialize(client)
+                @client = client
+                @base_uri = '/cards'
+            end
+
+            def create(token,options={},&block)
+                params = {
+                    :card => {
+                        :name => options[:name],
+                        :number => options[:number],
+                        :expiration_month => options[:expiration_month],
+                        :expiration_year => options[:expiration_year]
+                    }
+                }
+
+                request(token,:post,@base_uri,params,&block)
+            end
+
+            def list(token,&block)
+                request(token,:get,@base_uri,{},&block)
+            end
+
+            def get(token,id,&block)
+                request(token,:get,"#{@base_uri}/#{id}",{},&block)
+            end
+
+            def detail(token,id,&block)
+                request(token,:get,"#{@base_uri}/#{id}/details",{},&block)
+            end
+
+            private
+                def request(token,verb,url,params,&block)
+                    proc = Proc.new { |client| client.request(verb,url,params,&block) }
+                    @client.use_token(token, &proc)
+                end
+
+        end
+    end
 end

data/lib/kiik/wallet/transaction.rb

@@ -1,38 +1,38 @@
 module Kiik
-	class Wallet
-		class Transaction
+    class Wallet
+        class Transaction
 
-			def initialize(client)
-				@client = client
-				@base_uri = '/transactions/card'
-			end
+            def initialize(client)
+                @client = client
+                @base_uri = '/transactions/card'
+            end
 
-			def create(token,card,options={},&block)
-				params = {
-					:card => {
-						:credit_card_token => card[:token],
-						:cvv => card[:cvv]
-					},
-					:transaction => { 
-						:recipient => options[:recipient],
-						:amount => options[:amount], 
-						:order_number => options[:order_number]
-					}
-				}
+            def create(token,card,options={},&block)
+                params = {
+                    :card => {
+                        :credit_card_token => card[:token],
+                        :cvv => card[:cvv]
+                    },
+                    :transaction => {
+                        :recipient => options[:recipient],
+                        :amount => options[:amount],
+                        :order_number => options[:order_number]
+                    }
+                }
 
-				request(token,:post,@base_uri,params,&block)
-			end
+                request(token,:post,@base_uri,params,&block)
+            end
 
-			def callback(token,params={},&block)				
-				request(token,:put,'/payment/callback',params,&block)
-			end
+            def callback(token,params={},&block)
+                request(token,:put,'/payment/callback',params,&block)
+            end
 
-			private
-				def request(token,verb,url,params,&block)
-					proc = Proc.new { |client| client.request(verb,url,params,&block) }
-					@client.use_token(token, &proc)
-				end
+            private
+                def request(token,verb,url,params,&block)
+                    proc = Proc.new { |client| client.request(verb,url,params,&block) }
+                    @client.use_token(token, &proc)
+                end
 
-		end
-	end
+        end
+    end
 end

data/lib/kiik/wallet/user.rb

@@ -1,82 +1,63 @@
 module Kiik
-	class Wallet
-		class User
-
-			attr_reader :token
-
-			def initialize(client)
-				@client = client
-				@base_uri = '/users'
-				@card = Kiik::Wallet::Creditcard.new(client)
-			end
-
-			def create(options={},&block)
-				params = { 
-					:user => { 
-						:email => options[:email], 
-						:password => options[:password], 
-						:external_id => options[:id] 
-					}
-				}
-				@client.request(:post,@base_uri,request_params(params),&block)
-			end
-
-			def update(options={},&block)
-				params = { 
-					:user => { 
-						:email => options[:email], 
-						:password => options[:password], 
-						:new_password => options[:new_password] 
-					}
-				}
-				@client.request(:put,"#{@base_uri}/#{options[:id]}",request_params(params),&block)
-			end
-
-			def set_password(options={},&block)
-				params = { 
-					:user => { 
-						:email => options[:email], 
-						:password => options[:password], 
-						:new_password => options[:new_password] 
-					}
-				}
-				@client.request(:put,"#{@base_uri}/#{options[:id]}",request_params(params),&block)
-			end
-
-			def login(options={},&block)
-				params = { 
-					:auth => { 
-						:external_id => options[:id], 
-						:password => options[:password]
-					}
-				}
-				@client.request(:post, '/auth/login', params ) do |response| 
-					@token = response["token"]
-					block.call(response)
-				end
-			end
-
-			def regenerate_token(options={},&block)
-				params = { 
-					:auth => { 
-						:external_id => options[:id], 
-						:password => options[:password]
-					}
-				}
-				@client.request(:post, '/auth/regenerate_token', params ) do |response| 
-					@token = response["token"]
-					block.call(response)
-				end
-			end
-
-			def create_creditcard(options={},&block)
-				@card.create(options,&block)
-			end
-
-			private
-				def request_params(params={})
-					params.merge({ :client => { :api_id => @client.id } })
-				end
-		end
-	end
+    class Wallet
+        class User
+
+            def initialize(client)
+                @client = client
+                @base_uri = '/users'
+                @card = Kiik::Wallet::Creditcard.new(client)
+            end
+
+            def create(options={},&block)
+                params = {
+                    :user => {
+                        :email => options[:email],
+                        :password => options[:password],
+                        :external_id => options[:id]
+                    }
+                }
+                @client.request(:post,@base_uri,request_params(params),&block)
+            end
+
+            def set_password(options={},&block)
+                params = {
+                    :user => {
+                        :email => options[:email],
+                        :password => options[:password],
+                        :new_password => options[:new_password]
+                    }
+                }
+                @client.request(:put,"#{@base_uri}/#{options[:id]}",request_params(params),&block)
+            end
+
+            def login(options={},&block)
+                params = {
+                    :auth => {
+                        :external_id => options[:id],
+                        :password => options[:password]
+                    }
+                }
+                @client.request(:post, '/auth/login', params, &block )
+            end
+
+            def regenerate_token(options={},&block)
+                params = {
+                    :auth => {
+                        :external_id => options[:id],
+                        :password => options[:password]
+                    }
+                }
+                @client.request(:post, '/auth/regenerate_token', params, &block )
+            end
+
+            def create_creditcard(options={},&block)
+                @card.create(options,&block)
+            end
+
+            private
+                def request_params(params={})
+                    params.merge({ :client => { :api_id => @client.id } })
+                end
+        end
+    end
 end

data/spec/fixtures/kiik.yml

@@ -1,5 +1,6 @@
 :token: "098f6bcd4621d373cade4e832627b4f6"
 :wallet:
+  :url: "https://wallet2.kiik.com.br"
   :name: "Wallet Application"
   :api_id: "WALT"
   :api_secret: "b5i32od62d5hadxvopcgsdmipv2g8b"

data/spec/lib/kiik/wallet_client_spec.rb

@@ -1,8 +1,8 @@
 require "spec_helper"
 
 describe Kiik do
-  
-  
+
+
   context 'initialization' do
 
     before(:each) do
@@ -50,6 +50,6 @@ describe Kiik do
     end
 
   end
-  
+
 
 end

data/spec/lib/kiik/wallet_client_user_spec.rb

@@ -1,24 +1,28 @@
 require "spec_helper"
 
 describe Kiik do
-  
+
   before(:each) do
       Kiik.config_path = 'spec/fixtures/kiik.yml'
   end
 
   describe Kiik::Wallet::Client do
-    
+
     let(:wallet) { Kiik.wallet }
-    
+
     context "initialization" do
 
       it 'should set the user api ' do
         expect(wallet.user).not_to be_nil
       end
 
+      it 'should set the user api ' do
+        expect(wallet.user.login(:id => "123123-1231231-12312-31231", :password => "teste123" )).not_to be_nil
+      end
+
     end
 
   end
-  
+
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kiik-api
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Bruno de Queiroz
@@ -252,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A Gem for Kiik API