usman 0.1.5 → 0.1.6dev2

data/app/models/feature.rb

@@ -1,22 +1,19 @@
 class Feature < Usman::ApplicationRecord
   
-  require 'import_error_handler.rb'
-  extend Usman::ImportErrorHandler
-  
   # Constants
-  UNPUBLISHED = "unpublished"
   PUBLISHED = "published"
+  UNPUBLISHED = "unpublished"
   DISABLED = "disabled"
   
   STATUS = { 
-    UNPUBLISHED => "Un-Published", 
     PUBLISHED => "Published", 
+    UNPUBLISHED => "Un-Published", 
     DISABLED => "Disabled"
   }
 
   STATUS_REVERSE = { 
-    "Un-Published" => UNPUBLISHED, 
-    "Published" => PUBLISHED, 
+    "Published" => PUBLISHED,
+    "Un-Published" => UNPUBLISHED,
     "Disabled" => DISABLED
   }
   
@@ -26,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" }
 
   # ------------------
@@ -47,9 +44,7 @@ class Feature < Usman::ApplicationRecord
   scope :published, -> { where(status: PUBLISHED) }
   scope :disabled, -> { where(status: DISABLED) }
 
-  def self.save_row_data(row, base_path)
-
-    image_base_path = base_path + "images/"
+  def self.save_row_data(row)
 
     row.headers.each{ |cell| row[cell] = row[cell].to_s.strip }
 
@@ -60,45 +55,24 @@ class Feature < Usman::ApplicationRecord
     feature.status = Feature::UNPUBLISHED
     
     # Initializing error hash for displaying all errors altogether
-    error_object = Usman::ErrorHash.new
-
-    ## Adding a profile picture
-    begin
-      image_path = image_base_path + "features/#{feature.name.parameterize}.png"
-      image_path = image_base_path + "features/#{feature.name.parameterize}}.jpg" unless File.exists?(image_path)
-      if File.exists?(image_path)
-        feature.build_feature_image
-        feature.feature_image.image = File.open(image_path)
-      else
-        summary = "Feature Image not found for feature: #{feature.name}"
-        details = "#{image_path}/png doesn't exists"
-        error_object.warnings << { summary: summary, details: details }
-      end
-    rescue => e
-      summary = "Error during processing: #{$!}"
-      details = "Feature: #{feature.name}, Image Path: #{image_path}"
-      stack_trace = "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
-      error_object.errors << { summary: summary, details: details, stack_trace: stack_trace }
-    end if feature.feature_image.blank?
-
-    if feature.valid? && (feature.feature_image.blank? || feature.feature_image.valid?)
+    error_object = Kuppayam::Importer::ErrorHash.new
+
+    if feature.valid?
       feature.save!
     else
       summary = "Error while saving feature: #{feature.name}"
       details = "Error! #{feature.errors.full_messages.to_sentence}"
-      details << ", #{feature.feature_image.errors.full_messages.to_sentence}" if feature.feature_image
       error_object.errors << { summary: summary, details: details }
     end
     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
@@ -145,14 +119,44 @@ class Feature < Usman::ApplicationRecord
   # change the status to :suspended
   # Return the status
   # == Examples
-  #   >>> feature.suspend!
-  #   => "suspended"
-  def suspend!
+  #   >>> feature.disable!
+  #   => "disabled"
+  def disable!
     self.update_attribute(:status, DISABLED)
   end
 
-  def can_be_destroyed?
-    return true
+  # Permission Methods
+  # ------------------
+
+  def can_be_edited?
+    published? or unpublished?
+  end
+
+  def can_be_deleted?
+    true
+  end
+
+  def can_be_published?
+    unpublished? or disabled?
+  end
+
+  def can_be_unpublished?
+    published? or disabled?
+  end
+
+  def can_be_disabled?
+    published? or unpublished?
+  end
+
+  # Other Methods
+  # -------------
+
+  # * Return full name
+  # == Examples
+  #   >>> feature.display_name
+  #   => "Products"
+  def display_name
+    "#{name}"
   end
 	
 end

data/app/models/image/feature_image.rb

@@ -1,3 +1,3 @@
 class Image::FeatureImage < Image::Base
-	mount_uploader :image, FeatureImageUploader
+  mount_uploader :image, FeatureImageUploader
 end

data/app/models/image/profile_picture.rb

@@ -1,3 +1,3 @@
 class Image::ProfilePicture < Image::Base
-	mount_uploader :image, ProfilePictureUploader
+  mount_uploader :image, ProfilePictureUploader
 end

data/app/models/permission.rb

@@ -1,9 +1,6 @@
 class Permission < Usman::ApplicationRecord
   
-  require 'import_error_handler.rb'
-  extend Usman::ImportErrorHandler
-
-	# Associations
+  # Associations
   belongs_to :user
   belongs_to :feature
 
@@ -30,16 +27,14 @@ class Permission < Usman::ApplicationRecord
                                         LOWER(f.name) LIKE LOWER('%#{query}%')")}
 
 
-  def self.save_row_data(row, base_path)
-
-    image_base_path = base_path + "images/"
+  def self.save_row_data(row)
 
     row.headers.each{ |cell| row[cell] = row[cell].to_s.strip }
 
     return if row[:user].blank? || row[:feature].blank?
 
     # Initializing error hash for displaying all errors altogether
-    error_object = Usman::ErrorHash.new
+    error_object = Kuppayam::Importer::ErrorHash.new
 
     user = User.find_by_username(row[:user])
     unless user

data/app/models/role.rb

@@ -1,13 +1,10 @@
 class Role < Usman::ApplicationRecord
   
-  require 'import_error_handler.rb'
-  extend Usman::ImportErrorHandler
-  
   # Associations
   has_and_belongs_to_many :users
 
 	# Validations
-	validates :name, presence: true
+	validates :name, presence: true, length: {minimum: 3, maximum: 250}
 	
   # ------------------
   # Class Methods
@@ -18,10 +15,10 @@ class Role < Usman::ApplicationRecord
   # == Examples
   #   >>> role.search(query)
   #   => ActiveRecord::Relation object
-  scope :search, lambda {|query| where("LOWER(name) LIKE LOWER('%#{query}%')")
+  scope :search, lambda {|query| where("LOWER(roles.name) LIKE LOWER('%#{query}%')")
                         }
 
-  def self.save_row_data(row, base_path)
+  def self.save_row_data(row)
 
     row.headers.each{ |cell| row[cell] = row[cell].to_s.strip }
 
@@ -31,7 +28,7 @@ class Role < Usman::ApplicationRecord
     role.name = row[:name]
     
     # Initializing error hash for displaying all errors altogether
-    error_object = Usman::ErrorHash.new
+    error_object = Kuppayam::Importer::ErrorHash.new
 
     if role.valid?
       role.save!

data/app/models/user.rb

@@ -1,9 +1,5 @@
 class User < Usman::ApplicationRecord
 
-  require 'import_error_handler.rb'
-  extend Usman::ImportErrorHandler
-  extend KuppayamValidators
-  
   # including Password Methods
   has_secure_password
 
@@ -26,10 +22,10 @@ class User < Usman::ApplicationRecord
 
   EXCLUDED_JSON_ATTRIBUTES = [:confirmation_token, :password_digest, :reset_password_token, :unlock_token, :status, :reset_password_sent_at, :remember_created_at, :sign_in_count, :current_sign_in_at, :last_sign_in_at, :current_sign_in_ip, :last_sign_in_ip, :confirmed_at, :confirmation_sent_at, :unconfirmed_email, :failed_attempts, :locked_at, :created_at, :updated_at]
   DEFAULT_PASSWORD = "Password@1"
-  SESSION_TIME_OUT = 30.minutes
+  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?
@@ -43,26 +39,24 @@ class User < Usman::ApplicationRecord
   has_one :profile_picture, :as => :imageable, :dependent => :destroy, :class_name => "Image::ProfilePicture"
   has_many :permissions
   has_many :features, through: :permissions
-  has_and_belongs_to_many :users
+  has_and_belongs_to_many :roles
 
   
   # ------------------
   # Class Methods
   # ------------------
 
-  def self.find_by_email_or_username(query)
-    self.where("LOWER(email) = LOWER('#{query}') OR LOWER(username) = LOWER('#{query}')").first
-  end
+  # Scopes Methods
 
   # return an active record relation object with the search query in its where clause
   # Return the ActiveRecord::Relation object
   # == Examples
   #   >>> user.search(query)
   #   => ActiveRecord::Relation object
-  scope :search, lambda {|query| where("LOWER(name) LIKE LOWER('%#{query}%') OR\
-                                        LOWER(username) LIKE LOWER('%#{query}%') OR\
-                                        LOWER(email) LIKE LOWER('%#{query}%') OR\
-                                        LOWER(designation) LIKE LOWER('%#{query}%')")
+  scope :search, lambda {|query| where("LOWER(users.name) LIKE LOWER('%#{query}%') OR\
+                                        LOWER(users.username) LIKE LOWER('%#{query}%') OR\
+                                        LOWER(users.email) LIKE LOWER('%#{query}%') OR\
+                                        LOWER(users.designation) LIKE LOWER('%#{query}%')")
                         }
 
   scope :status, lambda { |status| where("LOWER(status)='#{status}'") }
@@ -70,10 +64,13 @@ class User < Usman::ApplicationRecord
   scope :pending, -> { where(status: PENDING) }
   scope :approved, -> { where(status: APPROVED) }
   scope :suspended, -> { where(status: SUSPENDED) }
+  
+  scope :super_admins, -> { where(super_admin: TRUE) }
+  scope :normal_users, -> { where(super_admin: FALSE) }
 
-  def self.save_row_data(row, base_path)
+  # Import Methods
 
-    image_base_path = base_path + "images/"
+  def self.save_row_data(row)
 
     row.headers.each{ |cell| row[cell] = row[cell].to_s.strip }
 
@@ -92,7 +89,7 @@ class User < Usman::ApplicationRecord
     user.assign_default_password
 
     # Initializing error hash for displaying all errors altogether
-    error_object = Usman::ErrorHash.new
+    error_object = Kuppayam::Importer::ErrorHash.new
 
     if user.valid?
       user.save!
@@ -102,47 +99,15 @@ class User < Usman::ApplicationRecord
       error_object.errors << { summary: summary, details: details }
     end
 
-    ## Adding a profile picture
-    begin
-      image_path = image_base_path + "users/#{user.username}.png"
-      image_path = image_base_path + "users/#{user.username}.jpg" unless File.exists?(image_path)
-      if File.exists?(image_path)
-        user.build_profile_picture
-        user.profile_picture.image = File.open(image_path)
-        if user.profile_picture.valid?
-          user.profile_picture.save
-        else
-          summary = "Error while saving user: #{user.name}"
-          details = "Error! #{user.errors.full_messages.to_sentence}"
-          details << ", #{user.profile_picture.errors.full_messages.to_sentence}" if user.profile_picture
-          error_object.errors << { summary: summary, details: details }
-        end
-      else
-        summary = "Profile Picture not found for user: #{user.name}"
-        details = "#{image_path}/png doesn't exists"
-        error_object.warnings << { summary: summary, details: details }
-      end
-    rescue => e
-      summary = "Error during processing: #{$!}"
-      details = "User: #{user.name}, Image Path: #{image_path}"
-      stack_trace = "Backtrace:\n\t#{e.backtrace.join("\n\t")}"
-      error_object.errors << { summary: summary, details: details, stack_trace: stack_trace }
-    end if user.profile_picture.blank?
-
     return error_object
   end
 
   # ------------------
-  # Instance variables
+  # Instance Methods
   # ------------------
-
-  # * 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
@@ -195,36 +160,26 @@ class User < Usman::ApplicationRecord
     self.update_attribute(:status, SUSPENDED)
   end
 
-  def is_super_admin?
-    super_admin
-  end
+  # Authentication Methods
+  # ----------------------
+
+  def start_session(remote_ip)
+    self.current_sign_in_at = Time.now
+    self.current_sign_in_ip = remote_ip
 
-  def start_session
-    # FIX ME - specs are not written to ensure that all these data are saved
-    self.token_created_at = Time.now
     self.sign_in_count = self.sign_in_count ? self.sign_in_count + 1 : 1
-    self.last_sign_in_at = self.current_sign_in_at
-    self.last_sign_in_ip = self.current_sign_in_ip
-    self.current_sign_in_at = self.token_created_at
 
-    # FIX ME - pass remote_ip to this method.
-    # Make necessary changes to authentication service to make it work
-    # self.current_sign_in_ip = remote_ip if remote_ip
     self.save
   end
 
   def end_session
-    # Reseting the auth token for user when he logs out.
-    # (Time.now - 1.second)
-    self.update_attributes auth_token: SecureRandom.hex, token_created_at: nil
-  end
-
-  def update_token
-    self.update_attribute(:token_created_at, Time.now)
-  end
+    self.last_sign_in_at = self.current_sign_in_at
+    self.last_sign_in_ip = self.current_sign_in_ip
+    
+    self.current_sign_in_at = nil
+    self.current_sign_in_ip = nil
 
-  def token_about_to_expire?
-    return self.token_created_at.nil? || (Time.now > self.token_created_at + (SESSION_TIME_OUT - 1.minute))
+    self.save
   end
 
   def assign_default_password
@@ -232,18 +187,13 @@ class User < Usman::ApplicationRecord
     self.password_confirmation = DEFAULT_PASSWORD
   end
 
-  def token_expired?
-    return self.token_created_at.nil? || (Time.now > self.token_created_at + SESSION_TIME_OUT)
-  end
-
   def generate_reset_password_token
      self.reset_password_token = SecureRandom.hex unless self.reset_password_token
      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!(
@@ -301,23 +251,68 @@ class User < Usman::ApplicationRecord
   end
 
   def can_be_deleted?
-    return true
+    suspended?
   end
 
   def can_be_edited?
     !suspended?
   end
 
+  # Role Methods
+  # ------------
+
+  def add_role(role)
+    return false unless self.approved?
+    role = Role.find_by_name(role) if role.is_a?(String)
+    if role
+      self.roles << role unless self.has_role?(role)
+      return true
+    else
+      return false
+    end
+  end
+
+  def remove_role(role)
+    role = Role.find_by_name(role) if role.is_a?(String)
+    self.roles.delete(role) if role
+  end
+
+  def has_role?(role)
+    role = Role.find_by_name(role) if role.is_a?(String)
+    if role && role.persisted?
+      return true if self.super_admin
+      self.roles.exists?(:id => [role.id])
+    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
 
   def should_validate_password?
-    self.new_record? || (self.new_record? == false and self.password.present?)
+    self.new_record? || (self.new_record? == false and self.password_digest_changed?)
   end
 
   def generate_auth_token
     self.auth_token = SecureRandom.hex unless self.auth_token
   end
 
+  # FIXME - this should be either removed or moved to feature model
   def get_feature(feature_name)
     case feature_name
     when Feature
@@ -332,25 +327,8 @@ class User < Usman::ApplicationRecord
     return feature
   end
 
-  def get_role(role_name)
-    self.roles.find_by_id(role_name) || self.roles.find_by_name(role_name)
-  end
-
-  def add_role(role_name)
-    role = self.get_role(role_name)
-    self.roles << role if role && role.persists?
-  end
-
-  def remove_role(role_name)
-    role = self.get_role(role_name)
-    if role
-      self.roles.delete(role)
-    end
-  end
-
-  def has_role?(role_name)
-    role = self.get_role(role_name)
-    role && role.persists?
+  def self.find_by_email_or_username(query)
+    self.where("LOWER(email) = LOWER('#{query}') OR LOWER(username) = LOWER('#{query}')").first
   end
 
 end

data/app/models/usman/application_record.rb

@@ -1,5 +1,8 @@
 module Usman
   class ApplicationRecord < ActiveRecord::Base
 	  self.abstract_class = true
+
+	  extend Kuppayam::Importer
+	  extend Kuppayam::Validators
 	end
 end

data/app/services/usman/authentication_service.rb

@@ -1,20 +1,21 @@
 module Usman
   class AuthenticationService
 
-    attr_reader :login_handle, :password, :error, :user
+    attr_reader :login_handle, :password, :error, :user, :remote_ip
 
     def initialize(params)
       @login_handle = params[:login_handle]
       @password = params[:password]
+      @remote_ip = params[:remote_ip]
       @error = nil
-
+      
       check_if_user_exists
       if @user
         authenticate
         check_if_user_is_approved
       end
 
-      @user.start_session unless @error
+      @user.start_session(@remote_ip) unless @error
     end
 
     def invalid_login_error

data/app/uploaders/profile_picture_uploader.rb

@@ -1,5 +1,6 @@
 class ProfilePictureUploader < ImageUploader
-	def store_dir
+
+  def store_dir
     "uploads/profile_pictures/#{model.id}"
   end
 

data/app/views/layouts/kuppayam/_header.html.erb

@@ -33,7 +33,7 @@
     <% if @current_user %>
         <span style="color:#898989;">Welcome</span> <span style="color:#4b4b4b;"><%= @current_user.name %></span>
         &nbsp;&nbsp;|&nbsp;&nbsp;
-        <%= link_to raw("Sign Out"), sign_out_path, method: :delete %>
+        <%= link_to raw("Sign Out"), usman.sign_out_path, method: :delete %>
     <% else %>
       <%= link_to raw("Sign In"), "#" %>
     <% end %>

data/app/views/layouts/kuppayam/_navbar.html.erb

@@ -45,7 +45,7 @@
 					</a>
 				</li>
 				<li class="last">
-					<%= link_to raw("<i class='fa-lock'></i>Sign Out"), sign_out_path, method: :delete %>
+					<%= link_to raw("<i class='fa-lock'></i>Sign Out"), usman.sign_out_path, method: :delete %>
 				</li>
 			</ul>
 		</li>

data/app/views/layouts/kuppayam/_sidebar.html.erb

@@ -37,6 +37,7 @@
 			
 			<!-- class "auto-inherit-active-class" will automatically add "active" class for parent elements who are marked already with class "active" -->
 			
+			<!-- Admin Dashboard -->
 			<li class="<%= nav_active?('admin/dashboard') ? 'active' : ''  %>">
 				<%= link_to raw("<i class=\"linecons-desktop\"></i> <span class='title'>Dashboard</span>"), usman.admin_dashboard_url %>
 			</li>
@@ -52,29 +53,29 @@
 					<li class="<%= nav_class("admin/users") %>">
 				    <%= link_to raw("<i class=\"linecons-user\"></i> <span class='title'>Manage Users</span>"), usman.admin_users_url %>
 				  </li>
-					
-					<li class="<%= nav_class("admin/users") %>">
-						<%= link_to raw("<i class=\"linecons-lock\"></i> <span class='title'>Manage Permissions</span>"), usman.admin_permissions_url %>
-					</li>
 				</ul>
-
 			</li>
 
+			<% if @current_user.super_admin? %>
 			<li class="">
 				<a href="/xenon/xenon-files/html/dashboard-1.html">
 					<i class="linecons-database"></i>
 					<span class="title">Master Data</span>
 				</a>
+
 				<ul>
 					<li class="">
 						<%= link_to raw("<i class=\"linecons-diamond\"></i> <span class='title'>Manage Features</span>"), usman.admin_features_url %>
 					</li>
 
-					<li class="">
-						<%= link_to raw("<i class=\"linecons-diamond\"></i> <span class='title'>Manage Roles</span>"), usman.admin_roles_url %>
+					<li class="<%= nav_class("admin/users") %>">
+						<%= link_to raw("<i class=\"linecons-lock\"></i> <span class='title'>Manage Permissions</span>"), usman.admin_permissions_url %>
 					</li>
 				</ul>
+
 			</li>
+			<% end %>
+
 		</ul>
 		
 	</div>

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

@@ -47,6 +47,5 @@
 			</div>
 		</div>
 	</div>
-	
 
 </div>

data/app/views/usman/admin/features/_form.html.erb

@@ -9,8 +9,11 @@
       </div>
     
       <div>
-        <%= link_to raw("<i class='fa fa-close mr-5'></i><span>Cancel</span>"), "#", onclick: "closeGenericModal();", class: "pull-left btn btn-white" %>
-        <%= submit_tag("Save", :class=>"btn btn-secondary pull-right") %>
+        
+        <%= submit_tag("Save", :class=>"btn btn-primary pull-right ml-10") %>
+        
+        <%= link_to raw("<i class='fa fa-close mr-5'></i><span>Cancel</span>"), "#", onclick: "closeGenericModal();", class: "pull-right ml-10 btn btn-white" %>
+
       </div>
       <%= clear_tag(10) %>
   </div>

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

@@ -2,7 +2,8 @@
 	<table class="table table-hover members-table middle-align">
 	  <thead> 
 			<tr> 
-				<th style="text-align: center;width:30px">#</th> 
+				<th style="text-align: center;width:60px">#</th> 
+				<th style="text-align: center;width:100px"><i class="fa fa-photo"></i></th> 
 				<th>Name</th>
 				<th style="width:100px;">Status</th>
 				<th style="text-align: center;" colspan="2">Actions</th>
@@ -16,6 +17,8 @@
 				
 		    <tr id="tr_feature_<%= feature.id %>">
 		      
+		      <td class="feature-image"></td>
+		      
 		      <td class="feature-image">
 		        <%= link_to(admin_feature_path(feature), remote: true) do %>
 		        	<%= display_image(feature, "feature_image.image.small.url", width: "32", height: "auto", class: "img-rectangle", alt: feature.display_name) %>