ants 0.2.8 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77f716463690574774c93d0fa1480dc9163fac32
-  data.tar.gz: 9b351de5e515a5babd2297c3ff33ed55b98166ba
+  metadata.gz: 8684f96b36137070f69d0d47d8dc7ffd382791cd
+  data.tar.gz: 9fc8852366aa9e43600d5f2b1888f43dd906679d
 SHA512:
-  metadata.gz: bf5db781a36806f90d6b8312ad8917f2ae7a755658f2e4b76363a0003ee9b5f9e2503e9acfe841e0c5833a5565171a1629921d246f4b586f6a54117b863d5cdc
-  data.tar.gz: 33a9d0d8ebf3c8960f37bb0fdb147f90f315b9e0ca1dddf83adc0d31db77adec327fec53411e90d397c3e6b2031849977a529125799e1b46bec63bcf7afcbad7
+  metadata.gz: 7266c9d93188a7fca00f2f33c1e1af59f0ea56195518abc374d54157542e40138f0553951bd6b8862ebedb0c73798cabbd64cb27a4a0f7e99f44686453b16ff6
+  data.tar.gz: 545cc51d36d4f67b8c578ac4742beae24887558225cf235506aba811345fede6349f0a6e2c2f648f7371b2c7e2308990acb475feada440a36023904a338a573f

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ants (0.2.8)
+    ants (0.3.0)
       devise
       mongoid (>= 4.0)
       mongoid-slug (>= 4.0.0)

data/app/assets/javascripts/ants/{admins.coffee → admin_users.coffee}

@@ -1,4 +1,4 @@
-class @AntsAdmins
+class @AntsAdminUsers
   constructor: (title='Admins', apiPath='/admin') ->
     config =
       title: title
@@ -6,7 +6,7 @@ class @AntsAdmins
 
       arrayStore: new RailsArrayStore({
         resource:    'admin'
-        path:        "#{ apiPath }/admins"
+        path:        "#{ apiPath }/admin_users"
         sortBy:      'name'
         searchable:  true
       })
@@ -47,7 +47,7 @@ class @AntsAdmins
             if input.object
               input.$el.removeClass 'input-required'
               input.$label.html 'Change Password'
-              input.config.placeholder = 'Type new password here to update the current one'
+              input.config.placeholder = 'Type new password & hit Save'
               input._add_placeholder()
 
-    return config
+    return config

data/app/controllers/admin/admin_users_controller.rb

@@ -0,0 +1,5 @@
+module Admin
+  class AdminUsersController < Admin::BaseController
+    mongosteen
+  end
+end

data/app/mailers/admin_user_mailer.rb

@@ -0,0 +1,3 @@
+class AdminUserMailer < Devise::Mailer
+
+end

data/app/models/{admin.rb → admin_user.rb}

@@ -1,4 +1,4 @@
-class Admin
+class AdminUser
   include Mongoid::Document
   include Mongoid::Timestamps
   include Mongoid::Search
@@ -8,7 +8,6 @@ class Admin
   field :name
   field :permissions, type: Array
 
-
   # Include default devise modules. Others available are:
   # :confirmable, :lockable, :timeoutable, :registerable and :omniauthable
   devise :database_authenticatable,
@@ -36,56 +35,45 @@ class Admin
   field :current_sign_in_ip, type: String
   field :last_sign_in_ip,    type: String
 
-
   ## Validations
   validates :name,  presence: true
 
-
   ## Search
   search_in :name, :email
 
   ## Scopes
   default_scope -> { asc(:name) }
 
-
   ## Indexes
   index({ name:  1 })
   index({ email: 1 }, { unique: true })
 
-
   ## Helpers
   def devise_mailer
-    AdminMailer
+    AdminUserMailer
   end
 
-
   def _list_item_title
     name.empty? ? email : name
   end
 
-
   def _list_item_subtitle
     last_sign_in_ago
   end
 
-
   def _list_item_thumbnail
-    "//www.gravatar.com/avatar/#{ Digest::MD5.hexdigest(email) }?s=80&d=retro&r=g"
+    hex = Digest::MD5.hexdigest(email)
+    "//www.gravatar.com/avatar/#{hex}?s=80&d=retro&r=g"
   end
 
-
   private
 
-    def last_sign_in_ago
-      if current_sign_in_at
-        'Seen ' + ActionController::Base.helpers.time_ago_in_words(current_sign_in_at) + ' ago'
-      else
-        'Never seen'
-      end
+  def last_sign_in_ago
+    if current_sign_in_at
+      time = ActionController::Base.helpers.time_ago_in_words(current_sign_in_at)
+      "Seen #{time} ago"
+    else
+      "Never seen"
     end
-
+  end
 end
-
-
-
-

data/app/views/ants/_profile.html.erb

@@ -1,9 +1,10 @@
 <div class="sidebar-profile" style="display:none;">
-  <%= image_tag current_admin._list_item_thumbnail %>
+  <% user = current_admin_user %>
+  <%= image_tag user._list_item_thumbnail %>
 
-  <% name = (current_admin.name.presence || "").strip.split(' ').first %>
-  <% path = "#/settings/admins/view/#{current_admin.id}" %>
+  <% name = (user.name.presence || "").strip.split(' ').first %>
+  <% path = "#/settings/admins/view/#{user.id}" %>
   <%= link_to name, path %>
 
-  <%= link_to "Sign out", destroy_admin_session_path, method: :delete %>
+  <%= link_to "Sign out", destroy_admin_user_session_path, method: :delete %>
 </div>

data/lib/ants/version.rb

@@ -1,3 +1,3 @@
 module Ants
-  VERSION = "0.2.8"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ants
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.3.0
 platform: ruby
 authors:
 - Alexander Kravets
@@ -154,7 +154,7 @@ files:
 - Rakefile
 - ants.gemspec
 - app/assets/javascripts/ants.coffee
-- app/assets/javascripts/ants/admins.coffee
+- app/assets/javascripts/ants/admin_users.coffee
 - app/assets/javascripts/ants/menu.coffee
 - app/assets/javascripts/ants/meta.coffee
 - app/assets/javascripts/ants/profile.coffee
@@ -163,13 +163,13 @@ files:
 - app/assets/stylesheets/ants.scss
 - app/assets/stylesheets/ants/header.scss
 - app/assets/stylesheets/ants/profile.scss
-- app/controllers/admin/admins_controller.rb
+- app/controllers/admin/admin_users_controller.rb
 - app/controllers/admin/menus_controller.rb
 - app/controllers/admin/redirects_controller.rb
 - app/controllers/redirects_controller.rb
 - app/helpers/menu_helper.rb
-- app/mailers/admin_mailer.rb
-- app/models/admin.rb
+- app/mailers/admin_user_mailer.rb
+- app/models/admin_user.rb
 - app/models/menu.rb
 - app/models/menu_link.rb
 - app/models/redirect.rb

data/app/controllers/admin/admins_controller.rb

@@ -1,3 +0,0 @@
-class Admin::AdminsController < Admin::BaseController
-  mongosteen
-end

data/app/mailers/admin_mailer.rb

@@ -1,3 +0,0 @@
-class AdminMailer < Devise::Mailer
-
-end