jungle_path 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ee8786f075f8d4f693e15c682d51d87ca0651ce
-  data.tar.gz: 458e1ee7faf30c2acfd2d3b19b22f8ac48f364f3
+  metadata.gz: 2d863de49b59f583f6e7c7c619d05585ce5a6beb
+  data.tar.gz: 9accfcad7372cb4f3f03467cf9037a543cc22aef
 SHA512:
-  metadata.gz: d37fe1cfbd16e0942dd497626d72f60a3a09e7cc4a5b12e5b724b750d907db5340ff847a2e253557f2adf81a466963dd6ff931e7423884f29febd61835afa5f0
-  data.tar.gz: 2ea39035f32dde0e6436385762050238c5f488cb45a7452a90af35c55c515771b7b0ef8cefc2fa74be7cb18d794f63ebe782c52fc254bb778792422f61fe8799
+  metadata.gz: dfe9bd5b5d466d8886c663e9f2adacab5e255957be73aefc43af4cd3dfd67187908ef175616eb0a130fd2ee549a49c7abd0b303e4c56c58a31f8b633aff98e00
+  data.tar.gz: 6939065836de7958a28eeb00bae99398904854ee27a545766ccfde0f9e1057958eef52b4a2f41dc088cc592b7778ee506da0da11e38bef565c5444ed643c16a2

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

@@ -67,6 +67,9 @@ module JunglePath
 							idn.key = nil
 						end
 						idn.valid = (idn.user and idn.user.is_valid)
+						if idn.valid
+							idn.alternative_user_key = data_provider.get_alternative_user_key(idn.user.id, no_cache) if data_provider.respond_to?('get_alternative_user_key')
+						end
 					end
 					idn
 				end

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

@@ -7,7 +7,7 @@ module JunglePath
 	module Authentication
 		module DataProvider
 			class Default
-				def initialize sinatra, cache, db, user_model, models, roles, schema_filters, role_schema_filters, role_query_filters, restriction_query_filters, user_query_filters
+				def initialize sinatra, cache, db, user_model, models, roles, schema_filters, role_schema_filters, role_query_filters, restriction_query_filters, user_query_filters, alternative_user_key_query=nil
 					@sinatra = sinatra
 					@cache = cache
 					@db = db
@@ -25,6 +25,7 @@ module JunglePath
 					@role_query_filters = role_query_filters
 					@restriction_query_filters = restriction_query_filters
 					@user_query_filters = user_query_filters
+					@alternative_user_key_query = alternative_user_key_query
 				end
 
 				def get_user(user_name, password, no_cache=false)
@@ -97,6 +98,20 @@ module JunglePath
 					filters
 				end
 
+				def get_alternative_user_key(user_id, no_cache=false)
+					cache_key = "#{user_id}_alt_key"
+					alt_key = @cache[cache_key]
+					if alt_key == nil or no_cache
+						if @alternative_user_key_query
+							ds = @db.base[@alternative_user_key_query, user_id]
+							hash = ds.first
+							if hash
+								alt_key = hash[:alt_key]
+							end
+						end
+					end
+					alt_key
+				end
 			end
 		end
 	end

data/lib/jungle_path/authentication/identity.rb

@@ -1,7 +1,7 @@
 module JunglePath
   module Authentication
 		class Identity
-			attr_accessor :remote_user, :remote_password, :user_name, :user, :key, :valid, :role, :authorization_filter, :query_filters
+			attr_accessor :remote_user, :remote_password, :user_name, :user, :key, :valid, :role, :authorization_filter, :query_filters, :alternative_user_key
 			def to_s
 				"JunglePath::Authentication::Identity: {\n  remote_user: #{@remote_user},\n  remote_password: #{@remote_password},\n  user_name: #{@user_name},\n  user: #{@user},\n  key: #{@key},\n  valid: #{@valid},\n  role: #{@role},\n  authorization_filter: #{@authorization_filter}\n,query_filters: #{@query_filters}\n}"
 			end
@@ -15,7 +15,8 @@ module JunglePath
           valid: @valid,
           role: @role,
           authorization_filter: @authorization_filter,
-          query_filters: @query_filters
+          query_filters: @query_filters,
+          alternative_user_key: @alternative_user_key
         }
       end
       def to_hash

data/lib/jungle_path/db_model/table.rb

@@ -95,6 +95,54 @@ module JunglePath
 				@description = value
 			end
 
+      def self.is_view?
+	      if @view_sql
+	        true
+	      else
+	        false
+	      end
+	    end
+
+	    def self.view_sql
+	      @view_sql
+	    end
+
+	    def self.view_sql=(value)
+	      @view_sql = value
+	    end
+
+	    def self.view_references
+	      if @view_references
+	        @view_references
+	      else
+	        references
+	      end
+	    end
+
+	    def self.view_references=(array_of_table_names)
+	      @view_references = Set.new(array_of_table_names)
+	    end
+
+	    def self.has_view_reference_to?(table)
+	      if @view_references
+	        @view_references.member?(table.table_name)
+	      else
+	        has_reference_to?(table)
+	      end
+	    end
+
+	    def self.has_view_references?
+	      if @view_references
+	        !@view_references.empty?
+	      else
+	        has_references?
+	      end
+	    end
+
+	    def self.has_no_view_references?
+	      !self.has_view_references?
+	    end
+
 			def self.inherited(sub_class)
 				sub_class.set_columns #setup subclass with particular class instance vars.
         @models = {} unless @models
@@ -115,28 +163,28 @@ module JunglePath
 				result.map {|key| @models[key]}
 			end
 
-			def self.model_sort(list, result=Set.new, level=0)
-				# return array of table names sorted in dependency order (not alphabetical order).
-				puts "level: #{level}."
-				remaining = []
-				list.each do |value|
-					puts "\tvalue: #{value.table_name}. references: #{value.references.to_a}."
-					if value.has_no_references?
-						puts "\tadding: #{value.table_name}."
-						result << value.table_name
-					elsif value.references.subset? result
-						puts "\tadding: #{value.table_name}."
-						result << value.table_name
-					else
-						remaining << value
-					end
-				end
-				puts "\tresult: #{result.length}: #{result.to_a}."
-				puts "\tremaining: #{remaining.length}: #{remaining}."
-				return [] if level > 10 #something is wrong!!!
-				result = self.model_sort(remaining, result, level + 1) if remaining.length > 0
-				result
-			end
+      def self.model_sort(list, result=Set.new, level=0)
+	      # return array of table names sorted in dependency order (not alphabetical order).
+	      #puts "level: #{level}."
+	      remaining = []
+	      list.each do |value|
+	        #puts "\tvalue: #{value.table_name}. references: #{value.references.to_a}."
+	        if value.has_no_view_references?
+	          #puts "\tadding: #{value.table_name}."
+	          result << value.table_name
+	        elsif value.view_references.subset? result
+	          #puts "\tadding: #{value.table_name}."
+	          result << value.table_name
+	        else
+	          remaining << value
+	        end
+	      end
+	      #puts "\tresult: #{result.length}: #{result.to_a}."
+	      #puts "\tremaining: #{remaining.length}: #{remaining}."
+	      return [] if level > 10 #something is wrong!!!
+	      result = self.model_sort(remaining, result, level + 1) if remaining.length > 0
+	      result
+	    end
 
 			def self.define(*column_defs)
 				set_columns

data/lib/jungle_path/gen/schema.rb

@@ -14,8 +14,13 @@ module JunglePath
 	      db.loggers << Logger.new(logger)
 	      schema = JunglePath::DBModel::Schema.new(db)
 	      table_subclasses.each do |table|
-	        puts "create table: #{table.table_name}"
-	        schema.create_table table
+					if table.is_view?
+	          puts "create view: #{table.table_name}"
+	          db.run(table.view_sql)
+	        else
+	          puts "create table: #{table.table_name}"
+	          schema.create_table table
+	        end
 	      end
 	    end
 

data/lib/jungle_path/version.rb

@@ -1,3 +1,3 @@
 module JunglePath
-	VERSION = '0.0.6'
+	VERSION = '0.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jungle_path
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Michael VanZant
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-25 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler