jets 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00d2f09e01d8be696832564080069855665cf1cc17111d0c6ade401a640bfe09
-  data.tar.gz: 4ec605c411378a9c49745298eaa4b73d10478fdbdd7adb012ac32ca9b58e7fa8
+  metadata.gz: 6becd540bc99766696d49280636867ca4183ab2dc6a9cadec90c9837acd06352
+  data.tar.gz: '0918860cc1c3429635f1d3cba3db58301d0090e55c1382049d23d45f2763dfa2'
 SHA512:
-  metadata.gz: 14b548c897b3331ef31b86edede38d1f2b9e4a01c050be39676a839afc5ecfa4b03b911e9da351c98858e8e7b4f063fdacd89425f0dd64540eb6db3ec68e9e34
-  data.tar.gz: 16b66bd00dbadf6afc08526a4610dc2b12688986c94425ed93adda048ccf605bf30caf9b8b6b998dc91c9a5c6cea265ec6410c95d3b3c9055914cf2c6227ab77
+  metadata.gz: 8fd318bf3aaa6039226e32a93703ebe5ad89e66b1c739378c525a160a7ae0f902b1709ea421b3849472243f5d3fe3f00ac35f91d7102accf856ceda28f6e3ae9
+  data.tar.gz: b7c0d69d5230806fbd630ac857abb8dd091f6f1dee8a3708f7f1485c57abcd3c063ae2250843a6a91503f23980a19ec8bbb7a388ade6168ec3ab5ac2547a98f7

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [2.2.1]
+- #369 clean up authorizers and bug fixes
+
 ## [2.2.0]
 - #368 API Gateway Authorizer Concept Support
 

data/lib/jets/authorizer/dsl.rb

@@ -33,7 +33,8 @@ module Jets::Authorizer
       # function associated with the cognito authorizer.
       def cognito_authorizer(props={})
         resources = [props]
-        meth = props[:name]
+        # Authorizer name can have dashes, but "method" name should be underscored for correct logical id.
+        meth = props[:name].gsub('-','_')
         resource = Jets::Resource::ApiGateway::Authorizer.new(props)
 
         # Mimic task to grab base_replacements, namely namespace.

data/lib/jets/authorizer/helpers/iam_helper.rb

@@ -31,17 +31,14 @@ module Jets::Authorizer::Helpers
         props[:usage_identifier_key] = usage_identifier_key if usage_identifier_key
       end
 
-      props = Jets::Camelizer.transform(props) # keys get converted from Symbols to Strings as part of this
-      # Only top-level keys and keys under context are pascalized
-      props.transform_keys! { |k| pascalize(k) }
-      if props['context']
-        props['context'].transform_keys! { |k| pascalize(k) }
-      end
+      props.transform_keys! { |k| pascalize(k) } # Only top-level keys are pascalized
+      # policyDocument is camelized, everything else is left alone
+      props["policyDocument"] = Jets::Camelizer.transform(props["policyDocument"])
       props
     end
 
     def pascalize(value)
-      new_value = value.camelize
+      new_value = value.to_s.camelize
       first_char = new_value[0..0].downcase
       new_value[0] = first_char
       new_value

data/lib/jets/cfn/builders/controller_builder.rb

@@ -24,6 +24,10 @@ module Jets::Cfn::Builders
           add_parameter(route.authorizer_id, description: route.authorizer_metadata)
         end
       end
+
+      if @app_class.authorizer
+        add_parameter(@app_class.authorizer_id, description: @app_class.authorizer_metadata)
+      end
     end
 
     def add_routes

data/lib/jets/controller/authorization.rb

@@ -31,24 +31,34 @@ class Jets::Controller
         end
       end
 
-      def authorizer_logical_id(action_name)
+      def authorizer_metadata
+        Jets::Router::Route::Authorizer.metadata(auth_to)
+      end
+
+      # Used to add to parameter to controller templates
+      def authorizer_id
+        Jets::Router::Route::Authorizer.logical_id(auth_to)
+      end
+
+      # Used to add to the API::Gateway Method selectively
+      def authorizer_logical_id_for(action_name)
         return unless auth_to
 
         only = auth_options[:only].map(&:to_s) if auth_options && auth_options[:only]
         except = auth_options[:except].map(&:to_s) if auth_options && auth_options[:except]
 
         if except and !except.include?(action_name)
-          logical_id = Jets::Router::Route.authorizer_logical_id(auth_to)
+          logical_id = Jets::Router::Route::Authorizer.logical_id(auth_to)
         end
 
         # only overrides except
         if only and only.include?(action_name)
-          logical_id = Jets::Router::Route.authorizer_logical_id(auth_to)
+          logical_id = Jets::Router::Route::Authorizer.logical_id(auth_to)
         end
 
         # if both only and except are not set then always set the logical_id
         if !only && !except
-          logical_id = Jets::Router::Route.authorizer_logical_id(auth_to)
+          logical_id = Jets::Router::Route::Authorizer.logical_id(auth_to)
         end
 
         logical_id
@@ -56,7 +66,7 @@ class Jets::Controller
 
       # Autoamtically sets authorization_type for the specific route based on the controller authorizer
       def infer_authorization_type_for(action_name)
-        return unless authorizer_logical_id(action_name)
+        return unless authorizer_logical_id_for(action_name)
         Jets::Authorizer::Base.authorization_type(auth_to)
       end
 

data/lib/jets/resource/api_gateway/method/authorization.rb

@@ -5,7 +5,7 @@ class Jets::Resource::ApiGateway::Method
       if @route.authorizer
         logical_id = @route.authorizer_id
       elsif controller_klass.authorizer
-        logical_id = controller_klass.authorizer_logical_id(@route.action_name)
+        logical_id = controller_klass.authorizer_logical_id_for(@route.action_name)
       end
 
       "!Ref #{logical_id}" if logical_id

data/lib/jets/router/route.rb

@@ -6,7 +6,7 @@
 class Jets::Router
   class Route
     include Util
-    include Authorization
+    include Authorizer
 
     CAPTURE_REGEX = "([^/]*)" # as string
 

data/lib/jets/router/route/{authorization.rb → authorizer.rb}

@@ -1,30 +1,15 @@
 class Jets::Router::Route
-  module Authorization
-    extend ActiveSupport::Concern
-
-    class_methods do
-      # Use by both Route and Controller
-      def authorizer_logical_id(authorizer, prefix_class: true)
-        klass, meth = authorizer.split("#")
-        words = [meth, "authorizer"]
-        words.unshift(klass) if prefix_class
-        words.join('_').camelize # logical_id
-      end
-    end
-
+  module Authorizer
     # IE: main#protect => MainProtectAuthorizer
     def authorizer_id(prefix_class: true)
       return unless authorizer
-      self.class.authorizer_logical_id(authorizer, prefix_class: prefix_class)
+      logical_id(authorizer, prefix_class: prefix_class)
     end
 
     # Metadata about the authorizer class that can be used later. Stored in the Authorizer template parameters.
     # In app_class.rb `def controller_params` it is used to build the input parameters for controller templates.
     def authorizer_metadata
-      klass = authorizer.split("#").first
-      authorizer_class = "#{klass}_authorizer".camelize
-      logical_id = authorizer_id(prefix_class: false)
-      "#{authorizer_class}.#{logical_id}"
+      metadata(authorizer)
     end
 
     def authorizer
@@ -39,10 +24,30 @@ class Jets::Router::Route
       @options[:api_key_required]
     end
 
+    module ModuleMethods
+      def logical_id(authorizer, prefix_class: true)
+        klass, meth = authorizer.split("#")
+        words = [meth, "authorizer"]
+        words.unshift(klass) if prefix_class
+        words.join('_').camelize # logical_id
+      end
+
+      def metadata(authorizer)
+        klass = authorizer.split("#").first
+        authorizer_class = "#{klass}_authorizer".camelize
+        logical_id = logical_id(authorizer, prefix_class: false)
+        # IE: MainAuthorizer.ProtectAuthorizer
+        "#{authorizer_class}.#{logical_id}"
+      end
+    end
+    include ModuleMethods # so available as instance methods
+    extend ModuleMethods # so also available as module method. IE: Jets::Router::Route::Authorizer.metadata(auth_to)
+
   private
     def inferred_authorization_type
       return unless authorizer
       Jets::Authorizer::Base.authorization_type(authorizer)
     end
+
   end
 end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-11 00:00:00.000000000 Z
+date: 2019-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -940,7 +940,7 @@ files:
 - lib/jets/router/resources/filter.rb
 - lib/jets/router/resources/options.rb
 - lib/jets/router/route.rb
-- lib/jets/router/route/authorization.rb
+- lib/jets/router/route/authorizer.rb
 - lib/jets/router/scope.rb
 - lib/jets/router/util.rb
 - lib/jets/rule/base.rb