haveapi 0.22.1 → 0.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d886505aa1e12970c014a30cd9b51aecb7b97218c62d4b86069c397d2979a69
-  data.tar.gz: 4c33b3e2c9fd695737163e00bb1dfe04799356a06591a8cecb6b1d27e675975b
+  metadata.gz: 54cc880c99b9714c7fd4661be4f8c7b4ff333e6bcbfa896a6d508f53791797a9
+  data.tar.gz: 6c69f7cc21150d4de0bcb3124c03dc50a3c134a945d32c72c2fb7fcca28291e8
 SHA512:
-  metadata.gz: 41837c1ac3eba812bf548cc00edb86f7ff7d9b6af63acbf07ba475027a099300f7a7c2109682e2108dd501b8a51d381625b1f308bee4b580ee49644894d97b57
-  data.tar.gz: 6b1b487e12e28912230a37c327de0863056931203574e5fd0d35096c61d3dbf5018af7846d2cee9116c53f442adb799497f1b803b9609599076b0fd065287f95
+  metadata.gz: 516218e4d6fdcfd4fe09114a2bc4ef4b979a0874e7a50db2bd6ce0535f3dcb5240d5ff4ee31e17dd98dd3c7e700d1f7960b4ceda49531d5d05ec4d33e8d4429b
+  data.tar.gz: 932a6f8690fb1378a4ba689f256d51c3b695ed0464d662970ee8e017d7b5f3c09467abcecfbd24e0c17bd7368a56c3c9edfad153a1793db1e32cfe709bcf0144

data/haveapi.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'activesupport', '>= 7.1'
   s.add_runtime_dependency 'github-markdown'
-  s.add_runtime_dependency 'haveapi-client', '~> 0.22.1'
+  s.add_runtime_dependency 'haveapi-client', '~> 0.23.1'
   s.add_runtime_dependency 'json'
   s.add_runtime_dependency 'mail'
   s.add_runtime_dependency 'nesty', '~> 1.0'

data/lib/haveapi/authentication/token/provider.rb

@@ -281,11 +281,11 @@ module HaveAPI::Authentication
 
             def exec
               provider = self.class.resource.token_instance
-              result = provider.config.renew_token(ActionRequest.new(
-                                                     request:,
-                                                     user: current_user,
-                                                     token: provider.token(request)
-                                                   ), ActionResult.new)
+              result = provider.config.renew.handle.call(ActionRequest.new(
+                                                           request:,
+                                                           user: current_user,
+                                                           token: provider.token(request)
+                                                         ), ActionResult.new)
 
               if result.ok?
                 { valid_to: result.valid_to }

data/lib/haveapi/client_examples/php_client.rb

@@ -147,15 +147,12 @@ module HaveAPI::ClientExamples
     end
 
     def format_parameters(dir, params, prefix = '')
-      ret = []
-
-      params.each do |k, v|
-        ret << if action[dir][:parameters][k][:type] == 'Custom'
-                 "#{prefix}  \"#{k}\" => custom type}"
-
-               else
-                 "#{prefix}  \"#{k}\" => #{value(v)}"
-               end
+      ret = params.map do |k, v|
+        if action[dir][:parameters][k][:type] == 'Custom'
+          "#{prefix}  \"#{k}\" => custom type}"
+        else
+          "#{prefix}  \"#{k}\" => #{value(v)}"
+        end
       end
 
       "#{prefix}[\n#{ret.join(",\n")}\n#{prefix}]"

data/lib/haveapi/resource.rb

@@ -116,7 +116,7 @@ module HaveAPI
       cls
     end
 
-    def self.define_action(name, superclass: Action, &block)
+    def self.define_action(name, superclass: Action, &)
       return false if const_defined?(name)
 
       cls = Class.new(superclass)
@@ -124,7 +124,7 @@ module HaveAPI
       cls.resource = self
       cls.action_name = name
       superclass.delayed_inherited(cls)
-      cls.class_exec(&block)
+      cls.class_exec(&)
     end
   end
 end

data/lib/haveapi/resources/action_state.rb

@@ -61,7 +61,6 @@ module HaveAPI::Resources
       authorize { allow }
 
       def exec
-        ret = []
         actions = @context.server.action_state.list_pending(
           current_user,
           input[:offset],
@@ -69,11 +68,9 @@ module HaveAPI::Resources
           input[:order].to_sym
         )
 
-        actions.each do |state|
-          ret << state_to_hash(state)
+        actions.map do |state|
+          state_to_hash(state)
         end
-
-        ret
       end
     end
 

data/lib/haveapi/server.rb

@@ -11,6 +11,20 @@ module HaveAPI
 
     include Hookable
 
+    has_hook :pre_mount,
+             desc: 'Called before API actions are mounted in sinatra',
+             args: {
+               server: 'HaveAPI::Server',
+               sinatra: 'Sinatra::Base'
+             }
+
+    has_hook :post_mount,
+             desc: 'Called after API actions are mounted in sinatra',
+             args: {
+               server: 'HaveAPI::Server',
+               sinatra: 'Sinatra::Base'
+             }
+
     # Called after the user was authenticated (or not). The block is passed
     # current user object or nil as an argument.
     has_hook :post_authenticated,
@@ -339,12 +353,16 @@ module HaveAPI
 
       @extensions.each { |e| e.enabled(self) }
 
+      call_hooks_for(:pre_mount, args: [self, @sinatra])
+
       # Mount default version first
       mount_version(@root, @default_version)
 
       @versions.each do |v|
         mount_version(version_prefix(v), v)
       end
+
+      call_hooks_for(:post_mount, args: [self, @sinatra])
     end
 
     def mount_version(prefix, v)

data/lib/haveapi/spec/mock_action.rb

@@ -8,7 +8,7 @@ module HaveAPI::Spec
       @v = v
     end
 
-    def call(input, user: nil, &block)
+    def call(input, user: nil, &)
       action = @action.new(nil, @v, input, nil, HaveAPI::Context.new(
                                                   @server,
                                                   version: @v,
@@ -26,7 +26,7 @@ module HaveAPI::Spec
       status, data, errors = action.safe_exec
       raise(data || 'action failed') unless status
 
-      action.instance_exec(@test, &block)
+      action.instance_exec(@test, &)
       data
     end
   end

data/lib/haveapi/spec/spec_methods.rb

@@ -74,12 +74,12 @@ module HaveAPI::Spec
     # @param version [any] API version, if not specified, the default version is used
     # @param user [any] object representing authenticated user
     # @yield [self] the block is executed in the action instance
-    def mock_action(r_name, a_name, params, version: nil, user: nil, &block)
+    def mock_action(r_name, a_name, params, version: nil, user: nil, &)
       app
       v = version || @api.default_version
       action, path = find_action(v, r_name, a_name)
       m = MockAction.new(self, @api, action, path, v)
-      m.call(params, user:, &block)
+      m.call(params, user:, &)
     end
 
     # Return parsed API response.

data/lib/haveapi/version.rb

@@ -1,4 +1,4 @@
 module HaveAPI
   PROTOCOL_VERSION = '2.0'.freeze
-  VERSION = '0.22.1'.freeze
+  VERSION = '0.23.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: haveapi
 version: !ruby/object:Gem::Version
-  version: 0.22.1
+  version: 0.23.1
 platform: ruby
 authors:
 - Jakub Skokan
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.1
+        version: 0.23.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.1
+        version: 0.23.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement