bootswatch_rails 3.2.0.11 → 3.2.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5c6154711bbb92cd3ebe2aab4d6c05ec7429918
-  data.tar.gz: 5be253e8c04f076e177fa0b45c9ff35040cb8100
+  metadata.gz: a206925a99b799bf8db48089529cd7459335c658
+  data.tar.gz: 6847b630b6fbd58394743926cc25a02692a18da5
 SHA512:
-  metadata.gz: 27b4412d15686c3d171b7a24ba1fca046cc8db835a969082dc743371afd7cfe170fa3678f922d172b0057f1ef137652496d06bbb95e755f1e7f6402077f802f2
-  data.tar.gz: b547102e9fc4420e8218718f4e145162af116be51d493162b5d1516897b5462fea7878b05f5d2e7eeb5d5142dac6d63ddc0aa478584d7eb31d0878e7e381dcd9
+  metadata.gz: 746c88ca7f52c4a98159d25d401126d117f60a4738871d44731697c72d5da0a0ddd1585656be3f4925c27d5a990f6071c6b9e9d517399ceb50bb809a336612bb
+  data.tar.gz: 0c0b16b89a3fa06965ac716cd7a975a2ef330dab0658bafd72745e4b74b4c1df40aa5266e73c59c16879a13900df4ea5bfdd3f5c896a7e827db555d0cec7e41c

data/Makefile

@@ -4,16 +4,20 @@
 #
 
 all: build
+	git status
+
+rel: build
+	./generate.sh
 	vim lib/bootswatch_rails/version.rb
 	git commit -a
 	rake release
 
 install: build
+	vim lib/bootswatch_rails/version.rb
 	git commit -a
 	sudo rake install
 
 build:
-	./generate.sh
 	test -d cleditor && git add cleditor || true
 	git add lib
 	git add vendor

data/lib/bootswatch_rails/version.rb

@@ -1,5 +1,5 @@
 module BootswatchRails
-  VERSION = "3.2.0.11"
+  VERSION = "3.2.0.13"
   THEMES = [:amelia, :cerulean, :cosmo, :custom, :cyborg, :darkly, :flatly, :journal, :lumen, :paper, :readable, :sandstone, :simplex, :slate, :spacelab, :superhero, :united, :yeti]
   DEFAULT = 1
 end

data/lib/generators/bootswatch_rails/carrierwave/templates/picture_uploader.rb

@@ -46,6 +46,9 @@ class <%= column.camelize %>Uploader < CarrierWave::Uploader::Base
   version :display do
     process :resize_to_limit => [600, 600]
   end
+  version :avatar do
+    process :resize_to_limit => [350, 350]
+  end
 
   # Add a white list of extensions which are allowed to be uploaded.
   # For images you might use something like this:

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

@@ -5,9 +5,11 @@ module BootswatchRails
 
   module Generators
     class SorceryGenerator < ActiveRecord::Generators::Base
-      desc "Install model, views and controller for Sorcery."
+      desc "Install model, views and controller for user with Sorcery."
       argument :name, type: :string, default: "user",
                banner: "user model (default 'user')"
+      class_option :picture, type: :boolean, default: false,
+               desc: 'Add picture to user (needs carrierwave)'
       class_option :user_activation, type: :boolean, default: false,
                desc: 'User activation by email with optional success email'
       class_option :reset_password, type: :boolean, default: false,
@@ -111,6 +113,10 @@ module BootswatchRails
 
       protected
 
+      def has_picture?
+        options.picture?
+      end
+
       def user_activation?
         options.user_activation?
       end
@@ -173,7 +179,9 @@ module BootswatchRails
       end
 
       def whitelist
-        ":email, :name, :active, :status, :password, :password_confirmation, :theme"
+        text = ":email, :name, :phone, :comment, :theme, " +
+        ":active, :status, :password, :password_confirmation"
+        text += ", :picture, :picture_cache" if has_picture?
       end
     end
   end

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

@@ -3,11 +3,29 @@
 
   <%%= f.input :email, autofocus: true %>
   <%%= f.input :name %>
+  <%%= f.input :phone %>
+  <%%= f.input :comment %>
+<%- if has_picture? -%>
+  <%%= f.input :picture %>
+  <%%= f.input :picture_cache, as: :hidden %>
+  <%%- if @<%= name %>.picture? -%>
+    <div class="form-group">
+      <div class="col-sm-offset-3 col-sm-9">
+        <%%= image_tag(@<%= name %>.picture_url(:thumb)) %>
+        &nbsp;&nbsp;&nbsp;
+        <label for="<%= name %>_remove_picture">
+          <%%= f.check_box :remove_picture %>
+          <%%= t('headers.destroy', name: t('activerecord.attributes.<%= name %>.picture')) %>
+        </label>
+      </div>
+    </div>
+  <%%- end -%>
+<%- end -%>
+  <%%= f.input :theme %>
   <%%= f.input :active %>
   <%%= f.input :password %>
   <%%= f.input :password_confirmation %>
   <%%= f.input :status %>
-  <%%= f.input :theme %>
 
   <%%= f.button :submit, class: 'btn btn-primary' %>
   <%%- if @<%= name %>.new_record? -%>

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

@@ -3,11 +3,13 @@
 <table class="table table-striped table-hover">
   <thead>
     <tr>
-      <th><%%= t('activerecord.attributes.<%= name %>.email') %></th>
-      <th><%%= t('activerecord.attributes.<%= name %>.name') %></th>
+      <th><%%= t('activerecord.models.<%= name %>.one') %></th>
+      <th><%%= t('activerecord.attributes.<%= name %>.comment') %></th>
+<%- if has_picture? -%>
+      <th><%%= t('activerecord.attributes.<%= name %>.picture') %></th>
+<%- end -%>
       <th><%%= t('activerecord.attributes.<%= name %>.active') %></th>
       <th><%%= t('activerecord.attributes.<%= name %>.status') %></th>
-      <th><%%= t('activerecord.attributes.<%= name %>.theme') %></th>
       <th class="index-actions"><%%= t('actions.title') %></th>
     </tr>
   </thead>
@@ -15,11 +17,13 @@
   <tbody>
     <%% @<%= table_name %>.each do |<%= name %>| %>
       <tr>
-        <td><%%= link_to <%= name %>.email, "mailto:#{<%= name %>.email}" %></td>
-        <td><%%= <%= name %>.name %></td>
+        <td><%%= mail_to(<%= name %>.email, <%= name %>.name) %><br><%%= <%= name %>.phone %></td>
+        <td><%%= <%= name %>.comment %></td>
+<%- if has_picture? -%>
+        <td><%%= image_tag(<%= name %>.picture_url(:thumb).to_s) %></td>
+<%- end -%>
         <td><%%= <%= name %>.active ? t('simple_form.yes') : t('simple_form.no') %></td>
         <td><%%= t('enums.<%= name %>.status.' + <%= name %>.status) %></td>
-        <td><%%= <%= name %>.theme %></td>
         <td class="index-actions">
           <%%= link_to t('actions.show'), <%= name %>, class: 'btn btn-default btn-xs' %>
           <br>

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

@@ -4,33 +4,51 @@
   <tbody>
     <tr>
       <td><%%= t('activerecord.attributes.<%= name %>.email') %></td>
-      <td><%%= link_to @<%= name %>.email, "mailto:#{@<%= name %>.email}" %></td>
+      <td><%%= mail_to(@<%= name %>.email) %></td>
     </tr>
     <tr>
       <td><%%= t('activerecord.attributes.<%= name %>.name') %></td>
       <td><%%= @<%= name %>.name %></td>
     </tr>
     <tr>
-      <td><%%= t('activerecord.attributes.<%= name %>.active') %></td>
-      <td><%%= @<%= name %>.active ? t('simple_form.yes') : t('simple_form.no') %></td>
+      <td><%%= t('activerecord.attributes.<%= name %>.phone') %></td>
+      <td><%%= @<%= name %>.phone %></td>
     </tr>
     <tr>
-      <td><%%= t('activerecord.attributes.<%= name %>.status') %></td>
-      <td><%%= t('enums.<%= name %>.status.' + @<%= name %>.status) %></td>
+      <td><%%= t('activerecord.attributes.<%= name %>.comment') %></td>
+      <td><%%= raw(@<%= name %>.comment) %></td>
     </tr>
+<%- if has_picture? -%>
+  <%%- if @<%= name %>.picture.present? -%>
+    <tr>
+      <td><%%= t('activerecord.attributes.<%= name %>.picture') %></td>
+      <td><%%= image_tag(@<%= name %>.picture_url(:avatar)) %></td>
+    </tr>
+  <%%- end -%>
+<%- end -%>
     <tr>
       <td><%%= t('activerecord.attributes.<%= name %>.theme') %></td>
       <td><%%= @<%= name %>.theme %></td>
     </tr>
+    <tr>
+      <td><%%= t('activerecord.attributes.<%= name %>.active') %></td>
+      <td><%%= @<%= name %>.active ? t('simple_form.yes') : t('simple_form.no') %></td>
+    </tr>
+    <tr>
+      <td><%%= t('activerecord.attributes.<%= name %>.status') %></td>
+      <td><%%= t('enums.<%= name %>.status.' + @<%= name %>.status) %></td>
+    </tr>
 <%- if activity_logging? -%>
+  <%%- if @<%= name %>.last_login_at.present? -%>
     <tr>
       <td><%%= t('activerecord.attributes.<%= name %>.last_login_at') %></td>
-      <td><%%= @<%= name %>.last_login_at %></td>
+      <td><%%= l(@<%= name %>.last_login_at) %></td>
     </tr>
     <tr>
       <td><%%= t('activerecord.attributes.<%= name %>.last_login_from_ip_address') %></td>
       <td><%%= @<%= name %>.last_login_from_ip_address %></td>
     </tr>
+  <%%- end -%>
 <%- end -%>
 <%- if brute_force_protection? -%>
     <tr>
@@ -39,20 +57,26 @@
     </tr>
 <%- end -%>
 <%- if activity_logging? -%>
+  <%%- if @<%= name %>.last_logout_at.present? -%>
     <tr>
       <td><%%= t('activerecord.attributes.<%= name %>.last_logout_at') %></td>
-      <td><%%= @<%= name %>.last_logout_at %></td>
+      <td><%%= l(@<%= name %>.last_logout_at) %></td>
     </tr>
+  <%%- end -%>
+  <%%- if @<%= name %>.last_activity_at.present? -%>
     <tr>
       <td><%%= t('activerecord.attributes.<%= name %>.last_activity_at') %></td>
-      <td><%%= @<%= name %>.last_activity_at %></td>
+      <td><%%= l(@<%= name %>.last_activity_at) %></td>
     </tr>
+  <%%- end -%>
 <%- end -%>
 <%- if brute_force_protection? -%>
+  <%%- if @<%= name %>.lock_expires_at.present? -%>
     <tr>
       <td><%%= t('activerecord.attributes.<%= name %>.lock_expires_at') %></td>
-      <td><%%= @<%= name %>.lock_expires_at %></td>
+      <td><%%= l(@<%= name %>.lock_expires_at) %></td>
     </tr>
+  <%%- end -%>
 <%- end -%>
   </tbody>
 </table>

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

@@ -45,9 +45,14 @@ de:
       <%= name %>:
         email: "E-Mail"
         name: "Name"
+        phone: "Telefon"
+        comment: "Bemerkung"
+<%- if has_picture? -%>
+        picture: "Bild"
+<%- end -%>
+        theme: "Oberfläche"
         active: "Aktiv"
         status: "Status"
-        theme: "Oberfläche"
         password: "Kennwort"
         password_confirmation: "Kennwort wiederholen"
 <%- if remember_me? -%>

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

@@ -3,9 +3,14 @@ class <%= migration_name.camelize %> < ActiveRecord::Migration
     create_table :<%= table_name %> do |t|
       t.string :email, null: false
       t.string :name
+      t.string :phone
+      t.text :comment
+<%- if has_picture? -%>
+      t.string :picture
+<%- end -%>
+      t.integer :theme, default: BootswatchRails::DEFAULT
       t.boolean :active, default: true
       t.integer :status, default: 0
-      t.integer :theme, default: BootswatchRails::DEFAULT
 
       t.string :crypted_password, null: false
       t.string :salt, null: false

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

@@ -6,6 +6,10 @@ class <%= class_name %> < ActiveRecord::Base
   validates :password, confirmation: true
   validates :password_confirmation, presence: true, on: :create
 
+<%- if has_picture? -%>
+  mount_uploader :picture, PictureUploader
+
+<%- end -%>
   enum status: <%= BootswatchRails::USER_STATUS %>
   validates :status, presence: true
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootswatch_rails
 version: !ruby/object:Gem::Version
-  version: 3.2.0.11
+  version: 3.2.0.13
 platform: ruby
 authors:
 - Volker Wiegand