faalis 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 211e5ba2ce64c3da64cb9977367eb4a2ae1594cc
-  data.tar.gz: 6a81b397d0532901c7025ef829c25acb8d368bf1
+  metadata.gz: 51c65def59ed76316939971e4a3ea8f73aa9bcdc
+  data.tar.gz: 3ff82b9fa6aab48e7c09a889dc6c27a8d846762c
 SHA512:
-  metadata.gz: 7b71d8ad541c9fb372730de7907c9b61963163cabb44b0fbef81f2b83874190bf3884835994ba98318bd696cc0ef854dbf8d2648c5f162d5a6299a86e8122766
-  data.tar.gz: dbd7e18ca0c10d0a29852edf7ae93f1024469cff6e1c117c6a811e09504839de2a0933f603717ba8305c0ba6b053f5cf511345ca1c9e02cc6bf07efdeb0940e3
+  metadata.gz: 353e68754e80ee0079e9ec5b816ef51bb46592054e4df572dedf95b2cbc72201749e12917a192759d4af4171fe826481c164fccdf2a70b35123b71a66947ad54
+  data.tar.gz: 686429d477d1e789649dad65b864f2dcb42c204a11b7c6f7ff43e71b1b71555d869f0da874c270153cffcc5bfd38ce761838e8acf1d85f32379de09c900ef83d

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

@@ -12,11 +12,22 @@ module Faalis
     def index
       @permissions = []
 
-      Faalis::Engine.models_with_permission.each do |model|
-        model = Object.const_get(model)
-        @permissions.concat(model.permission_strings(model))
+      ::ApplicationModels.all.each do |m|
+
+        model = m.model.constantize
+        if model.respond_to? :permission_strings
+          @permissions.concat(model.permission_strings(model))
+        end
       end
-      respond_with(@permissions)
+
+      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)
     end
 
     # @api GET permissions/user
@@ -26,14 +37,23 @@ module Faalis
       perms = []
       if current_user.group_id == 1
         # Generate all possible permissions for admin group
-        Faalis::Engine.models_with_permission.each do |model|
-          Object.const_get(model).possible_permissions.each do |p|
+        ::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 = model
+            perm.model = m
             perm.permission_type = p
             perms << perm
           end
         end
+        perms.uniq!
       else
         perms = current_user.group.permissions
       end

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

@@ -1,3 +1,7 @@
 class Faalis::Permissions::Auth
   include Faalis::Permissions
+
+  def self.humanize_class_name
+    "Auth Module"
+  end
 end

data/lib/faalis/engine.rb

@@ -25,7 +25,7 @@ require "devise"
 require "warden"
 require "cancan"
 require "mailboxer"
-
+require "model_discovery"
 
 module Faalis
   class Engine < ::Rails::Engine

data/lib/faalis/permissions.rb

@@ -2,7 +2,9 @@ module Faalis
   module Permissions
     extend ActiveSupport::Concern
 
+
     module ClassMethods
+
       # Default permission hash
       @@permissions = {
         :read => nil,
@@ -16,10 +18,16 @@ module Faalis
       # @return an array of strings representation of permissions
       def permission_strings(model)
         strings = []
+        model_name = model.to_s
+        humanize_name = ActiveModel::Name.new(model).human
+        if model.respond_to? :model_name
+          model_name = model.model_name
+          humanize_name = model_name.human
+        end
         @@permissions.each do |key, value|
           strings << {
-            :name => "#{key}|#{model.model_name}",
-            :string => _("can %s %s") % [_(key.to_s), model.model_name.human]
+            :name => "#{key}|#{model_name}",
+            :string => _("can %s %s") % [_(key.to_s), humanize_name]
           }
         end
         strings
@@ -61,5 +69,4 @@ module Faalis
 
     end
   end
-
 end

data/lib/faalis/version.rb

@@ -18,5 +18,5 @@
 # -----------------------------------------------------------------------------
 
 module Faalis
-  VERSION = "0.11.0"
+  VERSION = "0.11.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faalis
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Sameer Rahmani