adeia 0.13.1 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e4dd822bb51ed573e5258a836235200d77c42b3
-  data.tar.gz: af94c013e1d42646fc899fa9923597f8fac502c1
+  metadata.gz: 80c20ee4c4761c0bb3651f774214cc9863c0ce47
+  data.tar.gz: a2f50f53ab414860f4654d4a7a46e9c81ba48c8a
 SHA512:
-  metadata.gz: aeac9ff6d4a2306c3038d6f75d79825213af4ea178c2863fa4e7473a6c508299653a2b6d39c330b7978c49d5ba95cbcad5a9c6eb36d22320099674082e9957b3
-  data.tar.gz: 62b5d5e23a38b90df08983ddacbbfa3682a9ec4d60ba33053b812adf819af8cd85ba9dddd3df7bb258e1314f97974d0bc55b3e7e8cf790a76e9a5aa06941980a
+  metadata.gz: f282b9b7555a23ca53aba731b54616d470153ffc29e237ddc9441f3c899a64d77b22cae14965ddd07241bbf7a3cd5dc943f67d5bd8982c6b47531c2dc701f8b4
+  data.tar.gz: 4bef39c370e8597b9f2f0dd3033cdd5d9c7effdee3d7017562f30b05ba399192de70af4a72b9a0ba0b53864cfae09f4449e1fea55fbb6f62cda138b77c07f140

data/README.md

@@ -26,6 +26,8 @@ Then include the engine's routes in your `routes.rb`. The URL on which you mount
 mount Adeia::Engine => "/adeia"
 ```
 
+Finally copy the migrations by running `rake adeia:install:migrations` in your terminal.
+
 ### 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.

data/lib/adeia/database.rb

@@ -51,7 +51,7 @@ module Adeia
     end
 
     def user_groups
-      @user_groups ||= Adeia::Group.joins(:group_users).where(adeia_group_users: { user_id: @user.id })
+      @user_groups ||= Adeia::Group.joins(:group_users).where(adeia_group_users: { user_id: @user.id }).to_a
     end
 
     def owners
@@ -60,4 +60,4 @@ module Adeia
 
   end
 
-end
+end

data/lib/adeia/version.rb

@@ -1,3 +1,3 @@
 module Adeia
-  VERSION = "0.13.1"
+  VERSION = "0.14.0"
 end

data/spec/README.md

@@ -0,0 +1,5 @@
+# Rspec
+
+If you need to run the migrations
+
+`bundle exec rake app:db:migrate`

data/spec/adeia/controller_methods_spec.rb

@@ -8,7 +8,7 @@ module Adeia
       controller do
         def index
           require_login!
-          render nothing: true
+          head :ok
         end
       end
 
@@ -29,7 +29,7 @@ module Adeia
         require_login
 
         def index
-          render nothing: true
+          head :ok
         end
       end
 
@@ -51,7 +51,7 @@ module Adeia
         controller do
           def index
             @can = can? :read, "articles"
-            render nothing: true
+            head :ok
           end
         end
 
@@ -79,7 +79,7 @@ module Adeia
           def index
             @article = Article.create(title: "Rspec tests", content: "Lorem ipsum", id: 100)
             @can = can? :read, @article
-            render nothing: true
+            head :ok
           end
         end
 
@@ -97,7 +97,7 @@ module Adeia
           def index
             @article = Article.create(title: "Rspec tests", content: "Lorem ipsum", id: 100)
             @can = can? :read, "letters", @article
-            render nothing: true
+            head :ok
           end
         end
 
@@ -116,7 +116,7 @@ module Adeia
           def index
             @article = Article.create(title: "Rspec tests", content: "Lorem ipsum", id: 100)
             @can = can? :read, [:admin, @article]
-            render nothing: true
+            head :ok
           end
         end
 
@@ -135,7 +135,7 @@ module Adeia
       controller do
         def index
           @rights = rights? :read, "articles"
-          render nothing: true
+          head :ok
         end
       end
 
@@ -159,4 +159,4 @@ module Adeia
     end
 
   end
-end
+end

data/spec/controllers/articles_controller_spec.rb

@@ -81,12 +81,12 @@ describe ArticlesController, :type => :controller do
       end
 
       it "responds successfully" do
-        get :show, id: @article.id
+        get :show, params: { id: @article.id }
         expect(response).to be_success
       end
 
       it "loads the record" do
-        get :show, id: @article.id
+        get :show, params: { id: @article.id }
         expect(assigns(:article)).to eq @article
       end
 
@@ -109,15 +109,15 @@ describe ArticlesController, :type => :controller do
       end
 
       it "responds successfully" do
-        get :edit, id: @article.id
+        get :edit, params: { id: @article.id }
         expect(response).to be_success
       end
 
       it "loads the record" do
-        get :edit, id: @article.id
+        get :edit, params: { id: @article.id }
         expect(assigns(:article)).to eq @article
       end
 
     end
   end
-end
+end

data/spec/spec_helper.rb

@@ -1,12 +1,13 @@
 require 'factory_girl_rails'
 require 'capybara/rspec'
 require 'rspec/active_model/mocks'
+require 'rails-controller-testing'
 
 FactoryGirl.definition_file_paths = [ File.join(File.dirname(__FILE__), '../spec/factories') ]
 FactoryGirl.find_definitions
 
 RSpec.configure do |config|
-  
+
   config.expect_with :rspec do |expectations|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
   end

data/spec/test_app/app/controllers/comments_controller.rb

@@ -3,7 +3,7 @@ class CommentsController < ApplicationController
 
   def index
     require_login!
-    render text: "All the comments"
+    render plain: "All the comments"
   end
 
   def new
@@ -11,7 +11,7 @@ class CommentsController < ApplicationController
 
   def create
     require_login!
-    render text: "Comment created"
+    render plain: "Comment created"
   end
 
 end

data/spec/test_app/config/application.rb

@@ -19,9 +19,6 @@ module Dummy
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
 
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
-
     config.generators do |g|
       g.orm             :active_record
       g.template_engine :erb
@@ -31,4 +28,3 @@ module Dummy
     end
   end
 end
-

data/spec/test_app/config/environments/production.rb

@@ -22,7 +22,7 @@ Rails.application.configure do
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
-  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
+  config.public_file_server.enabled = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

data/spec/test_app/config/environments/test.rb

@@ -13,8 +13,8 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static file server for tests with Cache-Control for performance.
-  config.serve_static_files   = true
-  config.static_cache_control = 'public, max-age=3600'
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

data/spec/test_app/log/development.log

@@ -0,0 +1,211 @@
+   (1.1ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (1.0ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateUsers (20151012185720)
+   (0.1ms)  begin transaction
+   (0.6ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "password_digest" varchar, "remember_token" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20151012185720"]]
+   (1.0ms)  commit transaction
+Migrating to CreateArticles (20151012185726)
+   (0.1ms)  begin transaction
+   (0.5ms)  CREATE TABLE "articles" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar, "content" text, "user_id" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.2ms)  CREATE  INDEX "index_articles_on_user_id" ON "articles" ("user_id")
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20151012185726"]]
+   (1.0ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.2ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_articles_on_user_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_articles_on_user_id' AND type='index'
+
+  ActiveRecord::SchemaMigration Load (0.7ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateAdeiaElements (20151003144041)
+   (0.1ms)  begin transaction
+   (0.4ms)  CREATE TABLE "adeia_elements" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+  SQL (0.3ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20151003144041"]]
+   (1.0ms)  commit transaction
+Migrating to CreateAdeiaPermissions (20151003144208)
+   (0.1ms)  begin transaction
+   (0.7ms)  CREATE TABLE "adeia_permissions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "owner_id" integer, "owner_type" varchar, "adeia_element_id" integer, "permission_type" integer, "read_right" boolean DEFAULT 'f', "create_right" boolean DEFAULT 'f', "update_right" boolean DEFAULT 'f', "destroy_right" boolean DEFAULT 'f', "resource_id" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (0.2ms)  CREATE  INDEX "index_adeia_permissions_on_owner_type_and_owner_id" ON "adeia_permissions" ("owner_type", "owner_id")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_adeia_permissions_on_owner_type_and_owner_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_adeia_permissions_on_owner_type_and_owner_id' AND type='index'
+
+   (0.1ms)  CREATE  INDEX "index_adeia_permissions_on_adeia_element_id" ON "adeia_permissions" ("adeia_element_id")
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20151003144208"]]
+   (1.2ms)  commit transaction
+Migrating to CreateAdeiaGroups (20151003144650)
+   (0.1ms)  begin transaction
+   (0.4ms)  CREATE TABLE "adeia_groups" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20151003144650"]]
+   (1.0ms)  commit transaction
+Migrating to CreateAdeiaGroupUsers (20151003144706)
+   (0.1ms)  begin transaction
+   (0.5ms)  CREATE TABLE "adeia_group_users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "adeia_group_id" integer, "user_id" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.2ms)  CREATE  INDEX "index_adeia_group_users_on_adeia_group_id" ON "adeia_group_users" ("adeia_group_id")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_adeia_group_users_on_adeia_group_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_adeia_group_users_on_adeia_group_id' AND type='index'
+
+   (0.2ms)  CREATE  INDEX "index_adeia_group_users_on_user_id" ON "adeia_group_users" ("user_id")
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20151003144706"]]
+   (1.5ms)  commit transaction
+Migrating to CreateAdeiaTokens (20151003150524)
+   (0.1ms)  begin transaction
+   (0.4ms)  CREATE TABLE "adeia_tokens" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "token" varchar, "is_valid" boolean, "adeia_permission_id" integer, "exp_at" date, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.1ms)  CREATE  INDEX "index_adeia_tokens_on_adeia_permission_id" ON "adeia_tokens" ("adeia_permission_id")
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20151003150524"]]
+   (1.1ms)  commit transaction
+Migrating to CreateAdeiaActions (20151003150747)
+   (0.2ms)  begin transaction
+   (0.5ms)  CREATE TABLE "adeia_actions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+  SQL (0.5ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20151003150747"]]
+   (4.4ms)  commit transaction
+Migrating to CreateAdeiaActionPermissions (20151003150806)
+   (0.1ms)  begin transaction
+   (0.6ms)  CREATE TABLE "adeia_action_permissions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "adeia_action_id" integer, "adeia_permission_id" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.2ms)  CREATE  INDEX "index_adeia_action_permissions_on_adeia_action_id" ON "adeia_action_permissions" ("adeia_action_id")
+   (0.3ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_adeia_action_permissions_on_adeia_action_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_adeia_action_permissions_on_adeia_action_id' AND type='index'
+
+   (0.3ms)  CREATE  INDEX "index_adeia_action_permissions_on_adeia_permission_id" ON "adeia_action_permissions" ("adeia_permission_id")
+  SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20151003150806"]]
+   (1.1ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+   (0.3ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_adeia_action_permissions_on_adeia_permission_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_adeia_action_permissions_on_adeia_permission_id' AND type='index'
+
+   (0.2ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_adeia_action_permissions_on_adeia_action_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_adeia_action_permissions_on_adeia_action_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_adeia_group_users_on_user_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_adeia_group_users_on_user_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_adeia_group_users_on_adeia_group_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_adeia_group_users_on_adeia_group_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_adeia_permissions_on_adeia_element_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_adeia_permissions_on_adeia_element_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_adeia_permissions_on_owner_type_and_owner_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_adeia_permissions_on_owner_type_and_owner_id' AND type='index'
+
+   (0.3ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_adeia_tokens_on_adeia_permission_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_adeia_tokens_on_adeia_permission_id' AND type='index'
+
+   (0.2ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_articles_on_user_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_articles_on_user_id' AND type='index'
+
+   (1.3ms)  CREATE TABLE "adeia_action_permissions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "adeia_action_id" integer, "adeia_permission_id" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.1ms)  select sqlite_version(*)
+   (1.1ms)  CREATE  INDEX "index_adeia_action_permissions_on_adeia_action_id" ON "adeia_action_permissions" ("adeia_action_id")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_adeia_action_permissions_on_adeia_action_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_adeia_action_permissions_on_adeia_action_id' AND type='index'
+
+   (1.2ms)  CREATE  INDEX "index_adeia_action_permissions_on_adeia_permission_id" ON "adeia_action_permissions" ("adeia_permission_id")
+   (1.1ms)  CREATE TABLE "adeia_actions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.1ms)  CREATE TABLE "adeia_elements" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.1ms)  CREATE TABLE "adeia_group_users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "adeia_group_id" integer, "user_id" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.1ms)  CREATE  INDEX "index_adeia_group_users_on_adeia_group_id" ON "adeia_group_users" ("adeia_group_id")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_adeia_group_users_on_adeia_group_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_adeia_group_users_on_adeia_group_id' AND type='index'
+
+   (1.0ms)  CREATE  INDEX "index_adeia_group_users_on_user_id" ON "adeia_group_users" ("user_id")
+   (1.1ms)  CREATE TABLE "adeia_groups" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.4ms)  CREATE TABLE "adeia_permissions" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "owner_id" integer, "owner_type" varchar, "adeia_element_id" integer, "permission_type" integer, "read_right" boolean DEFAULT 'f', "create_right" boolean DEFAULT 'f', "update_right" boolean DEFAULT 'f', "destroy_right" boolean DEFAULT 'f', "resource_id" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.4ms)  CREATE  INDEX "index_adeia_permissions_on_adeia_element_id" ON "adeia_permissions" ("adeia_element_id")
+   (0.2ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_adeia_permissions_on_adeia_element_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_adeia_permissions_on_adeia_element_id' AND type='index'
+
+   (1.1ms)  CREATE  INDEX "index_adeia_permissions_on_owner_type_and_owner_id" ON "adeia_permissions" ("owner_type", "owner_id")
+   (1.3ms)  CREATE TABLE "adeia_tokens" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "token" varchar, "is_valid" boolean, "adeia_permission_id" integer, "exp_at" date, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.2ms)  CREATE  INDEX "index_adeia_tokens_on_adeia_permission_id" ON "adeia_tokens" ("adeia_permission_id")
+   (1.2ms)  CREATE TABLE "articles" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "title" varchar, "content" text, "user_id" integer, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.0ms)  CREATE  INDEX "index_articles_on_user_id" ON "articles" ("user_id")
+   (1.0ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar, "password_digest" varchar, "remember_token" varchar, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.1ms)  CREATE TABLE "schema_migrations" ("version" varchar NOT NULL) 
+   (1.2ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.2ms)  SELECT version FROM "schema_migrations"
+   (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20151012185726')
+   (0.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20151012185720')
+   (0.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20151003144041')
+   (1.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20151003144208')
+   (1.1ms)  INSERT INTO "schema_migrations" (version) VALUES ('20151003144650')
+   (1.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20151003144706')
+   (1.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20151003150524')
+   (0.9ms)  INSERT INTO "schema_migrations" (version) VALUES ('20151003150747')
+   (1.0ms)  INSERT INTO "schema_migrations" (version) VALUES ('20151003150806')