jungle_path 0.0.38 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d67c78a2a0d2004de4fd1b54237e0001cd6a594
-  data.tar.gz: 928ba34768a16f735eee53f601f16904e0a71fd6
+  metadata.gz: 5762beb8c823dfad35574fb5e808ab0c0d1161d6
+  data.tar.gz: ac57b10dd79f9e3a0f1b93bb4aea8dc16d1bbece
 SHA512:
-  metadata.gz: a765e960a5443e3fc9cd82c8a2c3bbc1b51cc168b6179179aa3903add73a17c38703b97a64ac05b1dcb8dc4eadf3c7e1b2c3a154d5e8e2be67532f94d2b3bd38
-  data.tar.gz: 7a40c03a11228fa503e5e462bcbad5c5091cf79036427178b3a5561796a55c095febaa3a9349222cde54befbebc15393e2d5cdb5c3baf5b87790b895b2e9232f
+  metadata.gz: 3604a75a339d754ec26f66b958d9192b005583749980e6acd076186f343054e2a9639f8bd9511fd9f4540e0e648b35959589e81e7b77edc639432b00e15d0b76
+  data.tar.gz: 9de2a60330ee58e7a7d33cb03d7b7f6f3d74f1a8a6bd60790433a011d32bd4b83ec4e8d188c96856437ca3c9a8cfe0409ec0e055d2bc7131032d82e9b38795ed

data/lib/jungle_path/api/helpers/standard_apis.rb

@@ -197,7 +197,7 @@ module JunglePath
 						if user_id == current_user.id
 							halt 403, "Self deletion not allowed."
 						end
-						handle_result(Controller::User.new(current_user, current_key, params, db).delete)
+						handle_result(Controller::User.new(current_identity, params, db).delete)
 					end
 				end
 
@@ -212,7 +212,7 @@ module JunglePath
 						if key_id == current_key.id
 							halt 403, "Self deletion of key not allowed."
 						end
-						handle_result(Controller::Key.new(current_user, current_key, params, db).delete)
+						handle_result(Controller::Key.new(current_identity, params, db).delete)
 					end
 
 					begin # authorization
@@ -248,27 +248,27 @@ module JunglePath
 					begin # api_keys gets
 						get '/keys/:key' do
 							pass if params['key'].match(/^\d+$/) # if key is an integer goto route /api_keys/:id
-							handle_result(Controller::Key.new(current_user, current_key, params, db).select_by_key)
+							handle_result(Controller::Key.new(current_identity, params, db).select_by_key)
 						end
 
 						get '/keys/user/:user_id' do
 							# get the api keys for this user.
-							handle_result(Controller::Key.new(current_user, current_key, params, db).select_by_user)
+							handle_result(Controller::Key.new(current_identity, params, db).select_by_user)
 						end
 
 						get '/keys/user/:user_id/default' do
 							# get the default api keys for this user.
-							handle_result(Controller::Key.new(current_user, current_key, params, db).select_default_by_user)
+							handle_result(Controller::Key.new(current_identity, params, db).select_default_by_user)
 						end
 
 						get '/keys/user/:user_id/application/:application_id' do
 							# get the api keys for this user for this application.
-							handle_result(Controller::Key.new(current_user, current_key, params, db).select_by_user)
+							handle_result(Controller::Key.new(current_identity, params, db).select_by_user)
 						end
 
 						get '/keys/user/:user_id/application/:application_id/default' do
 							# get the default api keys for this user for this application.
-							result = Controller::Key.new(current_user, current_key, params, db).select_default_by_user
+							result = Controller::Key.new(current_identity, params, db).select_default_by_user
 							#puts "result: #{result}."
 							handle_result(result)
 						end

data/lib/jungle_path/api/template.erb

@@ -11,23 +11,23 @@ module <%= name_space %>
     <% for table in tables %>
     begin # <%= table.plural_table_name %>
       get '/<%= table.plural_table_name %>' do
-        handle_result(<%= controller_name_space %>::<%= table.name.split('::').last %>.new(current_user, current_key, params, db).select)
+        handle_result(<%= controller_name_space %>::<%= table.name.split('::').last %>.new(current_identity, params, db).select)
       end
 
       get '/<%= table.plural_table_name %><%= table.template_pk_url %>' do
-        handle_result(<%= controller_name_space %>::<%= table.name.split('::').last %>.new(current_user, current_key, params, db).select)
+        handle_result(<%= controller_name_space %>::<%= table.name.split('::').last %>.new(current_identity, params, db).select)
       end
 
       post '/<%= table.plural_table_name %>' do
-        handle_result(<%= controller_name_space %>::<%= table.name.split('::').last %>.new(current_user, current_key, params, db).insert)
+        handle_result(<%= controller_name_space %>::<%= table.name.split('::').last %>.new(current_identity, params, db).insert)
       end
 
       put '/<%= table.plural_table_name %><%= table.template_pk_url %>' do
-        handle_result(<%= controller_name_space %>::<%= table.name.split('::').last %>.new(current_user, current_key, params, db).update)
+        handle_result(<%= controller_name_space %>::<%= table.name.split('::').last %>.new(current_identity, params, db).update)
       end
 
       delete '/<%= table.plural_table_name %><%= table.template_pk_url %>' do
-        handle_result(<%= controller_name_space %>::<%= table.name.split('::').last %>.new(current_user, current_key, params, db).delete)
+        handle_result(<%= controller_name_space %>::<%= table.name.split('::').last %>.new(current_identity, params, db).delete)
       end
     end
     <% end %>

data/lib/jungle_path/app/controllers/controller.rb

@@ -11,8 +11,8 @@ require_relative 'generated'
 
 module Controller
 	class User < JunglePath::Controller::Base
-		def initialize(current_user, current_key, params, db)
-			super(current_user, current_key, params, db, Schema::User)
+		def initialize(current_identity, params, db)
+			super(current_identity, params, db, Schema::User)
 		end
 
 		def insert(include_secure_columns: false)

data/lib/jungle_path/app/controllers/generated.rb

@@ -5,8 +5,8 @@ require_relative '../schemas/schema'
 module Controller
 
   class Answer < JunglePath::Controller::Base
-    def initialize(current_user, current_key, params, db)
-      super(current_user, current_key, params, db, Schema::Answer)
+    def initialize(current_identity, params, db)
+      super(current_identity, params, db, Schema::Answer)
     end
   end
 

data/lib/jungle_path/controller/authentication.rb

@@ -9,8 +9,8 @@ require 'jungle_path/sql'
 module JunglePath
   module Controller
     class User < Base
-      def initialize(current_user, current_key, params, db)
-        super(current_user, current_key, params, db, JunglePath::Schema::User)
+      def initialize(current_identity, params, db)
+        super(current_identity, params, db, JunglePath::Schema::User)
       end
 
       def insert(include_secure_columns: false)
@@ -78,8 +78,8 @@ module JunglePath
     end
 
     class Key < Base
-      def initialize(current_user, current_key, params, db)
-        super(current_user, current_key, params, db, JunglePath::Schema::Key)
+      def initialize(current_identity, params, db)
+        super(current_identity, params, db, JunglePath::Schema::Key)
       end
 
       def select_by_key(include_secure_columns: false)

data/lib/jungle_path/controller/base.rb

@@ -6,9 +6,10 @@ module JunglePath
   module Controller
     class Base
       attr_reader :table_class
-      def initialize(current_user, current_key, params, db, table_class)
-        @current_user = current_user
-        @current_key = current_key
+      def initialize(current_identity, params, db, table_class)
+        @current_identity = current_identity
+        @current_user = current_identity and current_identity.user
+        @current_key = current_identity and current_identity.key
         @db = db
         @table_class = table_class
         @params = self.class.transform(params.to_h, table_class.columns)

data/lib/jungle_path/controller/helpers.rb

@@ -2,8 +2,8 @@ module JunglePath
 	module Controller
 		module Helpers
 			module User
-		    def initialize(current_user, current_key, params, db, model_class)
-		      super(current_user, current_key, params, db, model_class)
+		    def initialize(current_identity, params, db, model_class)
+		      super(current_identity, params, db, model_class)
 		    end
 
 		    def insert(include_secure_columns: false)
@@ -25,8 +25,8 @@ module JunglePath
 		  end
 
 			module Key
-				def initialize(current_user, current_key, params, db, model_class)
-					super(current_user, current_key, params, db, model_class)
+				def initialize(current_identity, params, db, model_class)
+					super(current_identity, params, db, model_class)
 				end
 
 				def insert(include_secure_columns: false)

data/lib/jungle_path/controller/template.erb

@@ -9,8 +9,8 @@ module <%= controller_name_space %>
     def self.table_class
       <%= table.name.to_s %>
     end
-    def initialize(current_user, current_key, params, db)
-      super(current_user, current_key, params, db, <%= table.name.to_s %>)
+    def initialize(current_identity, params, db)
+      super(current_identity, params, db, <%= table.name.to_s %>)
     end
   end
   <% end %>

data/lib/jungle_path/version.rb

@@ -1,3 +1,3 @@
 module JunglePath
-	VERSION = '0.0.38'
+	VERSION = '0.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jungle_path
 version: !ruby/object:Gem::Version
-  version: 0.0.38
+  version: 0.1.0
 platform: ruby
 authors:
 - Michael VanZant
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-11 00:00:00.000000000 Z
+date: 2018-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler