bootswatch_rails 3.3.7.1 → 3.3.7.2
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bootswatch_rails.gemspec +1 -0
- data/lib/bootswatch_rails/version.rb +1 -1
- data/lib/generators/bootswatch_rails/sorcery/sorcery_generator.rb +6 -1
- data/lib/generators/bootswatch_rails/sorcery/templates/_form.html.erb +3 -0
- data/lib/generators/bootswatch_rails/sorcery/templates/log_in.html.erb +2 -2
- data/lib/generators/bootswatch_rails/sorcery/templates/show.html.erb +6 -0
- data/lib/generators/bootswatch_rails/sorcery/templates/sorcery.de.yml +4 -1
- data/lib/generators/bootswatch_rails/sorcery/templates/sorcery.en.yml +71 -0
- data/lib/generators/bootswatch_rails/sorcery/templates/user_migration.rb +10 -1
- data/lib/generators/bootswatch_rails/sorcery/templates/user_model.rb +12 -1
- data/lib/generators/bootswatch_rails/sorcery/templates/users_controller.rb +1 -1
- metadata +17 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 177b711bb09eb44385dd726f8c0ac44351f80fa0
|
4
|
+
data.tar.gz: 5d4cf51c0a20f59e891120ec0919b237d252ef36
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c4fc6d5810243db58a15c0d2fc39b69b21a36fbe1bdb01b2cb12250e559398af20a6d7507e57aaa1e06098ff9e4d602664d9297242ced4adaa07f0fe7a45202e
|
7
|
+
data.tar.gz: 200bf4fcbd97bf12de90e10d03a0fbc26fba7edc2363d537002b19ddfd5b5d91544457f146c3921524c0d68ba193214dcfa2bebdf20804ea830754180f9e2c52
|
data/bootswatch_rails.gemspec
CHANGED
@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
|
|
21
21
|
spec.required_ruby_version = '>= 1.9.3'
|
22
22
|
spec.add_dependency 'railties', '>= 4.0'
|
23
23
|
spec.add_dependency 'bootstrap-sass', '~> 3.1'
|
24
|
+
spec.add_dependency 'enumerize', '~> 2.0'
|
24
25
|
|
25
26
|
spec.add_development_dependency "bundler", "~> 1.6"
|
26
27
|
spec.add_development_dependency "rake", ">= 10.1"
|
@@ -4,7 +4,7 @@ module BootswatchRails
|
|
4
4
|
FONT_AWESOME = "4.6.2"
|
5
5
|
DATATABLES = "1.10.12"
|
6
6
|
RESPONSIVE = "2.1.0"
|
7
|
-
VERSION = "3.3.7.
|
7
|
+
VERSION = "3.3.7.2"
|
8
8
|
|
9
9
|
THEMES = [:cerulean, :cosmo, :custom, :cyborg, :darkly, :flatly, :journal, :lumen, :paper, :readable, :sandstone, :simplex, :slate, :spacelab, :superhero, :united, :yeti]
|
10
10
|
DEFAULT = 0
|
@@ -6,6 +6,10 @@ module BootswatchRails
|
|
6
6
|
desc "Install authentication (with Sorcery) and setup users."
|
7
7
|
argument :name, type: :string, default: "user",
|
8
8
|
banner: "name of the user model"
|
9
|
+
class_option :friendly, type: :boolean, default: false,
|
10
|
+
desc: 'Use real name in URLs (needs friendly_id gem)'
|
11
|
+
class_option :language, type: :boolean, default: false,
|
12
|
+
desc: 'Add language reference to user (foreign key)'
|
9
13
|
class_option :picture, type: :boolean, default: false,
|
10
14
|
desc: 'Add picture to user (needs carrierwave gem)'
|
11
15
|
class_option :gravatar, type: :boolean, default: false,
|
@@ -113,7 +117,7 @@ module BootswatchRails
|
|
113
117
|
end
|
114
118
|
|
115
119
|
def add_locales
|
116
|
-
%w[de].each do |locale|
|
120
|
+
%w[en de].each do |locale|
|
117
121
|
template "sorcery.#{locale}.yml", "config/locales/sorcery.#{locale}.yml"
|
118
122
|
end
|
119
123
|
end
|
@@ -178,6 +182,7 @@ module BootswatchRails
|
|
178
182
|
def whitelist
|
179
183
|
text = ":email, :name, :phone, :comment, :theme, " +
|
180
184
|
":active, :sysadm, :password, :password_confirmation"
|
185
|
+
text += ", :language_id" if options.language?
|
181
186
|
text += ", :picture, :picture_cache" if options.picture?
|
182
187
|
added_fields.each do |field|
|
183
188
|
text += ", :#{field[0]}"
|
@@ -1,5 +1,5 @@
|
|
1
|
-
<%%- page_title t('sorcery.
|
2
|
-
<h2><%%= t('sorcery.header') %></h2>
|
1
|
+
<%%- page_title t('sorcery.log_in') -%>
|
2
|
+
<h2><%%= t('sorcery.header', name: app_name) %></h2>
|
3
3
|
<%%- content_for(:help) { "<%= name %>_login" } -%>
|
4
4
|
|
5
5
|
<%%= simple_form_for(@<%= name %>, url: {action: "access"}) do |f| %>
|
@@ -33,6 +33,12 @@
|
|
33
33
|
<td><%%= t('activerecord.attributes.<%= name %>.gravatar') %></td>
|
34
34
|
<td><%%= image_tag(gravatar_url(@<%= name %>, 200)) %></td>
|
35
35
|
</tr>
|
36
|
+
<%- end -%>
|
37
|
+
<%- if options.language? -%>
|
38
|
+
<tr>
|
39
|
+
<td><%%= t('activerecord.attributes.<%= name %>.language') %></td>
|
40
|
+
<td><%%= @<%= name %>.language.name %></td>
|
41
|
+
</tr>
|
36
42
|
<%- end -%>
|
37
43
|
<tr>
|
38
44
|
<td><%%= t('activerecord.attributes.<%= name %>.theme') %></td>
|
@@ -4,7 +4,7 @@ de:
|
|
4
4
|
log_in: "Login"
|
5
5
|
log_out: "Logout"
|
6
6
|
sign_up: "Benutzerkonto anlegen"
|
7
|
-
header: "Login
|
7
|
+
header: "%{name} Login"
|
8
8
|
submit: "Login"
|
9
9
|
<%- if options.reset_password? -%>
|
10
10
|
reset:
|
@@ -39,6 +39,9 @@ de:
|
|
39
39
|
<%= name %>:
|
40
40
|
email: "E-Mail"
|
41
41
|
name: "Name"
|
42
|
+
<%- if options.language? -%>
|
43
|
+
language: "Sprache"
|
44
|
+
<%- end -%>
|
42
45
|
phone: "Telefon"
|
43
46
|
comment: "Bemerkung"
|
44
47
|
<%- if options.picture? -%>
|
@@ -0,0 +1,71 @@
|
|
1
|
+
en:
|
2
|
+
sorcery:
|
3
|
+
forbidden: "That is forbidden."
|
4
|
+
log_in: "Log in"
|
5
|
+
log_out: "Log out"
|
6
|
+
sign_up: "Sign up"
|
7
|
+
header: "%{name} Login"
|
8
|
+
submit: "Log in"
|
9
|
+
<%- if options.reset_password? -%>
|
10
|
+
reset:
|
11
|
+
forgot: "Forgot password?"
|
12
|
+
header: "Request new password"
|
13
|
+
send: "Send instructions"
|
14
|
+
back: "Back to log in"
|
15
|
+
delivered: "Instructions were sent to your account."
|
16
|
+
missing: "Keine E-Mail Adresse angegeben."
|
17
|
+
choose: "Eingabe neues Kennwort"
|
18
|
+
change: "Kennwort ändern"
|
19
|
+
success: "Das Kennwort wurde aktualisiert."
|
20
|
+
failed: "Das Kennwort konnte nicht aktualisiert werden."
|
21
|
+
<%- end -%>
|
22
|
+
new_password: "Neues Kennwort"
|
23
|
+
failed: "E-Mail oder Kennwort ungültig"
|
24
|
+
success: "Willkommen und frohes Schaffen!"
|
25
|
+
goodbye: "Tschüss und bis bald."
|
26
|
+
required: "Bitte melden Sie sich zuerst an."
|
27
|
+
|
28
|
+
<%= name %>_mailer:
|
29
|
+
reset_password_email:
|
30
|
+
subject: "Kennwort für #{name} zurücksetzen"
|
31
|
+
|
32
|
+
activerecord:
|
33
|
+
models:
|
34
|
+
<%= name %>:
|
35
|
+
one: "Benutzer"
|
36
|
+
other: "Benutzer"
|
37
|
+
new: "Neuer Benutzer"
|
38
|
+
attributes:
|
39
|
+
<%= name %>:
|
40
|
+
email: "E-Mail"
|
41
|
+
name: "Name"
|
42
|
+
<%- if options.language? -%>
|
43
|
+
language: "Language"
|
44
|
+
<%- end -%>
|
45
|
+
phone: "Telefon"
|
46
|
+
comment: "Bemerkung"
|
47
|
+
<%- if options.picture? -%>
|
48
|
+
picture: "Bild"
|
49
|
+
<%- end -%>
|
50
|
+
<%- if options.gravatar? -%>
|
51
|
+
gravatar: "Avatar"
|
52
|
+
<%- end -%>
|
53
|
+
theme: "Skin"
|
54
|
+
active: "Aktiv"
|
55
|
+
sysadm: "SysAdmin"
|
56
|
+
password: "Kennwort"
|
57
|
+
password_confirmation: "Kennwort wiederholen"
|
58
|
+
<%- if options.remember_me? -%>
|
59
|
+
remember_me: "Angemeldet bleiben"
|
60
|
+
<%- end -%>
|
61
|
+
<%- if options.activity_logging? -%>
|
62
|
+
last_login_at: "Letzte Anmeldung"
|
63
|
+
last_logout_at: "Letzte Abmeldung"
|
64
|
+
last_activity_at: "Letzte Aktivität"
|
65
|
+
last_login_from_ip_address: "Letzte IP-Adresse"
|
66
|
+
<%- end -%>
|
67
|
+
<%- if options.brute_force_protection? -%>
|
68
|
+
failed_logins_count: "Fehlversuche Anmeldung"
|
69
|
+
lock_expires_at: "Gesperrt bis"
|
70
|
+
<%- end -%>
|
71
|
+
|
@@ -3,12 +3,18 @@ class <%= migration_name.camelize %> < ActiveRecord::Migration
|
|
3
3
|
create_table :<%= table_name %> do |t|
|
4
4
|
t.string :email, null: false
|
5
5
|
t.string :name
|
6
|
+
<%- if options.language? -%>
|
7
|
+
t.references :language
|
8
|
+
<%- end -%>
|
6
9
|
t.string :phone
|
7
10
|
t.text :comment
|
11
|
+
<%- if options.friendly? -%>
|
12
|
+
t.string :slug
|
13
|
+
<%- end -%>
|
8
14
|
<%- if options.picture? -%>
|
9
15
|
t.string :picture
|
10
16
|
<%- end -%>
|
11
|
-
t.
|
17
|
+
t.string :theme #, default: BootswatchRails::DEFAULT
|
12
18
|
t.boolean :active, default: true
|
13
19
|
t.boolean :sysadm, default: false
|
14
20
|
<%- if added_fields.any? -%>
|
@@ -51,6 +57,9 @@ class <%= migration_name.camelize %> < ActiveRecord::Migration
|
|
51
57
|
end
|
52
58
|
|
53
59
|
add_index :<%= table_name %>, :email, unique: true
|
60
|
+
<%- if options.friendly? -%>
|
61
|
+
add_index :<%= table_name %>, :slug, unique: true
|
62
|
+
<%- end -%>
|
54
63
|
add_index :<%= table_name %>, :sysadm
|
55
64
|
<%- if added_fields.any? -%>
|
56
65
|
<%- added_fields.each do |field| -%>
|
@@ -1,4 +1,13 @@
|
|
1
1
|
class <%= class_name %> < ActiveRecord::Base
|
2
|
+
<%- if options.friendly? -%>
|
3
|
+
include FriendlyId
|
4
|
+
friendly_id :email, use: [:slugged]
|
5
|
+
|
6
|
+
<%- end -%>
|
7
|
+
<%- if options.language? -%>
|
8
|
+
belongs_to :language
|
9
|
+
|
10
|
+
<%- end -%>
|
2
11
|
authenticates_with_sorcery!
|
3
12
|
validates :email, presence: true, uniqueness: { case_sensitive: false }
|
4
13
|
validates :password, presence: true, on: :create
|
@@ -17,5 +26,7 @@ class <%= class_name %> < ActiveRecord::Base
|
|
17
26
|
mount_uploader :picture, PictureUploader
|
18
27
|
|
19
28
|
<%- end -%>
|
20
|
-
|
29
|
+
extend Enumerize
|
30
|
+
enumerize :theme, in: BootswatchRails::THEMES
|
31
|
+
# enum theme: BootswatchRails::THEMES
|
21
32
|
end
|
@@ -152,7 +152,7 @@ class <%= controller_name.camelize %> < ApplicationController
|
|
152
152
|
|
153
153
|
# Use callbacks to share common setup or constraints between actions.
|
154
154
|
def set_<%= name %>
|
155
|
-
@<%= name %> = <%= class_name
|
155
|
+
@<%= name %> = <%= class_name %>.<%= options.friendly? ? 'friendly.' : '' %>find(params[:id])
|
156
156
|
end
|
157
157
|
|
158
158
|
# Never trust parameters from the scary internet, only allow the white list through.
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: bootswatch_rails
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 3.3.7.
|
4
|
+
version: 3.3.7.2
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Volker Wiegand
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-09-
|
11
|
+
date: 2016-09-10 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: railties
|
@@ -38,6 +38,20 @@ dependencies:
|
|
38
38
|
- - "~>"
|
39
39
|
- !ruby/object:Gem::Version
|
40
40
|
version: '3.1'
|
41
|
+
- !ruby/object:Gem::Dependency
|
42
|
+
name: enumerize
|
43
|
+
requirement: !ruby/object:Gem::Requirement
|
44
|
+
requirements:
|
45
|
+
- - "~>"
|
46
|
+
- !ruby/object:Gem::Version
|
47
|
+
version: '2.0'
|
48
|
+
type: :runtime
|
49
|
+
prerelease: false
|
50
|
+
version_requirements: !ruby/object:Gem::Requirement
|
51
|
+
requirements:
|
52
|
+
- - "~>"
|
53
|
+
- !ruby/object:Gem::Version
|
54
|
+
version: '2.0'
|
41
55
|
- !ruby/object:Gem::Dependency
|
42
56
|
name: bundler
|
43
57
|
requirement: !ruby/object:Gem::Requirement
|
@@ -140,6 +154,7 @@ files:
|
|
140
154
|
- lib/generators/bootswatch_rails/sorcery/templates/reset_password_email.html.erb
|
141
155
|
- lib/generators/bootswatch_rails/sorcery/templates/show.html.erb
|
142
156
|
- lib/generators/bootswatch_rails/sorcery/templates/sorcery.de.yml
|
157
|
+
- lib/generators/bootswatch_rails/sorcery/templates/sorcery.en.yml
|
143
158
|
- lib/generators/bootswatch_rails/sorcery/templates/user_mailer.rb
|
144
159
|
- lib/generators/bootswatch_rails/sorcery/templates/user_migration.rb
|
145
160
|
- lib/generators/bootswatch_rails/sorcery/templates/user_model.rb
|