bootswatch_rails 3.2.0.33 → 3.2.0.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4773bcd616609782472a683efee64e5db8f92989
-  data.tar.gz: b985c56427dd68603366fc51685b99b03de851f2
+  metadata.gz: 5388ed8014195ad8437d496c3d7209aa6464f28e
+  data.tar.gz: b4c239dc6982e966fbe6f97558e2cc8225b6ae02
 SHA512:
-  metadata.gz: bbb8e5d2b303a86aaeacadf1744ab664ba8c7f16fad81a438685e59da389e285437273384c895bc9579de59b96b49cc66060e98b7aad56b72d815624f908bebd
-  data.tar.gz: 58b0224470162fb97ef7e4ebdb85594466ac7583c92bd1570ad28a2e7cce20284522c3f50bfd99dc77f350455463ddf1eb091ad2859e5e8837e6ab28533a79ec
+  metadata.gz: 6d0b32d97444ed1c2985d8b1dabd00e7b9ec86128c9909266412e8feabcfb210a2d58931c9b7f83e322a062e489d9f85cf9083fea016fb57fe613e068add08e2
+  data.tar.gz: 022b69b8708593e4c9d0340e8bf31ab8555552b8b2fb62e6de56ee13bd36418402cd55562de5a305759da83d70a521e38a8cae7fe3e28af7495e067bef72b358

data/lib/bootswatch_rails/version.rb

@@ -1,6 +1,6 @@
 module BootswatchRails
   BOOTSTRAP = "3.2.0"
-  VERSION = "3.2.0.33"
+  VERSION = "3.2.0.34"
   FONT_AWESOME = "4.2.0"
 
   THEMES = [:amelia, :cerulean, :cosmo, :custom, :cyborg, :darkly, :flatly, :journal, :lumen, :paper, :readable, :sandstone, :simplex, :slate, :spacelab, :superhero, :united, :yeti]

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

@@ -5,9 +5,11 @@ module BootswatchRails
     class SorceryGenerator < ActiveRecord::Generators::Base
       desc "Install authentication (with Sorcery) and (optional) authorization."
       argument :name, type: :string, default: "user",
-               banner: "user model (default 'user')"
+               banner: "name of the user model"
       class_option :picture, type: :boolean, default: false,
                desc: 'Add picture to user (needs carrierwave)'
+      class_option :gravatar, type: :boolean, default: false,
+               desc: 'Add Gravatar image to user (uses email)'
       class_option :authorization, type: :boolean, default: true,
                desc: 'Add dynamic athorization on top of authentication'
       class_option :user_activation, type: :boolean, default: false,
@@ -51,15 +53,20 @@ module BootswatchRails
         template "picture_uploader.rb", "app/uploaders/picture_uploader.rb"
       end
 
+      def add_gravatar
+        return unless options.gravatar?
+        template "gravatar_helper.rb", "app/helpers/gravatar_helper.rb"
+      end
+
       def add_mailer
-        return unless reset_password?
+        return unless options.reset_password?
         template "user_mailer.rb", "app/mailers/#{mailer_name}.rb"
         template "reset_password_email.html.erb", "app/views/#{mailer_name}/reset_password_email.html.erb"
       end
 
       def add_controllers
         template "users_controller.rb", "app/controllers/#{table_name}_controller.rb"
-        return unless authorization?
+        return unless options.authorization?
         # TODO
         # template "roles_controller.rb",       "app/controllers/roles_controller.rb"
         # template "assignments_controller.rb", "app/controllers/assignments_controller.rb"
@@ -68,7 +75,7 @@ module BootswatchRails
 
       def add_views
         views  = %w[edit _form index log_in new show]
-        views += %w[password change] if reset_password?
+        views += %w[password change] if options.reset_password?
         views.each do |view|
           template "#{view}.html.erb", "app/views/#{table_name}/#{view}.html.erb"
         end
@@ -87,7 +94,7 @@ module BootswatchRails
         lines << [
           "      get   'password'",
           "      post  'reset'"
-        ] if reset_password?
+        ] if options.reset_password?
         lines << [
           "    end"
         ]
@@ -97,7 +104,7 @@ module BootswatchRails
           "      patch 'refresh'",
           "      put   'refresh'",
           "    end"
-        ] if reset_password?
+        ] if options.reset_password?
         lines << [
           "  end",
           "  get '/login'  => '#{table_name}#log_in',  as: :login,  format: false",
@@ -139,63 +146,19 @@ module BootswatchRails
 
       protected
 
-      def has_picture?
-        options.picture?
-      end
-
-      def authorization?
-        options.authorization?
-      end
-
-      def user_activation?
-        options.user_activation?
-      end
-
-      def reset_password?
-        options.reset_password?
-      end
-
-      def remember_me?
-        options.remember_me?
-      end
-
-      def session_timeout?
-        options.session_timeout?
-      end
-
-      def brute_force_protection?
-        options.brute_force_protection?
-      end
-
-      def http_basic_auth?
-        options.http_basic_auth?
-      end
-
-      def activity_logging?
-        options.activity_logging?
-      end
-
-      def external?
-        options.external?
-      end
-
       def submodules
         modules = []
-        modules << ":user_activation"        if user_activation?
-        modules << ":reset_password"         if reset_password?
-        modules << ":remember_me"            if remember_me?
-        modules << ":session_timeout"        if session_timeout?
-        modules << ":brute_force_protection" if brute_force_protection?
-        modules << ":http_basic_auth"        if http_basic_auth?
-        modules << ":activity_logging"       if activity_logging?
-        modules << ":external"               if external?
+        modules << ":user_activation"        if options.user_activation?
+        modules << ":reset_password"         if options.reset_password?
+        modules << ":remember_me"            if options.remember_me?
+        modules << ":session_timeout"        if options.session_timeout?
+        modules << ":brute_force_protection" if options.brute_force_protection?
+        modules << ":http_basic_auth"        if options.http_basic_auth?
+        modules << ":activity_logging"       if options.activity_logging?
+        modules << ":external"               if options.external?
         modules.join(', ')
       end
 
-      def layout
-        options.layout
-      end
-
       def migration_name
         "create_#{table_name}"
       end
@@ -212,6 +175,7 @@ module BootswatchRails
         text = ":email, :name, :phone, :comment, :theme, " +
         ":active, :sysadm, :password, :password_confirmation"
         text += ", :picture, :picture_cache" if options.picture?
+        text
       end
     end
   end

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

@@ -5,7 +5,7 @@
   <%%= f.input :name %>
   <%%= f.input :phone %>
   <%%= f.input :comment %>
-<%- if has_picture? -%>
+<%- if options.picture? -%>
   <%%= f.input :picture %>
   <%%= f.input :picture_cache, as: :hidden %>
   <%%- if @<%= name %>.picture? -%>

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

@@ -1,4 +1,4 @@
 class Assignment < ActiveRecord::Base
-  belongs_to :user
+  belongs_to :<%= name %>
   belongs_to :role
 end

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

@@ -0,0 +1,6 @@
+module GravatarHelper
+  def gravatar_url(<%= name %>, size)
+    gravatar_id = Digest::MD5::hexdigest(<%= name %>.email).downcase
+    "http://gravatar.com/avatar/#{gravatar_id}.png?s=#{size}&d=mm"
+  end
+end

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

@@ -7,8 +7,11 @@
           <br>
           <%%= t('activerecord.attributes.<%= name %>.phone') %></th>
       <th><%%= t('activerecord.attributes.<%= name %>.comment') %></th>
-<%- if has_picture? -%>
+<%- if options.picture? -%>
       <th><%%= t('activerecord.attributes.<%= name %>.picture') %></th>
+<%- end -%>
+<%- if options.gravatar? -%>
+      <th><%%= t('activerecord.attributes.<%= name %>.gravatar') %></th>
 <%- end -%>
       <th><%%= t('activerecord.attributes.<%= name %>.active') %>
           <br>
@@ -28,10 +31,15 @@
         <td>
           <%%= <%= name %>.comment %>
         </td>
-<%- if has_picture? -%>
+<%- if options.picture? -%>
         <td>
           <%%= image_tag(<%= name %>.picture_url(:thumb).to_s) %>
         </td>
+<%- end -%>
+<%- if options.gravatar? -%>
+        <td>
+          <%%= image_tag(gravatar_url(<%= name %>, 100)) %>
+        </td>
 <%- end -%>
         <td>
           <%%= <%= name %>.active ? t('simple_form.yes') : t('simple_form.no') %>

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

@@ -9,25 +9,25 @@ Rails.application.config.sorcery.configure do |config|
   # config.not_authenticated_action = :not_authenticated
   # config.save_return_to_url = true
   # config.cookie_domain = nil
-<%- if session_timeout? -%>
+<%- if options.session_timeout? -%>
 
   # -- session_timeout --
   # config.session_timeout = 3600
   # config.session_timeout_from_last_action = false
 <%- end -%>
-<%- if http_basic_auth? -%>
+<%- if options.http_basic_auth? -%>
 
   # -- http_basic_auth --
   # config.controller_to_realm_map = { "application" => "Application" }
 <%- end -%>
-<%- if activity_logging? -%>
+<%- if options.activity_logging? -%>
 
   # -- activity_logging --
   # config.register_login_time = true
   # config.register_logout_time = true
   # config.register_last_activity_time = true
 <%- end -%>
-<%- if external? -%>
+<%- if options.external? -%>
 
   # -- external --
   # config.external_providers = []
@@ -49,7 +49,7 @@ Rails.application.config.sorcery.configure do |config|
     # user.custom_encryption_provider = nil
     # user.encryption_algorithm = :bcrypt
     # user.subclasses_inherit_config = false
-<%- if user_activation? -%>
+<%- if options.user_activation? -%>
 
     # -- user_activation --
     # user.activation_state_attribute_name = :activation_state
@@ -62,7 +62,7 @@ Rails.application.config.sorcery.configure do |config|
     # user.activation_success_email_method_name = :activation_success_email
     # user.prevent_non_active_users_to_login = true
 <%- end -%>
-<%- if reset_password? -%>
+<%- if options.reset_password? -%>
 
     # -- reset_password --
     # user.reset_password_token_attribute_name = :reset_password_token
@@ -74,13 +74,13 @@ Rails.application.config.sorcery.configure do |config|
     # user.reset_password_expiration_period = nil
     # user.reset_password_time_between_emails = 300
 <%- end -%>
-<%- if remember_me? -%>
+<%- if options.remember_me? -%>
 
     # -- remember_me --
     # user.remember_me_httponly = true
     # user.remember_me_for = 604800
 <%- end -%>
-<%- if brute_force_protection? -%>
+<%- if options.brute_force_protection? -%>
 
     # -- brute_force_protection --
     # user.failed_logins_count_attribute_name = :failed_logins_count
@@ -92,7 +92,7 @@ Rails.application.config.sorcery.configure do |config|
     # user.unlock_token_mailer_disabled = false
     # user.unlock_token_mailer = nil
 <%- end -%>
-<%- if activity_logging? -%>
+<%- if options.activity_logging? -%>
 
     # -- activity_logging --
     # user.last_login_at_attribute_name = :last_login_at
@@ -100,7 +100,7 @@ Rails.application.config.sorcery.configure do |config|
     # user.last_activity_at_attribute_name = :last_activity_at
     # user.activity_timeout = 600
 <%- end -%>
-<%- if external? -%>
+<%- if options.external? -%>
 
     # -- external --
     # user.authentications_class = nil

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

@@ -5,12 +5,12 @@
 
   <%%= f.input :email, autofocus: true %>
   <%%= f.input :password %>
-<%- if remember_me? -%>
+<%- if options.remember_me? -%>
   <%%= f.input :remember_me %>
 <%- end -%>
 
   <%%= f.button :submit, t('sorcery.submit'), class: 'btn btn-primary' %>
-<%- if reset_password? -%>
+<%- if options.reset_password? -%>
   <%%= link_to t('sorcery.reset.forgot'), password_<%= table_name %>_path, class: 'btn btn-default' %>
 <%- end -%>
 <%% end %>

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

@@ -1,5 +1,5 @@
 class Role < ActiveRecord::Base
   has_many :assignments
-  has_many :users, through: :assignments
+  has_many :<%= table_name %>, through: :assignments
   has_many :abilities
 end

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

@@ -18,13 +18,19 @@
       <td><%%= t('activerecord.attributes.<%= name %>.comment') %></td>
       <td><%%= raw(@<%= name %>.comment) %></td>
     </tr>
-<%- if has_picture? -%>
-  <%%- if @<%= name %>.picture.present? -%>
+<%- if options.picture? -%>
+  <%%- if @<%= name %>.picture? -%>
     <tr>
       <td><%%= t('activerecord.attributes.<%= name %>.picture') %></td>
-      <td><%%= image_tag(@<%= name %>.picture_url(:avatar)) %></td>
+      <td><%%= image_tag(<%= name %>.picture_url(:avatar).to_s) %></td>
     </tr>
   <%%- end -%>
+<%- end -%>
+<%- if options.gravatar? -%>
+    <tr>
+      <td><%%= t('activerecord.attributes.<%= name %>.gravatar') %></td>
+      <td><%%= image_tag(gravatar_url(@<%= name %>, 200)) %></td>
+    </tr>
 <%- end -%>
     <tr>
       <td><%%= t('activerecord.attributes.<%= name %>.theme') %></td>
@@ -38,7 +44,7 @@
       <td><%%= t('activerecord.attributes.<%= name %>.sysadm') %></td>
       <td><%%= @<%= name %>.sysadm ? t('simple_form.yes') : t('simple_form.no') %></td>
     </tr>
-<%- if activity_logging? -%>
+<%- if options.activity_logging? -%>
   <%%- if @<%= name %>.last_login_at.present? -%>
     <tr>
       <td><%%= t('activerecord.attributes.<%= name %>.last_login_at') %></td>
@@ -50,13 +56,13 @@
     </tr>
   <%%- end -%>
 <%- end -%>
-<%- if brute_force_protection? -%>
+<%- if options.brute_force_protection? -%>
     <tr>
       <td><%%= t('activerecord.attributes.<%= name %>.failed_logins_count') %></td>
       <td><%%= @<%= name %>.failed_logins_count %></td>
     </tr>
 <%- end -%>
-<%- if activity_logging? -%>
+<%- if options.activity_logging? -%>
   <%%- if @<%= name %>.last_logout_at.present? -%>
     <tr>
       <td><%%= t('activerecord.attributes.<%= name %>.last_logout_at') %></td>
@@ -70,7 +76,7 @@
     </tr>
   <%%- end -%>
 <%- end -%>
-<%- if brute_force_protection? -%>
+<%- if options.brute_force_protection? -%>
   <%%- if @<%= name %>.lock_expires_at.present? -%>
     <tr>
       <td><%%= t('activerecord.attributes.<%= name %>.lock_expires_at') %></td>

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

@@ -6,7 +6,7 @@ de:
     sign_up: "Benutzerkonto anlegen"
     header: "Login für interne Benutzer"
     submit: "Login"
-<%- if reset_password? -%>
+<%- if options.reset_password? -%>
     reset:
       forgot: "Kennwort vergessen?"
       header: "Kennwort anfordern"
@@ -34,7 +34,7 @@ de:
       <%= name %>:
         one: "Benutzer"
         other: "Benutzer"
-<%- if authorization? -%>
+<%- if options.authorization? -%>
       role:
         one: "Rolle"
         other: "Rollen"
@@ -51,24 +51,27 @@ de:
         name: "Name"
         phone: "Telefon"
         comment: "Bemerkung"
-<%- if has_picture? -%>
+<%- if options.picture? -%>
         picture: "Bild"
+<%- end -%>
+<%- if options.gravatar? -%>
+        gravatar: "Gravatar"
 <%- end -%>
         theme: "Oberfläche"
         active: "Aktiv"
         sysadm: "SysAdmin"
         password: "Kennwort"
         password_confirmation: "Kennwort wiederholen"
-<%- if remember_me? -%>
+<%- if options.remember_me? -%>
         remember_me: "Angemeldet bleiben"
 <%- end -%>
-<%- if activity_logging? -%>
+<%- 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 brute_force_protection? -%>
+<%- 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

@@ -5,7 +5,7 @@ class <%= migration_name.camelize %> < ActiveRecord::Migration
       t.string   :name
       t.string   :phone
       t.text     :comment
-<%- if has_picture? -%>
+<%- if options.picture? -%>
       t.string   :picture
 <%- end -%>
       t.integer  :theme, default: BootswatchRails::DEFAULT
@@ -14,27 +14,27 @@ class <%= migration_name.camelize %> < ActiveRecord::Migration
 
       t.string   :crypted_password, null: false
       t.string   :salt, null: false
-<%- if user_activation? -%>
+<%- if options.user_activation? -%>
       t.string   :activation_state, default: nil
       t.string   :activation_token, default: nil
       t.datetime :activation_token_expires_at, default: nil
 <%- end -%>
-<%- if reset_password? -%>
+<%- if options.reset_password? -%>
       t.string   :reset_password_token, default: nil
       t.datetime :reset_password_token_expires_at, default: nil
       t.datetime :reset_password_email_sent_at, default: nil
 <%- end -%>
-<%- if remember_me? -%>
+<%- if options.remember_me? -%>
       t.boolean  :remember_me
       t.string   :remember_me_token, default: nil
       t.datetime :remember_me_token_expires_at, default: nil
 <%- end -%>
-<%- if brute_force_protection? -%>
+<%- if options.brute_force_protection? -%>
       t.integer  :failed_logins_count, default: 0
       t.datetime :lock_expires_at, default: nil
       t.string   :unlock_token, default: nil
 <%- end -%>
-<%- if activity_logging? -%>
+<%- if options.activity_logging? -%>
       t.datetime :last_login_at, default: nil
       t.datetime :last_logout_at, default: nil
       t.datetime :last_activity_at, default: nil
@@ -46,19 +46,19 @@ class <%= migration_name.camelize %> < ActiveRecord::Migration
 
     add_index :<%= table_name %>, :email, unique: true
     add_index :<%= table_name %>, :sysadm
-<%- if user_activation? -%>
+<%- if options.user_activation? -%>
     add_index :<%= table_name %>, :activation_token
 <%- end -%>
-<%- if reset_password? -%>
+<%- if options.reset_password? -%>
     add_index :<%= table_name %>, :reset_password_token
 <%- end -%>
-<%- if remember_me? -%>
+<%- if options.remember_me? -%>
     add_index :<%= table_name %>, :remember_me_token
 <%- end -%>
-<%- if brute_force_protection? -%>
+<%- if options.brute_force_protection? -%>
     add_index :<%= table_name %>, :unlock_token
 <%- end -%>
-<%- if activity_logging? -%>
+<%- if options.activity_logging? -%>
     add_index :<%= table_name %>, [:last_logout_at, :last_activity_at]
 <%- end -%>
   end

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

@@ -10,7 +10,7 @@ class <%= class_name %> < ActiveRecord::Base
   has_many :roles, through: :assignments
   has_many :abilities, through: :roles
 
-<%- if has_picture? -%>
+<%- if options.picture? -%>
   mount_uploader :picture, PictureUploader
 
 <%- end -%>

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

@@ -56,14 +56,14 @@ class <%= controller_name.camelize %> < ApplicationController
   # GET /<%= table_name %>/log_in
   def log_in
     @<%= name %> = <%= class_name %>.new
-    render layout: '<%= layout %>'
+    render layout: '<%= options.layout %>'
   end
 
   # POST /<%= table_name %>/access
   def access
     @<%= name %> = <%= class_name %>.find_by email: params[:<%= name %>][:email]
     if @<%= name %>.present? and @<%= name %>.active
-<%- if remember_me? -%>
+<%- if options.remember_me? -%>
       @<%= name %> = login(params[:<%= name %>][:email], params[:<%= name %>][:password], params[:<%= name %>][:remember_me])
 <%- else -%>
       @<%= name %> = login(params[:<%= name %>][:email], params[:<%= name %>][:password])
@@ -77,12 +77,12 @@ class <%= controller_name.camelize %> < ApplicationController
       redirect_to log_in_users_path, alert: t('sorcery.failed')
     end
   end
-<%- if reset_password? -%>
+<%- if options.reset_password? -%>
 
   # GET /<%= table_name %>/password
   def password
     @<%= name %> = <%= class_name %>.new
-    render layout: '<%= layout %>'
+    render layout: '<%= options.layout %>'
   end
 
   # POST /<%= table_name %>/reset
@@ -104,7 +104,7 @@ class <%= controller_name.camelize %> < ApplicationController
       not_authenticated
       return
     end
-    render layout: '<%= layout %>'
+    render layout: '<%= options.layout %>'
   end
 
   # PATCH/PUT /<%= table_name %>/token/refresh

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootswatch_rails
 version: !ruby/object:Gem::Version
-  version: 3.2.0.33
+  version: 3.2.0.34
 platform: ruby
 authors:
 - Volker Wiegand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-21 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -129,6 +129,7 @@ files:
 - lib/generators/bootswatch_rails/sorcery/templates/assignment_model.rb
 - lib/generators/bootswatch_rails/sorcery/templates/change.html.erb
 - lib/generators/bootswatch_rails/sorcery/templates/edit.html.erb
+- lib/generators/bootswatch_rails/sorcery/templates/gravatar_helper.rb
 - lib/generators/bootswatch_rails/sorcery/templates/index.html.erb
 - lib/generators/bootswatch_rails/sorcery/templates/initializer.rb
 - lib/generators/bootswatch_rails/sorcery/templates/log_in.html.erb