adeia 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48b608ba6fd11efea91823a1be4b8d390d08e53f
-  data.tar.gz: dedc7c6f1500b5f137f0a1ec7bdf1029c6f66462
+  metadata.gz: 555890fd5721f4d65ca4345999ea2922b2fedc89
+  data.tar.gz: 413bafe58e642d675c199fedfef5f09695a80f2d
 SHA512:
-  metadata.gz: b2edfd6e4da84b1afff33fa0ee64cf312b921d13d3c285136a94478e86c7a42ab3bd4cb6c272dbca37809498ea3e709f9f58ac096e3fb1f91b1ac865be1f9a30
-  data.tar.gz: 09b82b09a77c4c540b1f9b63b2802a9e0fd030560351d7a922e2c63968935042ee4d775f0dfccfb42363060afa862cbcd44ec413d6c13c4905e14f66469749a1
+  metadata.gz: 01d579a52e049466377919bf830bee122c8c3bfdda703269848cddd9a07765a1632515a2f2a04efe3fa64c27362e280c1ac868cd06e50fff5062de4e92b31bcb
+  data.tar.gz: 316d4188ca353f7aacf9d660c9d5796f602ee528b8b697e6b6f2553d501b2c5825e41ca8afb502997568f4c8292124695bc6d3ac61903d9ce1540350cb1de26c

data/app/models/adeia/permission.rb

@@ -33,11 +33,11 @@ class Adeia::Permission < ActiveRecord::Base
     "#{id} - #{element.name} - R:#{read_right} - C:#{create_right}- U:#{update_right} - D:#{destroy_right} - #{resource_id} - #{actions.to_a}"
   end
 
-  def self.add(**args)
+  def self.add!(**args)
     self.create!(**conditions(args))
   end
 
-  def self.find_or_add_by(**args)
+  def self.find_or_add_by!(**args)
     conditions = conditions(args)
     if permission = self.where(**conditions).first
       permission
@@ -46,14 +46,15 @@ class Adeia::Permission < ActiveRecord::Base
     end
   end
 
-  def self.fetch_element_and_actions(element_name, action_names)
-    actions = action_names.map { |action| Adeia::Action.find_or_create_by(name: action) }.compact
-    element = Adeia::Element.find_or_create_by(name: element_name)
+  def self.fetch_element_and_actions!(element_name, action_names)
+    actions = action_names.map { |action| Adeia::Action.find_or_create_by!(name: action) }.compact
+    element = Adeia::Element.find_or_create_by!(name: element_name)
     return element, actions
   end
 
   def self.conditions(args)
-    element, actions = fetch_element_and_actions(args.fetch(:element), args.fetch(:actions, []))
+    args[:read] = args[:create] = args[:update] = args[:destroy] = true if args[:full]
+    element, actions = fetch_element_and_actions!(args.fetch(:element), args.fetch(:actions, []))
     return {
       owner: args.fetch(:owner),
       element: element,

data/lib/adeia/version.rb

@@ -1,3 +1,3 @@
 module Adeia
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/lib/tasks/init.rake

@@ -3,12 +3,10 @@ namespace :adeia do
   desc "Create the elements and a group with all the privileges"
   task permissions: :environment do
     elements =  %w(adeia/permissions adeia/tokens adeia/groups)
-    elements.concat(ENV["elements"].split(",")) if ENV["elements"].present?
+    elements.concat(ENV["elements"].split(",").map { |e| e.strip }) if ENV["elements"].present?
     owner = Adeia::Group.find_or_create_by!(name: "superadmin")
     elements.each do |element|
-      element = Adeia::Element.find_or_create_by!(name: element)
-      Adeia::Permission.find_or_create_by!(adeia_element_id: element.id, owner_id: owner.id, owner_type: "Adeia::Group",
-       permission_type: "all_entries", read_right: true, create_right: true, update_right: true, destroy_right: true)
+      Adeia::Permission.find_or_add_by!(owner: owner, element: element, full: true)
     end
   end
 

data/spec/models/adeia/permission_spec.rb

@@ -8,7 +8,7 @@ module Adeia
     describe "#add" do
 
       it "creates a permission with default attributes" do
-        permission = Permission.add(owner: user, element: "adeia/permissions", read: true)
+        permission = Permission.add!(owner: user, element: "adeia/permissions", read: true)
         expect(permission.owner).to eq user
         expect(permission.element.name).to eq "adeia/permissions"
         expect(permission.permission_type).to eq "all_entries"
@@ -19,20 +19,28 @@ module Adeia
       end
 
       it "creates a permission with good attributes" do
-        permission = Permission.add(owner: user, element: "adeia/permissions", type: "on_entry", read: true, resource_id: 1, actions: ["share"])
+        permission = Permission.add!(owner: user, element: "adeia/permissions", type: "on_entry", read: true, resource_id: 1, actions: ["share"])
         expect(permission.permission_type).to eq "on_entry"
         expect(permission.read_right).to be true
         expect(permission.resource_id).to eq 1
         expect(permission.actions.first.name).to eq "share"
       end
 
+      it "creates a permission with all the rights when using the full option" do
+        permission = Permission.add!(owner: user, element: "adeia/permissions", full: true)
+        expect(permission.read_right).to be true
+        expect(permission.create_right).to be true
+        expect(permission.update_right).to be true
+        expect(permission.destroy_right).to be true
+      end
+
     end
 
     describe "#find_or_add_by" do
 
       it "returns a permission when it already exists" do
-        permission = Permission.add(owner: user, element: "adeia/permissions", type: "on_entry", read: true, resource_id: 1, actions: ["share"])
-        expect(Permission.find_or_add_by(owner: user, element: "adeia/permissions", type: "on_entry")).to eq permission
+        permission = Permission.add!(owner: user, element: "adeia/permissions", type: "on_entry", read: true, resource_id: 1, actions: ["share"])
+        expect(Permission.find_or_add_by!(owner: user, element: "adeia/permissions", type: "on_entry")).to eq permission
       end
 
     end

data/spec/test_app/log/test.log

@@ -62208,3 +62208,68 @@ Migrating to CreateArticles (20151012185726)
   Adeia::Element Load (0.1ms)  SELECT  "adeia_elements".* FROM "adeia_elements" WHERE "adeia_elements"."name" = ? LIMIT 1  [["name", "adeia/permissions"]]
   Adeia::Permission Load (0.2ms)  SELECT  "adeia_permissions".* FROM "adeia_permissions" WHERE "adeia_permissions"."permission_type" = ? AND "adeia_permissions"."owner_type" = 'User' AND "adeia_permissions"."owner_id" = 1 AND "adeia_permissions"."adeia_element_id" = 1  ORDER BY "adeia_permissions"."id" ASC LIMIT 1  [["permission_type", 2]]
    (0.8ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.6ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.1ms)  begin transaction
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (1.4ms)  INSERT INTO "users" ("name", "password_digest", "remember_token", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?)  [["name", "admin"], ["password_digest", "$2a$04$hIlheFK4JK13c/TwBE/neebRgnAwQiduGOY.W8pfDJ01Q39/3AQl6"], ["remember_token", "-Bxu3n5h3E-hTtJ1eLEWBQ"], ["created_at", "2015-11-01 15:51:07.475630"], ["updated_at", "2015-11-01 15:51:07.475630"]]
+   (0.4ms)  RELEASE SAVEPOINT active_record_1
+  Adeia::Element Load (0.8ms)  SELECT  "adeia_elements".* FROM "adeia_elements" WHERE "adeia_elements"."name" = ? LIMIT 1  [["name", "adeia/permissions"]]
+   (0.4ms)  SAVEPOINT active_record_1
+  SQL (3.2ms)  INSERT INTO "adeia_elements" ("name", "created_at", "updated_at") VALUES (?, ?, ?)  [["name", "adeia/permissions"], ["created_at", "2015-11-01 15:51:07.499856"], ["updated_at", "2015-11-01 15:51:07.499856"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (1.6ms)  INSERT INTO "adeia_permissions" ("owner_id", "owner_type", "adeia_element_id", "permission_type", "read_right", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?)  [["owner_id", 1], ["owner_type", "User"], ["adeia_element_id", 1], ["permission_type", 0], ["read_right", "t"], ["created_at", "2015-11-01 15:51:07.534414"], ["updated_at", "2015-11-01 15:51:07.534414"]]
+  Adeia::Action Load (0.7ms)  SELECT "adeia_actions".* FROM "adeia_actions" INNER JOIN "adeia_action_permissions" ON "adeia_actions"."id" = "adeia_action_permissions"."adeia_action_id" WHERE "adeia_action_permissions"."adeia_permission_id" = ?  [["adeia_permission_id", 1]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (1.8ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "users" ("name", "password_digest", "remember_token", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?)  [["name", "admin"], ["password_digest", "$2a$04$GuQT..kVAtaq01bYIrm4..Gy8HVM1Hpr6EPPS.CLvtiepwGb6JiRK"], ["remember_token", "VugQ5Wth9tPoAPs74_iXcg"], ["created_at", "2015-11-01 15:51:07.592621"], ["updated_at", "2015-11-01 15:51:07.592621"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  Adeia::Action Load (0.6ms)  SELECT  "adeia_actions".* FROM "adeia_actions" WHERE "adeia_actions"."name" = ? LIMIT 1  [["name", "share"]]
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.4ms)  INSERT INTO "adeia_actions" ("name", "created_at", "updated_at") VALUES (?, ?, ?)  [["name", "share"], ["created_at", "2015-11-01 15:51:07.599122"], ["updated_at", "2015-11-01 15:51:07.599122"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  Adeia::Element Load (0.0ms)  SELECT  "adeia_elements".* FROM "adeia_elements" WHERE "adeia_elements"."name" = ? LIMIT 1  [["name", "adeia/permissions"]]
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  INSERT INTO "adeia_elements" ("name", "created_at", "updated_at") VALUES (?, ?, ?)  [["name", "adeia/permissions"], ["created_at", "2015-11-01 15:51:07.602467"], ["updated_at", "2015-11-01 15:51:07.602467"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  INSERT INTO "adeia_permissions" ("owner_id", "owner_type", "adeia_element_id", "permission_type", "read_right", "resource_id", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["owner_id", 1], ["owner_type", "User"], ["adeia_element_id", 1], ["permission_type", 2], ["read_right", "t"], ["resource_id", 1], ["created_at", "2015-11-01 15:51:07.612161"], ["updated_at", "2015-11-01 15:51:07.612161"]]
+  SQL (1.1ms)  INSERT INTO "adeia_action_permissions" ("adeia_action_id", "adeia_permission_id", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["adeia_action_id", 1], ["adeia_permission_id", 1], ["created_at", "2015-11-01 15:51:07.614087"], ["updated_at", "2015-11-01 15:51:07.614087"]]
+  Adeia::Action Load (0.1ms)  SELECT  "adeia_actions".* FROM "adeia_actions" WHERE "adeia_actions"."name" = ? LIMIT 1  [["name", "share"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (1.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.4ms)  INSERT INTO "users" ("name", "password_digest", "remember_token", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?)  [["name", "admin"], ["password_digest", "$2a$04$a/O3zJrlU3A2gAnnNtlt.OVuh8IaQ0lu6I7UZv15XgYTDgCKwfDZO"], ["remember_token", "zG0YaKIxhe_F7HPuhJciSw"], ["created_at", "2015-11-01 15:51:07.625291"], ["updated_at", "2015-11-01 15:51:07.625291"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  Adeia::Element Load (0.0ms)  SELECT  "adeia_elements".* FROM "adeia_elements" WHERE "adeia_elements"."name" = ? LIMIT 1  [["name", "adeia/permissions"]]
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "adeia_elements" ("name", "created_at", "updated_at") VALUES (?, ?, ?)  [["name", "adeia/permissions"], ["created_at", "2015-11-01 15:51:07.640444"], ["updated_at", "2015-11-01 15:51:07.640444"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  INSERT INTO "adeia_permissions" ("owner_id", "owner_type", "adeia_element_id", "permission_type", "read_right", "create_right", "update_right", "destroy_right", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)  [["owner_id", 1], ["owner_type", "User"], ["adeia_element_id", 1], ["permission_type", 0], ["read_right", "t"], ["create_right", "t"], ["update_right", "t"], ["destroy_right", "t"], ["created_at", "2015-11-01 15:51:07.642893"], ["updated_at", "2015-11-01 15:51:07.642893"]]
+  Adeia::Action Load (0.1ms)  SELECT "adeia_actions".* FROM "adeia_actions" INNER JOIN "adeia_action_permissions" ON "adeia_actions"."id" = "adeia_action_permissions"."adeia_action_id" WHERE "adeia_action_permissions"."adeia_permission_id" = ?  [["adeia_permission_id", 1]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.8ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "users" ("name", "password_digest", "remember_token", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?)  [["name", "admin"], ["password_digest", "$2a$04$PRphb4/hw4yAL4AECgeP9ePxRTzTu2ikKELQ8p0LxvpIqXYV1GsAe"], ["remember_token", "qxXZksrow_ZNBnF7tJ7j6w"], ["created_at", "2015-11-01 15:51:07.651492"], ["updated_at", "2015-11-01 15:51:07.651492"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  Adeia::Action Load (0.0ms)  SELECT  "adeia_actions".* FROM "adeia_actions" WHERE "adeia_actions"."name" = ? LIMIT 1  [["name", "share"]]
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "adeia_actions" ("name", "created_at", "updated_at") VALUES (?, ?, ?)  [["name", "share"], ["created_at", "2015-11-01 15:51:07.654218"], ["updated_at", "2015-11-01 15:51:07.654218"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  Adeia::Element Load (0.1ms)  SELECT  "adeia_elements".* FROM "adeia_elements" WHERE "adeia_elements"."name" = ? LIMIT 1  [["name", "adeia/permissions"]]
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  INSERT INTO "adeia_elements" ("name", "created_at", "updated_at") VALUES (?, ?, ?)  [["name", "adeia/permissions"], ["created_at", "2015-11-01 15:51:07.656456"], ["updated_at", "2015-11-01 15:51:07.656456"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.1ms)  INSERT INTO "adeia_permissions" ("owner_id", "owner_type", "adeia_element_id", "permission_type", "read_right", "resource_id", "created_at", "updated_at") VALUES (?, ?, ?, ?, ?, ?, ?, ?)  [["owner_id", 1], ["owner_type", "User"], ["adeia_element_id", 1], ["permission_type", 2], ["read_right", "t"], ["resource_id", 1], ["created_at", "2015-11-01 15:51:07.659961"], ["updated_at", "2015-11-01 15:51:07.659961"]]
+  SQL (0.1ms)  INSERT INTO "adeia_action_permissions" ("adeia_action_id", "adeia_permission_id", "created_at", "updated_at") VALUES (?, ?, ?, ?)  [["adeia_action_id", 1], ["adeia_permission_id", 1], ["created_at", "2015-11-01 15:51:07.661279"], ["updated_at", "2015-11-01 15:51:07.661279"]]
+  Adeia::Action Load (0.1ms)  SELECT  "adeia_actions".* FROM "adeia_actions" WHERE "adeia_actions"."name" = ? LIMIT 1  [["name", "share"]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  Adeia::Element Load (0.1ms)  SELECT  "adeia_elements".* FROM "adeia_elements" WHERE "adeia_elements"."name" = ? LIMIT 1  [["name", "adeia/permissions"]]
+  Adeia::Permission Load (0.2ms)  SELECT  "adeia_permissions".* FROM "adeia_permissions" WHERE "adeia_permissions"."permission_type" = ? AND "adeia_permissions"."owner_type" = 'User' AND "adeia_permissions"."owner_id" = 1 AND "adeia_permissions"."adeia_element_id" = 1  ORDER BY "adeia_permissions"."id" ASC LIMIT 1  [["permission_type", 2]]
+   (0.9ms)  rollback transaction

metadata

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