adeia 0.11.0 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4a1ebe192b9a6f72013ede46d4c0c4e0c5216948
-  data.tar.gz: 10f965b7685d483496fc0a774e888572dcc2532e
+  metadata.gz: 6d27952eb40a8808b7ba846ff9dd9a3e6360006d
+  data.tar.gz: 01adea387c3d8b18791f877b569158e7eb87f0c3
 SHA512:
-  metadata.gz: c9f8cef57a7f79abc2c08ca7b113a8da305aecfdabdf064e817dc1b9ef3f1f22e56d85ddabbd6f8e3437ef8da55bfda62f42a69394c86f6ca3d1cf3ee62a484e
-  data.tar.gz: 00af089afb586476ea97bf640fe32901da4a3a2ae9cdb4f7b911e052007e884e8aa737bfb5fab5d2fb18317f9401c85d0899a24b8a709cdba96ca0b31f8cdaf0
+  metadata.gz: 4abec95b33ba33e13336f0b7672657b3ee0bc252de077abb646be3721ceaf672d85a58d5ae89c15b91a1691e5307447c43045d16dc820cd386c5991536a9b9b1
+  data.tar.gz: 190837048b0ea27bcf8ffb9c2c957e654d4e6b55f978b7eb4b07a1e5332378115c336aaaae9a0dcaacb4ffa33ad38704bb4ec66514e0e5744193285fc854ff7b

data/README.md

@@ -26,6 +26,12 @@ Then include the engine's routes in your `routes.rb`. The URL on which you mount
 mount Adeia::Engine => "/adeia"
 ```
 
+### Tasks
+
+The first task to run is `rake adeia:permissions elements="first_element, second_element"`. It creates the given elements in the database and a superadmin group which has all the permissions.
+Then you can run `adeia:superuser user_id=your_id`, which add the given user in the superadmin group.
+If you need to add new groups, run `adeia:groups groups="first_group, second_group"`.
+
 ## Requirements
 
 Requires a User model with:
@@ -141,6 +147,13 @@ class EventsController < ApplicationController
 end
 ```
 
-### Other methods
+### Controller methods
 
 When an authorization exception is raised by the engine, it automatically store the current user's location in a cookie. The called method is `store_location` and is available in your controllers. Then you can use the method `redirect_back_or(default, message = nil)` which either redirects to the stored location if any or redirects the default provided path, with an optional message.
+
+## Model methods
+
+TODO
+
+* User model
+* Permission model

data/lib/adeia/controller_resource.rb

@@ -38,7 +38,7 @@ module Adeia
 
     def load_resource
       begin
-        @resource = resource_class.find(@controller.params.fetch(:id))
+        @resource ||= resource_class.find(@controller.params.fetch(:id))
         @controller.instance_variable_set("@#{resource_name}", @resource)
       rescue KeyError
         raise MissingParams.new(:id)
@@ -81,9 +81,9 @@ module Adeia
 
     def resource_class
       begin
-        @controller.controller_path.classify.constantize
+        @controller_name.classify.constantize
       rescue NameError
-        @controller.controller_name.classify.constantize
+        @controller_name.classify.demodulize.constantize
       end
     end
 
@@ -118,4 +118,4 @@ module Adeia
 
   end
 
-end
+end

data/lib/adeia/helpers/user_helper.rb

@@ -16,6 +16,19 @@ module Adeia
         has_many :permissions, class_name: "Adeia::Permission"
       end
 
+      def add_to_group(name)
+        group = Group.find_by_name
+        Adeia::GroupUser.create(group: group, user: self)
+      end
+
+      def permissions
+        @permissions ||= Adeia::Permission.where(owner: groups << self)
+      end
+
+      def groups
+        @groups ||= Adeia::Group.joins(:group_users).where(adeia_group_users: { user_id: self.id })
+      end
+
     end
   end
-end
+end

data/lib/adeia/version.rb

@@ -1,3 +1,3 @@
 module Adeia
-  VERSION = "0.11.0"
+  VERSION = "0.11.2"
 end

data/lib/tasks/init.rake

@@ -23,4 +23,12 @@ namespace :adeia do
     end
   end
 
+  desc "Create groups"
+  task groups: :environment do
+    groups = ENV["groups"].split(",").map { |e| e.strip } if ENV["groups"].present?
+    if groups.present?
+      groups.each { |group| Adeia::Group.create!(name: group) }
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adeia
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.2
 platform: ruby
 authors:
 - khcr