jungle_path 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3540331fdfa763c7ccef65f7a710419de1f13254
-  data.tar.gz: 166cea45aed2c52b6f956697d96e645451d4246a
+  metadata.gz: 4eb52d315417ae17e52f0f5ea2572caa5a294ed3
+  data.tar.gz: 57f7a7df31b7ac7e2ddab756ea1dc1303cd7a44b
 SHA512:
-  metadata.gz: f1554dd1c49227f534d9bb5abdfb01eaf015e1395d564ec2e7f96bc090a7ecca4cc94b2181611313062449edb534cb3e64d04b2e528e03233d11e939cf1a428e
-  data.tar.gz: 18fe8df3ad243874d70f3b51b63a1f953477e53f6bd3cda6af5e3c0401b5a66b7e30807bdc52453965d7bacb914ff2378c28bb4f966622fdfa11a24d7fd46f7b
+  metadata.gz: 783267b10234d3082bdf1891abc3a1154672eb9fa3ddeeb6ccebe7ef85f803d84c17ddd30ee3948f5a8f09cd2fb8a6750e85d0211b15578e9f738cad3eb49cfe
+  data.tar.gz: 9f25bb3f0dc97291d6db2e8a1984c148d47268c2487957370f6c4a0cadfdcd55da5c6c7f9e9190d9dd8373ce6b140a67ee432bff888b95bf425739eb45e2d604

data/lib/jungle_path/app/config/config.rb

@@ -209,18 +209,19 @@ module Config
 		# Replace usage of a table in a query with the given view or parameterized function
 		jungle.role_table_filters = {
 			user: [
-				{table_name: :contact, replacement: :filter_contact}
+				{table_name: :contact, replacement: :filter_contact},
+				{table_name: :test, replacement: :filter_test}
 			]
-				# more...
 		}
 	end
 
 	def self.restriction_table_filters
-		jungle.restriction_table_filters = {
-			me_related:[
-				{table_name: :contact, replacement: :filter_contact}
-			]
-		}
+		#jungle.restriction_table_filters = {
+		#	me_related:[
+		#		{table_name: :contact, replacement: :filter_contact}
+		#	]
+		#}
+		jungle.restriction_table_filters = {}
 	end
 
 	def self.user_table_filters

data/lib/jungle_path/app/schemas/schema.rb

@@ -32,6 +32,17 @@ module Schema
 		)
 	end
 
+	class Test < Schema::Base
+		self.description = ""
+		define(
+			[:id, :primary_key],
+			[:name, :string],
+			[:email, :string],
+			[:user_id, :foreign_key, :user, :unique],
+			[:audit_user]
+		)
+	end
+
 	class FilterContact < Schema::Base
     self.description = "Test View filter stuff."
     define(
@@ -44,6 +55,17 @@ module Schema
     self.view = Views.filter_contact
   end
 
+	class FilterTest < Schema::Base
+    self.description = "Test View filter stuff."
+    define(
+      [:id, :primary_key],
+      [:name, :string],
+      [:email, :string],
+			[:user_id, :foreign_key, :user],
+      [:audit_user]
+    )
+    self.view = Views.filter_test
+  end
 
 	class Practice < Schema::Base
 		self.description = ""

data/lib/jungle_path/app/schemas/views.rb

@@ -3,7 +3,7 @@ require 'jungle_path/db_model/view'
 
 module Views
 	def self.filter_contact
-		@f = JunglePath::DBModel::View.new(
+		@filter_contact = JunglePath::DBModel::View.new(
 			JunglePath::SQL::Helpers.sql("
 				create or replace function filter_contact(p_contact_id int)
 				returns table (
@@ -26,9 +26,39 @@ module Views
 				language sql;
 			"),
 			"drop function filter_contact(int)",
-			[:user],
+			[:contact],
 			[:contact_id]
-		) unless @f
-		@f
+		) unless @filter_contact
+		@filter_contact
+	end
+
+	def self.filter_test
+		@filter_test = JunglePath::DBModel::View.new(
+			JunglePath::SQL::Helpers.sql("
+				create or replace function filter_test(p_contact_id int)
+				returns table (
+				  id int,
+				  name text,
+				  email text,
+					user_id int,
+				  created_at timestamp,
+				  created_by_user_id int,
+				  updated_at timestamp,
+				  updated_by_user_id int
+				)
+				as
+				$body$
+					select
+						a.*
+					from contact a
+					where a.id = p_contact_id
+				$body$
+				language sql;
+			"),
+			"drop function filter_test(int)",
+			[:contact, :test],
+			[:contact_id]
+		) unless @filter_test
+		@filter_test
 	end
 end

data/lib/jungle_path/authentication/data_provider/default.rb

@@ -103,25 +103,33 @@ module JunglePath
 				end
 
 				def get_table_filters(identity, no_cache=false)
+					puts "get_table_filters!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
 					filters = {}
 
-					temp_filters = (@role_table_filters && @role_table_filters[identity.role]) || []
+					puts "@role_table_filters: #{@role_table_filters} ------------------------------------------------------------------------------------"
+					puts "identity.role: #{identity.role}"
+					temp_filters = (@role_table_filters && @role_table_filters[identity.role[:name]]) || []
+					puts "temp_filters: #{temp_filters} ------------------------------------------------------------------------------------"
 					temp_filters.each do |filter|
+						puts "role filter: #{filter}."
 						filters[filter[:table_name]] = filter
 					end
 
 					identity.authorization_filter.restrictions.each do |restriction|
 						temp_filters = (@restriction_table_filters && @restriction_table_filters[restriction]) || []
 						temp_filters.each do |filter|
+							puts "restriction filter: #{filter}."
 							filters[filter[:table_name]] = filter
 						end
 					end
 
 					temp_filters = (@user_table_filters && @user_table_filters[identity.user.id]) || []
 					temp_filters.each do |filter|
+						puts "user filter: #{filter}."
 						filters[filter[:table_name]] = filter
 					end
 
+					puts "filters: #{filters}"
 					filters
 				end
 

data/lib/jungle_path/query/sql_string.rb

@@ -130,10 +130,13 @@ module JunglePath
             if filter
               puts "hook_in_table_filters: frm.table_name: #{frm.table_name}."
               replacement_table = engine.tables[filter[:replacement]]
+              puts "replacement_table: #{replacement_table}"
               table_replacement_text = nil
               if replacement_table.view
+                puts "has view"
                 table_replacement_text = replacement_table.view.build_call(engine.identity, replacement_table)
               else
+                puts "no view"
                 table_replacement_text = "#{replacement_table.table_name}"
               end
               frm.table_replacement_text = table_replacement_text

data/lib/jungle_path/version.rb

@@ -1,3 +1,3 @@
 module JunglePath
-	VERSION = '0.0.14'
+	VERSION = '0.0.15'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jungle_path
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Michael VanZant
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler