ez-permissions 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dc0e6f33ade1b7263f4804869691932b40412a7be67252e079aa9e85e8a2e69
-  data.tar.gz: ca833df2913ce7d842f125d07bc685b28b74f349c1016b5169a3946ab1e8d0ee
+  metadata.gz: 6145e511809044ca7673cfd275fa009fbfad5a5dfccd9457469116bf6039a0ad
+  data.tar.gz: aaac5b48a4fa790de8df4f97ee86b4b42c52c5d130a24289c1876a298f7d1691
 SHA512:
-  metadata.gz: 7c4aed6394c86da052b307eccc2dc76c9fa89e53a66661a557ee8e5f01b36c2a273c990fdbfc2adea2bd7d39457a34f74b27ada0861edd52cb8ea805963137b0
-  data.tar.gz: d2edf56f4dcfbf2f7dabf9b6bf65ca9b535c3655e6cd9e1638e5e7f84916c08153baca23a3751d2d848fef348069acd30083edf586a2f026e93a47f9ce389525
+  metadata.gz: 90d8bc79ec20592692ca6c4a62096c8a6d166dec53e3514f53da77271cf80c83292e3fd8dfc3bec25dd11771abe70b632e365b7a646aa597b1fc8f3e18a54b96
+  data.tar.gz: bd6f64a211c6b233c673a74ef2992531794045a56025d7fa6dbec8326290caeb3b1647109105408300a8a960f33f094fd5492cb79b8c324b5132cebce8b9408d

data/lib/ez/permissions/dsl.rb

@@ -26,33 +26,31 @@ module Ez
       end
 
       def add(name, options = {})
-        if self.class.resource(name)
-          return message("[WARN] Ez::Permissions resource [#{name}] has been already defined!")
-        end
+        return message("Resource [#{name}] has been already defined!") if self.class.resource(name)
 
         resource = Ez::Permissions::Resource.new(name, options)
 
+        @resources << resource
+
+        return unless seed_to_db(resource)
+
         message(
-          "[SUCCESS] Ez::Permissions resource [#{name}] has been successfully registred with actions: \
-[#{resource.actions.join(', ')}]"
+          "Resource [#{name}] has been successfully registred with actions: [#{resource.actions.join(', ')}]",
+          'SUCCESS'
         )
-
-        @resources << resource
-        seed_to_db resource
       end
 
       private
 
-      def message(txt)
-        STDOUT.puts(txt)
+      def message(txt, level = 'WARN')
+        return if Ez::Permissions.config.mute_stdout
+
+        STDOUT.puts("[#{level}] Ez::Permissions: #{txt}")
       end
 
       def seed_to_db(resource)
         return unless try_db_connection
-
-        return unless ActiveRecord::Base.connection.data_source_exists?(Ez::Permissions.config.permissions_table_name)
-
-        return unless resource.actions
+        return unless check_permissions_table
 
         resource.actions.each do |action|
           Ez::Permissions::Permission.where(
@@ -65,7 +63,15 @@ module Ez
       def try_db_connection
         ActiveRecord::Base.connection
       rescue ActiveRecord::NoDatabaseError
-        STDOUT.puts 'Database does not exist'
+        message('Database does not exist')
+        false
+      end
+
+      def check_permissions_table
+        permissions_table = Ez::Permissions.config.permissions_table_name
+        return true if ActiveRecord::Base.connection.data_source_exists?(permissions_table)
+
+        message("Table #{permissions_table} does not exists. Please, check migrations")
         false
       end
     end

data/lib/ez/permissions/resource.rb

@@ -10,7 +10,7 @@ module Ez
       def initialize(name, options = {})
         @name    = name
         @model   = options.fetch(:model, nil)
-        @actions = process_actions(options.fetch(:actions, nil))
+        @actions = process_actions(options.fetch(:actions, []))
       end
 
       def <=>(other)
@@ -20,7 +20,7 @@ module Ez
       private
 
       def process_actions(actions)
-        return ACTIONS unless actions
+        return ACTIONS if actions.empty?
 
         actions.map { |action| action == :crud ? ACTIONS : action }.flatten
       end

data/lib/ez/permissions/version.rb

@@ -2,6 +2,6 @@
 
 module Ez
   module Permissions
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ez-permissions
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Volodya Sveredyuk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-08 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ez-core