easy-admin-rails 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e27a938d7c68cc803a52c941ab073b82d077d2019a09d1dab636e92016f2ae78
-  data.tar.gz: 94c16e1bd8b00dbcbddee3adad22dc0122eb50d118e6aa815f7d28dd437d0404
+  metadata.gz: 5a486a14f84c7adc080acaf93dd573f6bcd2fbe6c2118e4c37d58e3b34b254ff
+  data.tar.gz: d7e4324d5c53c1dd23ff1c3a2cd7df00d57feecea70fa4cb5a8e8e52520bb56c
 SHA512:
-  metadata.gz: 3d55741831c57254342bb1ef6546ffb1913070219896775251059f4dffdfa50b72af935d8d2fd47f103698d986a6b7eb56c67f9e318a706ecdf5bb430f955ba8
-  data.tar.gz: 663d5266e79bcb4a6ba283924f5edefd0b7c7dea0a56a9112789e6010513da638ad15a747d82c0328832412f4f12acbc7f4f9d6ab7b20724abf967f161e3a407
+  metadata.gz: 1325f6e7cf083a5a512bc8db44e3136c17dd4e4482fd7a4f08ec09d656108efe9767ed564a358cfbd5156644eeb9bb5e493b2b85254ac7e93121293dcb4875b7
+  data.tar.gz: 39933c874954b69d2678bc6e2128ac07d3dafa4578cd68e394156a1c5fa0f2bb923e1fb43f0b45f3dff49199208b16603855d1cef8fc4411a8645b1c57d29a0c

data/lib/easy_admin/permissions/dsl.rb

@@ -119,51 +119,31 @@ module EasyAdmin
         }
       end
 
-      # Create permissions and roles in the database
+      # Create roles in the database (simplified - no permissions table)
       def self.seed_database(data)
-        # Check if models are available (avoid running during migrations)
-        begin
-          EasyAdmin::Permissions::Permission
-          EasyAdmin::Permissions::Role
-          EasyAdmin::Permissions::RolePermission
-        rescue NameError => e
-          Rails.logger.info "EasyAdmin::Permissions models not yet loaded: #{e.message}"
-          return
-        end
+        # Skip if tables don't exist yet (during migrations or first setup)
+        return unless ActiveRecord::Base.connection.table_exists?(:easy_admin_roles)
 
-        ActiveRecord::Base.transaction do
-          # Create permissions
-          data[:permissions].each do |perm_data|
-            EasyAdmin::Permissions::Permission.find_or_create_by(name: perm_data[:name]) do |permission|
-              permission.resource_type = perm_data[:resource_type]
-              permission.action = perm_data[:action]
-              permission.description = perm_data[:description]
-              permission.conditions = perm_data[:conditions]
+        # Defer execution until Rails is fully initialized
+        if defined?(Rails) && Rails.application && !Rails.application.initialized?
+          Rails.application.config.after_initialize do
+            # Check if models are available (avoid loading during initialization)
+            begin
+              role_class = "EasyAdmin::Permissions::Role".constantize
+            rescue NameError => e
+              Rails.logger.debug "EasyAdmin::Permissions models not yet loaded: #{e.message}"
+              return
             end
-          end
-
-          # Create roles and assign permissions
-          data[:roles].each do |role_data|
-            role = EasyAdmin::Permissions::Role.find_or_create_by(slug: role_data[:slug]) do |r|
-              r.name = role_data[:name]
-              r.description = role_data[:description]
-              r.active = role_data[:active]
-              r.metadata = role_data[:metadata]
-            end
-
-            # Clear existing permissions for this role
-            role.role_permissions.destroy_all
 
-            # Assign new permissions
-            role_data[:permissions].each do |permission_name|
-              permission = EasyAdmin::Permissions::Permission.find_by(name: permission_name)
-              if permission
-                EasyAdmin::Permissions::RolePermission.find_or_create_by(
-                  role: role,
-                  permission: permission
-                )
-              else
-                Rails.logger.warn "Permission '#{permission_name}' not found for role '#{role_data[:name]}'"
+            ActiveRecord::Base.transaction do
+              # Create roles only (permissions are managed via JSON field)
+              data[:roles].each do |role_data|
+                role = role_class.find_or_initialize_by(slug: role_data[:slug])
+                role.assign_attributes(
+                  name: role_data[:name],
+                  description: role_data[:description],
+                  )
+                role.save! if role.changed?
               end
             end
           end
@@ -177,4 +157,4 @@ module EasyAdmin
       DSL.seed_database(data)
     end
   end
-end
+end

data/lib/easy_admin/version.rb

@@ -1,3 +1,3 @@
 module EasyAdmin
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy-admin-rails
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Slaurmagan