gdpr_rails 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81060ded3e832230b6f4536bdfc1eacf0df6bfc2f4e812ed0efde3f0c926c91b
-  data.tar.gz: d42e46f8f425c30855ea979d1e8add10ef65b0415b836da61411d563c1df7383
+  metadata.gz: 386298d1731a0a6830f1445e562f7e4dd0bca49ee37b0eed4fb1e35b9e1b8ca8
+  data.tar.gz: 5f31692024cae1c58a1403679fd7690c50bf3c07776c3d912f0873cb264135d8
 SHA512:
-  metadata.gz: 8341015bf4175df39f8ef6e5a82f48c6ae6f0c0478cf78ef0132302d7c1b4f4fe06e638cd85c6f97e3804cadf7cc3870efde6ddfe9c008c58d11a2a5b437dbaa
-  data.tar.gz: 1f0af3c64fd15593aa1627674e19a4c46501f886dd4f0afd9ce530e702e5f1415cf0d35a85766b43cab07dac123ea08a85bb38853d8bfffdf0e7f87bd6d14daf
+  metadata.gz: 52c20ac58d490cda8066dde9adbd91a8630216a9aae6ac5110dedbae379882d934e56d24b4e360d77d08c25660cb38e26cebb03926aa37e595ca6682d7a0139a
+  data.tar.gz: 163475f3ad0de7c4e1ea477b59ab51796e1903e918facc04aa3c283b4faa1452e5cadc4dfac0ac50f4e03ef33ba6096f211befeae10d85c77fa54c3920a46395

data/app/controllers/policy_manager/concerns/user_terms.rb

@@ -0,0 +1,42 @@
+module PolicyManager::Concerns::UserTerms
+
+  extend ActiveSupport::Concern
+
+  def accept_term(term)
+    if current_user
+      user_term = current_user.handle_policy_for(term)
+      return if user_term.accepted?
+      if user_term.accept!
+        term.rule.on_accept.call(self) if term.rule.on_accept.is_a?(Proc)
+      end
+    end
+
+    cookies["policy_rule_#{term.rule.name}"] = {
+        :value => "accepted",
+        :expires => 1.year.from_now
+    }
+
+    user_term
+  end
+
+  def reject_term(term)
+    if current_user
+      user_term = current_user.handle_policy_for(term)
+      return if user_term.rejected?
+      if user_term.reject!
+        term.rule.on_reject.call(self) if term.rule.on_reject.is_a?(Proc)
+      end
+    end
+
+    cookies.delete("policy_rule_#{term.rule.name}")
+
+    user_term
+  end
+
+  # Use callbacks to share common setup or constraints between actions.
+  def policy_term_on(name)
+    category = PolicyManager::Config.rules.find{|o| o.name == name}
+    category.terms.last
+  end
+
+end

data/app/controllers/policy_manager/user_terms_controller.rb

@@ -1,8 +1,11 @@
 require_dependency "policy_manager/application_controller"
+require "policy_manager/concerns/user_terms"
 
 module PolicyManager
   class UserTermsController < ApplicationController
 
+    include PolicyManager::Concerns::UserTerms
+
     skip_before_action :user_authenticated?, only: [:show, :accept, :reject, :blocking_terms]
     before_action :set_user_term, only: [:accept, :reject, :show, :edit, :update, :destroy]
 
@@ -44,8 +47,7 @@ module PolicyManager
     end
 
     def accept
-      
-      handle_term_accept
+      @user_term = accept_term(@term)
 
       respond_to do |format|
         format.html{ 
@@ -65,7 +67,7 @@ module PolicyManager
     end
 
     def reject
-      handle_term_reject
+      @user_term = reject_term(@term)
 
       respond_to do |format|
         format.html{ 
@@ -88,70 +90,10 @@ module PolicyManager
       end
     end
 
-=begin
-    # GET /user_terms/new
-    def new
-      @user_term = UserTerm.new
-    end
-
-    # POST /user_terms
-    def create
-      @user_term = UserTerm.new(user_term_params)
-
-      if @user_term.save
-        redirect_to @user_term, notice: 'User term was successfully created.'
-      else
-        render :new
-      end
-    end
-
-    # PATCH/PUT /user_terms/1
-    def update
-      if @user_term.update(user_term_params)
-        redirect_to @user_term, notice: 'User term was successfully updated.'
-      else
-        render :edit
-      end
-    end
-
-    # DELETE /user_terms/1
-    def destroy
-      @user_term.destroy
-      redirect_to user_terms_url, notice: 'User term was successfully destroyed.'
-    end
-=end
-
     private
 
-      def handle_term_accept
-        if current_user
-          @user_term = current_user.handle_policy_for(@term)
-          if @user_term.accept!
-            @term.rule.on_accept.call(self) if @term.rule.on_accept.is_a?(Proc)
-          end
-        end
-
-        cookies["policy_rule_#{@term.rule.name}"] = {
-          :value => "accepted",
-          :expires => 1.year.from_now
-        }
-      end
-
-      def handle_term_reject
-        if current_user
-          @user_term = current_user.handle_policy_for(@term)
-          if @user_term.reject!
-            @term.rule.on_reject.call(self) if @term.rule.on_reject.is_a?(Proc)
-          end
-        end
-
-        cookies.delete("policy_rule_#{@term.rule.name}")
-      end
-
-      # Use callbacks to share common setup or constraints between actions.
       def set_user_term
-        @category = PolicyManager::Config.rules.find{|o| o.name == params[:id]}
-        @term = @category.terms.last
+        @term = policy_term_on(params[:id])
       end
 
       # Only allow a trusted parameter "white list" through.

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

@@ -3,9 +3,9 @@ module PolicyManager::Concerns::UserBehavior
   extend ActiveSupport::Concern
 
   included do
-    has_many :user_terms, class_name: "PolicyManager::UserTerm", autosave: true
-    has_many :terms, through: :user_terms, class_name: "PolicyManager::Term"
-    has_many :portability_requests, class_name: "PolicyManager::PortabilityRequest"
+    has_many :user_terms, class_name: "PolicyManager::UserTerm", autosave: true, foreign_key: :user_id, inverse_of: :user
+    has_many :terms, through: :user_terms, class_name: "PolicyManager::Term", foreign_key: :user_id, inverse_of: :user
+    has_many :portability_requests, class_name: "PolicyManager::PortabilityRequest", foreign_key: :user_id, inverse_of: :user
 
     # adds policies
     PolicyManager::Config.rules.each do |rule|
@@ -87,14 +87,14 @@ module PolicyManager::Concerns::UserBehavior
   def confirm_all_policies!
     pending_policies.each do |c|
       term = c.terms.last
-      current_user.handle_policy_for(term).accept!
+      self.handle_policy_for(term).accept!
     end
   end
 
   def reject_all_policies!
     pending_policies.each do |c|
       term = c.terms.last
-      current_user.handle_policy_for(term).reject!
+      self.handle_policy_for(term).reject!
     end
   end
 

data/app/models/policy_manager/portability_request.rb

@@ -5,7 +5,7 @@ module PolicyManager
   class PortabilityRequest < ApplicationRecord
     include Paperclip::Glue
 
-    belongs_to :user, class_name: Config.user_resource.to_s
+    belongs_to :user, class_name: Config.user_resource.to_s, foreign_key:  :user_id
 
     has_attached_file :attachment,
       path: Config.exporter.try(:attachment_path) || Rails.root.join("tmp/portability/:id/build.zip").to_s,

data/app/models/policy_manager/user_term.rb

@@ -4,7 +4,7 @@ module PolicyManager
   class UserTerm < ApplicationRecord
     include AASM
 
-    belongs_to :user, class_name: Config.user_resource.to_s
+    belongs_to :user, class_name: Config.user_resource.to_s, foreign_key: :user_id
     belongs_to :term
 
     validates_uniqueness_of :term_id, :scope => :user_id

data/lib/policy_manager/config.rb

@@ -22,7 +22,7 @@ module PolicyManager
 
       # sets this defaults after configuration
       @@user_resource ||= 'User'
-      @@admin_user_resource ||= 'User'
+      @@admin_user_resource ||= @@user_resource
 
       self
     end

data/lib/policy_manager/version.rb

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

data/spec/dummy/app/models/another_user.rb

@@ -0,0 +1,26 @@
+class AnotherUser < ApplicationRecord
+  include PolicyManager::Concerns::UserBehavior
+
+  def enabled_for_validation
+    true
+  end
+
+  def foo_data
+    30.times.map do |i|
+      OpenStruct.new(
+          :id => i,
+          :country => "Australia",
+          :population => 20_000_000,
+          image: "http://lorempixel.com/400/200/sports/"
+      )
+    end
+  end
+
+  def account_data
+    {
+        name: "me",
+        dob: 30.years.ago,
+        image: "https://images.pexels.com/photos/34950/pexels-photo.jpg?auto=compress&cs=tinysrgb&h=650&w=940 1x, https://images.pexels.com/photos/34950/pexels-photo.jpg?auto=compress&cs=tinysrgb&dpr=2&h=650&w=940 2x"
+    }
+  end
+end

data/spec/dummy/config/database.yml

@@ -12,7 +12,7 @@ default: &default
 test:
   adapter: mysql2
   database: gdpr_test
-  host: "localhost"
+  host: <%= ENV.fetch("MYSQL_HOST") { "localhost"} %>
   username: root
   password:
   reconnect: true

data/spec/dummy/db/migrate/20190221193827_create_another_users.rb

@@ -0,0 +1,9 @@
+class CreateAnotherUsers < ActiveRecord::Migration[5.1]
+  def change
+    create_table :another_users do |t|
+      t.string :email
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/schema.rb

@@ -10,44 +10,15 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180410171354) do
+ActiveRecord::Schema.define(version: 2019_02_21_193827) do
 
-  create_table "policy_manager_portability_requests", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.integer "user_id"
-    t.string "state"
-    t.string "attachment"
-    t.string "attachment_file_name"
-    t.string "attachment_file_size"
-    t.datetime "attachment_content_type"
-    t.string "attachment_file_content_type"
-    t.datetime "expire_at"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-    t.index ["user_id"], name: "index_policy_manager_portability_requests_on_user_id"
-  end
-
-  create_table "policy_manager_terms", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.text "description"
-    t.string "rule"
-    t.string "state"
-    t.datetime "accepted_at"
-    t.datetime "rejected_at"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
-  end
-
-  create_table "policy_manager_user_terms", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
-    t.integer "user_id"
-    t.integer "term_id"
-    t.string "state"
+  create_table "another_users", force: :cascade do |t|
+    t.string "email"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
-    t.index ["state"], name: "index_policy_manager_user_terms_on_state"
-    t.index ["term_id"], name: "index_policy_manager_user_terms_on_term_id"
-    t.index ["user_id"], name: "index_policy_manager_user_terms_on_user_id"
   end
 
-  create_table "users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
+  create_table "users", force: :cascade do |t|
     t.string "email"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false