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

data/app/controllers/iugu/account_controller.rb

@@ -37,6 +37,7 @@ class Iugu::AccountController < Iugu::AccountSettingsController
   def update
     @account = Account.find(params[:id])
     @account.update_attributes(params[:account])
+    flash[:group] = :account_update
     redirect_to account_view_path(params[:id]), :notice => I18n.t("iugu.notices.account_updated")
   end
 
@@ -46,9 +47,10 @@ class Iugu::AccountController < Iugu::AccountSettingsController
   end
 
   def generate_new_token
-    if IuguSDK::enable_account_api_token == true
+    if IuguSDK::enable_account_api
       @account = current_user.accounts.find(params[:account_id])
       @account.update_api_token
+      flash[:group] = :api_token
       redirect_to account_view_path(params[:account_id]), :notice => I18n.t("iugu.notices.new_token_generated")
     else
       raise ActionController::RoutingError.new('Not found')

data/app/controllers/iugu/account_domains_controller.rb

@@ -5,7 +5,7 @@ class Iugu::AccountDomainsController < Iugu::AccountSettingsController
   before_filter(:only => [:index, :create, :destroy, :instruction, :verify, :primary, :update_subdomain]) { |c| c.must_be [:owner, :admin], :account_id }
 
   def index
-    unless IuguSDK::enable_custom_domain == false && IuguSDK::enable_subdomain == false
+    unless IuguSDK::enable_custom_domain == false && IuguSDK::enable_account_alias == false
       @account = current_user.accounts.find(params[:account_id])
       @account_domains = @account.account_domains.where(:account_id => params[:account_id])
       @account_domain = AccountDomain.new
@@ -25,6 +25,7 @@ class Iugu::AccountDomainsController < Iugu::AccountSettingsController
   end
 
   def destroy
+    flash[:group] = :account_domain
     begin
       @account = current_user.accounts.find(params[:account_id])
       @domain = @account.account_domains.find(params[:domain_id])
@@ -71,7 +72,7 @@ class Iugu::AccountDomainsController < Iugu::AccountSettingsController
   end
 
   def update_subdomain
-    if IuguSDK::enable_subdomain == true
+    if IuguSDK::enable_account_alias == true
       @account = current_user.accounts.find(params[:account_id])
       if @account.update_attributes(params[:account])
         redirect_to account_domains_index_path(@account.id), :notice => I18n.t("iugu.notices.subdomain_updated")

data/app/controllers/iugu/account_users_controller.rb

@@ -3,9 +3,13 @@ class Iugu::AccountUsersController < Iugu::AccountSettingsController
   before_filter(:only => [:destroy, :cancel_destruction]) { |c| c.must_be [:owner, :admin], :account_id }
 
   def index
-    @account = Account.find(params[:account_id])
-    @account_users = @account.account_users
-    render 'iugu/account_users/index'
+    if IuguSDK::enable_multiple_users_per_account
+      @account = Account.find(params[:account_id])
+      @account_users = @account.account_users
+      render 'iugu/account_users/index'
+    else
+      raise ActionController::RoutingError.new("Not found")
+    end
   end
 
   def view

data/app/controllers/iugu/confirmations_controller.rb

@@ -1,3 +1,5 @@
 class Iugu::ConfirmationsController < Devise::ConfirmationsController
   after_filter :select_account, :only => :show
+
+  layout IuguSDK.alternative_layout
 end

data/app/controllers/iugu/omniauth_callbacks_controller.rb

@@ -5,7 +5,7 @@ class Iugu::OmniauthCallbacksController < Devise::OmniauthCallbacksController
       if current_user 
         raise ActionController::RoutingError.new("Not found") unless IuguSDK::enable_social_linking
         current_user.find_or_create_social(env["omniauth.auth"])
-        redirect_to after_sign_in_path_for( current_user )
+        redirect_to(env["omniauth.origin"] || root_path)
       else
         raise ActionController::RoutingError.new("Not found") unless IuguSDK::enable_social_login
         if user = User.find_or_create_by_social(env["omniauth.auth"])

data/app/controllers/iugu/passwords_controller.rb

@@ -1,3 +1,5 @@
 class Iugu::PasswordsController < Devise::PasswordsController
   after_filter :select_account, :only => :update
+
+  layout IuguSDK.alternative_layout
 end

data/app/controllers/iugu/profile_controller.rb

@@ -9,10 +9,17 @@ class Iugu::ProfileController < Iugu::SettingsController
   def update
     @user = current_user
     @social_accounts = @user.social_accounts
+    if !params[:user][:password].blank?
+      flash.now[:group] = :password_update
+    else
+      flash.now[:group] = :profile_update
+    end
     if @user.update_attributes(params[:user])
-      flash[:notice] = I18n.t('iugu.notices.user_update')
+      I18n.locale = @user.locale 
+      sign_in @user, :bypass => true if !params[:user][:password].blank?
+      flash.now[:notice] = I18n.t('iugu.notices.user_update')
     else
-      flash[:error] = @user.errors.full_messages
+      flash.now[:error] = @user.errors.full_messages
     end
     render 'iugu/settings/profile'
   end
@@ -41,4 +48,19 @@ class Iugu::ProfileController < Iugu::SettingsController
     redirect_to profile_settings_path
   end
 
+  def become_user
+    if current_user.guest
+      @user = current_user
+      if current_user.become_user(params[:user])
+        sign_in @user
+        select_account
+        redirect_to root_path, :notice => I18n.t("iugu.notices.congrats_for_becoming_user")
+      else
+        render 'iugu/settings/profile'
+      end 
+    else
+      raise ActionController::RoutingError.new("Not found")
+    end 
+  end 
+
 end

data/app/controllers/iugu/registrations_controller.rb

@@ -1,14 +1,24 @@
 class Iugu::RegistrationsController < Devise::RegistrationsController
   after_filter :select_account, :only => [:create,:update]
 
+  layout IuguSDK.alternative_layout
+
   def try_first
-    @user = User.create_guest
-    @user.remember_me = true
-    sign_in @user
-    select_account
-    flash[:notice] = I18n.t("iugu.notices.guest_login")
-    redirect_to root_path
-    #respond_with @user, :location => sign_up_path_for(@user)
+    if IuguSDK::enable_guest_user
+      @user = User.create_guest
+      @user.remember_me = true
+      sign_in @user
+      select_account
+      flash[:notice] = I18n.t("iugu.notices.guest_login")
+      redirect_to root_path
+      #respond_with @user, :location => sign_up_path_for(@user)
+    else
+      raise ActionController::RoutingError.new("Not found")
+    end
+  end
+
+  def after_sign_up_path_for(resource)
+    IuguSDK::app_main_url
   end
 end
 

data/app/controllers/iugu/sessions_controller.rb

@@ -1,3 +1,5 @@
 class Iugu::SessionsController < Devise::SessionsController
   after_filter :select_account, :only => :create 
+
+  layout IuguSDK.alternative_layout
 end

data/app/controllers/iugu/unlocks_controller.rb

@@ -1,2 +1,3 @@
 class Iugu::UnlocksController < Devise::UnlocksController
+  layout IuguSDK.alternative_layout
 end

data/app/mailers/iugu_mailer.rb

@@ -13,4 +13,11 @@ class IuguMailer < Devise::Mailer
       format.html { render "iugu/mailer/invitation" }
     end
   end
+
+  def welcome(user)
+    @user = user
+    mail(to: @user.email, :subject => "Bem vindo!") do |format|
+      format.html { render "iugu/mailer/welcome" }
+    end
+  end
 end

data/app/models/account.rb

@@ -9,9 +9,12 @@ class Account < ActiveRecord::Base
 
   validates :subdomain, :uniqueness => true, :unless => Proc.new { |a| a.subdomain.blank? }
   validates :api_token, :uniqueness => true, :if => :api_token?
-  validate :subdomain_blacklist
+  validate :subdomain_blacklist, :name
+
+  attr_accessible :subdomain, :name 
 
   before_create :set_first_token
+  after_create :set_first_subdomain, :unless => :subdomain?
 
   def self.get_from_domain(domain)
     AccountDomain.verified.find_by_url(domain).try(:account) || Account.find_by_subdomain(domain.gsub(".#{IuguSDK::application_main_host}",""))
@@ -53,6 +56,10 @@ class Account < ActiveRecord::Base
     self.api_token = generate_api_token
   end
 
+  def set_first_subdomain
+    self.update_attribute(:subdomain, "#{IuguSDK::account_alias_prefix}#{id}")
+  end
+
   def generate_api_token
     Digest::MD5.hexdigest("#{SecureRandom.hex(10)}-#{DateTime.now.to_s}")
   end

data/app/models/account_domain.rb

@@ -5,9 +5,15 @@ class AccountDomain < ActiveRecord::Base
   validates :url, :account_id, :presence => true
   validate :validate_pattern, :validate_blacklist
 
+  attr_accessible :url
+
   before_create :validate_not_repeated
 
-  before_destroy { |record| record.update_attributes(:verified => false, :primary => false) }
+  before_destroy do |record|
+    record.verified = false
+    record.primary = false
+    record.save
+  end
   before_destroy :set_first_domain
 
   scope :verified, where(:verified => true)

data/app/models/account_role.rb

@@ -5,6 +5,8 @@ class AccountRole < ActiveRecord::Base
   validates_uniqueness_of :name, :scope => :account_user_id, :allow_nil => false
   validates_presence_of :account_user
 
+  attr_accessible :name
+
   before_destroy do
     false if only_owner?
   end

data/app/models/account_user.rb

@@ -8,6 +8,8 @@ class AccountUser < ActiveRecord::Base
   validates_presence_of :user
   validates_presence_of :account
 
+  attr_accessible :user
+
   handle_asynchronously :destroy, :queue => Proc.new { |p| "account_user_#{p.id}_destroy" },
                         :run_at => Proc.new { DateTime.now + IuguSDK::delay_account_user_exclusion }
 

data/app/models/available_language.rb

@@ -1,9 +1,34 @@
+# encoding: utf-8
+#
 class AvailableLanguage
   def self.all
+    default = {"English" => "en", 'Português (Brasil)' => "pt-BR"}
     begin
-      YAML.load_file("#{Rails.root.to_s}/config/available_language.yml")['locales']
+      YAML.load_file("#{Rails.root.to_s}/config/available_language.yml")['locales'] || default
     rescue
-      ["en"]
+      default
+    end
+  end
+
+  def self.best_locale_for(lang)
+    lang.gsub!('_', '-')
+    locale = "en"
+    if self.all.values.include? lang
+      locale = lang 
+    else
+      self.all.values.each do |l|
+        locale = l if l.gsub(/-.*/, '') == lang.gsub(/-.*/, '')
+      end
+    end
+    locale
+  end
+
+  def self.default_locale
+    default = "en"
+    begin
+      YAML.load_file("#{Rails.root.to_s}/config/available_language.yml")['default'] || default
+    rescue
+      default
     end
   end
   

data/app/models/user.rb

@@ -14,15 +14,24 @@ class User < ActiveRecord::Base
          :recoverable, :rememberable, :validatable, :omniauthable
 
   # Setup accessible (or protected) attributes for your model
-  attr_accessible :email, :password, :password_confirmation, :remember_me, :locale, :name, :birthdate, :guest
+  attr_accessible :email, :password, :password_confirmation, :remember_me, :locale, :name, :birthdate, :guest, :account_alias
+
+  mattr_accessor :account_alias
+  
+  before_destroy :destroy_private_accounts
 
   before_create :skip_confirmation!, :unless => Proc.new { IuguSDK::enable_user_confirmation }
 
   after_create :create_account_for_user
 
+  after_create :send_welcome_mail, :if => Proc.new { |r| IuguSDK::enable_welcome_mail && !r.email.blank? }
+
   before_save :skip_reconfirmation!, :unless => Proc.new { IuguSDK::enable_email_reconfirmation }
 
   validates :email, :email => true, :unless => :guest?
+  validates :locale, :presence => true
+
+  default_value_for :locale, AvailableLanguage.default_locale
 
   def destruction_job
     Delayed::Job.find_by_queue("user_#{id}_destroy")
@@ -55,7 +64,8 @@ class User < ActiveRecord::Base
       :locale => locale
     })
     user.skip_confirmation!
-    user.save
+    user.save(:validate => false)
+    user.delay(:run_at => DateTime.now + IuguSDK::destroy_guest_in, :queue => "guest_#{user.id}").destroy
     user
   end
 
@@ -67,6 +77,9 @@ class User < ActiveRecord::Base
         return false if !User.where(:email => auth["extra"]["raw_info"]["email"]).empty?
         user.email = auth["extra"]["raw_info"]["email"]
       end
+      user.birthdate = Date.strptime(auth["extra"]["raw_info"]["birthday"], '%m/%d/%Y') if auth["extra"]["raw_info"]["birthday"]
+      user.locale = AvailableLanguage.best_locale_for(auth["extra"]["raw_info"]["locale"]) if auth["extra"]["raw_info"]["locale"]
+      user.locale = AvailableLanguage.best_locale_for(auth["extra"]["raw_info"]["lang"]) if auth["extra"]["raw_info"]["lang"]
       user.skip_confirmation!
       user.save(:validate => false)
       social_account = user.create_social(auth)
@@ -101,12 +114,40 @@ class User < ActiveRecord::Base
     self.accounts.where( [ "accounts.id = ?", account_id] ).first || self.accounts.first
   end
 
+  def become_user(data)
+    if self.guest
+      self.guest = false
+      self.email = data[:email]
+      self.password = data[:password]
+      self.password_confirmation = data[:password_confirmation]
+      if self.save
+        Delayed::Job.find_by_queue("guest_#{id}").destroy
+        self
+      else
+        self.guest = true
+        false
+      end
+    else
+      false
+    end
+  end
+
   private
 
+  def destroy_private_accounts
+    self.accounts.each do |acc|
+      acc.destroy if acc.account_users.count <= 1
+    end
+  end
+
   def email_required?
     !(has_social? || guest?)
   end
 
+  def send_welcome_mail
+    IuguMailer.welcome(self).deliver
+  end
+
 
   #def self.reconfirmable
   #  true
@@ -116,7 +157,7 @@ class User < ActiveRecord::Base
   
   def create_account_for_user
     if accountable?
-      new_account = Account.create({})
+      new_account = Account.create( :subdomain => account_alias )
       account_user = new_account.account_users.create( { :user => self } )
     end
   end

data/app/models/user_invitation.rb

@@ -23,7 +23,7 @@ class UserInvitation < ActiveRecord::Base
   def accept(user)
     account = Account.find(account_id)
     if account.account_users.where(:user_id => user.id).empty?
-      account.account_users << account_user = AccountUser.create(:user_id => user.id)
+      account.account_users << account_user = AccountUser.create(:user => user)
       account_user.set_roles(roles.split(',')) if roles
       true
     else

data/app/views/iugu/account_domains/index.html.haml

@@ -1,7 +1,9 @@
 %h2
   = I18n.t("iugu.account_domains") + " (##{@account.id})"
+- if flash[:group] == :account_domain
+  = flash[:notice]
 
-- if IuguSDK::enable_subdomain == true
+- if IuguSDK::enable_account_alias == true
   %div
     = simple_form_for @account, :url => update_subdomain_path(:id => @account.id), :method => :put do |f|
       - if @account.errors.any?

data/app/views/iugu/account_roles/edit.html.haml

@@ -4,14 +4,14 @@
     - APP_ROLES['roles'].each do |role|
       %div
         = check_box_tag "roles[]", role, @account_user.is?(role), :id => "#{role}_checkbox"
-        = label_tag "#{role}_checkbox", role
+        = label_tag "#{role}_checkbox", I18n.t("iugu.#{role}")
 
   - elsif current_user.is?(:admin, @account)
     - APP_ROLES['roles'].each do |role|
       - unless role == APP_ROLES['owner_role'] || role == APP_ROLES['admin_role']
         %div
           = check_box_tag "roles[]", role, @account_user.is?(role), :id => "#{role}_checkbox"
-          = label_tag "#{role}_checkbox", role
+          = label_tag "#{role}_checkbox", I18n.t("iugu.#{role}")
     
   %div
     = submit_tag I18n.t("iugu.save")

data/app/views/iugu/account_users/index.html.haml

@@ -2,7 +2,10 @@
 
 - @account_users.each do |account_user|
   %div
-    = account_user.user.name || account_user.user.email
+    - if account_user.user.name.blank?
+      = account_user.user.email
+    - else
+      = account_user.user.name
     - if current_user.is?(:owner, @account) || current_user.is?(:admin, @account)
       |
       = link_to I18n.t("iugu.permissions"), account_roles_edit_path(:id => @account.id, :user_id => account_user.user_id)

data/app/views/iugu/confirmations/new.html.haml

@@ -1,8 +1,9 @@
-%h2 Resend confirmation instructions
+%h2
+  = I18n.t("iugu.resend_confirmation_instructions")
 = simple_form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f|
   = f.error_notification
   .inputs
     = f.input :email, :required => true
   .actions
-    = f.button :submit, "Resend confirmation instructions"
+    = f.button :submit, I18n.t("iugu.resend_confirmation_instructions")
 = render :partial => "devise/shared/links"

data/app/views/iugu/invitations/new.html.haml

@@ -13,14 +13,14 @@
     - APP_ROLES['roles'].each do |role|
       %div
         = check_box_tag "user_invitation[roles][]", role, false, :id => "#{role}_checkbox"
-        = label_tag "#{role}_checkbox", role
+        = label_tag "#{role}_checkbox", I18n.t("iugu.#{role}")
 
-  - if current_user.is?(:admin, @account)
+  - elsif current_user.is?(:admin, @account)
     - APP_ROLES['roles'].each do |role|
       - unless role == APP_ROLES['owner_role'] || role == APP_ROLES['admin_role'] 
         %div
           = check_box_tag "user_invitation[roles][]", role, false, :id => "#{role}_checkbox"
-          = label_tag "#{role}_checkbox", role
+          = label_tag "#{role}_checkbox", I18n.t("iugu.#{role}")
 
   %div
     = f.submit I18n.t("iugu.invite")