passaporteweb-client 0.0.15 → 0.0.16

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    passaporteweb-client (0.0.15)
+    passaporteweb-client (0.0.16)
       multi_json (~> 1.7.1)
       rest-client (~> 1.6.7)
 
@@ -58,15 +58,15 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  awesome_print (~> 1.1.0)
+  awesome_print (~> 1.1)
   bundler (~> 1.3.2)
-  coveralls (~> 0.6.3)
+  coveralls (~> 0.6)
   passaporteweb-client!
-  pry (~> 0.9.12)
-  pry-nav (~> 0.2.3)
-  rake (~> 10.0.4)
-  rdoc (~> 4.0.1)
-  rspec (~> 2.13.0)
-  simplecov (~> 0.7.1)
-  vcr (~> 2.4.0)
+  pry (~> 0.9)
+  pry-nav (~> 0.2)
+  rake (~> 10.0)
+  rdoc (~> 4.0)
+  rspec (~> 2.13)
+  simplecov (~> 0.7)
+  vcr (~> 2.4)
   webmock (~> 1.9.3)

data/lib/passaporte_web/identity.rb

@@ -6,7 +6,7 @@ module PassaporteWeb
   class Identity
     include Attributable
 
-    ATTRIBUTES = [:accounts, :birth_date, :country, :cpf, :email, :first_name, :gender, :is_active, :language, :last_name, :nickname, :notifications, :send_myfreecomm_news, :send_partner_news, :services, :timezone, :update_info_url, :uuid, :password, :password2, :must_change_password, :inhibit_activation_message, :tos]
+    ATTRIBUTES = [:accounts, :birth_date, :country, :cpf, :email, :first_name, :gender, :id_token, :is_active, :language, :last_name, :nickname, :notifications, :send_myfreecomm_news, :send_partner_news, :services, :timezone, :update_info_url, :uuid, :password, :password2, :must_change_password, :inhibit_activation_message, :tos]
     UPDATABLE_ATTRIBUTES = [:first_name, :last_name, :nickname, :cpf, :birth_date, :gender, :send_myfreecomm_news, :send_partner_news, :country, :language, :timezone]
     CREATABLE_ATTRIBUTES = *(UPDATABLE_ATTRIBUTES + [:email, :password, :password2, :must_change_password, :tos, :inhibit_activation_message])
 

data/lib/passaporte_web/identity_service_account.rb

@@ -36,6 +36,14 @@ module PassaporteWeb
       @errors = {}
     end
 
+    def name
+      @name || (@account_data.nil? ? nil : @account_data['name'])
+    end
+
+    def uuid
+      @uuid || (@account_data.nil? ? nil : @account_data['uuid'])
+    end
+
     # Creates a new ServiceAccount for the supplied Identity on the current authenticated application.
     # The supplied Identity will be the ServiceAccount's owner. You should supply either the <tt>name</tt>
     # or the (service account's) <tt>uuid</tt> attribute. If the latter is supplied, the supplied Identity

data/lib/passaporte_web/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module PassaporteWeb
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

data/passaporteweb-client.gemspec

@@ -27,14 +27,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency "multi_json", "~> 1.7.1"
 
   spec.add_development_dependency "bundler", "~> 1.3.2"
-  spec.add_development_dependency "rake", "~> 10.0.4"
-  spec.add_development_dependency 'rdoc', '~> 4.0.1'
-  spec.add_development_dependency "rspec", "~> 2.13.0"
-  spec.add_development_dependency "vcr", "~> 2.4.0"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency 'rdoc', '~> 4.0'
+  spec.add_development_dependency "rspec", "~> 2.13"
+  spec.add_development_dependency "vcr", "~> 2.4"
   spec.add_development_dependency "webmock", "~> 1.9.3"
-  spec.add_development_dependency "pry", "~> 0.9.12"
-  spec.add_development_dependency "pry-nav", "~> 0.2.3"
-  spec.add_development_dependency "awesome_print", "~> 1.1.0"
-  spec.add_development_dependency "simplecov", "~> 0.7.1"
-  spec.add_development_dependency "coveralls", "~> 0.6.3"
+  spec.add_development_dependency "pry", "~> 0.9"
+  spec.add_development_dependency "pry-nav", "~> 0.2"
+  spec.add_development_dependency "awesome_print", "~> 1.1"
+  spec.add_development_dependency "simplecov", "~> 0.7"
+  spec.add_development_dependency "coveralls", "~> 0.6"
 end

data/spec/passaporte_web/identity_service_account_spec.rb

@@ -56,8 +56,8 @@ describe PassaporteWeb::IdentityServiceAccount do
       account.service_data.should == {"name" => "Identity Client","slug" => "identity_client"}
       account.account_data.should == {"name" => "Investimentos","uuid" => "859d3542-84d6-4909-b1bd-4f43c1312065"}
       account.add_member_url.should == '/organizations/api/accounts/859d3542-84d6-4909-b1bd-4f43c1312065/members/'
-      # account.name.should == 'Investimentos' # TODO ???
-      # account.uuid.should == '859d3542-84d6-4909-b1bd-4f43c1312065' # TODO ???
+      account.name.should == 'Investimentos'
+      account.uuid.should == '859d3542-84d6-4909-b1bd-4f43c1312065'
     end
     it "should include expired service accounts if asked to" do
       accounts = described_class.find_all(identity, true)
@@ -90,6 +90,8 @@ describe PassaporteWeb::IdentityServiceAccount do
         account.service_data.should == {"name" => "Identity Client","slug" => "identity_client"}
         account.account_data['name'].should == 'Conta Nova em Folha'
         account.account_data['uuid'].should_not be_nil
+        account.name.should == 'Conta Nova em Folha'
+        account.uuid.should_not be_nil
         account.url.should_not be_nil
         account.membership_details_url.should_not be_nil
         account.add_member_url.should_not be_nil
@@ -112,6 +114,8 @@ describe PassaporteWeb::IdentityServiceAccount do
         account.service_data.should == {"name" => "Identity Client","slug" => "identity_client"}
         account.account_data['name'].should_not be_nil
         account.account_data['uuid'].should == account_uuid
+        account.name.should_not be_nil
+        account.uuid.should == account_uuid
         account.url.should_not be_nil
         account.membership_details_url.should_not be_nil
         account.add_member_url.should_not be_nil

data/spec/passaporte_web/identity_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 describe PassaporteWeb::Identity do
 
   describe "constants" do
-    it { described_class::ATTRIBUTES.should == [:accounts, :birth_date, :country, :cpf, :email, :first_name, :gender, :is_active, :language, :last_name, :nickname, :notifications, :send_myfreecomm_news, :send_partner_news, :services, :timezone, :update_info_url, :uuid, :password, :password2, :must_change_password, :inhibit_activation_message, :tos] }
+    it { described_class::ATTRIBUTES.should == [:accounts, :birth_date, :country, :cpf, :email, :first_name, :gender, :id_token, :is_active, :language, :last_name, :nickname, :notifications, :send_myfreecomm_news, :send_partner_news, :services, :timezone, :update_info_url, :uuid, :password, :password2, :must_change_password, :inhibit_activation_message, :tos] }
     it { described_class::UPDATABLE_ATTRIBUTES.should == [:first_name, :last_name, :nickname, :cpf, :birth_date, :gender, :send_myfreecomm_news, :send_partner_news, :country, :language, :timezone] }
     it { described_class::CREATABLE_ATTRIBUTES.should == [:first_name, :last_name, :nickname, :cpf, :birth_date, :gender, :send_myfreecomm_news, :send_partner_news, :country, :language, :timezone, :email, :password, :password2, :must_change_password, :tos, :inhibit_activation_message] }
   end
@@ -12,7 +12,7 @@ describe PassaporteWeb::Identity do
   describe ".new" do
     it "should instanciate an empty object" do
       identity = described_class.new
-      identity.attributes.should == {:accounts=>nil, :birth_date=>nil, :country=>nil, :cpf=>nil, :email=>nil, :first_name=>nil, :gender=>nil, :is_active=>nil, :language=>nil, :last_name=>nil, :nickname=>nil, :notifications=>nil, :send_myfreecomm_news=>nil, :send_partner_news=>nil, :services=>nil, :timezone=>nil, :update_info_url=>nil, :uuid=>nil, :password=>nil, :password2=>nil, :must_change_password=>nil, :inhibit_activation_message=>nil, :tos=>nil}
+      identity.attributes.should == {:accounts=>nil, :birth_date=>nil, :country=>nil, :cpf=>nil, :email=>nil, :first_name=>nil, :gender=>nil, :id_token => nil, :is_active=>nil, :language=>nil, :last_name=>nil, :nickname=>nil, :notifications=>nil, :send_myfreecomm_news=>nil, :send_partner_news=>nil, :services=>nil, :timezone=>nil, :update_info_url=>nil, :uuid=>nil, :password=>nil, :password2=>nil, :must_change_password=>nil, :inhibit_activation_message=>nil, :tos=>nil}
     end
     it "should instanciate an object with attributes set" do
       attributes = {
@@ -46,7 +46,7 @@ describe PassaporteWeb::Identity do
         "tos"=>nil
       }
       identity = described_class.new(attributes)
-      identity.attributes.should == {:accounts=>[], :birth_date=>"1945-10-27", :country=>"Brasil", :cpf=>nil, :email=>"lula@example.com", :first_name=>"Luis Inácio", :gender=>"M", :is_active=>true, :language=>"pt_BR", :last_name=>"da Silva", :nickname=>"Lula", :notifications=>{"count"=>0, "list"=>"/notifications/api/"}, :send_myfreecomm_news=>false, :send_partner_news=>false, :services=>{"myfinance"=>"/accounts/api/service-info/a5868d14-6529-477a-9c6b-a09dd42a7cd2/myfinance/", "account_manager"=>"/accounts/api/service-info/a5868d14-6529-477a-9c6b-a09dd42a7cd2/account_manager/"}, :timezone=>"GMT-3", :update_info_url=>"/profile/api/info/a5868d14-6529-477a-9c6b-a09dd42a7cd2/", :uuid=>"a5868d14-6529-477a-9c6b-a09dd42a7cd2", :password=>nil, :password2=>nil, :must_change_password=>nil, :inhibit_activation_message=>nil, :tos=>nil}
+      identity.attributes.should == {:accounts=>[], :birth_date=>"1945-10-27", :country=>"Brasil", :cpf=>nil, :email=>"lula@example.com", :first_name=>"Luis Inácio", :gender=>"M", :id_token => nil, :is_active=>true, :language=>"pt_BR", :last_name=>"da Silva", :nickname=>"Lula", :notifications=>{"count"=>0, "list"=>"/notifications/api/"}, :send_myfreecomm_news=>false, :send_partner_news=>false, :services=>{"myfinance"=>"/accounts/api/service-info/a5868d14-6529-477a-9c6b-a09dd42a7cd2/myfinance/", "account_manager"=>"/accounts/api/service-info/a5868d14-6529-477a-9c6b-a09dd42a7cd2/account_manager/"}, :timezone=>"GMT-3", :update_info_url=>"/profile/api/info/a5868d14-6529-477a-9c6b-a09dd42a7cd2/", :uuid=>"a5868d14-6529-477a-9c6b-a09dd42a7cd2", :password=>nil, :password2=>nil, :must_change_password=>nil, :inhibit_activation_message=>nil, :tos=>nil}
       identity.last_name.should == "da Silva"
       identity.is_active.should == true
       identity.timezone.should == "GMT-3"
@@ -125,6 +125,12 @@ describe PassaporteWeb::Identity do
       identity.accounts.map { |a| a['expiration'] }.uniq.should == [nil, "2013-04-02 00:00:00", "2014-05-01 00:00:00"]
       identity.accounts.map { |a| a['services'] }.flatten.uniq.map { |s| s['slug'] }.sort.should == ["identity_client", "vc-promove"]
     end
+    # REGRSSION
+    it "should return the is_active and id_token fields" do
+      identity = described_class.find('13b972ab-0946-4a5b-8217-60255a9cbee7', true, true)
+      identity.is_active.should be_true
+      identity.id_token.should be_nil # não mostra token pois não foi autenticado com a senha do usuário
+    end
     it "should raise an error if no profiles exist with that uuid" do
       expect {
         described_class.find("invalid-uuid")
@@ -166,6 +172,12 @@ describe PassaporteWeb::Identity do
       identity.accounts.map { |a| a['expiration'] }.uniq.should == [nil, "2013-04-02 00:00:00", "2014-05-01 00:00:00"]
       identity.accounts.map { |a| a['services'] }.flatten.uniq.map { |s| s['slug'] }.sort.should == ["identity_client", "vc-promove"]
     end
+    # REGRSSION
+    it "should return the is_active and id_token fields" do
+      identity = described_class.find_by_email('mobileteste269@mailinator.com', true, true)
+      identity.is_active.should be_true
+      identity.id_token.should be_nil # não mostra token pois não foi autenticado com a senha do usuário
+    end
     it "should raise an error if no profiles exist with that email" do
       expect {
         described_class.find("invalid@email.com")
@@ -182,6 +194,12 @@ describe PassaporteWeb::Identity do
       identity.email.should == 'teste@teste.com'
       identity.update_info_url.should == '/accounts/api/identities/5e32f927-c4ab-404e-a91c-b2abc05afb56/'
     end
+    # REGRSSION
+    it "should return the is_active and id_token fields" do
+      identity = described_class.authenticate('mobileteste269@mailinator.com', 'vivalasvegas')
+      identity.is_active.should be_true
+      identity.id_token.should == '9864ec27fb4fd866f6fad5bc041d0363d0bc0fd2945858a1'
+    end
     it "should return false if the password is wrong for the given email" do
       described_class.authenticate('teste@teste.com', 'wrong password').should be_false
     end

metadata

@@ -2,7 +2,7 @@
 name: passaporteweb-client
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Rodrigo Tassinari de Oliveira
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -67,13 +67,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.4
+        version: '10.0'
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.4
+        version: '10.0'
   type: :development
   prerelease: false
 - !ruby/object:Gem::Dependency
@@ -83,13 +83,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '4.0'
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.1
+        version: '4.0'
   type: :development
   prerelease: false
 - !ruby/object:Gem::Dependency
@@ -99,13 +99,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '2.13'
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '2.13'
   type: :development
   prerelease: false
 - !ruby/object:Gem::Dependency
@@ -115,13 +115,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.4'
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.4'
   type: :development
   prerelease: false
 - !ruby/object:Gem::Dependency
@@ -147,13 +147,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: '0.9'
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: '0.9'
   type: :development
   prerelease: false
 - !ruby/object:Gem::Dependency
@@ -163,13 +163,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0.2'
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0.2'
   type: :development
   prerelease: false
 - !ruby/object:Gem::Dependency
@@ -179,13 +179,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :development
   prerelease: false
 - !ruby/object:Gem::Dependency
@@ -195,13 +195,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.7'
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '0.7'
   type: :development
   prerelease: false
 - !ruby/object:Gem::Dependency
@@ -211,13 +211,13 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '0.6'
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '0.6'
   type: :development
   prerelease: false
 description: A Ruby client for the PassaporteWeb REST API