iugusdk 1.0.0.alpha.1 → 1.0.0.alpha.2

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

@@ -1,9 +1,10 @@
 %h2 Sign in
-= simple_form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
-  .inputs
-    = f.input :email, :required => false, :autofocus => true
-    = f.input :password, :required => false
-    = f.input :remember_me, :as => :boolean if devise_mapping.rememberable?
-  .actions
-    = f.button :submit, "Sign in"
-= render :partial => "devise/shared/links"
+- unless IuguSDK::enable_social_only
+  = simple_form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f|
+    .inputs
+      = f.input :email, :required => false, :autofocus => true
+      = f.input :password, :required => false
+      = f.input :remember_me, :as => :boolean if devise_mapping.rememberable?
+    .actions
+      = f.button :submit, "Sign in"
+= render :partial => "iugu/shared/links"

data/app/views/iugu/settings/account.html.haml

@@ -4,38 +4,48 @@
 %h2
   = I18n.t("iugu.account_settings") + " (##{@account.id})"
 
-= simple_form_for @account, :url => account_update_path(:id => @account.id), :method => :put do |f|
-  = f.label :name
-  = f.text_field :name
-  %br
-  = f.label :subdomain
-  = f.text_field :subdomain
-  %br
-  = f.submit I18n.t("iugu.save")
+- if current_user.is?(:owner, @account)
+
+  = simple_form_for @account, :url => account_update_path(:id => @account.id), :method => :put do |f|
+    = f.label :name
+    = f.text_field :name
+    %br
+    = f.submit I18n.t("iugu.save")
 
 %br
 Plan Name
 = link_to I18n.t("iugu.change")
 
-%br
-%br
-Custom Domains
-= link_to I18n.t("iugu.manage"), account_domains_index_path(@account.id)
-%br
-- if @primary_domain
-  Primary: 
-  = @primary_domain.url
+- unless IuguSDK::enable_custom_domain == false && IuguSDK::enable_subdomain == false
+  %br
+  %br
+  Custom Domains
+  - if current_user.is?(:owner, @account) || current_user.is?(:admin, @account)
+    = link_to I18n.t("iugu.manage"), account_domains_index_path(@account.id)
+  %br
+  - if @primary_domain
+    Primary: 
+    = @primary_domain.url
 
-%br
 %br
 = link_to I18n.t("iugu.users_and_roles"), account_users_index_path(@account.id)
 
+- if IuguSDK::enable_subscription_features
+  %br
+  %br
+  %div
+    = link_to I18n.t("iugu.payment_history")
 %br
-%br
-= link_to I18n.t("iugu.payment_history")
 
-- if current_user.is?(:owner, @account) || current_user.is?(:admin, @account)
-  %br
+- unless IuguSDK::enable_account_api_token == false
+  - if current_user.is?(:owner, @account)
+    %div
+      Api Token
+      = link_to I18n.t("iugu.generate_new_token"), account_generate_new_token_path(@account.id), :method => :post
+      %br
+      = @account.api_token
+
+- if current_user.is?(:owner, @account)
   %br
   - unless @account.destroying?
     = link_to I18n.t("iugu.cancel_account"), account_destroy_path(@account.id), :method => :delete
@@ -44,5 +54,3 @@ Custom Domains
       = link_to I18n.t("iugu.undo"), account_cancel_destruction_path(@account.id), :method => :delete
     - else
       = I18n.t("iugu.account_destruction_in") + @account.destruction_job.run_at.to_s
-
-

data/app/views/iugu/settings/accounts.html.haml

@@ -6,15 +6,13 @@
 - if current_user.accounts.count > 0
 
   %h3 
-    - if IuguSDK::allow_create_account
+    - if IuguSDK::enable_multiple_accounts
       = I18n.t("iugu.accounts")
     - else
       - if current_user.accounts.count > 1
         = I18n.t("iugu.accounts")
       - else
         = I18n.t("iugu.account")
-  %div
-    = link_to I18n.t("iugu.create_account"), account_create_path, :method => :post
 
   - current_user.accounts.each do |account|
     %div
@@ -31,3 +29,7 @@
 - else
   %h2
     I dont have any Accounts
+
+- if IuguSDK::enable_multiple_accounts == true
+  %div
+    = link_to I18n.t("iugu.create_account"), account_create_path, :method => :post

data/app/views/iugu/settings/profile.html.haml

@@ -30,61 +30,64 @@
     = f.submit "OK"
 %br
 
-%div
-  %h3
-    = I18n.t "iugu.change_password"
-
-= simple_form_for @user, :url => profile_update_path, :method => :post do |f|
-  - if @user.errors.include?(:password)
-    #error_explanation{ :style => "margin-bottom: 15px" }
-      %ul
-        %li
-          = "Password " + @user.errors[:password].first
-
+- unless IuguSDK::enable_social_only
   %div
-    = f.label :password
-    = f.password_field :password
+    %h3
+      = I18n.t "iugu.change_password"
 
-  %div
-    = f.label :password_confirmation
-    = f.password_field :password_confirmation
+  = simple_form_for @user, :url => profile_update_path, :method => :post do |f|
+    - if @user.errors.include?(:password)
+      #error_explanation{ :style => "margin-bottom: 15px" }
+        %ul
+          %li
+            = "Password " + @user.errors[:password].first
 
-  %div
-    = f.submit "OK", :id => "new_password_submit"
+    %div
+      = f.label :password
+      = f.password_field :password
+  
+    %div
+      = f.label :password_confirmation
+      = f.password_field :password_confirmation
 
-  %div
-    - if @user.destroying?
-      = I18n.t("iugu.user_destruction_in")
-      = @user.destruction_job.run_at
-      - unless @user.destruction_job.locked_at
-        = link_to I18n.t("iugu.undo"), profile_cancel_destruction_path, :confirm => I18n.t("iugu.are_you_sure?") 
-    - else
-      = link_to I18n.t("iugu.remove_user"), profile_destroy_path, :confirm => I18n.t("iugu.are_you_sure?") 
-%br
+    %div
+      = f.submit "OK", :id => "new_password_submit"
 
 %div
-  %h3
-    = I18n.t "iugu.social_account"
+  - if @user.destroying?
+    = I18n.t("iugu.user_destruction_in")
+    = @user.destruction_job.run_at
+    - unless @user.destruction_job.locked_at
+      = link_to I18n.t("iugu.undo"), profile_cancel_destruction_path, :confirm => I18n.t("iugu.are_you_sure?") 
+  - else
+    = link_to I18n.t("iugu.remove_user"), profile_destroy_path, :confirm => I18n.t("iugu.are_you_sure?") 
+%br
 
-  - if flash[:social]
-    #error_explanation{ :style => "margin-bottom: 15px" }
-      %ul
-        %li
-          = flash[:social]
+- if IuguSDK::enable_social_linking
 
-  - @social_accounts.each do |social_account|
+  %div
+    %h3
+      = I18n.t "iugu.social_account"
 
-    %div
-      = social_account.provider.capitalize
-      UID:
-      = social_account.social_id
-      = link_to "Remove", social_destroy_path(:id => social_account.id)
+    - if flash[:social]
+      #error_explanation{ :style => "margin-bottom: 15px" }
+        %ul
+          %li
+            = flash[:social]
+
+    - @social_accounts.each do |social_account|
 
-  - SOCIAL_ACCOUNTS.keys.each do |provider|
-    
-    - unless @social_accounts.where(:provider => provider).first 
       %div
-        = link_to "Sign in with #{provider.capitalize}", "/account/auth/#{provider}"
+        = social_account.provider.capitalize
+        UID:
+        = social_account.social_id
+        = link_to "Remove", social_destroy_path(:id => social_account.id)
+
+    - SOCIAL_ACCOUNTS.keys.each do |provider|
+    
+      - unless @social_accounts.where(:provider => provider).first 
+        %div
+          = link_to "Sign in with #{provider.capitalize}", "/account/auth/#{provider}"
 
 
 

data/app/views/iugu/shared/_links.haml

@@ -1,19 +1,22 @@
 - if controller_name != 'sessions'
   = link_to "Sign in", new_session_path(resource_name)
   %br/
-- if devise_mapping.registerable? && controller_name != 'registrations'
-  = link_to "Sign up", new_registration_path(resource_name)
-  %br/
-- if devise_mapping.recoverable? && controller_name != 'passwords'
-  = link_to "Forgot your password?", new_password_path(resource_name)
+- unless IuguSDK::enable_social_only
+  - if devise_mapping.registerable? && controller_name != 'registrations'
+    = link_to "Sign up", new_registration_path(resource_name)
+    %br/
+  - if devise_mapping.recoverable? && controller_name != 'passwords'
+    = link_to "Forgot your password?", new_password_path(resource_name)
   %br/
-- if devise_mapping.confirmable? && controller_name != 'confirmations'
-  = link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)
+- if IuguSDK::enable_user_confirmation
+  - if devise_mapping.confirmable? && controller_name != 'confirmations'
+    = link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)
   %br/
 - if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
   = link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name)
   %br/
-- if devise_mapping.omniauthable?
-  - resource_class.omniauth_providers.each do |provider|
-    = link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider)
-    %br/
+- if IuguSDK::enable_social_login
+  - if devise_mapping.omniauthable?
+    - resource_class.omniauth_providers.each do |provider|
+      = link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider)
+      %br/

data/app/views/layouts/settings.html.haml

@@ -33,7 +33,7 @@
 
         = link_to I18n.t("iugu.profile"), profile_settings_path
         = ' | '
-        - if IuguSDK::allow_create_account == false && current_user.accounts.count <= 1
+        - if IuguSDK::enable_multiple_accounts == false && current_user.accounts.count <= 1
           = link_to I18n.t("iugu.account"), account_view_path
         - else
           = link_to I18n.t("iugu.accounts"), account_settings_path

data/config/initializers/devise.rb

@@ -227,16 +227,3 @@ Devise.setup do |config|
   # end
 
 end
-
-Warden::Manager.after_authentication do |record,auth,opts|
-  if record && record.respond_to?(:accounts)
-    include IuguSDK::Controllers::Helpers
-    cookie_name = 'account'
-    account = record.default_account( auth.cookies['last_' + cookie_name + '_id']  )
-    if account
-      auth.cookies['last_' + cookie_name.downcase + '_id'] = { :value => account.id, :expires => 365.days.from_now }
-      auth.env['rack.session'][ 'current_' + cookie_name.downcase + '_id'  ] = account.id
-    end
-  end
-end
-

data/config/locales/iugu.en.yml

@@ -6,6 +6,8 @@ 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:
+    try_first: "Try first"
+    generate_new_token: "Generate new token"
     create_account: "Create Account"
     add: "Add"
     active: "Active"
@@ -62,6 +64,10 @@ en:
     verify_later: "Verify later"
     instructions: "Instructions"
     notices:
+      guest_login: "Guest successfully login"
+      subdomain_updated: "Subdomain successfully updated"
+      you_are_already_member_of_this_account: "You already member of this account"
+      new_token_generated: "New token generated"
       account_updated: "Account was successfully updated"
       account_not_found: "Account not found"
       user_invited: "User invited"

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

@@ -6,6 +6,8 @@ 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:
+    try_first: "Testar Primeiro"
+    generate_new_token: "Gerar novo token"
     create_account: "Criar Conta"
     add: "Adicionar"
     active: "Ativa"
@@ -62,6 +64,10 @@ pt-BR:
     verify_later: "Verificar depois"
     instructions: "Instruções"
     notices:
+      guest_login: "Convidado logado com sucesso"
+      subdomain_updated: "Subdominio atualizado com sucesso"
+      you_are_already_member_of_this_account: "Você já é membro dessa conta"
+      new_token_generated: "Novo token gerado"
       account_updated: "Conta atualizada com sucesso."
       account_not_found: "Conta não encontrada"
       user_invited: "Usuário convidado"

data/config/routes.rb

@@ -6,10 +6,11 @@ Rails.application.routes.draw do
   constraints(IuguSDK::RootTenancyUrl) do
 
     get "settings" => "iugu/settings#index", :as => "settings"
-    get "settings/account" => "iugu/account#index", :as => "account_settings"
+    get "settings/accounts" => "iugu/account#index", :as => "account_settings"
     get "settings/account/(:id)" => "iugu/account#view", :as => "account_view"
     delete "settings/account/(:id)" => "iugu/account#destroy", :as => "account_destroy"
     delete "settings/account/(:id)/cancel" => "iugu/account#cancel_destruction", :as => "account_cancel_destruction"
+    post "settings/account/(:account_id)/generate_new_token" => "iugu/account#generate_new_token", :as => "account_generate_new_token"
     put "settings/account/(:id)" => "iugu/account#update", :as => "account_update"
     post "settings/account" => "iugu/account#create", :as => "account_create"
 
@@ -24,6 +25,7 @@ Rails.application.routes.draw do
     get "settings/account/:account_id/domain/:domain_id" => "iugu/account_domains#instructions", :as => "account_domains_instructions"
     post '/settings/account/:account_id/domain/:domain_id' => 'iugu/account_domains#verify', :as => 'verify_domain'
     post '/settings/account/:account_id/domain/:domain_id/primary' => 'iugu/account_domains#primary', :as => 'primary_domain'
+    put '/settings/account/:account_id/subdomain' => 'iugu/account_domains#update_subdomain', :as => 'update_subdomain'
 
     get "select_account/:id" => "iugu/account#select", :as => "account_select"
     get "settings/profile" => "iugu/profile#index", :as => "profile_settings"
@@ -52,9 +54,12 @@ Rails.application.routes.draw do
       delete 'logout' => 'iugu/sessions#destroy', :as => 'destroy_user_session' 
 
       # Registration Stuff
-      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'
+      unless IuguSDK::enable_social_only
+        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'
+      end
+      post 'try_first' => 'iugu/registrations#try_first', :as => 'try_first'
 
       # Confirmation Stuff
       post 'confirmation' => 'iugu/confirmations#create', :as => 'user_confirmation'

data/db/migrate/20120725170859_add_api_token_to_account.rb

@@ -0,0 +1,9 @@
+class AddApiTokenToAccount < ActiveRecord::Migration
+  def up
+    add_column :accounts, :api_token, :string
+  end
+
+  def down
+    remove_column :accounts, :api_token
+  end
+end

data/db/migrate/20120803172545_add_guest_to_users.rb

@@ -0,0 +1,9 @@
+class AddGuestToUsers < ActiveRecord::Migration
+  def up
+    add_column :users, :guest, :boolean
+  end
+
+  def down
+    remove_column :users, :guest
+  end
+end

data/lib/iugusdk/controllers/helpers.rb

@@ -12,7 +12,7 @@ module IuguSDK
         @current_user_account ||= search_user_account( session[:current_account_id] )
       end
 
-      def select_account( resource, account_id=nil )
+      def set_account( resource, account_id=nil )
         if account_id == nil
           account_id = cookies[:last_used_account_id] if cookies[:last_used_account_id]
         end

data/lib/iugusdk/engine.rb

@@ -5,7 +5,7 @@ module IuguSDK
       ActiveSupport.on_load(:action_controller) do
         include IuguSDK::Controllers::Helpers
         helper_method "search_user_account", "current_user_account", "is_active?", "body_classes"
-        ActionController::Base.send(:include, LocaleFilter)
+        ActionController::Base.send(:include, IuguSDKBaseController)
       end
     end
 

data/lib/iugusdk/iugusdk_base_controller.rb

@@ -0,0 +1,17 @@
+module IuguSDKBaseController
+
+  def self.included(receiver)
+    receiver.append_before_filter :configure_locale
+  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?
+  end
+
+end

data/lib/iugusdk/version.rb

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

data/lib/iugusdk.rb

@@ -5,7 +5,7 @@ require 'iugusdk/controllers/helpers'
 require 'iugusdk/valid_tenancy_urls'
 require 'iugusdk/root_tenancy_url'
 require "iugusdk/engine"
-require "iugusdk/locale_filter"
+require "iugusdk/iugusdk_base_controller"
 require "http_accept_language"
 require 'devise'
 require 'omniauth'
@@ -27,11 +27,10 @@ module IuguSDK
   mattr_accessor :default_subscription_name
   mattr_accessor :guest_user_prefix
   mattr_accessor :multiple_accounts_per_user
-  mattr_accessor :custom_domain_for_accounts
   mattr_accessor :default_layout
 
-  mattr_accessor :allow_create_account
-  self.allow_create_account = false
+  mattr_accessor :enable_multiple_accounts
+  self.enable_multiple_accounts = true
 
   mattr_accessor :application_main_host
   self.application_main_host = "iugusdk.dev"
@@ -51,6 +50,33 @@ module IuguSDK
   mattr_accessor :delay_user_exclusion
   self.delay_user_exclusion = 0
 
+  mattr_accessor :enable_subdomain
+  self.enable_subdomain = 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_social_login
+  self.enable_social_login = false
+
+  mattr_accessor :enable_social_linking
+  self.enable_social_linking = false
+
+  mattr_accessor :enable_user_confirmation
+  self.enable_user_confirmation = false
+
+  mattr_accessor :enable_email_reconfirmation
+  self.enable_email_reconfirmation = false
+
+  mattr_accessor :enable_subscription_features
+  self.enable_subscription_features = false
+
+  mattr_accessor :enable_social_only
+  self.enable_social_only = false
+
   self.application_title = 'Application Name'
 
   self.no_signup_form = false
@@ -59,7 +85,6 @@ module IuguSDK
   self.default_subscription_name = 'free'
   self.guest_user_prefix = 'appuser'
   self.multiple_accounts_per_user = false
-  self.custom_domain_for_accounts = false
 
   self.default_layout = "settings"
 

data/spec/controller_macros.rb

@@ -33,7 +33,7 @@ module ControllerMacros
         account = Fabricate(:account)
         account.account_users << Fabricate(:account_user, :user => user)
         sign_in user
-        # select_account
+        set_account user
       end
     end
   end

data/spec/controllers/account_controller_spec.rb

@@ -47,35 +47,6 @@ describe Iugu::AccountController do
       end
     end
 
-    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
-      before(:each) do
-        @account_user = @user.accounts.first.account_users.find_by_user_id(@user.id)
-        @account = @user.accounts.first
-        @account.account_users << Fabricate(:account_user) { user Fabricate(:user) { email "notowner@account.test" } }
-        @account_user.roles.destroy_all
-        @account_user.roles << AccountRole.create(:name => "user")
-        get :destroy, :id => @user.accounts.first.id
-      end
-
-      it { response.should redirect_to account_settings_path }
-
-      it 'should not destroy the account' do
-        @user.accounts.first.destroying?.should be_false
-      end
-    
-    end
-  
   end
 
   context "cancel_destruction" do
@@ -96,16 +67,6 @@ describe Iugu::AccountController do
       end
     end
 
-    context "when using wrong id" do
-      before do
-        get :cancel_destruction, :id => 987213
-      end
-
-      it { response.should redirect_to account_settings_path }
-
-      it { flash.now[:notice].should == I18n.t("iugu.notices.account_not_found") }
-
-    end
   end
 
   context "select" do
@@ -133,12 +94,6 @@ describe Iugu::AccountController do
       @user.accounts.first.name.should == "fudum"
     end
 
-    it 'should raise error if receive an invalid id' do
-      lambda {
-        put :update, :id => 892738912731893719237, :account => { :name => "fudum" }
-      }.should raise_error ActionController::RoutingError
-    end
-  
   end
 
   context "create" do
@@ -154,7 +109,33 @@ describe Iugu::AccountController do
         post :create
       end.should change(@user.accounts, :count).by(1)
     end
+  
+  end
+
+  context "generate_new_token" do
+    login_as_user
+    before(:each) do
+      IuguSDK::enable_account_api_token = true
+      @account = @user.accounts.last
+      post :generate_new_token, :account_id => @account.id
+    end
+
+    it { response.should redirect_to account_view_path(@account.id) }
+
+    it { flash.now[:notice].should == I18n.t("iugu.notices.new_token_generated") }
+
+    context "when enable_account_api_token == false" do
+      before(:each) do
+        IuguSDK::enable_account_api_token = false
+      end
 
+      it 'should raise RoutingError' do
+        lambda {
+          post :generate_new_token, :account_id => @account.id
+        }.should raise_error ActionController::RoutingError
+      end
+
+    end
   
   end