iugusdk 1.0.0.alpha.0 → 1.0.0.alpha.1

data/app/controllers/iugu/account_controller.rb

@@ -25,7 +25,7 @@ class Iugu::AccountController < Iugu::AccountSettingsController
         end
       end
     rescue
-      notice = "Account not found"
+      notice = I18n.t("iugu.notices.account_not_found")
     end
     redirect_to(account_settings_path, :notice => notice)
   end
@@ -35,7 +35,7 @@ class Iugu::AccountController < Iugu::AccountSettingsController
       current_user.accounts.find(params[:id]).cancel_destruction if params[:id]
       notice = I18n.t("iugu.account_destruction_undone")
     rescue
-      notice = "Account not found"
+      notice = I18n.t("iugu.notices.account_not_found")
     end
     redirect_to(account_settings_path, :notice => notice)
   end
@@ -49,7 +49,7 @@ class Iugu::AccountController < Iugu::AccountSettingsController
     begin
       @account = Account.find(params[:id])
       @account.update_attributes(params[:account])
-      redirect_to(account_view_path(params[:id]))
+      redirect_to account_view_path(params[:id]), :notice => I18n.t("iugu.notices.account_updated")
     rescue
       raise ActionController::RoutingError.new('Not Found')
     end

data/app/controllers/iugu/account_domains_controller.rb

@@ -8,8 +8,8 @@ class Iugu::AccountDomainsController < Iugu::AccountSettingsController
 
   def create
     @account = current_user.accounts.find(params[:account_id])
-    if @account.account_domains << AccountDomain.create(params[:account_domain])
-      redirect_to account_domains_index_path(params[:account_id]), :notice => notice = I18n.t("iugu.notices.domain_created")
+    if @account.account_domains << @domain = AccountDomain.create(params[:account_domain])
+      redirect_to account_domains_instructions_path(:account_id => params[:account_id], :domain_id => @domain.id)#, :notice => notice = I18n.t("iugu.notices.domain_created")
     else
       render :index
     end
@@ -43,7 +43,7 @@ class Iugu::AccountDomainsController < Iugu::AccountSettingsController
       if @domain.verify 
         redirect_to account_domains_index_path(params[:account_id]), :notice => I18n.t("iugu.notices.domain_verified")
       else
-        redirect_to account_domains_index_path(params[:account_id]), :notice => I18n.t("iugu.notices.domain_not_verified")
+        redirect_to account_domains_instructions_path(:account_id => params[:account_id], :domain_id => params[:domain_id]), :notice => I18n.t("iugu.notices.domain_not_verified")
       end
     rescue
       redirect_to account_domains_index_path(params[:account_id]), :notice => I18n.t("iugu.notices.domain_not_found")

data/app/models/account.rb

@@ -7,7 +7,7 @@ class Account < ActiveRecord::Base
   handle_asynchronously :destroy, :queue => Proc.new { |p| "account_#{p.id}_destroy" },
                         :run_at => Proc.new { DateTime.now + IuguSDK::delay_account_exclusion }
 
-  validates :subdomain, :uniqueness => true
+  validates :subdomain, :uniqueness => true, :unless => Proc.new { |a| a.subdomain.blank? }
   validate :subdomain_blacklist
 
   def self.get_from_domain(domain)

data/app/models/user_invitation.rb

@@ -4,6 +4,8 @@ class UserInvitation < ActiveRecord::Base
   before_create :set_sent_at
   after_create :send_email
 
+  belongs_to :account
+
   def self.find_by_invitation_token(invitation_token)
     begin
       user_invitation = UserInvitation.find(id = invitation_token.gsub(/.{27}$/, ''))

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

@@ -22,8 +22,7 @@
       - if domain.verified
         = I18n.t("iugu.verified")
       - else
-        = I18n.t("iugu.not_verified")
-        = link_to I18n.t("iugu.instructions"), account_domains_instructions_path(:account_id => @account.id, :domain_id => domain.id)
+        = link_to I18n.t("iugu.not_verified"), account_domains_instructions_path(:account_id => @account.id, :domain_id => domain.id)
 
       - if current_user.is?(:owner, @account)
         |

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

@@ -0,0 +1,4 @@
+%div
+  = link_to I18n.t("iugu.verify_domain"), verify_domain_path(:account_id => @account.id, :domain_id => @domain.id), :method => :post
+%div
+  = link_to I18n.t("iugu.verify_later"), account_domains_index_path(@account.id)

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

@@ -16,8 +16,5 @@
           = I18n.t("iugu.removing")
         - else
           = link_to I18n.t("iugu.undo"), account_users_cancel_destruction_path(:account_id => account_user.account_id, :user_id => account_user.user_id), :method => 'delete' 
-
-%br
-%br
-%div
-  = link_to I18n.t("iugu.invite"), new_invite_path(:account_id => @account.id)
+      %div
+        = link_to I18n.t("iugu.invite"), new_invite_path(:account_id => @account.id)

data/config/locales/iugu.en.yml

@@ -58,8 +58,12 @@ en:
     set_primary: "Set Primary"
     verified: "Verified"
     not_verified: "Not Verified"
+    verify_domain: "Verify Domain"
+    verify_later: "Verify later"
     instructions: "Instructions"
     notices:
+      account_updated: "Account was successfully updated"
+      account_not_found: "Account not found"
       user_invited: "User invited"
       sign_up: "Thank you for signing up"
       user_update: "User was successfully updated."

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

@@ -58,8 +58,12 @@ pt-BR:
     set_primary: "Setar primario"
     verified: "Verificado"
     not_verified: "Não Verificado"
+    verify_domain: "Verificar Dominio"
+    verify_later: "Verificar depois"
     instructions: "Instruções"
     notices:
+      account_updated: "Conta atualizada com sucesso."
+      account_not_found: "Conta não encontrada"
       user_invited: "Usuário convidado"
       sign_up: "Obrigado por se cadastrar."
       user_update: "Seus dados foram atualizados."

data/lib/iugusdk/version.rb

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

data/spec/controllers/account_controller_spec.rb

@@ -47,13 +47,15 @@ describe Iugu::AccountController do
       end
     end
 
-    context "when using right id" do
+    context "when using wrong id" do
       before do
         get :destroy, :id => 31241
       end
 
       it { response.should redirect_to account_settings_path }
 
+      it { flash.now[:notice].should == I18n.t("iugu.notices.account_not_found") }
+
     end
 
     context "when user is not the owner" do
@@ -101,6 +103,8 @@ describe Iugu::AccountController do
 
       it { response.should redirect_to account_settings_path }
 
+      it { flash.now[:notice].should == I18n.t("iugu.notices.account_not_found") }
+
     end
   end
 
@@ -122,6 +126,9 @@ describe Iugu::AccountController do
   
     it { response.should redirect_to account_view_path(@user.accounts.first.id) }
 
+    it { flash.now[:notice].should == I18n.t("iugu.notices.account_updated") }
+
+
     it 'should update account name' do
       @user.accounts.first.name.should == "fudum"
     end

data/spec/controllers/account_domains_controller_spec.rb

@@ -19,9 +19,7 @@ describe Iugu::AccountDomainsController do
       post :create, :account_id => @account.id, :account_domain => { :url => "new.test.net" }
     end
   
-    it { response.should redirect_to account_domains_index_path(@account.id) } 
-
-    it { flash.now[:notice].should == I18n.t("iugu.notices.domain_created") }
+    it { response.should redirect_to account_domains_instructions_path(@account.id, AccountDomain.last.id) } 
 
     context "without required fields" do
       before(:each) do
@@ -120,7 +118,7 @@ describe Iugu::AccountDomainsController do
           get :verify, :account_id => @account.id, :domain_id => @domain.id
         end
 
-        it { response.should redirect_to account_domains_index_path(@account.id) } 
+        it { response.should redirect_to account_domains_instructions_path(@account.id, @domain.id) } 
 
         it { flash.now[:notice].should == I18n.t("iugu.notices.domain_not_verified") }
 

data/spec/dummy/log/development.log

@@ -0,0 +1,104 @@
+Connecting to database specified by database.yml
+   (0.3ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+   (81.1ms)  DROP DATABASE IF EXISTS `iugusdk_test`
+   (0.2ms)  CREATE DATABASE `iugusdk_test` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`
+   (79.4ms)  CREATE TABLE `account_domains` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `account_id` int(11), `url` varchar(255), `verified` tinyint(1), `primary` tinyint(1)) ENGINE=InnoDB
+   (227.3ms)  CREATE TABLE `account_roles` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `account_user_id` int(11)) ENGINE=InnoDB
+   (151.2ms)  CREATE TABLE `account_users` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `account_id` int(11), `user_id` int(11)) ENGINE=InnoDB
+   (173.3ms)  CREATE TABLE `accounts` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `created_at` datetime, `updated_at` datetime, `name` varchar(255), `subscription_id` int(11), `subdomain` varchar(255)) ENGINE=InnoDB
+   (79.1ms)  CREATE TABLE `delayed_jobs` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `priority` int(11) DEFAULT 0, `attempts` int(11) DEFAULT 0, `handler` text, `last_error` text, `run_at` datetime, `locked_at` datetime, `failed_at` datetime, `locked_by` varchar(255), `queue` varchar(255), `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+   (186.2ms)  CREATE INDEX `delayed_jobs_priority` ON `delayed_jobs` (`priority`, `run_at`)
+   (120.2ms)  CREATE TABLE `social_accounts` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `social_id` int(11), `user_id` int(11), `provider` varchar(255), `token` varchar(255), `secret` varchar(255)) ENGINE=InnoDB
+   (164.0ms)  CREATE TABLE `user_invitations` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `invited_by` int(11), `email` varchar(255), `sent_at` datetime, `account_id` int(11), `token` varchar(255), `roles` varchar(255)) ENGINE=InnoDB
+   (125.3ms)  CREATE TABLE `users` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `email` varchar(255) DEFAULT '' NOT NULL, `encrypted_password` varchar(255) DEFAULT '' NOT NULL, `reset_password_token` varchar(255), `reset_password_sent_at` datetime, `remember_created_at` datetime, `confirmation_token` varchar(255), `confirmed_at` datetime, `confirmation_sent_at` datetime, `unconfirmed_email` varchar(255), `created_at` datetime, `updated_at` datetime, `birthdate` date, `name` varchar(255), `locale` varchar(255)) ENGINE=InnoDB
+   (188.6ms)  CREATE UNIQUE INDEX `index_users_on_confirmation_token` ON `users` (`confirmation_token`)
+   (108.9ms)  CREATE INDEX `index_users_on_email` ON `users` (`email`)
+   (132.2ms)  CREATE UNIQUE INDEX `index_users_on_reset_password_token` ON `users` (`reset_password_token`)
+   (176.2ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
+   (169.6ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
+   (0.1ms)  SELECT version FROM `schema_migrations`
+   (1.4ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120719162426')
+Connecting to database specified by database.yml
+   (83.8ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
+   (268.8ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
+   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+Migrating to CreateAccount (20120528164634)
+   (97.7ms)  CREATE TABLE `accounts` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120528164634')
+Migrating to AddDeviseToUsers (20120529134109)
+   (152.1ms)  CREATE TABLE `users` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `email` varchar(255) DEFAULT '' NOT NULL, `encrypted_password` varchar(255) DEFAULT '' NOT NULL, `reset_password_token` varchar(255), `reset_password_sent_at` datetime, `remember_created_at` datetime, `confirmation_token` varchar(255), `confirmed_at` datetime, `confirmation_sent_at` datetime, `unconfirmed_email` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (129.8ms)  CREATE UNIQUE INDEX `index_users_on_email` ON `users` (`email`)
+   (111.3ms)  CREATE UNIQUE INDEX `index_users_on_reset_password_token` ON `users` (`reset_password_token`)
+   (117.0ms)  CREATE UNIQUE INDEX `index_users_on_confirmation_token` ON `users` (`confirmation_token`)
+   (1.4ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120529134109')
+Migrating to AddBirthdateAndNameToUser (20120529162901)
+   (145.8ms)  ALTER TABLE `users` ADD `birthdate` date
+   (151.3ms)  ALTER TABLE `users` ADD `name` varchar(255)
+   (0.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120529162901')
+Migrating to AddNameAndSubscriptionIdAndUserIdToAccount (20120529174755)
+   (106.1ms)  ALTER TABLE `accounts` ADD `name` varchar(255)
+   (124.4ms)  ALTER TABLE `accounts` ADD `subscription_id` int(11)
+   (99.8ms)  ALTER TABLE `accounts` ADD `user_id` int(11)
+   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120529174755')
+Migrating to CreateAccountUsers (20120529180814)
+   (124.5ms)  CREATE TABLE `account_users` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `account_id` int(11), `user_id` int(11)) ENGINE=InnoDB
+   (0.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120529180814')
+Migrating to RemoveUserIdFromAccounts (20120530114709)
+   (119.3ms)  ALTER TABLE `accounts` DROP `user_id`
+   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120530114709')
+Migrating to CreateAccountRoles (20120531171438)
+   (119.0ms)  CREATE TABLE `account_roles` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `account_user_id` int(11)) ENGINE=InnoDB
+   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120531171438')
+Migrating to AddLocaleToUser (20120604131034)
+   (114.9ms)  ALTER TABLE `users` ADD `locale` varchar(255)
+   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120604131034')
+Migrating to CreateSocialAccount (20120605142527)
+   (94.3ms)  CREATE TABLE `social_accounts` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `social_id` int(11), `user_id` int(11), `provider` varchar(255), `token` varchar(255), `secret` varchar(255)) ENGINE=InnoDB
+   (1.0ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120605142527')
+Migrating to SetLocale (20120612141130)
+  SQL (0.3ms)  UPDATE `users` SET locale = 'en' WHERE `users`.`locale` IS NULL
+   (0.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120612141130')
+Migrating to RemoveUniqueFromUserEmail (20120613173114)
+   (95.9ms)  DROP INDEX `index_users_on_email` ON `users`
+   (162.1ms)  CREATE INDEX `index_users_on_email` ON `users` (`email`)
+   (0.6ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120613173114')
+Migrating to CreateDelayedJobs (20120615180728)
+   (95.0ms)  CREATE TABLE `delayed_jobs` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `priority` int(11) DEFAULT 0, `attempts` int(11) DEFAULT 0, `handler` text, `last_error` text, `run_at` datetime, `locked_at` datetime, `failed_at` datetime, `locked_by` varchar(255), `queue` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (181.6ms)  CREATE INDEX `delayed_jobs_priority` ON `delayed_jobs` (`priority`, `run_at`)
+   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120615180728')
+Migrating to CreateUserInvitations (20120629154429)
+   (182.3ms)  CREATE TABLE `user_invitations` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `invited_by` int(11), `email` varchar(255), `sent_at` datetime, `account_id` int(11)) ENGINE=InnoDB
+   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120629154429')
+Migrating to AddTokenToUserInvitations (20120629195345)
+   (155.6ms)  ALTER TABLE `user_invitations` ADD `token` varchar(255)
+   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120629195345')
+Migrating to AddRolesToUserInvitations (20120705202827)
+   (94.5ms)  ALTER TABLE `user_invitations` ADD `roles` varchar(255)
+   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120705202827')
+Migrating to CreateAccountDomain (20120716145846)
+   (127.2ms)  CREATE TABLE `account_domains` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `account_id` int(11), `url` varchar(255), `verified` tinyint(1), `primary` tinyint(1)) ENGINE=InnoDB
+   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120716145846')
+Migrating to AddSubdomainToAccount (20120719162426)
+   (115.4ms)  ALTER TABLE `accounts` ADD `subdomain` varchar(255)
+   (0.5ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20120719162426')
+   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+Connecting to database specified by database.yml
+   (0.2ms)  SELECT `schema_migrations`.`version` FROM `schema_migrations` 
+   (0.4ms)  DROP DATABASE IF EXISTS `iugusdk_test`
+   (0.2ms)  CREATE DATABASE `iugusdk_test` DEFAULT CHARACTER SET `utf8` COLLATE `utf8_unicode_ci`
+   (54.8ms)  CREATE TABLE `account_domains` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `account_id` int(11), `url` varchar(255), `verified` tinyint(1), `primary` tinyint(1)) ENGINE=InnoDB
+   (257.1ms)  CREATE TABLE `account_roles` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `account_user_id` int(11)) ENGINE=InnoDB
+   (106.9ms)  CREATE TABLE `account_users` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `account_id` int(11), `user_id` int(11)) ENGINE=InnoDB
+   (117.9ms)  CREATE TABLE `accounts` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `name` varchar(255), `subscription_id` int(11), `subdomain` varchar(255)) ENGINE=InnoDB
+   (138.2ms)  CREATE TABLE `delayed_jobs` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `priority` int(11) DEFAULT 0, `attempts` int(11) DEFAULT 0, `handler` text, `last_error` text, `run_at` datetime, `locked_at` datetime, `failed_at` datetime, `locked_by` varchar(255), `queue` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL) ENGINE=InnoDB
+   (117.6ms)  CREATE INDEX `delayed_jobs_priority` ON `delayed_jobs` (`priority`, `run_at`)
+   (170.1ms)  CREATE TABLE `social_accounts` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `social_id` int(11), `user_id` int(11), `provider` varchar(255), `token` varchar(255), `secret` varchar(255)) ENGINE=InnoDB
+   (164.0ms)  CREATE TABLE `user_invitations` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `invited_by` int(11), `email` varchar(255), `sent_at` datetime, `account_id` int(11), `token` varchar(255), `roles` varchar(255)) ENGINE=InnoDB
+   (115.6ms)  CREATE TABLE `users` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `email` varchar(255) DEFAULT '' NOT NULL, `encrypted_password` varchar(255) DEFAULT '' NOT NULL, `reset_password_token` varchar(255), `reset_password_sent_at` datetime, `remember_created_at` datetime, `confirmation_token` varchar(255), `confirmed_at` datetime, `confirmation_sent_at` datetime, `unconfirmed_email` varchar(255), `created_at` datetime NOT NULL, `updated_at` datetime NOT NULL, `birthdate` date, `name` varchar(255), `locale` varchar(255)) ENGINE=InnoDB
+   (123.5ms)  CREATE UNIQUE INDEX `index_users_on_confirmation_token` ON `users` (`confirmation_token`)
+   (133.4ms)  CREATE INDEX `index_users_on_email` ON `users` (`email`)
+   (148.4ms)  CREATE UNIQUE INDEX `index_users_on_reset_password_token` ON `users` (`reset_password_token`)
+   (134.7ms)  CREATE TABLE `schema_migrations` (`version` varchar(255) NOT NULL) ENGINE=InnoDB
+   (128.7ms)  CREATE UNIQUE INDEX `unique_schema_migrations` ON `schema_migrations` (`version`)
+   (0.1ms)  SELECT version FROM `schema_migrations`
+   (0.5ms)  INSERT INTO `schema_migrations` (version) VALUES ('20120719162426')