bootswatch_rails 3.3.7.1 → 3.3.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 784e415236066a7cddfecfb402c0319f138d75a1
-  data.tar.gz: 84a780cdc23b18310313b5809fe9ac43cc7ffd79
+  metadata.gz: 177b711bb09eb44385dd726f8c0ac44351f80fa0
+  data.tar.gz: 5d4cf51c0a20f59e891120ec0919b237d252ef36
 SHA512:
-  metadata.gz: 2472e9d02c6522affecfdb254345d02e76b73731705ab723fc24d3ce098baf1235e0db8dbd870d48831a910e46aa47f991d66101acc9321c43f1d6c47908129a
-  data.tar.gz: fb7a6449401be4941ef8c5990db3ab5c61bd3a5463a3d8e03cf3d1216c9aaa822547246c8c1451276afb1221b9ecfd0e504fb03e1f78d127afb5191b1edc34a4
+  metadata.gz: c4fc6d5810243db58a15c0d2fc39b69b21a36fbe1bdb01b2cb12250e559398af20a6d7507e57aaa1e06098ff9e4d602664d9297242ced4adaa07f0fe7a45202e
+  data.tar.gz: 200bf4fcbd97bf12de90e10d03a0fbc26fba7edc2363d537002b19ddfd5b5d91544457f146c3921524c0d68ba193214dcfa2bebdf20804ea830754180f9e2c52

data/bootswatch_rails.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 1.9.3'
   spec.add_dependency 'railties', '>= 4.0'
   spec.add_dependency 'bootstrap-sass', '~> 3.1'
+  spec.add_dependency 'enumerize', '~> 2.0'
   
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", ">= 10.1"

data/lib/bootswatch_rails/version.rb

@@ -4,7 +4,7 @@ module BootswatchRails
   FONT_AWESOME = "4.6.2"
   DATATABLES = "1.10.12"
   RESPONSIVE = "2.1.0"
-  VERSION = "3.3.7.1"
+  VERSION = "3.3.7.2"
 
   THEMES = [:cerulean, :cosmo, :custom, :cyborg, :darkly, :flatly, :journal, :lumen, :paper, :readable, :sandstone, :simplex, :slate, :spacelab, :superhero, :united, :yeti]
   DEFAULT = 0

data/lib/generators/bootswatch_rails/sorcery/sorcery_generator.rb

@@ -6,6 +6,10 @@ module BootswatchRails
       desc "Install authentication (with Sorcery) and setup users."
       argument :name, type: :string, default: "user",
                banner: "name of the user model"
+      class_option :friendly, type: :boolean, default: false,
+               desc: 'Use real name in URLs (needs friendly_id gem)'
+      class_option :language, type: :boolean, default: false,
+               desc: 'Add language reference to user (foreign key)'
       class_option :picture, type: :boolean, default: false,
                desc: 'Add picture to user (needs carrierwave gem)'
       class_option :gravatar, type: :boolean, default: false,
@@ -113,7 +117,7 @@ module BootswatchRails
       end
 
       def add_locales
-        %w[de].each do |locale|
+        %w[en de].each do |locale|
           template "sorcery.#{locale}.yml", "config/locales/sorcery.#{locale}.yml"
         end
       end
@@ -178,6 +182,7 @@ module BootswatchRails
       def whitelist
         text = ":email, :name, :phone, :comment, :theme, " +
         ":active, :sysadm, :password, :password_confirmation"
+        text += ", :language_id" if options.language?
         text += ", :picture, :picture_cache" if options.picture?
         added_fields.each do |field|
           text += ", :#{field[0]}"

data/lib/generators/bootswatch_rails/sorcery/templates/_form.html.erb

@@ -22,6 +22,9 @@
   <%%- end -%>
 <%- end -%>
   <%%= f.input :theme %>
+<%- if options.language? -%>
+  <%%= f.association :language %>
+<%- end -%>
   <%%= f.input :active %>
   <%%= f.input :password %>
   <%%= f.input :password_confirmation %>

data/lib/generators/bootswatch_rails/sorcery/templates/log_in.html.erb

@@ -1,5 +1,5 @@
-<%%- page_title t('sorcery.header') -%>
-<h2><%%= t('sorcery.header') %></h2>
+<%%- page_title t('sorcery.log_in') -%>
+<h2><%%= t('sorcery.header', name: app_name) %></h2>
 <%%- content_for(:help) { "<%= name %>_login" } -%>
 
 <%%= simple_form_for(@<%= name %>, url: {action: "access"}) do |f| %>

data/lib/generators/bootswatch_rails/sorcery/templates/show.html.erb

@@ -33,6 +33,12 @@
       <td><%%= t('activerecord.attributes.<%= name %>.gravatar') %></td>
       <td><%%= image_tag(gravatar_url(@<%= name %>, 200)) %></td>
     </tr>
+<%- end -%>
+<%- if options.language? -%>
+    <tr>
+      <td><%%= t('activerecord.attributes.<%= name %>.language') %></td>
+      <td><%%= @<%= name %>.language.name %></td>
+    </tr>
 <%- end -%>
     <tr>
       <td><%%= t('activerecord.attributes.<%= name %>.theme') %></td>

data/lib/generators/bootswatch_rails/sorcery/templates/sorcery.de.yml

@@ -4,7 +4,7 @@ de:
     log_in: "Login"
     log_out: "Logout"
     sign_up: "Benutzerkonto anlegen"
-    header: "Login für interne Benutzer"
+    header: "%{name} Login"
     submit: "Login"
 <%- if options.reset_password? -%>
     reset:
@@ -39,6 +39,9 @@ de:
       <%= name %>:
         email: "E-Mail"
         name: "Name"
+<%- if options.language? -%>
+        language: "Sprache"
+<%- end -%>
         phone: "Telefon"
         comment: "Bemerkung"
 <%- if options.picture? -%>

data/lib/generators/bootswatch_rails/sorcery/templates/sorcery.en.yml

@@ -0,0 +1,71 @@
+en:
+  sorcery:
+    forbidden: "That is forbidden."
+    log_in: "Log in"
+    log_out: "Log out"
+    sign_up: "Sign up"
+    header: "%{name} Login"
+    submit: "Log in"
+<%- if options.reset_password? -%>
+    reset:
+      forgot: "Forgot password?"
+      header: "Request new password"
+      send: "Send instructions"
+      back: "Back to log in"
+      delivered: "Instructions were sent to your account."
+      missing: "Keine E-Mail Adresse angegeben."
+      choose: "Eingabe neues Kennwort"
+      change: "Kennwort ändern"
+      success: "Das Kennwort wurde aktualisiert."
+      failed: "Das Kennwort konnte nicht aktualisiert werden."
+<%- end -%>
+    new_password: "Neues Kennwort"
+    failed: "E-Mail oder Kennwort ungültig"
+    success: "Willkommen und frohes Schaffen!"
+    goodbye: "Tschüss und bis bald."
+    required: "Bitte melden Sie sich zuerst an."
+
+  <%= name %>_mailer:
+    reset_password_email:
+      subject: "Kennwort für #{name} zurücksetzen"
+
+  activerecord:
+    models:
+      <%= name %>:
+        one: "Benutzer"
+        other: "Benutzer"
+        new: "Neuer Benutzer"
+    attributes:
+      <%= name %>:
+        email: "E-Mail"
+        name: "Name"
+<%- if options.language? -%>
+        language: "Language"
+<%- end -%>
+        phone: "Telefon"
+        comment: "Bemerkung"
+<%- if options.picture? -%>
+        picture: "Bild"
+<%- end -%>
+<%- if options.gravatar? -%>
+        gravatar: "Avatar"
+<%- end -%>
+        theme: "Skin"
+        active: "Aktiv"
+        sysadm: "SysAdmin"
+        password: "Kennwort"
+        password_confirmation: "Kennwort wiederholen"
+<%- if options.remember_me? -%>
+        remember_me: "Angemeldet bleiben"
+<%- end -%>
+<%- if options.activity_logging? -%>
+        last_login_at: "Letzte Anmeldung"
+        last_logout_at: "Letzte Abmeldung"
+        last_activity_at: "Letzte Aktivität"
+        last_login_from_ip_address: "Letzte IP-Adresse"
+<%- end -%>
+<%- if options.brute_force_protection? -%>
+        failed_logins_count: "Fehlversuche Anmeldung"
+        lock_expires_at: "Gesperrt bis"
+<%- end -%>
+

data/lib/generators/bootswatch_rails/sorcery/templates/user_migration.rb

@@ -3,12 +3,18 @@ class <%= migration_name.camelize %> < ActiveRecord::Migration
     create_table :<%= table_name %> do |t|
       t.string   :email, null: false
       t.string   :name
+<%- if options.language? -%>
+      t.references :language
+<%- end -%>
       t.string   :phone
       t.text     :comment
+<%- if options.friendly? -%>
+      t.string   :slug
+<%- end -%>
 <%- if options.picture? -%>
       t.string   :picture
 <%- end -%>
-      t.integer  :theme, default: BootswatchRails::DEFAULT
+      t.string  :theme    #, default: BootswatchRails::DEFAULT
       t.boolean  :active, default: true
       t.boolean  :sysadm, default: false
 <%- if added_fields.any? -%>
@@ -51,6 +57,9 @@ class <%= migration_name.camelize %> < ActiveRecord::Migration
     end
 
     add_index :<%= table_name %>, :email, unique: true
+<%- if options.friendly? -%>
+    add_index :<%= table_name %>, :slug, unique: true
+<%- end -%>
     add_index :<%= table_name %>, :sysadm
 <%- if added_fields.any? -%>
   <%- added_fields.each do |field| -%>

data/lib/generators/bootswatch_rails/sorcery/templates/user_model.rb

@@ -1,4 +1,13 @@
 class <%= class_name %> < ActiveRecord::Base
+<%- if options.friendly? -%>
+  include FriendlyId
+  friendly_id :email, use: [:slugged]
+
+<%- end -%>
+<%- if options.language? -%>
+  belongs_to :language
+
+<%- end -%>
   authenticates_with_sorcery!
   validates :email, presence: true, uniqueness: { case_sensitive: false }
   validates :password, presence: true, on: :create
@@ -17,5 +26,7 @@ class <%= class_name %> < ActiveRecord::Base
   mount_uploader :picture, PictureUploader
 
 <%- end -%>
-  enum theme: BootswatchRails::THEMES
+  extend Enumerize
+  enumerize :theme, in: BootswatchRails::THEMES
+  # enum theme: BootswatchRails::THEMES
 end

data/lib/generators/bootswatch_rails/sorcery/templates/users_controller.rb

@@ -152,7 +152,7 @@ class <%= controller_name.camelize %> < ApplicationController
 
     # Use callbacks to share common setup or constraints between actions.
     def set_<%= name %>
-      @<%= name %> = <%= class_name %>.find(params[:id])
+      @<%= name %> = <%= class_name %>.<%= options.friendly? ? 'friendly.' : '' %>find(params[:id])
     end
 
     # Never trust parameters from the scary internet, only allow the white list through.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootswatch_rails
 version: !ruby/object:Gem::Version
-  version: 3.3.7.1
+  version: 3.3.7.2
 platform: ruby
 authors:
 - Volker Wiegand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: enumerize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +154,7 @@ files:
 - lib/generators/bootswatch_rails/sorcery/templates/reset_password_email.html.erb
 - lib/generators/bootswatch_rails/sorcery/templates/show.html.erb
 - lib/generators/bootswatch_rails/sorcery/templates/sorcery.de.yml
+- lib/generators/bootswatch_rails/sorcery/templates/sorcery.en.yml
 - lib/generators/bootswatch_rails/sorcery/templates/user_mailer.rb
 - lib/generators/bootswatch_rails/sorcery/templates/user_migration.rb
 - lib/generators/bootswatch_rails/sorcery/templates/user_model.rb