safai 0.0.14 → 0.0.15

Sign up to get free protection for your applications and to get access to all the features.
Files changed (2) hide show
  1. data/lib/safai.rb +30 -29
  2. metadata +1 -1
data/lib/safai.rb CHANGED
@@ -114,49 +114,50 @@ class Safai
114
114
 
115
115
  module DeviseHelpers
116
116
 
117
- def resource_name
118
- :user
119
- end
117
+ def resource_name
118
+ :user
119
+ end
120
120
 
121
- def resource
122
- @resource ||= User.new
123
- end
121
+ def resource
122
+ @resource ||= User.new
123
+ end
124
124
 
125
- def devise_mapping
126
- @devise_mapping ||= Devise.mappings[:user]
127
- end
125
+ def devise_mapping
126
+ @devise_mapping ||= Devise.mappings[:user]
127
+ end
128
128
 
129
- #DEVISE end
129
+ #DEVISE end
130
130
 
131
- def devise_error_messages!
132
- flash_alerts = []
133
- error_key = 'errors.messages.not_saved'
131
+ def devise_error_messages!
132
+ flash_alerts = []
133
+ error_key = 'errors.messages.not_saved'
134
134
 
135
- if !flash.empty?
136
- flash_alerts.push(flash[:error]) if flash[:error]
137
- flash_alerts.push(flash[:alert]) if flash[:alert]
138
- flash_alerts.push(flash[:notice]) if flash[:notice]
139
- error_key = 'devise.failure.invalid'
140
- end
135
+ if !flash.empty?
136
+ flash_alerts.push(flash[:error]) if flash[:error]
137
+ flash_alerts.push(flash[:alert]) if flash[:alert]
138
+ flash_alerts.push(flash[:notice]) if flash[:notice]
139
+ error_key = 'devise.failure.invalid'
140
+ end
141
141
 
142
- return "" if resource.errors.empty? && flash_alerts.empty?
143
- errors = resource.errors.empty? ? flash_alerts : resource.errors.full_messages
142
+ return "" if resource.errors.empty? && flash_alerts.empty?
143
+ errors = resource.errors.empty? ? flash_alerts : resource.errors.full_messages
144
144
 
145
- messages = errors.map { |msg| content_tag(:li, msg) }.join
146
- sentence = I18n.t(error_key, :count => errors.count,
145
+ messages = errors.map { |msg| content_tag(:li, msg) }.join
146
+ sentence = I18n.t(error_key, :count => errors.count,
147
147
  :resource => resource.class.model_name.human.downcase)
148
148
 
149
- html = <<-HTML
150
- <div id="error_explanation">
151
- <h2>#{sentence}</h2>
152
- <ul>#{messages}</ul>
153
- </div>
154
- HTML
149
+ html = <<-HTML
150
+ <div id="error_explanation">
151
+ <h2>#{sentence}</h2>
152
+ <ul>#{messages}</ul>
153
+ </div>
154
+ HTML
155
155
 
156
156
  html.html_safe
157
157
  end
158
158
 
159
159
  end
160
+ end
160
161
 
161
162
  #======================================
162
163
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: safai
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.14
4
+ version: 0.0.15
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors: