usman 0.1.5dev3 → 0.1.5dev4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 282cec83d33da8573012b77b4317338c0e15ad69
-  data.tar.gz: b5af5bb9d890bbcdd9fa401d85af2e4d06cf3125
+  metadata.gz: 908dce0296be6976f2db177e9586962af623052d
+  data.tar.gz: b5b7162ad3de55dc217bdb1057d27c2a87b0ca9d
 SHA512:
-  metadata.gz: eb9ebdd170834a60847044c811dc3be70da654237d0ba7a8d7ae355ae1c79d1136012e5b3f13ba8fdaf46239172ca19b9f69c353ab28a059b14cc84dc1e1951f
-  data.tar.gz: 148a16128404efd56fb2990ae0b664ab68946bf2c8fc7780b3dfb7580df687d43e77c84e42bf50cbaa0a7690454dc704fbd230e43553f163005ec39819cb69f5
+  metadata.gz: f27ef6f08daeeade4c7d67e6f4408f9cd78cb275c4590388258f26eec4e0e0c7316f9a5c09b7aa3cb5d5c34b5518a296af2591813033989f2832350e1af9d5b7
+  data.tar.gz: a7e54900294fd49152a56307ad33725837f39b9ed1794ac747036650df08621ae3e7012d0eb310df8e4493e029c33d3ab197e51279613e60319eea2cc74de15f

data/app/controllers/usman/admin/users_controller.rb

@@ -59,7 +59,7 @@ module Usman
         
         # Normal users should not be able to view super admins
         # He should not be seeing admins even while searching
-        if @current_user.is_super_admin?
+        if @current_user.super_admin?
           @relation = @relation.where("super_admin IS #{@super_admin.to_s.upcase}") if @super_admin.nil? == false && @query.nil?
         else
           @relation = @relation.where("super_admin IS FALSE")

data/app/helpers/usman/authentication_helper.rb

@@ -89,7 +89,7 @@ module Usman
           redirect_or_popup_to_default_sign_in_page
           return
         else
-          @current_user.update_token if @current_user.token_about_to_expire?
+          @current_user.update_token! if @current_user.token_about_to_expire?
         end
       else
         text = "#{I18n.t("authentication.permission_denied.heading")}: #{I18n.t("authentication.permission_denied.message")}"
@@ -102,7 +102,7 @@ module Usman
 
     # This method is usually used as a before filter from admin controllers to ensure that the logged in user is a super admin
     def require_super_admin
-      unless @current_user.is_super_admin?
+      unless @current_user.super_admin?
         text = "#{I18n.t("authentication.permission_denied.heading")}: #{I18n.t("authentication.permission_denied.message")}"
         set_flash_message(text, :error, false) if defined?(flash) && flash
 

data/app/models/feature.rb

@@ -23,7 +23,7 @@ class Feature < Usman::ApplicationRecord
   has_one :feature_image, :as => :imageable, :dependent => :destroy, :class_name => "Image::FeatureImage"
 
 	# Validations
-	validates :name, presence: true
+	validates :name, presence: true, length: {minimum: 3, maximum: 250}
 	validates :status, :presence => true, :inclusion => {:in => STATUS.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
 
   # ------------------
@@ -67,13 +67,12 @@ class Feature < Usman::ApplicationRecord
     return error_object
   end
 
-  # * Return full name
-  # == Examples
-  #   >>> feature.display_name
-  #   => "Products"
-  def display_name
-    "#{name}"
-  end
+  # ------------------
+  # Instance Methods
+  # ------------------
+
+  # Status Methods
+  # --------------
 
   # * Return true if the user is not published, else false.
   # == Examples
@@ -126,6 +125,9 @@ class Feature < Usman::ApplicationRecord
     self.update_attribute(:status, DISABLED)
   end
 
+  # Permission Methods
+  # ------------------
+
   def can_be_destroyed?
     return true
   end
@@ -141,5 +143,16 @@ class Feature < Usman::ApplicationRecord
   def can_be_removed?
     published? or unpublished? or disabled?
   end
+
+  # Other Methods
+  # -------------
+
+  # * Return full name
+  # == Examples
+  #   >>> feature.display_name
+  #   => "Products"
+  def display_name
+    "#{name}"
+  end
 	
 end

data/app/models/user.rb

@@ -25,7 +25,7 @@ class User < Usman::ApplicationRecord
   SESSION_TIME_OUT = 120.minutes
 
   # Validations
-  validates :name, presence: true
+  validates :name, presence: true, length: {minimum: 3, maximum: 250}
   validate_username :username
   validate_email :email
   validate_password :password, condition_method: :should_validate_password?
@@ -105,14 +105,9 @@ class User < Usman::ApplicationRecord
   # ------------------
   # Instance variables
   # ------------------
-
-  # * Return full name
-  # == Examples
-  #   >>> user.display_name
-  #   => "Joe Black"
-  def display_name
-    "#{name}"
-  end
+  
+  # Status Methods
+  # --------------
 
   # * Return true if the user is not approved, else false.
   # == Examples
@@ -165,9 +160,8 @@ class User < Usman::ApplicationRecord
     self.update_attribute(:status, SUSPENDED)
   end
 
-  def is_super_admin?
-    super_admin
-  end
+  # Authentication Methods
+  # ----------------------
 
   def start_session
     # FIX ME - specs are not written to ensure that all these data are saved
@@ -185,11 +179,12 @@ class User < Usman::ApplicationRecord
 
   def end_session
     # Reseting the auth token for user when he logs out.
+    # Resetting the token_created_at to nil
     # (Time.now - 1.second)
     self.update_attributes auth_token: SecureRandom.hex, token_created_at: nil
   end
 
-  def update_token
+  def update_token!
     self.update_attribute(:token_created_at, Time.now)
   end
 
@@ -215,9 +210,8 @@ class User < Usman::ApplicationRecord
      self.reset_password_sent_at = Time.now unless self.reset_password_sent_at
   end
 
-  def default_image_url(size="small")
-    "/assets/kuppayam/defaults/user-#{size}.png"
-  end
+  # Permission Methods
+  # ------------------
 
   def set_permission(feature_name, **options)
     options.reverse_merge!(
@@ -282,6 +276,9 @@ class User < Usman::ApplicationRecord
     !suspended?
   end
 
+  # Role Methods
+  # ------------
+
   def add_role(role)
     return false unless self.approved?
     role = Role.find_by_name(role) if role.is_a?(String)
@@ -306,7 +303,21 @@ class User < Usman::ApplicationRecord
     else
       return false
     end
-    
+  end
+
+  # Other Methods
+  # -------------
+
+  # * Return full name
+  # == Examples
+  #   >>> user.display_name
+  #   => "Joe Black"
+  def display_name
+    "#{name}"
+  end
+
+  def default_image_url(size="small")
+    "/assets/kuppayam/defaults/user-#{size}.png"
   end
 
   private

data/app/models/usman/application_record.rb

@@ -2,8 +2,7 @@ module Usman
   class ApplicationRecord < ActiveRecord::Base
 	  self.abstract_class = true
 
-	  require 'kuppayam/importer.rb'
 	  extend Kuppayam::Importer
-	  extend KuppayamValidators
+	  extend Kuppayam::Validators
 	end
 end

data/app/views/usman/admin/users/_index.html.erb

@@ -44,7 +44,7 @@
 
 					<td class="hidden-xs hidden-sm"><%= link_to user.email, admin_user_path(user), remote: true, class: "email" %></td>
 					
-					<% if @current_user.is_super_admin? %>
+					<% if @current_user.super_admin? %>
 						<td class="hidden-xs hidden-sm">
 							<% if user.super_admin? %>
 				        <span class="mr-10 mt-5 label label-warning">Super Admin</span>

data/app/views/usman/admin/users/_row.html.erb

@@ -27,7 +27,7 @@
 
   <td class="hidden-xs hidden-sm"><%= link_to user.email, admin_user_path(user), remote: true, class: "email" %></td>
 
-  <% if @current_user.is_super_admin? %>
+  <% if @current_user.super_admin? %>
   <td class="hidden-xs hidden-sm">
   	<% if user.super_admin %>
       <span class="mr-10 mt-5 label label-warning">Super Admin</span>

data/app/views/usman/admin/users/index.html.erb

@@ -4,7 +4,7 @@
     <ul class="nav nav-tabs">
 
       <%# Show Admin tab only for admins %>
-      <% if @current_user.is_super_admin? %>
+      <% if @current_user.super_admin? %>
         <li class="<%= @super_admin == false ? 'active' : '' %>">
           <%= link_to "Users", admin_users_path(sa: '0') %>
         </li>

data/app/views/usman/sessions/_form.html.erb

@@ -25,7 +25,7 @@
   </div>
 
   <div class="login-header text-center">
-    <p>Sign in to access the admin area!</p>
+    <p>Merchandise Application</p>
   </div>
 
   <div class="form-group">

data/lib/usman/version.rb

@@ -1,3 +1,3 @@
 module Usman
-  VERSION = '0.1.5dev3'
+  VERSION = '0.1.5dev4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: usman
 version: !ruby/object:Gem::Version
-  version: 0.1.5dev3
+  version: 0.1.5dev4
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -90,14 +90,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5dev3
+        version: 0.1.5dev4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5dev3
+        version: 0.1.5dev4
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement