iugusdk 1.0.0.alpha.7 → 1.0.0.alpha.9

data/app/assets/stylesheets/iugu-sdk.css.sass

@@ -1,7 +1,12 @@
 @import "iugu-ux/core"
+@import "compass/utilities/general/clearfix"
 
 .iugu-ui
-  .responsive-dialog
+  .default-sdk-wrapper
+    padding: 0px
+  .default-optional
+    margin-bottom: 15px
+  .default-sdk-dialog
     width: 320px
     height: 480px
     margin-left: -160px
@@ -47,6 +52,26 @@
       .twitter,.twitter:visited
         background: #39B6DE
         color: #fff
+      .button:last-child
+        margin-bottom: 0px !important
+        
+          
+
+  &.settings .wrapper .container,.default-sdk-dialog
+
+    .social
+      table
+        tr td
+          width: 50%
+      table tr td:first-child span
+        display: block
+        font-size: 13px
+        text-transform: uppercase
+        color: #666
+        font-weight: bold
+        padding: 15px
+        padding-left: 10px
+        padding-bottom: 0px
 
     input[type="text"],input.string,input.password,.button
       width: 100%
@@ -72,3 +97,58 @@
 
     .full-width
       width: 100%
+
+@include for-small-screens()
+  .iugu-ui
+    .default-sdk-wrapper
+      padding: 10px
+    .default-optional
+      margin-bottom: 0px
+    .default-sdk-dialog
+      width: 100%
+      height: auto
+      position: relative
+      margin-left: auto
+      margin-right: auto
+      margin-top: auto
+      left: auto
+      top: auto
+
+
+.iugu-ui.settings
+  .wrapper
+    max-width: 600px
+    margin-left: auto
+    margin-right: auto
+    padding: 10px
+
+    .header
+      @include clearfix
+      .button
+        float: right
+
+    .tabbed .nav li
+      width: 50%
+
+    .tabbed .container
+      overflow: hidden
+
+@include for-small-screens(390px)
+  .iugu-ui,.iugu-ui.settings
+    .wrapper
+      .header
+        width: 100%
+        margin-top: 50px
+        position: relative
+        overflow: visible
+        @include box-mode
+        a
+          text-align: center
+          display: block
+          img
+            margin-bottom: $baseLineSpacing
+        .button
+          width: 100%
+          float: none
+          position: absolute
+          top: -50px

data/app/controllers/iugu/omniauth_callbacks_controller.rb

@@ -6,15 +6,16 @@ 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(env["omniauth.origin"] || root_path )
+        flash[:group] = :social
+        redirect_to((env["omniauth.origin"] || root_path ) + "#social", notice: I18n.t("iugu.social_linked"))
       else
         raise ActionController::RoutingError.new("Not found") unless IuguSDK::enable_social_login
         if user = User.find_or_create_by_social(env["omniauth.auth"])
           sign_in user
           select_account
-          redirect_to after_sign_in_path_for( user )
+          redirect_to after_sign_in_path_for( user ) + "#social"
         else
-          redirect_to (env["omniauth.origin"] || root_path ), :notice => I18n.t('errors.messages.email_already_in_use')
+          redirect_to (env["omniauth.origin"] || root_path ) + "#social", :notice => I18n.t('errors.messages.email_already_in_use')
         end 
       end
     else

data/app/controllers/iugu/profile_controller.rb

@@ -9,8 +9,8 @@ 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
+    if params[:form_group] == "password"
+      flash.now[:group] = :password
     else
       flash.now[:group] = :profile_update
     end
@@ -18,8 +18,6 @@ class Iugu::ProfileController < Iugu::SettingsController
       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.now[:error] = @user.errors.full_messages
     end
     render 'iugu/settings/profile'
   end
@@ -27,15 +25,19 @@ class Iugu::ProfileController < Iugu::SettingsController
   def destroy
     if IuguSDK::enable_user_cancel
       (user = current_user).destroy
-      redirect_to(profile_settings_path, :notice => I18n.t("iugu.user_destruction_in") + user.destruction_job.run_at.to_s)
+      flash[:group] = :remove_user
+      flash[:error] = I18n.t("iugu.user_destruction_in") + user.destruction_job.run_at.to_s
+      redirect_to(profile_settings_path)
     else
       raise ActionController::RoutingError.new("Not found")
     end
   end
 
   def cancel_destruction
+    flash[:group] = :remove_user
+    flash[:error] = I18n.t("iugu.user_destruction_undone")
     current_user.cancel_destruction
-    redirect_to(profile_settings_path, :notice => I18n.t("iugu.user_destruction_undone"))
+    redirect_to(profile_settings_path)
   end
 
   def destroy_social
@@ -48,7 +50,8 @@ class Iugu::ProfileController < Iugu::SettingsController
     rescue
       notice = I18n.t("errors.messages.not_found")
     end
-    flash[:social] = notice
+    flash[:notice] = notice
+    flash[:group] = :social
     redirect_to profile_settings_path
   end
 
@@ -70,6 +73,8 @@ class Iugu::ProfileController < Iugu::SettingsController
   def renew_token
     if IuguSDK::enable_user_api
       current_user.token.refresh
+      flash[:group] = :api
+      flash[:notice] = I18n.t("iugu.notices.new_token_generated")
       redirect_to profile_settings_path
     else
       raise ActionController::RoutingError.new("Not found")

data/app/controllers/iugu/registrations_controller.rb

@@ -1,5 +1,6 @@
 class Iugu::RegistrationsController < Devise::RegistrationsController
   after_filter :select_account, :only => [:create,:update]
+  before_filter :verify_private_api_secret, :only => [:create]
 
   layout IuguSDK.alternative_layout
 
@@ -36,5 +37,12 @@ class Iugu::RegistrationsController < Devise::RegistrationsController
   def after_sign_up_path_for(resource)
     IuguSDK::app_main_url
   end
-end
 
+  private
+
+  def verify_private_api_secret
+    if request.format.json?
+      render :json=>{:errors=>"Unauthorized"}, :status=>401 unless params[:private_api_secret] == IuguSDK::private_api_secret 
+    end
+  end
+end

data/app/models/user.rb

@@ -9,7 +9,7 @@ class User < ActiveRecord::Base
   has_many :account_users, :dependent => :destroy
   has_many :accounts, :through => :account_users
   has_many :social_accounts, :dependent => :destroy
-  has_one :token, :as => :tokenable, :class_name => "ApiToken"
+  has_one :token, :as => :tokenable, :class_name => "ApiToken", :dependent => :destroy
 
   alias :_destroy :destroy
   def destroy
@@ -144,19 +144,12 @@ class User < ActiveRecord::Base
     end
   end
 
-  def access_token
-    "none"
-  end
-
-  # def to_json
-  #   super(:only => [:email,:id])
-  # end
   def as_json(options = nil)
     {
       id: id,
       email: email,
       locale: locale,
-      access_token: access_token
+      access_token: token.token
     }
   end
 

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

@@ -1,9 +1,28 @@
-%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, I18n.t("iugu.resend_confirmation_instructions")
-= render :partial => "devise/shared/links"
+- content_for :title do I18n.t("iugu.resend_confirmation_instructions") end
+
+.default-sdk-wrapper
+  .default-sdk-dialog
+    .container.no-padding
+
+      = render :partial => "iugu/shared/responsive-dialog.header"
+
+      .padding
+
+        = simple_form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post, :class => "no-bottom-margin" }) do |f|
+
+
+          - if resource.errors.size > 0
+            .notice.notice-red
+              = f.error_notification
+
+          %h6.no-bottom-margin
+            = I18n.t("iugu.resend_confirmation_instructions")
+
+
+          .inputs
+            = f.input :email, :required => false, :label => false, :placeholder => "E-mail"
+          .actions
+            = f.button :submit, I18n.t("iugu.resend_confirmation_instructions_action"), :class => "full-width default"
+
+          %a.button.no-bottom-margin{ :href => new_session_path(resource_name) }
+            = I18n.t("iugu.back")

data/app/views/iugu/mailer/reset_password_instructions.html.haml

@@ -3,4 +3,11 @@
   #{@resource.email}!
 %p 
   = I18n.t("iugu.confirm_email_through_link_below")
-%p= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token)
+
+%p= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token)
+
+%p
+  If you didn't request this, please ignore this email.
+
+%p
+  Your password won't change until you access the link above and create a new one.

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

@@ -1,12 +1,31 @@
-%h2 
-  = I18n.t("iugu.change_your_password")
-= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f|
-  = f.error_notification
-  = f.input :reset_password_token, :as => :hidden
-  = f.full_error :reset_password_token
-  .inputs
-    = f.input :password, :label => I18n.t("iugu.new_password"), :required => true
-    = f.input :password_confirmation, :label => I18n.t("iugu.confirm_your_new_password"), :required => true
-  .actions
-    = f.button :submit, I18n.t("iugu.change_my_password")
-= render :partial => "devise/shared/links"
+- content_for :title do I18n.t("iugu.change_your_password") end
+
+.default-sdk-wrapper
+  .default-sdk-dialog
+    .container.no-padding
+
+      = render :partial => "iugu/shared/responsive-dialog.header"
+
+      .padding
+
+        = simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put, :class => "no-bottom-margin" }) do |f|
+
+
+          - if resource.errors.size > 0
+            .notice.notice-red
+              = f.error_notification
+
+          %h6.no-bottom-margin
+            = I18n.t("iugu.change_your_password")
+
+          .inputs
+            = f.input :password, :label => false, :placeholder => I18n.t("iugu.new_password"), :required => true
+            = f.input :password_confirmation, :label => false, :placeholder => I18n.t("iugu.confirm_your_new_password"), :required => true
+
+          = f.input :reset_password_token, :as => :hidden
+
+          .actions
+            = f.button :submit, I18n.t("iugu.change_my_password"), :class => "full-width default"
+            %a.button.no-bottom-margin{ :href => new_session_path(resource_name) }
+              = I18n.t("iugu.back")
+

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

@@ -1,9 +1,30 @@
-%h2 
-  = I18n.t("iugu.forgot_your_password?")
-= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f|
-  = f.error_notification
-  .inputs
-    = f.input :email, :required => true
-  .actions
-    = f.button :submit, I18n.t("iugu.send_me_reset_password_instructions")
-= render :partial => "devise/shared/links"
+- content_for :title do I18n.t("iugu.forgot_your_password?") end
+
+.default-sdk-wrapper
+  .default-sdk-dialog
+    .container.no-padding
+
+      = render :partial => "iugu/shared/responsive-dialog.header"
+
+      .padding
+
+        = simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post, :class => "no-bottom-margin" }) do |f|
+
+
+          - if resource.errors.size > 0
+            .notice.notice-red
+              = f.error_notification
+
+          %h6.no-bottom-margin
+            = I18n.t("iugu.forgot_your_password?")
+
+
+          .inputs
+            = f.input :email, :required => false, :label => false, :placeholder => "E-mail"
+          .actions
+            = f.button :submit, I18n.t("iugu.send_me_reset_password_instructions"), :class => "full-width default"
+
+          %a.button.no-bottom-margin{ :href => new_session_path(resource_name) }
+            = I18n.t("iugu.back")
+
+

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

@@ -1,23 +1,55 @@
-%h2 
-  = I18n.t("iugu.sign_up")
-= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f|
-  = f.error_notification
-  .inputs
-    = f.input :email, :required => true, :autofocus => true
-    = f.input :password, :required => true, :label => I18n.t("activerecord.attributes.password")
-    = f.input :password_confirmation, :required => true, :label => I18n.t("activerecord.attributes.password_confirmation")
-    - if IuguSDK::enable_alias_on_signup
-      = f.input :account_alias, :label => 'Alias'
-    = render :partial => "iugu/shared/signup_fields", :locals => {:f => f}
-    = f.hidden_field :locale, :value => @matched_locale_from_browser
-    - if IuguSDK::enable_subscription_features
-      = f.hidden_field :plan_id, value: @plan_id
-      = f.hidden_field :price_id, value: @price_id
-  .actions
-    = f.button :submit, I18n.t("iugu.sign_up")
-
-- if IuguSDK::enable_guest_user
-  = link_to I18n.t("iugu.try_first"), try_first_path, :method => :post
-
-%br
-= render :partial => "iugu/shared/links"
+- content_for :title do I18n.t("iugu.sign_up") end
+
+.default-sdk-wrapper
+  .default-sdk-dialog
+    .container.no-padding
+
+      = render :partial => "iugu/shared/responsive-dialog.header"
+
+      .padding
+      
+        = simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :class => "no-bottom-margin" } ) do |f|
+
+
+          - if resource.errors.size > 0
+            .notice.notice-red
+              = f.error_notification
+
+          %h6.no-bottom-margin
+            = I18n.t("iugu.sign_up")
+
+          - if IuguSDK::enable_guest_user
+            .element-spacing
+              .text
+                = I18n.t "iugu.skip_and_save_later"
+                %a{ :href => try_first_path, :"data-method" => :post }
+                  = I18n.t "iugu.skip_and_save_later_action"
+
+          .inputs
+            = f.input :email, :required => false, :autofocus => true, :placeholder => "E-Mail", :label => false
+            = f.input :password, :required => false, :placeholder => I18n.t("activerecord.attributes.password"), :label => false
+            = f.input :password_confirmation, :required => false, :placeholder => I18n.t("activerecord.attributes.password_confirmation"), :label => false
+            - if IuguSDK::enable_alias_on_signup
+              = f.input :account_alias, :label => 'Alias'
+            = render :partial => "iugu/shared/signup_fields", :locals => {:f => f}
+            = f.hidden_field :locale, :value => @matched_locale_from_browser
+            - if IuguSDK::enable_subscription_features
+              = f.hidden_field :plan_id, value: @plan_id
+              = f.hidden_field :price_id, value: @price_id
+          .actions
+            = f.button :submit, I18n.t("iugu.sign_up"), :class => "full-width default no-bottom-margin"
+
+          - if IuguSDK::enable_social_login
+            .social
+              .text
+                = I18n.t("iugu.or_sign_up_with")
+              - if devise_mapping.omniauthable?
+                - resource_class.omniauth_providers.each do |provider|
+                  = link_to "#{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "full-width button no-bottom-margin default #{provider.to_s}"
+
+
+    .container.default-optional
+      %a.button.no-bottom-margin{ :href => new_session_path(resource_name) }
+        = I18n.t "iugu.already_have_account"
+        %span.more-text
+          = I18n.t "iugu.already_have_account_action"

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

@@ -1,56 +1,57 @@
-- content_for :title do I18n.t("iugu.sign_in") + " - " + IuguSDK::application_title  end
-
-.responsive-dialog
-  .container.no-padding
-
-    = render :partial => "iugu/shared/responsive-dialog.header"
-
-
-    .padding
-      %h6.no-bottom-margin
-        = I18n.t("iugu.sign_in")
-
-      - unless flash[:social] || flash[:group]
-        - flash.each do |name, msg|
-          - if msg.is_a? String
-            .notice.notice-red{ :class => name }
-              %button.close{ :'data-dismiss' => "notice" }
-                ×
-              %h4.notice-heading
-                = msg
-
-      - if IuguSDK::enable_signup_form
-        = simple_form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "no-bottom-margin" }) do |f|
-          .inputs
-            = f.input :email, :required => false, :autofocus => true, :placeholder => "E-Mail", :label => false
-
-            = f.input :password, :required => false, :placeholder => I18n.t("activerecord.attributes.password"), :label => false
-            // = f.input :remember_me, :as => :boolean, :label => I18n.t("activerecord.attributes.remember_me") if devise_mapping.rememberable?
-          .actions
-            = f.button :submit, I18n.t("iugu.sign_in"), :class => "full-width default"
-
-          - if devise_mapping.recoverable? && controller_name != 'passwords'
-            = link_to I18n.t("iugu.forgot_your_password?"), new_password_path(resource_name), :class => "button full-width no-bottom-margin"
-
-          - if IuguSDK::enable_social_login
-            .social
-              .text
-                = I18n.t("iugu.or_sign_up_with")
-              - if devise_mapping.omniauthable?
-                - resource_class.omniauth_providers.each do |provider|
-                  = link_to "#{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "full-width button no-bottom-margin default #{provider.to_s}"
-
-
-      - if IuguSDK::enable_user_confirmation
-        - if devise_mapping.confirmable? && controller_name != 'confirmations'
-          .text
-            = link_to I18n.t("iugu.did_not_receive_confirmation_instructions?"), new_confirmation_path(resource_name)
-
-  - if IuguSDK::enable_signup_form
-    .container
-      %a.button.no-bottom-margin{ :href => new_registration_path(resource_name) }
-        = I18n.t("iugu.no_account")
-        %span.more-text
-          = I18n.t("iugu.no_account_action")
+- content_for :title do I18n.t("iugu.sign_in") end
+
+.default-sdk-wrapper
+  .default-sdk-dialog
+    .container.no-padding
+
+      = render :partial => "iugu/shared/responsive-dialog.header"
+
+
+      .padding
+        %h6.no-bottom-margin
+          = I18n.t("iugu.sign_in")
+
+        - unless flash[:social] || flash[:group]
+          - flash.each do |name, msg|
+            - if msg.is_a? String
+              .notice.notice-red{ :class => name }
+                %button.close{ :'data-dismiss' => "notice" }
+                  ×
+                %h4.notice-heading
+                  = msg
+
+        - if IuguSDK::enable_signup_form
+          = simple_form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => { :class => "no-bottom-margin" }) do |f|
+            .inputs
+              = f.input :email, :required => false, :autofocus => true, :placeholder => "E-Mail", :label => false
+
+              = f.input :password, :required => false, :placeholder => I18n.t("activerecord.attributes.password"), :label => false
+              // = f.input :remember_me, :as => :boolean, :label => I18n.t("activerecord.attributes.remember_me") if devise_mapping.rememberable?
+            .actions
+              = f.button :submit, I18n.t("iugu.sign_in"), :class => "full-width default"
+
+            - if devise_mapping.recoverable? && controller_name != 'passwords'
+              = link_to I18n.t("iugu.forgot_your_password?"), new_password_path(resource_name), :class => "button full-width no-bottom-margin"
+
+            - if IuguSDK::enable_social_login
+              .social
+                .text
+                  = I18n.t("iugu.or_sign_up_with")
+                - if devise_mapping.omniauthable?
+                  - resource_class.omniauth_providers.each do |provider|
+                    = link_to "#{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider), :class => "full-width button no-bottom-margin default #{provider.to_s}"
+
+
+        - if IuguSDK::enable_user_confirmation
+          - if devise_mapping.confirmable? && controller_name != 'confirmations'
+            .text
+              = link_to I18n.t("iugu.did_not_receive_confirmation_instructions?"), new_confirmation_path(resource_name)
+
+    - if IuguSDK::enable_signup_form
+      .container.default-optional
+        %a.button.no-bottom-margin{ :href => new_registration_path(resource_name) }
+          = I18n.t("iugu.no_account")
+          %span.more-text
+            = I18n.t("iugu.no_account_action")