gdpr_rails 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b43a8ecf784c5fe1b24530af6c767b88c0af6d54
-  data.tar.gz: 492df811d80c74b0c28b69dde3e3bba0feeebf64
+  metadata.gz: 70a54c711a8c434950a40e3aae520b540d3ff731
+  data.tar.gz: 19e30660f9b8d32290c53f8a1601920295d62ed1
 SHA512:
-  metadata.gz: 53f0054aaeafad9a6e64022609bbccfbf0417b0488291b33b578c93ea07e8cd57000c03f6c549824ada0e7115b33843d97bd9bba9c428bfefaae7779dcf66183
-  data.tar.gz: 3e366811b4af4b5dc8f5dac5bf2448e1b9c05379de27ab4fd9a701c4ae0b1def7f5a117bfe3c1f4f972d8dc06ac571d6744525b68b81efce9103ff1b372c2e10
+  metadata.gz: 316a1b707c726b8384c5a18464429aa2b95e8738322ded3f1c711ed4a46e6b03b0ef0a2e2b9eab36a5d9fe801c21001659cc38cdb0c60916a7ff6feafc3316ed
+  data.tar.gz: 5bf69e3583ec2e3374a8018e9f4085b5b0a83a9674f0cf347911ab6c70dca6e26053cb6c7aef51e934c0bb21a08b8452ae7ec0dc195433fd5d4b1be9ccaaab6a

data/Rakefile

@@ -14,14 +14,10 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
-
-
 load 'rails/tasks/statistics.rake'
 
-
-
 require 'bundler/gem_tasks'
 
 require 'rake/testtask'
@@ -33,4 +29,12 @@ Rake::TestTask.new(:test) do |t|
 end
 
 
-task default: :test
+require 'rspec/core'
+require 'rspec/core/rake_task'
+
+desc "Run all specs in spec directory (excluding plugin specs)"
+RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
+
+task :default => :spec
+
+#task default: :test

data/app/controllers/policy_manager/application_controller.rb

@@ -14,7 +14,7 @@ module PolicyManager
 
     def user_authenticated?
       if !current_user
-        render :file => "public/401.html", :layout => false, :status => :unauthorized
+        render :file => "401.erb", :layout => false, :status => :unauthorized
       end
     end
 

data/app/controllers/policy_manager/portability_requests_controller.rb

@@ -7,7 +7,11 @@ module PolicyManager
 
     # GET /portability_requests
     def index
-      @portability_requests = PortabilityRequest.order(created_at: :desc).paginate(:page => params[:page], :per_page => 10)
+      @portability_requests = PortabilityRequest.order(created_at: :desc)
+                                                .paginate(
+                                                  :page => params[:page], 
+                                                  :per_page => 10
+                                                )
     end
 
     def confirm
@@ -19,7 +23,7 @@ module PolicyManager
 
     # DELETE /portability_requests/1
     def destroy
-      @portability_request.destroy
+      @portability_request = PortabilityRequest.find(params[:id]).destroy
       redirect_to portability_requests_url, notice: I18n.t("terms_app.portability_requests.index.destroyed")
     end
 

data/app/controllers/policy_manager/terms_controller.rb

@@ -7,7 +7,9 @@ module PolicyManager
     
     # GET /terms
     def index
-      @terms = Term.all
+      @terms = Term.where(rule: params[:category_id]).paginate(
+                                                :page => params[:page], 
+                                                :per_page => 10)
     end
 
     # GET /terms/1

data/app/controllers/policy_manager/user_portability_requests_controller.rb

@@ -4,38 +4,41 @@ module PolicyManager
   class UserPortabilityRequestsController < ApplicationController
 
     def index
-      @user_portability_requests = current_user.portability_requests.order(created_at: :desc).paginate(:page => params[:page], :per_page => 10)
+      @user_portability_requests = current_user.portability_requests
+                                               .order(created_at: :desc)
+                                               .paginate(
+                                                :page => params[:page], 
+                                                :per_page => 10)
     end
 
     def create
       respond_to do |format|
-        format.html{
+       
           if current_user.can_request_portability?
             if current_user.portability_requests.create
-              redirect_to user_portability_requests_path, notice: I18n.t("terms_app.user_portability_requests.index.created")
+              format.html{
+                redirect_to user_portability_requests_path, notice: I18n.t("terms_app.user_portability_requests.index.created")
+              }
+              format.json{
+                render json: {notice: I18n.t("terms_app.user_portability_requests.index.created")}
+              }
             end
           else
-            redirect_to user_portability_requests_path, notice: I18n.t("terms_app.user_portability_requests.index.has_pending")
+            format.html{
+              redirect_to user_portability_requests_path, notice: I18n.t("terms_app.user_portability_requests.index.has_pending")
+            }
+            format.json{
+              render json: {notice: I18n.t("terms_app.user_portability_requests.index.has_pending")}, status: 422  
+            }
           end
-        }
-        format.json{
-          if current_user.can_request_portability?
-            if current_user.portability_requests.create
-              render json: {notice: I18n.t("terms_app.user_portability_requests.index.created")}
-            end
-          else
-            render json: {notice: I18n.t("terms_app.user_portability_requests.index.has_pending")}, status: 422  
-          end
-        }
+        
       end
     end
 
-    def destroy
-      PortabilityRequest.find(params[:id]).destroy
-      redirect_to user_portability_requests_url, notice: I18n.t("terms_app.portability_requests.index.destroyed")
-    end
-
-    private
+    #def destroy
+    #  PortabilityRequest.find(params[:id]).destroy
+    #  redirect_to user_portability_requests_url, notice: I18n.t("terms_app.portability_requests.index.destroyed")
+    #end
 
   end
 end

data/app/controllers/policy_manager/user_terms_controller.rb

@@ -24,7 +24,10 @@ module PolicyManager
     def blocking_terms
       respond_to do |format|
         format.html{ }
-        format.json{ render json: PolicyManager::Config.rules.map{|p| p.name if p.blocking == true }.compact! }
+        format.json{ render json: PolicyManager::Config.rules
+                                                       .select{|p| p.blocking }
+                                                       .map(&:name) 
+        }
       end
     end
 
@@ -32,7 +35,6 @@ module PolicyManager
       rules = current_user.pending_policies.map{|o| "policy_rule_#{o.name}"}
       resource_params = params.require(:user).permit(rules)
       current_user.update_attributes(resource_params)
-      
       @pending_policies = current_user.pending_policies
       
       respond_to do |format|
@@ -63,7 +65,6 @@ module PolicyManager
     end
 
     def reject
-
       handle_term_reject
 
       respond_to do |format|
@@ -87,6 +88,7 @@ module PolicyManager
       end
     end
 
+=begin
     # GET /user_terms/new
     def new
       @user_term = UserTerm.new
@@ -117,6 +119,7 @@ module PolicyManager
       @user_term.destroy
       redirect_to user_terms_url, notice: 'User term was successfully destroyed.'
     end
+=end
 
     private
 

data/app/mailers/policy_manager/application_mailer.rb

@@ -4,8 +4,10 @@ module PolicyManager
     layout 'mailer'
 
     # configurable mailer helpers
-    Config.exporter.mail_helpers.each do |helpers|
-      add_template_helper(helpers)
+    if Config.exporter.present?
+      Config.exporter.mail_helpers.each do |helpers|
+        add_template_helper(helpers)
+      end
     end
   end
 end

data/app/mailers/policy_manager/portability_mailer.rb

@@ -5,7 +5,7 @@ module PolicyManager
       @portability_request = PortabilityRequest.find(portability_request_id)
       @user = Config.user_resource.find(@portability_request.user_id)
       
-      opts = { :to => @user.email, :subject => I18n.t("terms_app.mails.progress.subject") }
+      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_name: PolicyManager::Config.exporter.mailer_templates[:progress]
@@ -21,7 +21,7 @@ module PolicyManager
       @user = Config.user_resource.find(@portability_request.user_id)
       @link = @portability_request.download_link
       
-      opts = { :to => @user.email, :subject => I18n.t("terms_app.mails.completed.subject") }
+      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_name: PolicyManager::Config.exporter.mailer_templates[:complete]
@@ -35,7 +35,7 @@ module PolicyManager
     def admin_notification(user_id)
       @user = Config.user_resource.find(user_id)
   
-      opts = { :to => Config.admin_email(@user), :subject => I18n.t("terms_app.mails.admin.subject", email: @user.email) }
+      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_name: PolicyManager::Config.exporter.mailer_templates[:admin]

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

@@ -107,6 +107,7 @@ module PolicyManager::Concerns::UserBehavior
 
   def policy_term_on(rule)
     category = PolicyManager::Config.rules.find{|o| o.name == rule}
+    #binding.pry if category.blank?
     term = category.terms.where(state: "published").last
     raise "no term for #{rule} policy" if term.blank?
     term

data/app/models/policy_manager/user_term.rb

@@ -10,15 +10,16 @@ module PolicyManager
     validates_uniqueness_of :term_id, :scope => :user_id
 
     aasm :column => :state do
-      state :rejected, :initial => true
+      state :passive, :initial => true
+      state :rejected
       state :accepted
 
       event :accept do
-        transitions from: :rejected, to: :accepted
+        transitions from: [:passive, :rejected], to: :accepted
       end
 
       event :reject do
-        transitions from: :accepted, to: :rejected
+        transitions from: [:passive, :accepted], to: :rejected
       end
     end
 

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

@@ -41,7 +41,7 @@
       <nav class="col-md-2 d-none d-md-block bg-light sidebar">
         <div class="sidebar-sticky">
           <ul class="nav flex-column">
-            <% if PolicyManager::Config.is_admin?(current_user) %>
+            <% if PolicyManager::Config.is_admin?(controller.current_user) %>
 
               <li class="nav-item">
                 <a class="nav-link" href="<%= categories_path %>">
@@ -59,7 +59,7 @@
 
             <% end %>
 
-            <% if current_user.is_a? PolicyManager::Config.user_resource %>
+            <% if controller.current_user.is_a? PolicyManager::Config.user_resource %>
 
               <li class="separator"></li>
 

data/app/views/layouts/policy_manager/portability.erb

@@ -0,0 +1,5 @@
+<body> 
+  eeeee 
+  <%= yield %> 
+  eeee
+</body>

data/app/views/policy_manager/401.erb

@@ -0,0 +1 @@
+<h1>access denied</h1>

data/app/views/policy_manager/user_terms/show.html.erb

@@ -17,7 +17,7 @@
 
 <% else %>
   <strong>
-    <%= current_user.email %>
+    <%= controller.current_user.email %>
   </strong> <%= I18n.t("terms_app.user_terms.show.pending.message") %>
 
   <hr/>

data/app/views/policy_manager/user_terms/show.json.jbuilder

@@ -5,9 +5,9 @@ if @user_term.persisted? && @user_term.state == "accepted"
   json.message "#{I18n.t("terms_app.user_terms.show.accepted.message")}"
   json.url reject_user_term_path(params[:id])
   json.method :put
-elsif current_user.present? 
+elsif controller.current_user.present? 
   json.status "pending"
-  json.message "#{current_user.email} #{I18n.t("terms_app.user_terms.show.pending.message")}"
+  json.message "#{controller.current_user.email} #{I18n.t("terms_app.user_terms.show.pending.message")}"
   json.url accept_user_term_path(params[:id])
   json.method :put
 else

data/lib/policy_manager/config.rb

@@ -44,7 +44,8 @@ module PolicyManager
       if has_different_admin_user_resource?
         user.is_a? admin_user_resource
       else
-        @@is_admin_method.call(user)
+        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) 
       end
     end
 

data/lib/policy_manager/engine.rb

@@ -1,5 +1,11 @@
 module PolicyManager
   class Engine < ::Rails::Engine
     isolate_namespace PolicyManager
+    config.generators do |g|
+      g.test_framework :rspec, :fixture => false
+      #g.fixture_replacement :factory_girl, :dir => 'spec/factories'
+      g.assets false
+      g.helper false
+    end
   end
 end

data/lib/policy_manager/exporter.rb

@@ -42,7 +42,7 @@ module PolicyManager
     end
 
     def layout
-      handled_template(@layout) || '<body> eeeee <%= yield %> eeee</body>'
+      handled_template(@layout) || 'policy_manager/portability'
     end
 
     def mail_helpers

data/lib/policy_manager/exporter/handler.rb

@@ -24,7 +24,7 @@ module PolicyManager
       create_sections
       generate_zip
       handle_zip_upload
-      after_zip.call(zip_path, resource)
+      after_zip.call(zip_path, resource) if after_zip.is_a?(Proc)
       clear!
     end
 

data/lib/policy_manager/exporter/view.rb

@@ -1,6 +1,5 @@
 require "erb"
 require 'open-uri'
-require "tilt"
 require "will_paginate"
 require 'will_paginate/view_helpers'
 require 'will_paginate/view_helpers/action_view'

data/lib/policy_manager/version.rb

@@ -1,3 +1,3 @@
 module PolicyManager
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/spec/controllers/policy_manager/categories_controller_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+describe PolicyManager::CategoriesController  do
+  routes { PolicyManager::Engine.routes }
+  render_views
+  
+  before :each do 
+
+    @config = PolicyManager::Config.setup do |c|
+      c.is_admin_method = ->(o){true}
+      c.add_rule({name: "age", 
+        validates_on: [:create, :update],
+        blocking: true, 
+        if: ->(o){ o.enabled_for_validation } 
+      })
+    end
+
+    @category = @config.rules.first.name
+
+    pr = PolicyManager::Term.create(description: "el", rule: "age")
+    pr.publish!
+
+    User.any_instance.stubs(:enabled_for_validation).returns(false)
+    @user = User.new
+    @user.email = "a@a.cl"
+    @user.save
+    PolicyManager::ApplicationController.any_instance.stubs(:current_user).returns(User.first)
+
+  end
+
+  it "should get index" do
+    ApplicationController.any_instance.stubs(:current_user).returns(User.first)
+
+    PolicyManager::Config.stubs(:is_admin?).returns(true)
+    
+    get :index
+    assert_response :success
+    assert_select "table td", "age"
+  end
+
+  it "should show category" do
+
+    PolicyManager::Config.stubs(:is_admin?).returns(true)
+    get :show , params: {id: @category}
+    assert_response :success
+    assert_select "h2", "age Policy"
+    assert_select ".btn", "New Term"
+  end
+
+
+end

data/spec/controllers/policy_manager/portability_requests_controller_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+module PolicyManager 
+  describe PortabilityRequestsController do
+
+    routes { PolicyManager::Engine.routes }
+    render_views
+
+    before :each do
+
+      @config = PolicyManager::Config.setup do |c|
+        c.is_admin_method = ->(o){true}
+        c.user_resource = User
+        c.from_email = "admin@acme.com"
+        c.admin_email_inbox = "admin@acme.com"
+        c.add_rule({name: "age", 
+          validates_on: [:create, :update],
+          blocking: true, 
+          if: ->(o){ o.enabled_for_validation } 
+        })
+        c.exporter = {
+          path: Rails.root + "tmp/export",
+          resource: User
+        }
+      end
+
+      if defined?(PolicyManager::PortabilityRequest)
+        PolicyManager.send(:remove_const, :"PortabilityRequest")
+        load PolicyManager::Engine.root + 'app/models/policy_manager/portability_request.rb'
+      end
+
+      @category = @config.rules.first.name
+
+      @term = PolicyManager::Term.create(description: "desc 1", rule: "age")
+      @term.publish!
+
+      User.any_instance.stubs(:enabled_for_validation).returns(false)
+      @user = User.new
+      @user.email = "a@a.cl"
+      @user.save
+      PolicyManager::PortabilityRequest.delete_all
+    end
+
+    it "should get index empty records" do
+      @controller.stubs(:allow_admins).returns(true)
+      @controller.stubs(:current_user).returns(User.last)
+
+      get :index
+      assert PortabilityRequest.count == 0
+      assert_response :success
+    end
+
+    it "should get index with records" do
+      @controller.stubs(:allow_admins).returns(true)
+      @controller.stubs(:current_user).returns(User.last)
+
+      @user.portability_requests.create
+      get :index
+      assert PortabilityRequest.count == 1
+      assert_response :success
+    end
+
+    it "confirm" do
+      @controller.stubs(:allow_admins).returns(true)
+      @controller.stubs(:current_user).returns(User.last)
+
+      @user.portability_requests.create
+      get :confirm, params: {id: @user.portability_requests.first.id }
+
+      assert_response :redirect
+      assert_predicate @user.portability_requests.first, :completed?
+    end
+
+    it "destroy" do
+      @controller.stubs(:allow_admins).returns(true)
+      @controller.stubs(:current_user).returns(User.last)
+
+      @user.portability_requests.create
+      delete :destroy, params: {id: @user.portability_requests.first.id }
+      #follow_redirect!
+      assert_response :redirect
+      assert_equal @user.portability_requests.size, 0
+    end
+
+  end
+end