faalis 0.26.3 → 1.0.0.alpha0

data/app/assets/stylesheets/faalis/dashboard/dashboard.css.scss

@@ -239,4 +239,8 @@ fieldset {
          }
       }
    }
+}
+
+.select2-container {
+   width: 100%;
 }

data/app/assets/stylesheets/faalis/dashboard/ltr/application.css

@@ -20,10 +20,10 @@
  *= require faalis/dashboard/dashboard
  *= require faalis/dashboard/sidebar
  *= require faalis/dashboard/list_view
- *= require faalis/dashboard/ng-quick-date
- *= require faalis/dashboard/ng-quick-date-default-theme
- *= require faalis/dashboard/ng-grid
- *= require faalis/dashboard/select2
+ *= require ngQuickDate/ng-quick-date
+ *= require ngQuickDate/ng-quick-date-default-theme
+ *= require ng-grid/ng-grid
+ *= require select2/select2
  *= require_tree ../share/
 
 */

data/app/assets/stylesheets/faalis/dashboard/rtl/application.css

@@ -19,9 +19,9 @@
  *= require faalis/dashboard/dashboard
  *= require faalis/dashboard/sidebar
  *= require faalis/dashboard/list_view
- *= require faalis/dashboard/ng-quick-date
- *= require faalis/dashboard/ng-quick-date-default-theme
- *= require faalis/dashboard/ng-grid
- *= require faalis/dashboard/select2
+ *= require ngQuickDate/ng-quick-date
+ *= require ngQuickDate/ng-quick-date-default-theme
+ *= require ng-grid/ng-grid
+ *= require select2/select2
  *= require_tree ../share/
 */

data/app/assets/stylesheets/faalis/dashboard/rtl/base.css.scss.erb

@@ -3,12 +3,12 @@
 
 @font-face {
   font-family: 'Droid Arabic Naskh';
-  src: url(<%= asset_path("DroidNaskh-Regular.ttf")%>) format('truetype'); /* Saf3—5, Chrome4+, FF3.5, Opera 10+ */
+  src: url(<%= asset_path("DroidNaskh-Regular.ttf")%>) format('truetype'); /*  Chrome4+, FF3.5, Opera 10+ */
 }
 
 
 :not(.fa){
-    font-family: 'Droid Arabic Naskh', tahome, serif !important;
+    font-family: 'Droid Arabic Naskh', tahome, serif;
 }
 
 input[type="integer"] {

data/app/controllers/faalis/api/v1/permissions_controller.rb

@@ -10,24 +10,8 @@ module Faalis
     # @api GET permissions
     # @return All permissions
     def index
-      @permissions = []
-
-      ::ApplicationModels.all.each do |m|
-
-        model = m.model.constantize
-        if model.respond_to? :permission_strings
-          @permissions.concat(model.permission_strings(model))
-        end
-      end
-
-      Faalis::Engine.models_with_permission.each do |m|
-        model = m.constantize
-        if model.respond_to? :permission_strings
-          @permissions.concat(model.permission_strings(model))
-        end
-      end
-
-      respond_with(@permissions.uniq)
+      @permissions = Faalis::Discovery::Permissions.all_permissions
+      respond_with(@permissions)
     end
 
     # @api GET permissions/user
@@ -35,28 +19,13 @@ module Faalis
     def user_permissions
       @permissions = {}
       perms = []
-      if current_user.group_id == 1
-        # Generate all possible permissions for admin group
-        ::ApplicationModels.all.each do |model|
-          model.model.constantize.possible_permissions.each do |p|
-            perm = DummyPerm.new
-            perm.model = model.model
-            perm.permission_type = p
-            perms << perm
-          end
-        end
-        Faalis::Engine.models_with_permission.each do |m|
-          m.constantize.possible_permissions.each do |p|
-            perm = DummyPerm.new
-            perm.model = m
-            perm.permission_type = p
-            perms << perm
-          end
-        end
-        perms.uniq!
-      else
-        perms = current_user.group.permissions
+      current_user.permissions do |perm|
+        tmp = DummyPerm.new
+        tmp.model = perm.model
+        tmp.permission_type = perm.permission_type
+        perms << tmp
       end
+      perms.uniq!
 
       # Generate a suitable Hash for permissions
       perms.each do |perm|

data/app/controllers/faalis/api/v1/users_controller.rb

@@ -4,8 +4,8 @@ module Faalis
   class API::V1::UsersController < ::APIController
 
     def index
-      @users = User.joins(:group).all
-      authorize! :read, @users
+      @users = User.joins(:groups).all
+      #authorize! :read, @users
       respond_with(@users)
     end
 
@@ -35,8 +35,8 @@ module Faalis
         user_fields[:password] =  params[:password]
       end
 
-      if params.include? :group and params[:group]
-        user_fields[:group] =  Group.find(params[:group]) || nil
+      if params.include? :groups and params[:groups]
+        user_fields[:groups] =  Group.find(params[:groups]) || nil
       end
 
       if @user.update(user_fields)
@@ -58,9 +58,9 @@ module Faalis
                          password: params[:password],
                        })
 
-      if params.include? :group
-        group = Group.find(params[:group]) || nil
-        @user.group = group
+      if params.include? :groups
+        group = Group.find(params[:groups]) || nil
+        @user.groups = group
       end
 
       if @user.save

data/app/models/ability.rb

@@ -31,12 +31,10 @@ class Ability
 
     # IMPORTANT: Remove this snippet with more suitable one
     # TODO: Remove this snippet with more suitable one
-    user.group.permissions.each do |permission|
-      can permission.permission_type.to_sym, permission.model.constantize
-    end
-
-    if user and user.group_id == 1
-      can :manage, :all
+    user.groups.each do |group|
+      group.permissions.each do |permission|
+        can permission.permission_type.to_sym, permission.model.constantize
+      end
     end
   end
 end

data/app/models/faalis/concerns/assignment.rb

@@ -6,9 +6,9 @@ module Faalis
     module Assignment
 
       def self.included(base)
-        base.scope :assignment_query, -> (field, value) do
+        base.scope :assignment_query, ->(field, value) do
           base.where(field => value)
-       end
+        end
       end
 
     end

data/app/models/faalis/group.rb

@@ -18,10 +18,24 @@
 # -----------------------------------------------------------------------------
 
 module Faalis
-  class Group < ActiveRecord::Base
-    validates :name, :presence => true
+  # **Group** model for **Faalis** platform
+  class Group < Faalis::ORM.proper_base_class
 
-    has_and_belongs_to_many :permissions
-    has_many :users
+    # Make this model authorizable
+    include Faalis::Concerns::Authorizable
+
+    # Define **Group** fields if current ORM was **Mongoid**
+    if Faalis::ORM.mongoid?
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      field :name, type: String
+    end
+
+    has_and_belongs_to_many :users, class_name: 'Faalis::User'
+    has_and_belongs_to_many :permissions, class_name: 'Faalis::Permission'
+
+    # Validations
+    validates :name, presence: true
   end
 end

data/app/models/faalis/permission.rb

@@ -1,7 +1,16 @@
 module Faalis
-  class Permission < ActiveRecord::Base
+  class Permission < Faalis::ORM.proper_base_class
 
-    has_and_belongs_to_many :groups
+    if Faalis::ORM.mongoid?
+      include Mongoid::Document
+      include Mongoid::Timestamps
+
+      field :model, type: String
+      field :permission_type, type: String
+
+    end
+
+    has_and_belongs_to_many :groups, class_name: 'Faalis::Group'
 
     def string_repr
       _("can %s %s") % [_(self.permission_type.to_s), self.model.underscore.humanize]

data/app/models/faalis/permissions/auth.rb

@@ -1,7 +1,8 @@
 class Faalis::Permissions::Auth
-  include Faalis::Permissions
+  # Make this model authorizable
+  include Faalis::Concerns::Authorizable
 
   def self.humanize_class_name
-    "Auth Module"
+    'Auth Module'
   end
 end

data/app/models/faalis/user.rb

@@ -18,85 +18,39 @@
 # -----------------------------------------------------------------------------
 
 module Faalis
-  class User < ActiveRecord::Base
-    #acts as messageable for mailboxer
-    acts_as_messageable
-
-    validates :password, presence: true, length: {minimum: 5, maximum: 120}, on: :create
-    validates :password, length: {minimum: 5, maximum: 120}, on: :update, allow_blank: true
-    validates :email, presence: true, length: {minimum: 6}
-    #validates :password,presence: true, length: { in: 6..20 }
-    # Include default devise modules. Others available are:
-    # :token_authenticatable, :confirmable,
-    # :lockable, :timeoutable and :omniauthable
-    @@devise_options = [:database_authenticatable,
-                        :registerable,
-                        :recoverable,
-                        :rememberable,
-                        :trackable,
-                        :lockable,
-                        :timeoutable,
-                        :validatable,
-                        :omniauthable]
-
-    if Rails.env.production?
-      @@devise_options << :confirmable
+  # **User** model for **Faalis** platform
+  class User < Faalis::ORM.proper_base_class
+
+    # AuthDefinitions contains all the **Devise** related configurations.
+    include Faalis::User::AuthDefinitions
+    # Permission related methods for user
+    include Faalis::User::Permission
+
+    # Make this model authorizable
+    include Faalis::Concerns::Authorizable
+
+    # Define **User** fields if current ORM was Mongoid -----------------------
+    if Faalis::ORM.mongoid?
+      include Mongoid::Document
+      include Mongoid::Timestamps
+      include Faalis::User::MongoidFields
+      # FIXME: Port mailboxer to work with mongoid
     end
 
-    if Devise.omniauth_configs.any?
-      @@devise_options << :omniauthable
-      @@devise_options << {:omniauth_providers => Devise.omniauth_configs.keys}
+    # Define **User** fields if current ORM was ActiveRecord-------------------
+    if Faalis::ORM.active_record?
+      # acts as messageable for mailboxer
+      #acts_as_messageable
     end
 
-    belongs_to :group
+    has_and_belongs_to_many :groups, class_name: 'Faalis::Group'
 
-    devise *@@devise_options
-
-    def name
-      if first_name or last_name
-        "#{first_name} #{last_name}"
-      else
-        email
-      end
-
-    end
-
-    def full_name
-      name
-    end
-
-    def password_required?
-      # TODO: nil? is not suitable for here we should use empty? or blink?
-      if Devise.omniauth_configs.any?
-        return (provider.nil? || password.nil?) && super
-      else
-         password.nil? && super
-      end
-    end
-
-    def self.find_from_oauth(auth, signed_in_resource=nil)
-      user = User.where(:provider => auth.provider, :uid => auth.uid).first
-
-      first_name = auth.info.first_name
-      last_name = auth.info.last_name
-
-      if first_name.blank?
-        # With first_name being blank last_name is probably is blank too
-        name = auth.info.name.split(" ")
-        first_name = name[0]
-        last_name = name[1,] || ""
-      end
-      unless user
-        user = User.create(first_name: first_name,
-                           last_name: last_name,
-                           provider: auth.provider,
-                           uid: auth.uid,
-                           email: auth.info.email,
-                           password: Devise.friendly_token[0,20])
-      end
-      user
+    # Validations
+    validates :password, presence: true, length: {minimum: 5, maximum: 120}, on: :create
+    validates :password, length: {minimum: 5, maximum: 120}, on: :update, allow_blank: true
+    validates :email, presence: true, length: {minimum: 6}
 
-    end
+    devise *@@devise_options
 
   end
 end

data/app/models/faalis/user/auth_definitions.rb

@@ -0,0 +1,94 @@
+module Faalis
+  module User::AuthDefinitions
+
+    def self.included(base)
+
+      base.class_eval do
+        # Include default devise modules. Others available are:
+        # :token_authenticatable, :confirmable,
+        # :lockable, :timeoutable and :omniauthable
+        @@devise_options = [:database_authenticatable,
+                            :registerable,
+                            :recoverable,
+                            :rememberable,
+                            :trackable,
+                            :lockable,
+                            :timeoutable,
+                            :validatable]
+
+        if Rails.env.production?
+          @@devise_options << :confirmable
+        end
+
+        if Devise.omniauth_configs.any?
+          @@devise_options << :omniauthable
+          @@devise_options << {:omniauth_providers => Devise.omniauth_configs.keys}
+        end
+      end
+      base.extend ClassMethods
+    end
+
+    def name
+      if first_name or last_name
+        "#{first_name} #{last_name}"
+      else
+        email
+      end
+
+    end
+
+    def full_name
+      name
+    end
+
+
+    # Confirmation not required when using omniauth
+    def confirmation_required?
+      super && identities.empty?
+    end
+
+    def update_with_password(params, *options)
+      if encrypted_password.blank?
+        update_attributes(params, *options)
+      else
+        super
+      end
+    end
+
+    def password_required?
+      # TODO: nil? is not suitable for here we should use empty? or blink?
+      if Devise.omniauth_configs.any?
+        return (provider.nil? || password.nil?) && super
+      else
+        password.nil? && super
+      end
+    end
+
+    module ClassMethods
+      def find_from_oauth(auth, signed_in_resource = nil)
+        user = User.where(:provider => auth.provider, :uid => auth.uid).first
+
+        first_name = auth.info.first_name
+        last_name = auth.info.last_name
+
+        if first_name.blank?
+          # With first_name being blank last_name is probably is blank too
+          name = auth.info.name.split(' ')
+          first_name = name[0]
+          last_name = name[1,] || ''
+        end
+        unless user
+          user = User.create(first_name: first_name,
+                             last_name: last_name,
+                             provider: auth.provider,
+                             uid: auth.uid,
+                             email: auth.info.email,
+                             password: Devise.friendly_token[0,20])
+        end
+        user
+      end
+
+    end
+
+  end
+end