adeia 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8f3fd953fefe554dbfdfae35659ed458803b4e3
-  data.tar.gz: bc0c7afa108aee25eba2416ef552b92440cbce94
+  metadata.gz: 2d828301de03cf12cd48ff7481bd4f3204837345
+  data.tar.gz: 672fe459da7978ff31551d3572cb583da8ed0d6b
 SHA512:
-  metadata.gz: 6b613663e417d07764a2369e2479641bb59f524fc2f72d61adeb387bfeb66232c3bb76ec6c723ad33912e8c4c7810757dc711e5a84c446153f6891f55d907af5
-  data.tar.gz: 3a14ae9b52370880ad7596e041cf235de72e11e929b5fbbbb07b6035cc4eba8a3f0ab2a7fe422a7cf0524ada1b1027d925076865af9c830962dcc9f2bdbb79b9
+  metadata.gz: de6a3fb607cc5aa648682a00b214e5e91735dd144f4047c5dde1dd9a84d3c7a1e9212640986949dedb29ec9789b732c33f173585e336201e29d36231b465c5ca
+  data.tar.gz: 00a3c0b57a03e08ba025eb3a265e0806df80dd5356b71e845e02da8751c4647696c45b8a7ee06d40ef37f1e2b7bc26bcece4b2822f76d6264cfa754fee49d318

data/app/models/adeia/action.rb

@@ -1,6 +1,6 @@
 module Adeia
   class Action < ActiveRecord::Base
-    has_many :action_permissions, dependent: :destroy
+    has_many :action_permissions, foreign_key: :adeia_action_id, dependent: :destroy
     has_many :permissions, through: :action_permissions
 
     validates :name, presence: true

data/app/models/adeia/action_permission.rb

@@ -1,6 +1,6 @@
 module Adeia
   class ActionPermission < ActiveRecord::Base
-    belongs_to :action
-    belongs_to :permission
+    belongs_to :action, foreign_key: :adeia_action_id
+    belongs_to :permission, foreign_key: :adeia_permission_id
   end
 end

data/app/models/adeia/element.rb

@@ -1,5 +1,5 @@
 class Adeia::Element < ActiveRecord::Base
-  has_many :permissions
+  has_many :permissions, foreign_key: :adeia_element_id
 
   validates :name, presence: true
 end

data/app/models/adeia/group.rb

@@ -1,5 +1,5 @@
 class Adeia::Group < ActiveRecord::Base
-  has_many :group_users, dependent: :destroy
+  has_many :group_users, foreign_key: :adeia_group_id, dependent: :destroy
   has_many :permissions, as: :owner
 
   validates :name, presence: true

data/app/models/adeia/group_user.rb

@@ -1,4 +1,4 @@
 class Adeia::GroupUser < ActiveRecord::Base
-  belongs_to :group
+  belongs_to :group, foreign_key: :adeia_group_id
   belongs_to :user
 end

data/app/models/adeia/permission.rb

@@ -1,8 +1,8 @@
 class Adeia::Permission < ActiveRecord::Base
   belongs_to :owner, polymorphic: true
-  belongs_to :element
+  belongs_to :element, foreign_key: :adeia_element_id
 
-  has_many :action_permissions, dependent: :destroy
+  has_many :action_permissions, foreign_key: :adeia_permission_id, dependent: :destroy
   has_many :actions, through: :action_permissions
 
   enum permission_type: [:all_entries, :on_ownerships, :on_entry]

data/app/models/adeia/token.rb

@@ -1,21 +1,21 @@
 module Adeia
   class Token < ActiveRecord::Base
-    belongs_to :permission
+    belongs_to :permission, foreign_key: :adeia_permission_id
 
-    validates :permission_id, presence: true
+    validates :permission, presence: true
     validates :exp_at, presence: true
 
     before_create :generate_token
 
+    def is_valid?
+      exp_at > Time.now && is_valid
+    end
+
     private
 
     def generate_token
       self.token = SecureRandom.urlsafe_base64
     end
-
-    def is_valid?
-      exp_at > Time.now && is_valid
-    end
     
   end
 end

data/db/migrate/20151003144208_create_adeia_permissions.rb

@@ -2,7 +2,7 @@ class CreateAdeiaPermissions < ActiveRecord::Migration
   def change
     create_table :adeia_permissions do |t|
       t.references :owner, polymorphic: true, index: true
-      t.references :element, index: true, foreign_key: true
+      t.references :adeia_element, index: true, foreign_key: true
       t.integer :permission_type
       t.boolean :read_right
       t.boolean :create_right

data/db/migrate/20151003144706_create_adeia_group_users.rb

@@ -1,7 +1,7 @@
 class CreateAdeiaGroupUsers < ActiveRecord::Migration
   def change
     create_table :adeia_group_users do |t|
-      t.references :group, index: true, foreign_key: true
+      t.references :adeia_group, index: true, foreign_key: true
       t.references :user, index: true, foreign_key: true
 
       t.timestamps null: false

data/db/migrate/20151003150524_create_adeia_tokens.rb

@@ -3,7 +3,7 @@ class CreateAdeiaTokens < ActiveRecord::Migration
     create_table :adeia_tokens do |t|
       t.string :token
       t.boolean :is_valid
-      t.references :permission, index: true, foreign_key: true
+      t.references :adeia_permission, index: true, foreign_key: true
       t.date :exp_at
 
       t.timestamps null: false

data/db/migrate/20151003150806_create_adeia_action_permissions.rb

@@ -1,8 +1,8 @@
 class CreateAdeiaActionPermissions < ActiveRecord::Migration
   def change
     create_table :adeia_action_permissions do |t|
-      t.references :action, index: true, foreign_key: true
-      t.references :permission, index: true, foreign_key: true
+      t.references :adeia_action, index: true, foreign_key: true
+      t.references :adeia_permission, index: true, foreign_key: true
 
       t.timestamps null: false
     end

data/lib/adeia/database.rb

@@ -42,7 +42,7 @@ module Adeia
     def token_rights(right_name)
       @permission_token ||= Adeia::Token.find_by(token: @token)
       if @permission_token && @permission_token.is_valid?
-        @token_rights ||= Adeia::Permission.joins(:element).where(id: @permission_token.permission_id, adeia_elements: { name: @controller }, "#{right_name}_right": true)
+        @token_rights ||= Adeia::Permission.joins(:element).where(id: @permission_token.adeia_permission_id, adeia_elements: { name: @controller }, "#{right_name}_right": true)
         @token_resource_ids ||= @token_rights.pluck(:resource_id).compact
         return { rights: @token_rights, resource_ids: @token_resource_ids }
       else

data/lib/adeia/version.rb

@@ -1,3 +1,3 @@
 module Adeia
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/spec/factories.rb

@@ -3,7 +3,6 @@ FactoryGirl.define do
   factory :token, class: "Adeia::Token" do
     token { SecureRandom.urlsafe_base64 }
     is_valid true
-    permission { create(:permission) }
     exp_at { 1.month.from_now }
   end
 

data/spec/test_app/db/schema.rb

@@ -14,14 +14,14 @@
 ActiveRecord::Schema.define(version: 20151012185726) do
 
   create_table "adeia_action_permissions", force: :cascade do |t|
-    t.integer  "action_id"
-    t.integer  "permission_id"
-    t.datetime "created_at",    null: false
-    t.datetime "updated_at",    null: false
+    t.integer  "adeia_action_id"
+    t.integer  "adeia_permission_id"
+    t.datetime "created_at",          null: false
+    t.datetime "updated_at",          null: false
   end
 
-  add_index "adeia_action_permissions", ["action_id"], name: "index_adeia_action_permissions_on_action_id"
-  add_index "adeia_action_permissions", ["permission_id"], name: "index_adeia_action_permissions_on_permission_id"
+  add_index "adeia_action_permissions", ["adeia_action_id"], name: "index_adeia_action_permissions_on_adeia_action_id"
+  add_index "adeia_action_permissions", ["adeia_permission_id"], name: "index_adeia_action_permissions_on_adeia_permission_id"
 
   create_table "adeia_actions", force: :cascade do |t|
     t.string   "name"
@@ -36,13 +36,13 @@ ActiveRecord::Schema.define(version: 20151012185726) do
   end
 
   create_table "adeia_group_users", force: :cascade do |t|
-    t.integer  "group_id"
+    t.integer  "adeia_group_id"
     t.integer  "user_id"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at",     null: false
+    t.datetime "updated_at",     null: false
   end
 
-  add_index "adeia_group_users", ["group_id"], name: "index_adeia_group_users_on_group_id"
+  add_index "adeia_group_users", ["adeia_group_id"], name: "index_adeia_group_users_on_adeia_group_id"
   add_index "adeia_group_users", ["user_id"], name: "index_adeia_group_users_on_user_id"
 
   create_table "adeia_groups", force: :cascade do |t|
@@ -54,30 +54,30 @@ ActiveRecord::Schema.define(version: 20151012185726) do
   create_table "adeia_permissions", force: :cascade do |t|
     t.integer  "owner_id"
     t.string   "owner_type"
-    t.integer  "element_id"
+    t.integer  "adeia_element_id"
     t.integer  "permission_type"
     t.boolean  "read_right"
     t.boolean  "create_right"
     t.boolean  "update_right"
     t.boolean  "destroy_right"
     t.integer  "resource_id"
-    t.datetime "created_at",      null: false
-    t.datetime "updated_at",      null: false
+    t.datetime "created_at",       null: false
+    t.datetime "updated_at",       null: false
   end
 
-  add_index "adeia_permissions", ["element_id"], name: "index_adeia_permissions_on_element_id"
+  add_index "adeia_permissions", ["adeia_element_id"], name: "index_adeia_permissions_on_adeia_element_id"
   add_index "adeia_permissions", ["owner_type", "owner_id"], name: "index_adeia_permissions_on_owner_type_and_owner_id"
 
   create_table "adeia_tokens", force: :cascade do |t|
     t.string   "token"
     t.boolean  "is_valid"
-    t.integer  "permission_id"
+    t.integer  "adeia_permission_id"
     t.date     "exp_at"
-    t.datetime "created_at",    null: false
-    t.datetime "updated_at",    null: false
+    t.datetime "created_at",          null: false
+    t.datetime "updated_at",          null: false
   end
 
-  add_index "adeia_tokens", ["permission_id"], name: "index_adeia_tokens_on_permission_id"
+  add_index "adeia_tokens", ["adeia_permission_id"], name: "index_adeia_tokens_on_adeia_permission_id"
 
   create_table "articles", force: :cascade do |t|
     t.string   "title"