clark_kent 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16e05c36a33e634fe52d5ea06d46cee658000ec1
-  data.tar.gz: 7665fe1475e4e166c1ece1c0ccbff9d10cbb4a6b
+  metadata.gz: 3c34878d9556ca9a31e59d729e9ac3a43e93a803
+  data.tar.gz: de458bb88ae2f76aa6a5e72f66a08f793ea25e28
 SHA512:
-  metadata.gz: 7b8a3037c4d58e596304587896e1b62bacb7e4d776084ccf4a36dc0817373a34ea4e0179934ecd5c8b70f766beb859c98f3a636c4719e4c6dfb371256549f0b9
-  data.tar.gz: a6977bec1c3edac9b9573e3b6b52c49909c70db503c1f3063f22041167e4ee3fbe991e1ee38c7498944e488db33a29ba832f1095570fc3a7a59f5172bb582184
+  metadata.gz: e018555c2be860db91d04e078ebddf284226a4e249ee0438403f62bc364265b5d09aa2677aa971f2b92d574a958a7dc7657ae18a463661dedf1be28774cc4d84
+  data.tar.gz: 3be2139359d5236a4a623d03c860469261bf1407a979e798b1d22a52b8222a15480402232b251a6cd21bded7f0d4a1f623a66fa60500dd4f1aa8171020c90220

data/app/controllers/clark_kent/application_controller.rb

@@ -1,2 +1,8 @@
 class ClarkKent::ApplicationController < ClarkKent.base_controller
+
+  def clark_kent_user
+    @clark_kent_user ||= send ClarkKent.current_user_method
+  end
+
+  helper_method :clark_kent_user
 end

data/app/helpers/clark_kent/application_helper.rb

@@ -79,7 +79,7 @@ module ClarkKent
 
     def collection_for(report_filter,name)
       if report_filter.filterable.collection_for(name).is_a? Symbol
-        current_user.send(report_filter.filterable.collection_for(name))
+        clark_kent_user.send(report_filter.filterable.collection_for(name))
       else
         report_filter.filterable.collection_for(name)
       end

data/app/views/clark_kent/reports/_edit.html.erb

@@ -13,18 +13,18 @@
     <div class="ih-span one-quarter">
       <div class="ih-row">sharing</div>
       <div class="ih-row">
-        <%= f.input :sharing_scope_type, collection: ClarkKent::SharingScopeKind.select_options_for_user(current_user),
+        <%= f.input :sharing_scope_type, collection: ClarkKent::SharingScopeKind.select_options_for_user(clark_kent_user),
           input_html: revealer("sharing_options", highlander: true),
           label: false, include_blank: false %>
       </div>
       <div class="ih-row" <%= revealer_target_attrs("sharing_options") %>>
-        <%= f.input :sharing_scope_id, as: :hidden, input_html: {value: current_user.id, data: {foo: ClarkKent.user_class_name}}, wrapper_html: revealer_option("sharing_options", trigger: ClarkKent.user_class_name).merge(id: "sharing_options_#{ClarkKent.user_class_name}") %>
-        <% ClarkKent::SharingScopeKind.custom_for_user(current_user).each do |sharing_scope_kind| %>
-          <% if sharing_scope_kind.associated_containers_for(current_user).respond_to? :each %>
-            <%= f.input :sharing_scope_id, collection: sharing_scope_kind.associated_containers_for(current_user), label: false, include_blank: false,
+        <%= f.input :sharing_scope_id, as: :hidden, input_html: {value: clark_kent_user.id, data: {foo: ClarkKent.user_class_name}}, wrapper_html: revealer_option("sharing_options", trigger: ClarkKent.user_class_name).merge(id: "sharing_options_#{ClarkKent.user_class_name}") %>
+        <% ClarkKent::SharingScopeKind.custom_for_user(clark_kent_user).each do |sharing_scope_kind| %>
+          <% if sharing_scope_kind.associated_containers_for(clark_kent_user).respond_to? :each %>
+            <%= f.input :sharing_scope_id, collection: sharing_scope_kind.associated_containers_for(clark_kent_user), label: false, include_blank: false,
               wrapper_html: revealer_option("sharing_options", trigger: sharing_scope_kind.class_name).merge(id: "sharing_options_#{sharing_scope_kind.class_name}") %>
           <% else %>
-            <%= f.input :sharing_scope_id, as: :hidden, input_html: {value: sharing_scope_kind.associated_containers_for(current_user).id}, wrapper_html: revealer_option("sharing_options", trigger: sharing_scope_kind.associated_containers_for(current_user).class.name).merge(id: "sharing_options_#{sharing_scope_kind.associated_containers_for(current_user).class.name}") %>
+            <%= f.input :sharing_scope_id, as: :hidden, input_html: {value: sharing_scope_kind.associated_containers_for(clark_kent_user).id}, wrapper_html: revealer_option("sharing_options", trigger: sharing_scope_kind.associated_containers_for(clark_kent_user).class.name).merge(id: "sharing_options_#{sharing_scope_kind.associated_containers_for(clark_kent_user).class.name}") %>
           <% end %>
         <% end %>
         <%= f.input :sharing_scope_id, as: :hidden, input_html: {value: ''},

data/app/views/clark_kent/reports/_object_filter.html.erb

@@ -5,7 +5,7 @@
 	<div class="ih-row">
 		<% options = case filter.collection.class.name
 			 when 'String', 'Symbol'
-			   current_user.send(filter.collection)
+			   clark_kent_user.send(filter.collection)
 			 when 'Array'
 			   filter.collection
 			 end %>

data/app/views/clark_kent/reports/index.html.erb

@@ -1,6 +1,6 @@
 <h1>Reports</h1>
 <% ClarkKent::SharingScopeKind.all.each do |sharing_scope_kind| %>
-  <% sharing_scope_kind.scopes_for(current_user).each do |sharing_scope| %>
+  <% sharing_scope_kind.scopes_for(clark_kent_user).each do |sharing_scope| %>
     <% if sharing_scope.reports.any? %>
       <div id="<%= sharing_scope.dom_id %>">
         <h3><%= sharing_scope.human_name %></h3>

data/lib/clark_kent/version.rb

@@ -1,3 +1,3 @@
 module ClarkKent
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

data/lib/clark_kent.rb

@@ -5,7 +5,7 @@ require 'aws-sdk-v1'
 
 module ClarkKent
   mattr_accessor  :resource_options, :user_class_name, :other_sharing_scopes, :base_controller,
-                  :custom_report_links
+                  :custom_report_links, :current_user_method
 
   def self.bucket_name
     @@bucket_name || "clark-kent"
@@ -19,12 +19,14 @@ module ClarkKent
     base_controller_name = options[:base_controller_name]
     @@base_controller = base_controller_name.constantize if base_controller_name.present?
     @@custom_report_links = options[:custom_report_links] || []
+    @@current_user_method = options[:current_user_method]
   end
 
   def self.user_class
     @@user_class = (@@user_class_name || "User").constantize
   end
 
+
 end
 
 class Date

data/test/controllers/clark_kent/reports_controller_test.rb

@@ -4,19 +4,19 @@ class ClarkKent::ReportsControllerTest < ControllerTest
   include Rails.application.routes.mounted_helpers
 
   let(:report) {ClarkKent::Report.first}
-  let(:current_user) {User.first}
+  let(:clark_kent_user) {User.first}
 
   setup do
     @report_email = report.report_emails.create(when_to_send: 'Monday', name: 'Owner Arrival')
   end
 
   it "should get index" do
-    get clark_kent.reports_path(current_user_id: current_user.id)
+    get clark_kent.reports_path(clark_kent_user_id: clark_kent_user.id)
     assert_response :success
   end
 
   it "should get new" do
-    get clark_kent.new_report_path(current_user_id: current_user.id)
+    get clark_kent.new_report_path(clark_kent_user_id: clark_kent_user.id)
     assert_response :success
   end
 
@@ -24,7 +24,7 @@ class ClarkKent::ReportsControllerTest < ControllerTest
     post clark_kent.reports_path(report: {
             name: 'delete me', resource_type: report.resource_type,
             sharing_scope_id: report.sharing_scope_id, sharing_scope_type: report.sharing_scope_type },
-            current_user_id: current_user.id)
+            clark_kent_user_id: clark_kent_user.id)
     report = ClarkKent::Report.find_by(name: 'delete me')
     report.wont_be_nil
     report.destroy
@@ -35,7 +35,7 @@ class ClarkKent::ReportsControllerTest < ControllerTest
     post clark_kent.reports_path(report: {
             name: 'delete me', resource_type: '',
             sharing_scope_id: report.sharing_scope_id, sharing_scope_type: report.sharing_scope_type },
-            current_user_id: current_user.id)
+            clark_kent_user_id: clark_kent_user.id)
     report = ClarkKent::Report.find_by(name: 'delete me')
     report.must_be_nil
     assert_response :conflict
@@ -43,24 +43,24 @@ class ClarkKent::ReportsControllerTest < ControllerTest
   end
 
   it "should show report" do
-    get clark_kent.report_path(id: report, current_user_id: current_user.id)
+    get clark_kent.report_path(id: report, clark_kent_user_id: clark_kent_user.id)
     assert_response :success
   end
 
   it "should show report results" do
-    get clark_kent.report_path(id: report, current_user_id: current_user.id, run_report: true, created_at_until: Date.today.strftime("%m/%d/%Y"), created_at_from: Date.yesterday)
+    get clark_kent.report_path(id: report, clark_kent_user_id: clark_kent_user.id, run_report: true, created_at_until: Date.today.strftime("%m/%d/%Y"), created_at_from: Date.yesterday)
     assert_response :success
     @response.body.must_match 'Guitar strings'
   end
 
   it "should show report run errors" do
-    get clark_kent.report_path(id: report, current_user_id: current_user.id, run_report: true)
+    get clark_kent.report_path(id: report, clark_kent_user_id: clark_kent_user.id, run_report: true)
     assert_response :success
     @response.body.must_match 'At least one date range is required.'
   end
 
   it "should get edit" do
-    get clark_kent.edit_report_path(id: report, current_user_id: current_user.id)
+    get clark_kent.edit_report_path(id: report, clark_kent_user_id: clark_kent_user.id)
     assert_response :success
   end
 
@@ -69,14 +69,14 @@ class ClarkKent::ReportsControllerTest < ControllerTest
           report: {
             name: report.name, resource_type: report.resource_type,
             sharing_scope_id: report.sharing_scope_id, sharing_scope_type: report.sharing_scope_type },
-          current_user_id: current_user.id)
+          clark_kent_user_id: clark_kent_user.id)
     assert_response :success
   end
 
   it "should destroy report" do
     report = ClarkKent::Report.create(name: 'delete me', resource_type: 'Order')
     assert_difference('ClarkKent::Report.count', -1) do
-      delete clark_kent.report_path(id: report, current_user_id: current_user.id)
+      delete clark_kent.report_path(id: report, clark_kent_user_id: clark_kent_user.id)
     end
 
     assert_redirected_to clark_kent.reports_path

data/test/dummy/app/controllers/application_controller.rb

@@ -10,4 +10,8 @@ class ApplicationController < ActionController::Base
   end
 
   helper_method :current_user
+
+  def effective_user
+    current_user
+  end
 end

data/test/dummy/config/initializers/zz_clark_kent.rb

@@ -6,5 +6,6 @@ ClarkKent.config({
   ],
   user_class_name: 'User',
   other_sharing_scopes: [['Department',:department]],
-  base_controller_name: '::ApplicationController'
+  base_controller_name: '::ApplicationController',
+  current_user_method: :effective_user
 })