iugusdk 1.0.0.alpha.2 → 1.0.0.alpha.3

data/config/initializers/devise.rb

@@ -213,7 +213,7 @@ Devise.setup do |config|
   # config.omniauth :github, 'APP_ID', 'APP_SECRET', :scope => 'user,public_repo'
 
   SOCIAL_ACCOUNTS.keys.each do |provider_name|
-    config.omniauth provider_name.to_sym, SOCIAL_ACCOUNTS[provider_name]['token'], SOCIAL_ACCOUNTS[provider_name]['secret']
+    config.omniauth provider_name.to_sym, SOCIAL_ACCOUNTS[provider_name]['token'], SOCIAL_ACCOUNTS[provider_name]['secret'], :scope => SOCIAL_ACCOUNTS[provider_name]['scope']
   end
      
 

data/config/locales/iugu.en.yml

@@ -6,6 +6,10 @@ en:
       only_social_and_no_email: "You need email and password to unlink this Social Account"
       email_already_in_use: "This email is already in use"
   iugu:
+    welcome: "Welcome"
+    edit: "Edit"
+    update: "Update"
+    unhappy?: "Unhappy?"
     try_first: "Try first"
     generate_new_token: "Generate new token"
     create_account: "Create Account"
@@ -13,6 +17,7 @@ en:
     active: "Active"
     unnamed: "Unnamed"
     back_to: "Back to"
+    back: "Back"
     save: "Save"
     invited_by: "Invited by"
     accept: "Accept"
@@ -39,12 +44,14 @@ en:
     remove_user: "Remove User"
     removing: "Removing..."
     cancel_account: "Cancel Account"
+    cancel_my_account: "Cancel my account"
     undo: "Undo"
     signed_in: "You are signed in as"
     settings: "Settings"
     in_your_settings_form: "in your settings form"
     sign_out: "Sign out"
     sign_in: "Sign in"
+    sign_in_with: "Sign in with"
     sign_up: "Sign up"
     profile: "Profile"
     profile_settings: "Profile Settings"
@@ -52,6 +59,11 @@ en:
     account_number: "Account Number"
     account_roles: "User roles on account"
     change_password: "Change password"
+    change_your_password: "Change your password"
+    change_my_password: "Change my password"
+    forgot_your_password?: "Forgot your password?"
+    new_password: "New password"
+    confirm_your_new_password: "Confirm your new password"
     change: "Change"
     manage: "Manage"
     social_account: "Social network accounts"
@@ -63,7 +75,23 @@ en:
     verify_domain: "Verify Domain"
     verify_later: "Verify later"
     instructions: "Instructions"
+    resend_confirmation_instructions: "Resend confirmation instructions"
+    confirm_email_through_link_below: "You can confirm your account email through the link below"
+    send_me_reset_password_instructions: "Send me reset password instructions"
+    leave_it_blank_if_dont_wanna_change_it: "leave it blank if you don't want to change it"
+    we_need_your_current_password_to_confirm_changes: "we need your current password to confirm your changes"
+    did_not_receive_confirmation_instructions?: "Didn't receive confirmation instructions?"
+    plan_name: "Plan name"
+    custom_domains: "Custom domains"
+    api_token: "Api token"
+    i_dont_have_any_accounts: "I don't have any accounts"
+    owner: "owner"
+    admin: "admin"
+    user: "user"
+    guest: "guest"
+    become_user: "Become an User"
     notices:
+      congrats_for_becoming_user: "Congratulations for becoming an user"
       guest_login: "Guest successfully login"
       subdomain_updated: "Subdomain successfully updated"
       you_are_already_member_of_this_account: "You already member of this account"
@@ -80,4 +108,15 @@ en:
       domain_verified: "Domain successfully verified"
       domain_not_verified: "Domain could not be verified"
       domain_set_primary: "Domain successfully set as primary"
+
+  activerecord:
+    models:
+      user: "User"
+    attributes:
+      password: "Password"
+      password_confirmation: "Password confirmation"
+      name: "Name"
+      birthdate: "Birthdate"
+      locale: "Locale"
+      remember_me: "Remember me"
       

data/config/locales/iugu.pt-BR.yml

@@ -6,6 +6,10 @@ pt-BR:
       only_social_and_no_email: "Você precisa de um email para poder apagar essa rede social"
       email_already_in_use: "Esse email já foi utilizado"
   iugu:
+    welcome: "Bem vindo"
+    edit: "Editar"
+    update: "Atualizar"
+    unhappy?: "Infeliz?"
     try_first: "Testar Primeiro"
     generate_new_token: "Gerar novo token"
     create_account: "Criar Conta"
@@ -13,6 +17,7 @@ pt-BR:
     active: "Ativa"
     unnamed: "Sem nome"
     back_to: "Voltar para"
+    back: "Voltar"
     save: "Salvar"
     invited_by: "Convidado por"
     accept: "Aceitar"
@@ -37,7 +42,8 @@ pt-BR:
     are_you_sure?: "Tem certeza disso?"
     remove: "Excluir"
     remove_user: "Remover Usuário"
-    cancel_account: "Cancelar Conta"
+    cancel_account: "Cancelar conta"
+    cancel_my_account: "Cancelar minha conta"
     removing: "Excluindo..."
     undo: "Desfazer"
     signed_in: "Você está logado como"
@@ -45,13 +51,19 @@ pt-BR:
     in_your_settings_form: "no seu formulario de configurações"
     sign_out: "Deslogar"
     sign_in: "Logar"
+    sign_in_with: "Logar-se com"
     sign_up: "Cadastro"
     profile: "Perfil"
     profile_settings: "Configurações de Perfil"
-    account_settings: "Account Settings"
-    account_number: "Account Number"
-    account_roles: "User roles on account"
+    account_settings: "Configurações de conta"
+    account_number: "Número de conta"
+    account_roles: "Papeis de usúarios na conta"
     change_password: "Mudar senha"
+    change_your_password: "Mude sua senha"
+    change_my_password: "Mudar minha senha"
+    forgot_your_password?: "Esqueceu sua senha?"
+    new_password: "Nova senha"
+    confirm_your_new_password: "Confirme sua nova senha"
     change: "Alterar"
     manage: "Manejar"
     social_account: "Redes sociais"
@@ -63,7 +75,23 @@ pt-BR:
     verify_domain: "Verificar Dominio"
     verify_later: "Verificar depois"
     instructions: "Instruções"
+    resend_confirmation_instructions: "Instruções para re-envio de confirmação"
+    confirm_email_through_link_below: "Você pode confirmar o email da sua conta no link abaixo"
+    send_me_reset_password_instructions: "Me envie instruções para reset de senha"
+    leave_it_blank_if_dont_wanna_change_it: "Deixa em branco se não quiser alterar"
+    we_need_your_current_password_to_confirm_changes: "Nos precisamos da sua senha atual para confirmar as mudanças"
+    did_not_receive_confirmation_instructions?: "Não recebeu as instruções para confirmação?"
+    plan_name: "Nome do Plano"
+    custom_domains: "Dominios customizados"
+    api_token: "Token da api"
+    i_dont_have_any_accounts: "Eu não tenho nenhuma conta"
+    owner: "dono"
+    admin: "administrador"
+    user: "usuário"
+    guest: "convidado"
+    become_user: "Tornar-se um usuário"
     notices:
+      congrats_for_becoming_user: "Parabens por se tornar um usuário!"
       guest_login: "Convidado logado com sucesso"
       subdomain_updated: "Subdominio atualizado com sucesso"
       you_are_already_member_of_this_account: "Você já é membro dessa conta"
@@ -80,4 +108,15 @@ pt-BR:
       domain_verified: "Dominio verificado"
       domain_not_verified: "Não foi possivel verificar o dominio"
       domain_set_primary: "O dominio foi configurado como primario"
+
+  activerecord:
+    models:
+      user: "Usuário"
+    attributes:
+      password: "Senha"
+      password_confirmation: "Confirmação de senha"
+      name: "Nome"
+      birthdate: "Data de nascimento"
+      locale: "Localidade"
+      remember_me: "Lembre-me"
               

data/config/routes.rb

@@ -33,6 +33,7 @@ Rails.application.routes.draw do
     get "settings/profile/cancel_destruction" => "iugu/profile#cancel_destruction", :as => "profile_cancel_destruction"
     post "settings/profile" => "iugu/profile#update", :as => "profile_update"
     get "settings/profile/social/destroy" => "iugu/profile#destroy_social", :as => "social_destroy"
+    post 'become_user' => 'iugu/profile#become_user', :as => 'become_user'
 
     get '/settings/account/:account_id/invite' => 'iugu/invitations#new', :as => 'new_invite'
     post '/settings/account/:account_id/invite' => 'iugu/invitations#create', :as => 'create_invite'
@@ -54,7 +55,7 @@ Rails.application.routes.draw do
       delete 'logout' => 'iugu/sessions#destroy', :as => 'destroy_user_session' 
 
       # Registration Stuff
-      unless IuguSDK::enable_social_only
+      if IuguSDK::enable_signup_form
         get 'signup' => 'iugu/registrations#new', :as => 'new_user_registration'
         post 'signup' => 'iugu/registrations#create', :as => 'user_registration'
         get 'cancel_signup' => 'iugu/registrations#cancel', :as => 'cancel_user_registration'

data/lib/iugusdk.rb

@@ -13,6 +13,7 @@ require 'omniauth-twitter'
 require 'omniauth-facebook'
 require 'delayed_job'
 require 'delayed_job_active_record'
+require 'koala'
 # TODO: ALE - Acho q vai precisar disto
 # require 'oauth2'
 
@@ -21,16 +22,15 @@ module IuguSDK
   mattr_accessor :app_root
 
   mattr_accessor :application_title
-  mattr_accessor :no_signup_form
   mattr_accessor :app_main_url
   mattr_accessor :app_root_url
   mattr_accessor :default_subscription_name
   mattr_accessor :guest_user_prefix
-  mattr_accessor :multiple_accounts_per_user
   mattr_accessor :default_layout
+  mattr_accessor :alternative_layout
 
   mattr_accessor :enable_multiple_accounts
-  self.enable_multiple_accounts = true
+  self.enable_multiple_accounts = false
 
   mattr_accessor :application_main_host
   self.application_main_host = "iugusdk.dev"
@@ -50,20 +50,23 @@ module IuguSDK
   mattr_accessor :delay_user_exclusion
   self.delay_user_exclusion = 0
 
-  mattr_accessor :enable_subdomain
-  self.enable_subdomain = false
+  mattr_accessor :destroy_guest_in
+  self.destroy_guest_in = 7
+
+  mattr_accessor :enable_account_alias
+  self.enable_account_alias = false
 
   mattr_accessor :enable_custom_domain
   self.enable_custom_domain = false
 
-  mattr_accessor :enable_account_api_token
-  self.enable_custom_domain = false
+  mattr_accessor :enable_account_api
+  self.enable_account_api = false
 
   mattr_accessor :enable_social_login
   self.enable_social_login = false
 
   mattr_accessor :enable_social_linking
-  self.enable_social_linking = false
+  self.enable_social_linking = true
 
   mattr_accessor :enable_user_confirmation
   self.enable_user_confirmation = false
@@ -74,19 +77,33 @@ module IuguSDK
   mattr_accessor :enable_subscription_features
   self.enable_subscription_features = false
 
-  mattr_accessor :enable_social_only
-  self.enable_social_only = false
+  mattr_accessor :enable_signup_form
+  self.enable_signup_form = true
+
+  mattr_accessor :enable_guest_user
+  self.enable_guest_user = false
+
+  mattr_accessor :account_alias_prefix
+  self.account_alias_prefix = 'account'
+
+  mattr_accessor :enable_alias_on_signup
+  self.enable_alias_on_signup = false
+
+  mattr_accessor :enable_multiple_users_per_account
+  self.enable_multiple_users_per_account = false
+
+  mattr_accessor :enable_welcome_mail
+  self.enable_welcome_mail = false
 
   self.application_title = 'Application Name'
 
-  self.no_signup_form = false
   self.app_main_url = '/'
   self.app_root_url = '/'
   self.default_subscription_name = 'free'
   self.guest_user_prefix = 'appuser'
-  self.multiple_accounts_per_user = false
 
   self.default_layout = "settings"
+  self.alternative_layout = "application"
 
   def initialize
   end

data/lib/iugusdk/controllers/helpers.rb

@@ -12,6 +12,10 @@ module IuguSDK
         @current_user_account ||= search_user_account( session[:current_account_id] )
       end
 
+      def current_account
+        current_user_account.try(:account)
+      end
+
       def set_account( resource, account_id=nil )
         if account_id == nil
           account_id = cookies[:last_used_account_id] if cookies[:last_used_account_id]

data/lib/iugusdk/engine.rb

@@ -4,7 +4,7 @@ module IuguSDK
     initializer 'iugusdk.action_controller' do |app|
       ActiveSupport.on_load(:action_controller) do
         include IuguSDK::Controllers::Helpers
-        helper_method "search_user_account", "current_user_account", "is_active?", "body_classes"
+        helper_method "search_user_account", "current_user_account", "is_active?", "body_classes", "current_account"
         ActionController::Base.send(:include, IuguSDKBaseController)
       end
     end

data/lib/iugusdk/iugusdk_base_controller.rb

@@ -5,13 +5,21 @@ module IuguSDKBaseController
   end
 
   def select_account
-    Rails.logger.info "SELECT ACCOUNT"
     set_account(current_user) if current_user
   end
 
   def configure_locale
-    @matched_locale_from_browser = request.preferred_language_from(AvailableLanguage.all)
-    I18n.locale = current_user.locale || "en" if signed_in?
+    @matched_locale_from_browser = request.preferred_language_from(AvailableLanguage.all.values)
+    if signed_in?
+      if current_user.locale.blank?
+        locale = "en" 
+      else
+        locale = current_user.locale
+      end
+    else
+      locale = @matched_locale_from_browser
+    end
+    I18n.locale = locale
   end
 
 end

data/lib/iugusdk/root_tenancy_url.rb

@@ -15,6 +15,10 @@ module IuguSDK
     def self.matches?(request)
       application_domain = IuguSDK::application_main_host
       valids = [ application_domain, ['www.',application_domain].join ]
+      unless Rails.env.production?
+        first_part_uri = application_domain.gsub('.dev','')
+        return true if request.host.match("#{first_part_uri}\.[^\.]+\.[^\.]+\.[^\.]+\.[^\.]+\.xip.io")
+      end
       valids.include?( request.host )
     end
 

data/lib/iugusdk/version.rb

@@ -1,3 +1,3 @@
 module IuguSDK
-  VERSION = "1.0.0.alpha.2"
+  VERSION = "1.0.0.alpha.3"
 end

data/spec/controllers/account_controller_spec.rb

@@ -115,7 +115,7 @@ describe Iugu::AccountController do
   context "generate_new_token" do
     login_as_user
     before(:each) do
-      IuguSDK::enable_account_api_token = true
+      IuguSDK::enable_account_api = true
       @account = @user.accounts.last
       post :generate_new_token, :account_id => @account.id
     end
@@ -124,9 +124,9 @@ describe Iugu::AccountController do
 
     it { flash.now[:notice].should == I18n.t("iugu.notices.new_token_generated") }
 
-    context "when enable_account_api_token == false" do
+    context "when enable_account_api == false" do
       before(:each) do
-        IuguSDK::enable_account_api_token = false
+        IuguSDK::enable_account_api = false
       end
 
       it 'should raise RoutingError' do

data/spec/controllers/account_domains_controller_spec.rb

@@ -179,9 +179,9 @@ describe Iugu::AccountDomainsController do
       @account = @user.accounts.first
     end
 
-    context "when enable_subdomain == true" do
+    context "when enable_account_alias == true" do
       before(:each) do
-        IuguSDK::enable_subdomain = true
+        IuguSDK::enable_account_alias = true
         put :update_subdomain, :account_id => @account.id, :account => {:subdomain => "subdomain"}
       end
 
@@ -200,9 +200,9 @@ describe Iugu::AccountDomainsController do
       end
     end
 
-    context "when enable_subdomain == false" do
+    context "when enable_account_alias == false" do
       before(:each) do
-        IuguSDK::enable_subdomain = false
+        IuguSDK::enable_account_alias = false
       end
 
       it 'should raise RoutingError' do
@@ -234,12 +234,12 @@ describe Iugu::AccountDomainsController do
   
   end
 
-  context "when enable_custom_domain == false && enable_subdomain == false" do
+  context "when enable_custom_domain == false && enable_account_alias == false" do
     login_as_user
     before(:each) do
       @account = @user.accounts.first
       IuguSDK::enable_custom_domain = false
-      IuguSDK::enable_subdomain = false
+      IuguSDK::enable_account_alias = false
     end
 
     it 'index method should raise RoutingError' do

data/spec/controllers/account_users_controller_spec.rb

@@ -4,10 +4,22 @@ describe Iugu::AccountUsersController do
   context "index" do
     login_as_user
     before(:each) do
+      IuguSDK::enable_multiple_users_per_account = true
       get :index, :account_id => @user.accounts.first.id
     end
 
     it { response.should render_template 'iugu/account_users/index' }
+
+    context "when enable_multiple_users_per_account == false" do
+      before(:each) do
+        IuguSDK::enable_multiple_users_per_account = false
+      end
+      it 'should raise routing error' do
+        lambda{
+          get :index, :account_id => @user.accounts.first.id
+        }.should raise_error ActionController::RoutingError
+      end
+    end
   
   end
 
@@ -31,9 +43,9 @@ describe Iugu::AccountUsersController do
 
       before(:each) do
         @target_user = Fabricate(:user) do
-          email 'target@teste.teste'
+          email 'targetdestroy@teste.teste'
         end
-        @account.account_users << @account_user = AccountUser.create(:user_id => @target_user.id)
+        @account.account_users << @account_user = AccountUser.create(:user => @target_user)
       end
 
       it 'should raise routing error if account_id is invalid' do
@@ -96,7 +108,7 @@ describe Iugu::AccountUsersController do
       @target_user = Fabricate(:user) do
         email 'target@test.test'
       end
-      @account.account_users << @account_user = AccountUser.create(:user_id => @target_user.id)
+      @account.account_users << @account_user = AccountUser.create(:user => @target_user)
       @account_user.set_roles ["user"]
       @account_user.destroy
     end