adeia 0.15.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 605ce68d14c5ef2253c3781728549c7d2a1f3f96
-  data.tar.gz: 5676dd30928133149c7065863b8efde3d74670de
+SHA256:
+  metadata.gz: fc3818ab4c31e2b816d9e922c0b4c31790052c4afbe853164e4cefafed00421b
+  data.tar.gz: 17aa1f60f15b7712591da8c01fe6a57b4a0967c5483cdae86aad10d621f92886
 SHA512:
-  metadata.gz: e71c77a3fa2bf4451eb47cccc57dba45b76e3d980b8f5e40d353439c8679c468148508cc18777b26ee85677393e96d3e0d67b6f32e571982b060b4a6a7d6ee9d
-  data.tar.gz: 46155469ad139615faac10e783d627e14166989d709e8dfda97b3184469a838a69fce00c65cad3028cc754eb4efab4f16214a84beca3b681e76925b771a7b0d3
+  metadata.gz: a6980f26f072c7925947c45c1c0aed945a344a2c198a0682f5c6d442299f6e6fc8cbf3fc28d4341a82b53a79e64f61d35443d775eed1e9750d25cf4d2d1ec199
+  data.tar.gz: 134eb7cd2ad22cec00948a11b3995d599b2736f77bd841624a803c4814015b9038aaa8abb3b28bbb6b2341b8d9877e2017373dbded30d5e7cfdab4f2ed907168

data/app/assets/config/manifest.js

@@ -0,0 +1,2 @@
+//= link_directory ../stylesheets/adeia .css
+//= linl_directory ../javascripts/adeia .js

data/app/assets/javascripts/adeia/application.js

@@ -10,5 +10,5 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
+//= require ./flash.js
 //= require snaptable
-//= require_tree .

data/app/assets/javascripts/adeia/flash.js

@@ -1,5 +1,11 @@
-$(document).on("ready page:load", function() {
-  $('body').on("click", "#flash .close", function() {
-    $('#flash').hide();
-  });
-});
+document.addEventListener("DOMContentLoaded", (e) => {
+  
+  const flash = document.querySelector("#flash")
+
+  if (flash != null) {
+    document.querySelector("#flash .close").addEventListener("click", () => {
+      flash.remove()
+    });
+  }
+
+});

data/app/assets/javascripts/adeia/nested_form.js

@@ -1,26 +1,30 @@
-$(document).on("ready page:load", function() {
-
-  $(".add-fields").click(function(e) {
-    e.preventDefault();
-    var count = $(this).attr("data-count"), type = $(this).data("type"),
-        lastFields = $("." + type + "-fields:last"), newFields = lastFields.clone();
-    count++;
-    newFields.find("input, select")
-      .attr("name", function( i, val ) { if(val) { return val.replace(/\d/, count) } })
-      .attr("id", function( i, val ) { if(val) { return val.replace(/\d/, count) } })
-      .val([]);
-    newFields.find("label").attr("for", function( i, val ) { return val.replace(/\d/, count) });
-    newFields.insertAfter(lastFields);
-    $(this).attr("data-count", count);
-    newFields.show();
+const addButton = document.querySelector(".add-fields")
+addButton.addEventListener("click", (e) => {
+  e.preventDefault();
+  let count = Number(e.target.dataset.count) + 1;
+  const type = e.target.dataset.type;
+  const lastFields = document.querySelectorAll("." + type + "-fields");
+  const lastField = lastFields[lastFields.length - 1]
+  const newFields = lastField.cloneNode(true);
+  const label = newFields.querySelector("label");
+  label.setAttribute("for", label.getAttribute("for").replace(/\d/, count));
+  newFields.querySelectorAll("input, select").forEach(element => {
+    element.setAttribute("name", element.getAttribute("name").replace(/\d/, count));
+    element.setAttribute("id", element.getAttribute("id").replace(/\d/, count));
+    element.value = ""
   });
+  lastField.after(newFields);
+  newFields.style.display = "block";
+  e.target.dataset.count = Number(count) + 1;
+})
 
-  $(".fields-for").on("click", ".remove-fields", function(e) {
+const fieldsFor = document.querySelector(".fields-for");
+fieldsFor.addEventListener("click", (e) => {
+  if (e.target.classList.contains("remove-fields")) {
     e.preventDefault();
-    var type = $(this).attr("data-type"),
-        fields = $(this).parents("." + type + "-fields");
-    fields.find("input[identifier=destroy]").val("1");
-    fields.hide();
-  });
-
-});
+    const type = e.target.dataset.type;
+    const fields = e.target.closest("." + type + "-fields");
+    fields.querySelector("input[identifier=destroy]").value = 1
+    fields.style.display = "none";
+  }
+})

data/app/assets/stylesheets/adeia/application.css

@@ -12,4 +12,5 @@
  *
  *= require_tree .
  *= require_self
+ *= require snaptable
  */

data/app/controllers/adeia/permissions_controller.rb

@@ -41,7 +41,7 @@ module Adeia
     private
 
     def permission_params
-      params.require(:permission).permit(:permission_type, :adeia_element_id, :global_owner, :read_right, :create_right, :update_right, :destroy_right, :resource_id, actions_attributes: [:name])
+      params.require(:permission).permit(:permission_type, :adeia_element_id, :global_owner, :read_right, :create_right, :update_right, :destroy_right, :resource_id, actions_attributes: [:id, :name, :_destroy])
     end
 
   end

data/app/models/adeia/permission.rb

@@ -24,7 +24,7 @@ class Adeia::Permission < ActiveRecord::Base
   end
 
   def autosave_associated_records_for_actions
-    self.actions = actions.reject{ |a| a._destroy == true }.map do |action|
+    self.actions = actions.reject{ |a| a.marked_for_destruction? }.map do |action|
       Adeia::Action.find_or_create_by(name: action.name)
     end
   end
@@ -77,8 +77,8 @@ class Adeia::Permission < ActiveRecord::Base
   end
 
   def presence_of_a_right
-    unless read_right || update_right || destroy_right || actions.any?
-      errors[:base] << I18n.t("errors.messages.right_required")
+    unless read_right || create_right || update_right || destroy_right || actions.any?
+      errors.add(:base, I18n.t("errors.messages.right_required"))
     end
   end
 

data/app/views/adeia/group_users/_form.html.erb

@@ -3,7 +3,7 @@
   <%= render 'error_messages', object: f.object %>
 
   <%= f.label :user_id %>
-  <%= f.collection_select :user_id, User.all, :id, :name %>
+  <%= f.collection_select :user_id, User.all, :id, :email %>
 
   <%= f.label :adeia_group_id %>
   <%= f.collection_select :adeia_group_id, Adeia::Group.all, :id, :name %>

data/app/views/adeia/permissions/_form.html.erb

@@ -4,7 +4,7 @@
 
   <%= f.label :permission_type %>
   <%= f.select :permission_type, options_for_enum(@permission, :permission_type) %>
-  
+
   <%= f.label :adeia_element_id %>
   <%= f.collection_select :adeia_element_id, Adeia::Element.all, :id, :name %>
 
@@ -32,6 +32,8 @@
         <%= action_f.label :name %>
         <%= action_f.text_field :name %>
 
+        <%= action_f.hidden_field :_destroy, identifier: "destroy" %>
+
         <button class="remove-fields" data-type="actions"><%= t "adeia.permissions.form.actions.destroy" %></button>
       </div>
 
@@ -44,4 +46,6 @@
 
   <%= f.submit %>
 
-<% end %>
+<% end %>
+
+<%= javascript_include_tag "adeia/nested_form.js" %>

data/app/views/layouts/adeia/_flash.html.erb

@@ -1,8 +1,16 @@
 <% if flash.any? %>
-  <% flash.each do |key, value| %>
-    <%= content_tag(:div, id: "flash", class: "flash-#{key}") do %>
-      <%= value %>
-      <span class="close"><%= t "application.close" %></span>
+  <div id="flash">
+    <% flash.each do |key, value| %>
+      <div class="flash-<%= key %>">
+        <div class="wrapper">
+          <span class="flash-content"><%= value.html_safe %></span>
+        
+          <svg classs="close" width="100%" height="100%" viewBox="0 0 100 100" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:1.5;">
+            <path d="M0,100L100,0"/>
+            <path d="M0,0L100,100"/>
+          </svg>
+        </div>
+      </div>
     <% end %>
-  <% end %>
-<% end %>
+  </div>
+<% end %>

data/app/views/layouts/adeia/application.html.erb

@@ -2,8 +2,8 @@
 <html>
 <head>
   <title>Adeia</title>
-  <%= stylesheet_link_tag    'adeia/application', media: 'all', 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'adeia/application', 'data-turbolinks-track' => true %>
+  <%= stylesheet_link_tag 'adeia/application', media: 'all' %>
+  <%= javascript_include_tag 'adeia/application' %>
   <%= csrf_meta_tags %>
 </head>
 <body>

data/config/initializers/assets.rb

@@ -0,0 +1,2 @@
+# add the application file to the pipeline
+Rails.application.config.assets.precompile += %w( adeia/application.css adeia/application.js adeia/nested_form.js)

data/db/migrate/20151003144041_create_adeia_elements.rb

@@ -1,4 +1,4 @@
-class CreateAdeiaElements < ActiveRecord::Migration
+class CreateAdeiaElements < ActiveRecord::Migration[4.2]
   def change
     create_table :adeia_elements do |t|
       t.string :name

data/db/migrate/20151003144208_create_adeia_permissions.rb

@@ -1,4 +1,4 @@
-class CreateAdeiaPermissions < ActiveRecord::Migration
+class CreateAdeiaPermissions < ActiveRecord::Migration[4.2]
   def change
     create_table :adeia_permissions do |t|
       t.references :owner, polymorphic: true, index: true

data/db/migrate/20151003144650_create_adeia_groups.rb

@@ -1,4 +1,4 @@
-class CreateAdeiaGroups < ActiveRecord::Migration
+class CreateAdeiaGroups < ActiveRecord::Migration[4.2]
   def change
     create_table :adeia_groups do |t|
       t.string :name

data/db/migrate/20151003144706_create_adeia_group_users.rb

@@ -1,4 +1,4 @@
-class CreateAdeiaGroupUsers < ActiveRecord::Migration
+class CreateAdeiaGroupUsers < ActiveRecord::Migration[4.2]
   def change
     create_table :adeia_group_users do |t|
       t.references :adeia_group, index: true, foreign_key: true

data/db/migrate/20151003150524_create_adeia_tokens.rb

@@ -1,4 +1,4 @@
-class CreateAdeiaTokens < ActiveRecord::Migration
+class CreateAdeiaTokens < ActiveRecord::Migration[4.2]
   def change
     create_table :adeia_tokens do |t|
       t.string :token

data/db/migrate/20151003150747_create_adeia_actions.rb

@@ -1,4 +1,4 @@
-class CreateAdeiaActions < ActiveRecord::Migration
+class CreateAdeiaActions < ActiveRecord::Migration[4.2]
   def change
     create_table :adeia_actions do |t|
       t.string :name

data/db/migrate/20151003150806_create_adeia_action_permissions.rb

@@ -1,4 +1,4 @@
-class CreateAdeiaActionPermissions < ActiveRecord::Migration
+class CreateAdeiaActionPermissions < ActiveRecord::Migration[4.2]
   def change
     create_table :adeia_action_permissions do |t|
       t.references :adeia_action, index: true, foreign_key: true

data/lib/adeia/authorization.rb

@@ -14,9 +14,10 @@ module Adeia
     end
 
     def check_permissions!
-      if !@user
+      load_permissions
+      if !@user && @rights.empty?
         raise LoginRequired
-      elsif load_permissions && @rights.empty?
+      elsif @rights.empty?
         raise AccessDenied
       end
     end

data/lib/adeia/database.rb

@@ -51,11 +51,19 @@ module Adeia
     end
 
     def user_groups
-      @user_groups ||= Adeia::Group.joins(:group_users).where(adeia_group_users: { user_id: @user.id }).to_a
+      if @user_groups.nil?
+        @user_groups = []
+        @user_groups = Adeia::Group.joins(:group_users).where(adeia_group_users: { user_id: @user.id }).to_a if @user
+      end
+      return @user_groups
     end
 
     def owners
-      @owners ||= user_groups.push @user
+      if @owners.nil?
+        @owners = user_groups
+        @owners = user_groups.push @user if @user
+      end
+      return @owners
     end
 
   end

data/lib/adeia/engine.rb

@@ -13,7 +13,7 @@ module Adeia
       g.test_framework :rspec
       g.assets false
       g.helper false
-      g.factory_girl false
+      g.factory_bot false
     end
 
     initializer 'Adeia.requirements' do |app|

data/lib/adeia/version.rb

@@ -1,3 +1,3 @@
 module Adeia
-  VERSION = "0.15.1"
+  VERSION = "1.0.0"
 end

data/spec/README.md

@@ -2,4 +2,4 @@
 
 If you need to run the migrations
 
-`bundle exec rake app:db:migrate`
+`bundle exec rake app:db:migrate RAILS_ENV=test`

data/spec/controllers/articles_controller_spec.rb

@@ -14,7 +14,7 @@ describe ArticlesController, :type => :controller do
 
         it "responds successfully" do
           get :index
-          expect(response).to be_success
+          expect(response).to have_http_status(:success)
         end
 
         it "loads the records" do
@@ -82,7 +82,7 @@ describe ArticlesController, :type => :controller do
 
       it "responds successfully" do
         get :show, params: { id: @article.id }
-        expect(response).to be_success
+        expect(response).to have_http_status(:success)
       end
 
       it "loads the record" do
@@ -97,7 +97,7 @@ describe ArticlesController, :type => :controller do
 
       it "responds successfully" do
         get :new
-        expect(response).to be_success
+        expect(response).to have_http_status(:success)
       end
 
     end
@@ -110,7 +110,7 @@ describe ArticlesController, :type => :controller do
 
       it "responds successfully" do
         get :edit, params: { id: @article.id }
-        expect(response).to be_success
+        expect(response).to have_http_status(:success)
       end
 
       it "loads the record" do

data/spec/factories.rb

@@ -1,33 +1,33 @@
-FactoryGirl.define do
+FactoryBot.define do
 
   factory :token, class: "Adeia::Token" do
     token { SecureRandom.urlsafe_base64 }
-    is_valid true
+    is_valid { true }
     exp_at { 1.month.from_now }
   end
 
   factory :permission, class: "Adeia::Permission" do
     transient do
-      element_name 'admin/articles'
-      group_name "admin"
-      type_name 'all_entries'
-      action 'share'
+      element_name { 'admin/articles' }
+      group_name { 'admin' }
+      type_name { 'all_entries' }
+      action { 'share' }
     end
     element { Adeia::Element.find_or_create_by(name: element_name) }
     owner { Adeia::Group.find_by_name(group_name) || create(:group, name: group_name) }
     
     permission_type { Adeia::Permission.permission_types[type_name] }
 
-    resource_id nil
-    read_right false
-    create_right false
-    update_right false
-    destroy_right false
+    resource_id { nil }
+    read_right { false }
+    create_right { false }
+    update_right { false }
+    destroy_right { false }
     actions {[ Adeia::Action.find_or_create_by(name: action) ]}
   end
 
   factory :group, class: "Adeia::Group" do
-    name "admin"
+    name { "admin" }
   end
 
   factory :user_group, class: "Adeia::GroupUser" do
@@ -38,14 +38,14 @@ FactoryGirl.define do
   ### Test App factories
 
   factory :user do
-    name "admin"
-    password "12341"
-    password_confirmation "12341"
+    name { "admin" }
+    password { "12341" }
+    password_confirmation { "12341" }
   end
   
   factory :article do
-    title "Des ours meurt chaque année"
-    content "Chaque année, plus de 1000 ourse blancs meurt"
+    title { "Des ours meurt chaque année" }
+    content { "Chaque année, plus de 1000 ourse blancs meurt" }
     user { User.find_by_name("editor") || create(:user, name: "editor") }
   end
 

data/spec/spec_helper.rb

@@ -1,10 +1,10 @@
-require 'factory_girl_rails'
+require 'factory_bot_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
+FactoryBot.definition_file_paths = [ File.join(File.dirname(__FILE__), '../spec/factories') ]
+FactoryBot.find_definitions
 
 RSpec.configure do |config|
 
@@ -16,6 +16,6 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
 
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
 
 end

data/spec/test_app/app/assets/config/manifest.js

@@ -0,0 +1,2 @@
+//= link_tree ../images
+//= link_directory ../stylesheets .css

data/spec/test_app/app/views/layouts/application.html.erb

@@ -1,9 +1,8 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Dummy</title>
-  <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track' => true %>
-  <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %>
+  <title>Test App</title>
+  <%= stylesheet_link_tag 'application', media: 'all' %>
   <%= csrf_meta_tags %>
 </head>
 <body>

data/spec/test_app/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -18,11 +17,10 @@ ActiveRecord::Schema.define(version: 20151012185726) do
     t.integer  "adeia_permission_id"
     t.datetime "created_at",          null: false
     t.datetime "updated_at",          null: false
+    t.index ["adeia_action_id"], name: "index_adeia_action_permissions_on_adeia_action_id"
+    t.index ["adeia_permission_id"], name: "index_adeia_action_permissions_on_adeia_permission_id"
   end
 
-  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"
     t.datetime "created_at", null: false
@@ -40,11 +38,10 @@ ActiveRecord::Schema.define(version: 20151012185726) do
     t.integer  "user_id"
     t.datetime "created_at",     null: false
     t.datetime "updated_at",     null: false
+    t.index ["adeia_group_id"], name: "index_adeia_group_users_on_adeia_group_id"
+    t.index ["user_id"], name: "index_adeia_group_users_on_user_id"
   end
 
-  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|
     t.string   "name"
     t.datetime "created_at", null: false
@@ -52,8 +49,8 @@ ActiveRecord::Schema.define(version: 20151012185726) do
   end
 
   create_table "adeia_permissions", force: :cascade do |t|
-    t.integer  "owner_id"
     t.string   "owner_type"
+    t.integer  "owner_id"
     t.integer  "adeia_element_id"
     t.integer  "permission_type"
     t.boolean  "read_right",       default: false
@@ -63,11 +60,10 @@ ActiveRecord::Schema.define(version: 20151012185726) do
     t.integer  "resource_id"
     t.datetime "created_at",                       null: false
     t.datetime "updated_at",                       null: false
+    t.index ["adeia_element_id"], name: "index_adeia_permissions_on_adeia_element_id"
+    t.index ["owner_type", "owner_id"], name: "index_adeia_permissions_on_owner_type_and_owner_id"
   end
 
-  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"
@@ -75,20 +71,18 @@ ActiveRecord::Schema.define(version: 20151012185726) do
     t.date     "exp_at"
     t.datetime "created_at",          null: false
     t.datetime "updated_at",          null: false
+    t.index ["adeia_permission_id"], name: "index_adeia_tokens_on_adeia_permission_id"
   end
 
-  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"
     t.text     "content"
     t.integer  "user_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.index ["user_id"], name: "index_articles_on_user_id"
   end
 
-  add_index "articles", ["user_id"], name: "index_articles_on_user_id"
-
   create_table "users", force: :cascade do |t|
     t.string   "name"
     t.string   "password_digest"