gdpr_rails 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 95e0a7e67d192035998e554716ca08d874dfc929
-  data.tar.gz: 732c3ef839875872d46a3f727833b8a503bcc75e
+SHA256:
+  metadata.gz: 81060ded3e832230b6f4536bdfc1eacf0df6bfc2f4e812ed0efde3f0c926c91b
+  data.tar.gz: d42e46f8f425c30855ea979d1e8add10ef65b0415b836da61411d563c1df7383
 SHA512:
-  metadata.gz: 5d17a5fd871b67bc064cd437ba6efb186f9e4f68d4d1af81c1b279d1884893fae8ed8a3d80e97f7342294ceaba74bdbe7aa652eca77556242c6a58a12fd74df8
-  data.tar.gz: 392f644111967fc375c7625c693bfe0f360ea1e48c610bf6a239ea22b830c6a0e14c196183f49f848c45ba1cb318c87f9d7c71d8d079fc76664dad26ad875084
+  metadata.gz: 8341015bf4175df39f8ef6e5a82f48c6ae6f0c0478cf78ef0132302d7c1b4f4fe06e638cd85c6f97e3804cadf7cc3870efde6ddfe9c008c58d11a2a5b437dbaa
+  data.tar.gz: 1f0af3c64fd15593aa1627674e19a4c46501f886dd4f0afd9ce530e702e5f1415cf0d35a85766b43cab07dac123ea08a85bb38853d8bfffdf0e7f87bd6d14daf

data/README.md

@@ -235,7 +235,7 @@ PolicyManager::Config.setup do |c|
   # minimal exporter setup
   c.exporter = {
     path: Rails.root + "tmp/export",
-    resource: User
+    resource: 'User'
   }
 
   # portability rules, collection render. This will call a @user.articles

data/app/controllers/policy_manager/application_controller.rb

@@ -9,7 +9,7 @@ module PolicyManager
     before_action :set_language
 
     def allow_admins
-      return redirect_to root_path unless Config.is_admin?(current_user)
+      return redirect_to pending_user_terms_path unless Config.is_admin?(current_user)
     end
 
     def doc

data/app/controllers/policy_manager/categories_controller.rb

@@ -3,7 +3,7 @@ require_dependency "policy_manager/application_controller"
 module PolicyManager
   class CategoriesController < ApplicationController
 
-    before_action :allow_admins 
+    before_action :allow_admins
 
     # GET /categories
     def index

data/app/helpers/policy_manager/terms_helper.rb

@@ -1,4 +1,10 @@
 module PolicyManager
   module TermsHelper
+
+    def render_term_for(policy)
+      return if policy.nil?
+      PolicyManager::Config.rules.find{|o| o.name == policy}.terms.published.last
+    end
+
   end
 end

data/app/jobs/policy_manager/exporter_job.rb

@@ -3,8 +3,13 @@ module PolicyManager
     queue_as :default
 
     def perform(user_id)
-      user = Config.user_resource.find(user_id)
+      user_model = if Config.user_resource.is_a?(String)
+        Config.user_resource.constantize
+      else
+        Config.user_resource
+      end
+      user = user_model.find(user_id)
       Config.exporter.perform(user)
     end
   end
-end
+end

data/app/mailers/policy_manager/portability_mailer.rb

@@ -3,14 +3,14 @@ module PolicyManager
 
     def progress_notification(portability_request_id)
       @portability_request = PortabilityRequest.find(portability_request_id)
-      @user = Config.user_resource.find(@portability_request.user_id)
-      
+      @user = find_user_resource(@portability_request.user_id)
+
       opts = { from: Config.from_email, to: @user.email, subject: I18n.t("terms_app.mails.progress.subject") }
       opts.merge!({
-        template_path: PolicyManager::Config.exporter.mailer_templates[:path].to_s, 
+        template_path: PolicyManager::Config.exporter.mailer_templates[:path].to_s,
         template_name: PolicyManager::Config.exporter.mailer_templates[:progress]
       }) if has_custom_template?(:progress)
-      
+
       set_mail_lang
 
       mail(opts)
@@ -18,26 +18,26 @@ module PolicyManager
 
     def completed_notification(portability_request_id)
       @portability_request = PortabilityRequest.find(portability_request_id)
-      @user = Config.user_resource.find(@portability_request.user_id)
+      @user = find_user_resource(@portability_request.user_id)
       @link = @portability_request.download_link
-      
+
       opts = { from: Config.from_email, to: @user.email, subject: I18n.t("terms_app.mails.completed.subject") }
       opts.merge!({
-        template_path: PolicyManager::Config.exporter.mailer_templates[:path].to_s, 
+        template_path: PolicyManager::Config.exporter.mailer_templates[:path].to_s,
         template_name: PolicyManager::Config.exporter.mailer_templates[:complete]
       }) if has_custom_template?(:complete)
-      
+
       set_mail_lang
 
       mail(opts)
     end
 
     def admin_notification(user_id)
-      @user = Config.user_resource.find(user_id)
-  
+      @user = find_user_resource(user_id)
+
       opts = { from: Config.from_email, to: Config.admin_email(@user), subject: I18n.t("terms_app.mails.admin.subject", email: @user.email) }
       opts.merge!({
-        template_path: PolicyManager::Config.exporter.mailer_templates[:path].to_s, 
+        template_path: PolicyManager::Config.exporter.mailer_templates[:path].to_s,
         template_name: PolicyManager::Config.exporter.mailer_templates[:admin]
       }) if has_custom_template?(:admin)
 
@@ -57,5 +57,13 @@ module PolicyManager
       PolicyManager::Config.exporter.mailer_templates[template].present? && PolicyManager::Config.exporter.mailer_templates[:path].to_s.present?
     end
 
+    def find_user_resource(user_id)
+      user_model = if Config.user_resource.is_a?(String)
+        Config.user_resource.constantize
+      else
+        Config.user_resource
+      end
+      user_model.find(user_id)
+    end
   end
 end

data/app/models/policy_manager/concerns/user_behavior.rb

@@ -4,7 +4,7 @@ module PolicyManager::Concerns::UserBehavior
 
   included do
     has_many :user_terms, class_name: "PolicyManager::UserTerm", autosave: true
-    has_many :terms, through: :user_terms
+    has_many :terms, through: :user_terms, class_name: "PolicyManager::Term"
     has_many :portability_requests, class_name: "PolicyManager::PortabilityRequest"
 
     # adds policies
@@ -22,7 +22,7 @@ module PolicyManager::Concerns::UserBehavior
 
         define_method :"check_#{rule_name}" do
           if self.send(rule_name).blank? && needs_policy_confirmation_for?(rule.name)
-            errors.add(rule_name, "needs confirmation")
+            errors.add(rule_name, I18n.t("terms_app.user_behavior.needs_confirmation"))
           end
         end  
       end  
@@ -137,4 +137,4 @@ module PolicyManager::Concerns::UserBehavior
     end
   end
 
-end
+end

data/app/models/policy_manager/portability_request.rb

@@ -7,8 +7,8 @@ module PolicyManager
 
     belongs_to :user, class_name: Config.user_resource.to_s
 
-    has_attached_file :attachment, 
-      path: Config.exporter.try(:attachment_path) || Rails.root.join("tmp/portability/:id/build.zip").to_s, 
+    has_attached_file :attachment,
+      path: Config.exporter.try(:attachment_path) || Rails.root.join("tmp/portability/:id/build.zip").to_s,
       storage: Config.exporter.try(:attachment_storage) || :filesystem,
       s3_permissions: :private
 
@@ -41,7 +41,7 @@ module PolicyManager
     end
 
     def download_link
-      url = self.attachment.expiring_url(PolicyManager::Config.exporter.expiration_link) 
+      url = self.attachment.expiring_url(PolicyManager::Config.exporter.expiration_link)
       PolicyManager::Config.exporter.customize_link(url)
     end
 

data/app/models/policy_manager/user_term.rb

@@ -3,7 +3,7 @@ require "aasm"
 module PolicyManager
   class UserTerm < ApplicationRecord
     include AASM
-    
+
     belongs_to :user, class_name: Config.user_resource.to_s
     belongs_to :term
 

data/app/views/policy_manager/shared/_header.erb

@@ -8,7 +8,7 @@
       </a>
 
       <div class="d-flex order-lg-2 ml-auto">
-        
+
         <div class="dropdown">
           <a href="#" class="nav-link pr-0 leading-none" data-toggle="dropdown">
             <span class="avatar" style="background-image: url(<%= gravatar_url(controller.current_user, 40)%>)"></span>
@@ -29,14 +29,14 @@
             </a>
             <div class="dropdown-divider"></div>
             -->
-            
+
             <% if PolicyManager::Config.logout_url.present? %>
               <a class="dropdown-item" href="<%= PolicyManager::Config.logout_url %>">
                 <i class="dropdown-icon fe fe-log-out"></i>
                 <%= I18n.t("terms_app.sign_out") %>
               </a>
             <% end %>
-  
+
           </div>
         </div>
 
@@ -54,7 +54,7 @@
       <div class="col-lg order-lg-first">
 
         <ul class="nav nav-tabs border-0 flex-column flex-lg-row">
-          
+
           <% if PolicyManager::Config.is_admin?(controller.current_user) %>
 
             <li class="nav-item">
@@ -97,4 +97,4 @@
       </div>
     </div>
   </div>
-</div>
+</div>

data/config/locales/en.yml

@@ -1,5 +1,7 @@
 en:
   terms_app:
+    user_behavior:
+      needs_confirmation: needs confirmation
     title: PolicyManager
     sub_title: PolicyManager
     sign_out: Logout

data/config/locales/es.yml

@@ -1,5 +1,7 @@
 es:
   terms_app:
+    user_behavior:
+      needs_confirmation: necesita confirmación
     title: PolicyManager
     sub_title: PolicyManager
     sign_out: Salir

data/config/locales/fr.yml

@@ -1,5 +1,7 @@
 fr:
   terms_app:
+    user_behavior:
+      needs_confirmation: besoin de confirmation
     title: Gestionnaire de données personnelles
     sub_title: Gestionnaire de données personnelles
     sign_out: Se déconnecter

data/config/locales/tr.yml

@@ -0,0 +1,126 @@
+tr:
+  terms_app:
+    user_behavior:
+      needs_confirmation: onay gerekiyor
+    title: Politika Yöneticisi
+    sub_title: Politika Yöneticisi
+    sign_out: Çıkış
+    menu:
+      policies: Politikalar
+      portability_requests: Portatiflik talepleri
+      user_portability_requests: Portatiflik taleplerim
+      user_pending_policies: Bekleyen politikalarım
+    misc:
+      back: Geri
+      edit: Düzenle
+      show: Göster
+      save: Kaydet
+      download: İndir
+      are_you_sure: Emin misiniz?
+    states:
+      draft: Taslak
+      published: Yayınlanmış
+    categories:
+      index:
+        title: Politikalar
+        table:
+          name: İsim
+          terms: Koşullar
+          show: Göster
+      show:
+        title: "%{name} Politikası"
+        new: Yeni Koşul
+        table:
+          id: Id
+          content: İçerik
+          state: Durum
+          updated_at: Güncellenme Tarihi
+          show: Göster
+    terms:
+      index:
+        title: Koşullar
+        button: Yeni Koşul
+        table:
+          description: Açıklama
+          category: Politika
+          updated_at: Güncellenme Tarihi
+          show: Göster
+          edit: Düzenle
+          destroy: Sil
+      new:
+        title: "%{name} yeni koşul"
+        state: Durum
+        description: Açıklama
+        button: Buton
+        error: koşul kaydetmede hata
+        created: Başarılı şekilde oluşturuldu
+        updated: Başarılı şekilde güncellendi
+        destroyed: Başarılı şekilde silindi
+      edit:
+        title: "%{name} koşulunu düzenle"
+        state: Durum
+        description: Açıklama
+        error: koşul kaydedilirken
+      show:
+        title: Koşul
+        last_update: Son güncelleme
+        table:
+          name: Adı
+          terms: Koşullar
+          show: Göster
+    user_terms:
+      pending:
+        title: Bekliyen politikalarım
+        empty: Bekliyen politika yok
+      show:
+        accepted:
+          message: Kabul edilen politika
+          question: Fikrini değiştirdin mi?
+          reject: Reddet
+          not_now: Şimdi değil
+        pending:
+          message: Lütfen bu politikayı kabul ediniz
+          agree: Kabul
+          not_now: Şimdi değil
+    user_portability_requests:
+      index:
+        title: Taşınabilirlik taleplerim
+        empty:  Taşınabilirlik talebi yok
+        table:
+          state: Durum
+          file: Dosya
+          created_at: Oluşturulma zamanı
+          destroy: Sil
+        button: Yeni taşınabilirlik talebi
+        states:
+          pending: Beklemede
+          progress: İşlemde
+          completed: Tamamlandı
+        has_pending: Bekleyen bir isteğiniz var, henüz başka bir tane oluşturamzsınız.
+        created: Bilgi talebi gönderildi!
+    portability_requests:
+      index:
+        title: Bekleyen talepler
+        destroyed: Silme işlemi başarılı
+        empty: Herhangi bir talep yok
+        table:
+          user: Kullanıcı
+          state: Durum
+          created_at: Oluşturulma zamanı
+          destroy: Sil
+          confirm: Onayla
+        states:
+          pending: Beklemede
+          progress: İşlemde
+          completed: Tamamlandı
+    mails:
+      admin:
+        subject: Kullanıcı %{email} taşınabilirlik isteği gönderdi
+      progress:
+        subject: Verileriniz işleniyor
+      completed:
+        subject: Verileriniz kullanılabilir
+  will_paginate:
+    previous_label: "<"
+    next_label: ">"
+    page_gap: "…"

data/lib/policy_manager/config.rb

@@ -21,8 +21,8 @@ module PolicyManager
       yield self
 
       # sets this defaults after configuration
-      @@user_resource ||= User
-      @@admin_user_resource ||= User
+      @@user_resource ||= 'User'
+      @@admin_user_resource ||= 'User'
 
       self
     end
@@ -45,7 +45,7 @@ module PolicyManager
         user.is_a? admin_user_resource
       else
         raise Rails.logger.error("GDPR ERROR! please add is_admin_method to your gdpr initializer") if @@is_admin_method.blank?
-        @@is_admin_method.call(user) 
+        @@is_admin_method.call(user)
       end
     end
 
@@ -78,4 +78,4 @@ module PolicyManager
     end
 
   end
-end
+end

data/lib/policy_manager/exporter/handler.rb

@@ -7,7 +7,11 @@ module PolicyManager
 
     def initialize(opts={})
       self.path = opts[:path]
-      self.resource = opts[:resource]
+      self.resource = if opts[:resource].is_a?(String)
+        opts[:resource].constantize
+      else
+        opts[:resource]
+      end
       self.after_zip = opts[:after_zip] if opts[:after_zip]
     end
 
@@ -68,20 +72,20 @@ module PolicyManager
       base_dir = self.base_path.join(rule.name)
       FileUtils.mkdir_p(base_dir)
       resource_path = base_dir.join("index.html")
-      
+
       view = ExporterView.new({
-        assigns: {member: o}, 
-        build_path: self.base_path, 
-        base_path: resource_path, 
-        template: rule.template, 
+        assigns: {member: o},
+        build_path: self.base_path,
+        base_path: resource_path,
+        template: rule.template,
         rule: rule
       }).save(resource_path)
 
       puts "saving at #{self.path.join rule.name}"
-      
+
       json = JsonExporterView.new({
-        assigns: {member: o}, 
-        template: rule.json_template, 
+        assigns: {member: o},
+        template: rule.json_template,
         folder: base_dir
       }).save if rule.json_template.present?
     end
@@ -93,26 +97,26 @@ module PolicyManager
       base_dir  = self.base_path.join(rule.name)
       FileUtils.mkdir_p(base_dir)
 
-      (1..o.total_pages).to_a.each do |i| 
+      (1..o.total_pages).to_a.each do |i|
         o = resource.portability_collection_for(rule, i)
 
         page_name = i
         folder_dir = page_name == 1 ? base_dir : base_dir.join(page_name.to_s)
         FileUtils.mkdir_p(folder_dir)
         resource_path = folder_dir.join("index.html")
-        
+
         view = ExporterView.new({
-          assigns: {collection: o} , 
-          build_path: self.base_path, 
-          base_path: resource_path, 
-          template: rule.template, 
+          assigns: {collection: o} ,
+          build_path: self.base_path,
+          base_path: resource_path,
+          template: rule.template,
           rule: rule
         }).save(resource_path)
 
-        
+
         json = JsonExporterView.new({
-          assigns: {collection: o}, 
-          template: rule.json_template, 
+          assigns: {collection: o},
+          template: rule.json_template,
           folder: folder_dir
         }).save if rule.json_template.present?
 
@@ -123,12 +127,12 @@ module PolicyManager
     def render_index
       resource_path = self.base_path.join("index.html")
       template = PolicyManager::Config.exporter.index_template
-      view = ExporterView.new({ 
+      view = ExporterView.new({
         assigns: {
           collection: PolicyManager::Config.portability_rules
-        }, 
-        build_path: self.base_path, 
-        base_path: resource_path, 
+        },
+        build_path: self.base_path,
+        base_path: resource_path,
         template: template
       }).save( resource_path )
       puts "saving at #{resource_path}"
@@ -142,4 +146,4 @@ module PolicyManager
     end
 
   end
-end
+end

data/lib/policy_manager/exporter.rb

@@ -2,14 +2,14 @@ require "fileutils"
 
 module PolicyManager
   class Exporter
-    attr_accessor :path, 
-                  :resource, 
-                  :index_template, 
-                  :layout, 
-                  :after_zip, 
-                  :mail_helpers, 
+    attr_accessor :path,
+                  :resource,
+                  :index_template,
+                  :layout,
+                  :after_zip,
+                  :mail_helpers,
                   :attachment_path,
-                  :attachment_storage, 
+                  :attachment_storage,
                   :expiration_link,
                   :customize_link,
                   :mailer_templates,
@@ -61,7 +61,7 @@ module PolicyManager
 
     def handled_template(template)
       return if template.blank?
-      if template.is_a?(String) 
+      if template.is_a?(String)
         template
       elsif template.is_a?(Pathname)
         File.open(template).read
@@ -78,4 +78,4 @@ module PolicyManager
     end
 
   end
-end
+end

data/lib/policy_manager/version.rb

@@ -1,3 +1,3 @@
 module PolicyManager
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 end

data/spec/controllers/policy_manager/portability_requests_controller_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-module PolicyManager 
+module PolicyManager
   describe PortabilityRequestsController do
 
     routes { PolicyManager::Engine.routes }
@@ -9,17 +9,17 @@ module PolicyManager
 
       @config = PolicyManager::Config.setup do |c|
         c.is_admin_method = ->(o){true}
-        c.user_resource = User
+        c.user_resource = 'User'
         c.from_email = "admin@acme.com"
         c.admin_email_inbox = "admin@acme.com"
-        c.add_rule({name: "age", 
+        c.add_rule({name: "age",
           validates_on: [:create, :update],
-          blocking: true, 
-          if: ->(o){ o.enabled_for_validation } 
+          blocking: true,
+          if: ->(o){ o.enabled_for_validation }
         })
         c.exporter = {
           path: Rails.root + "tmp/export",
-          resource: User
+          resource: 'User'
         }
       end
 

data/spec/dummy/config/database.yml

@@ -14,7 +14,7 @@ test:
   database: gdpr_test
   host: "localhost"
   username: root
-  password: 
+  password:
   reconnect: true
   port: 3306
   encoding: utf8

data/spec/models/policy_manager/exporter_spec.rb

@@ -2,16 +2,16 @@ require 'spec_helper'
 require 'ostruct'
 
 describe PolicyManager::Exporter do
-    
+
   before(:each) do
     PolicyManager::Term.create(description: "el", rule: "age")
 
     @config = PolicyManager::Config.setup do |c|
-      c.add_rule({name: "age", validates_on: [:create, :update], 
+      c.add_rule({name: "age", validates_on: [:create, :update],
                   if: ->(o){ o.enabled_for_validation } })
-      c.exporter = { 
-        path: Rails.root + "tmp/export", 
-        resource: User ,
+      c.exporter = {
+        path: Rails.root + "tmp/export",
+        resource: 'User' ,
         index_template: '<h1>index template, custom</h1>
                         <ul>
                           <% @collection.each do |rule| %>
@@ -24,8 +24,8 @@ describe PolicyManager::Exporter do
       }
 
       c.add_portability_rule({
-        name: "exportable_data", 
-        collection: :foo_data, 
+        name: "exportable_data",
+        collection: :foo_data,
         template: "hellow , here a collection will be rendered
         <%= @base_path %>
          <% @collection.each do |item| %>
@@ -38,13 +38,13 @@ describe PolicyManager::Exporter do
       })
 
       c.add_portability_rule({
-        name: "my_account", 
+        name: "my_account",
         member: :account_data,
-        template: "hellow , here a resource will be rendered <%= image_tag(@member[:image]) %> <%= @member[:name] %> "          
+        template: "hellow , here a resource will be rendered <%= image_tag(@member[:image]) %> <%= @member[:name] %> "
       })
 
       c.add_portability_rule({
-        name: "my_account_from_template", 
+        name: "my_account_from_template",
         member: :account_data,
         template: Rails.root.join("app/views").join("template.erb")
       })
@@ -76,10 +76,10 @@ describe PolicyManager::Exporter do
     user = User.create(email: "a@a.cl")
     assert !user.errors.any?
     PolicyManager::ExporterHandler.any_instance.stubs(:clear!).returns(true)
-      
+
     PolicyManager::ExporterHandler.any_instance.stubs(:handle_zip_upload).returns(true)
     @config.exporter.perform(user)
-  
+
     assert File.exists?(Rails.root.join("tmp/export/#{user.id}"))
     paths = Dir.glob( Rails.root.join("tmp/export/#{user.id}") + "*")
     names = paths.map{|o| File.basename(o) }
@@ -91,8 +91,8 @@ describe PolicyManager::Exporter do
 
     FileUtils.rm_rf(Rails.root.join("tmp/export/#{user.id}"))
     FileUtils.rm_rf(Rails.root.join("tmp/export/#{user.id}-out.zip"))
-  
- 
+
+
   end
 
 end