leanweb 0.5.2 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d558c8dc51eb0ded4ae4ca0c73bed085cbc9f807df31f615ec697f2555c59492
-  data.tar.gz: f45c4c2df3cbdfd6dcc1b56c37e6a79d36b24497b8a62faad2ee2c7d0d47027d
+  metadata.gz: 6b3993343fb571b11c2bdf16e2874103e79b5994dee7218c94fd7175a5458a57
+  data.tar.gz: c9cdaff0f1ae2cb6af897b644f3ffa39829bd590c5c2f6aecf81329485f96495
 SHA512:
-  metadata.gz: d7e428e0f47aea5c20e8bf59a8bc93e4bfec30488c9e84a2e9d3d26901fcd6ae5b96710fd7cfc4346c028781879cf343bc479069aec58b0e3f41ef1ec43a8a42
-  data.tar.gz: 87a6f8b615112c8525a9241b6fc0d4b02b305334abc064072b6c4babe80a775af138fa935161211c9af547acbdef9f9ab808aa1f2455f221357b17904fd4a498
+  metadata.gz: b5abde684aa9f4f542c0256a3af664298797c424541db46540d77862098c7e8509cb00ff81e7d1a7d4032025727e4cb2610d3ee75bcc51be0cd7b10f54c704f5
+  data.tar.gz: c4a154a07332e20bcd5f60d830516a6a937f3e507cd010e9df5266c51b14fa9740d32cc03594b2b362f215780aad68f833f1939c7eba63df201fb6c616de5d6f

data/contrib/lib/hawese.rb

@@ -10,7 +10,6 @@
 require 'json'
 require 'net/http'
 require 'openssl'
-require 'tilt'
 require 'uri'
 
 # Hawese client.
@@ -22,6 +21,13 @@ require 'uri'
 # - HAWESE_ORIGIN
 # - HAWESE_AUTH_TOKEN
 class Hawese
+  # Error to display when a response is unexpected.
+  class UnexpectedResponseError < RuntimeError
+    def initialize(message = 'Unexpected response')
+      super(message)
+    end
+  end
+
   class << self
     ENDPOINT = ENV.fetch('HAWESE_ENDPOINT')
     RETURN_URL = ENV.fetch('HAWESE_RETURN_URL') do
@@ -44,15 +50,31 @@ class Hawese
       JSON.parse(Net::HTTP.get(uri), symbolize_names: true)
     end
 
-    def purchase(gateway, fields)
-      uri = URI("#{ENDPOINT}/#{ORIGIN}/gateways/#{gateway}/purchase")
-      uri.query = URI.encode_www_form(return_url: RETURN_URL)
+    def do_action(gateway, schema, fields)
+      uri = URI("#{ENDPOINT}/#{ORIGIN}/gateways/#{gateway}/#{schema}")
+      uri.query = URI.encode_www_form(return_url: RETURN_URL) if
+        schema == 'purchase'
       response = Net::HTTP.post(
         uri,
         fields.to_json,
-        'Content-Type' => 'application/json'
+        {
+          'Authorization' => "Bearer #{ENV.fetch('HAWESE_AUTH_TOKEN')}",
+          'Content-Type' => 'application/json'
+        }
       )
-      JSON.parse(response.body, symbolize_names: true)
+      process_response(response)
+    end
+
+    def purchase(gateway, fields)
+      do_action(gateway, 'purchase', fields)
+    end
+
+    def link(gateway, fields)
+      do_action(gateway, 'link', fields)
+    end
+
+    def charge(gateway, fields)
+      do_action(gateway, 'charge', fields)
     end
 
     def receipt(gateway, payment_uuid, fields = {})
@@ -66,7 +88,7 @@ class Hawese
         })
         req.body = fields.to_json
         response = http.request(req)
-        receipt_process_response(response)
+        process_response(response)
       end
     end
 
@@ -98,14 +120,22 @@ class Hawese
       fields
     end
 
-    def receipt_process_response(response)
+    def process_response(response)
       response_body = JSON.parse(response.body, symbolize_names: true)
-
-      case response.code
-      when '401' then raise(response_body)
-      when '200' then response_body
-      else raise(response_body[:error][:message])
+      unless response.code.to_i.between?(200, 299)
+        raise(
+          UnexpectedResponseError,
+          if response_body.instance_of?(String)
+            response_body
+          else
+            response_body.[](:error)&.[](:message)
+          end
+        )
       end
+
+      response_body
+    rescue JSON::ParserError
+      raise(response.body)
     end
   end
 end

data/contrib/lib/rack/session/json_file.rb

@@ -76,7 +76,7 @@ module Rack
 
       def generate_sid(*)
         sid = super
-        FileUtils.mkdir_p(@session_dir, mode: 0o700)
+        FileUtils.mkdir_p(@session_dir, mode: 0o1777)
         ::File.new("#{@session_dir}/#{sid}", 'w', 0o600).close
         sid
       end

data/lib/leanweb/route.rb

@@ -72,9 +72,6 @@ module LeanWeb
       return respond_proc(request) if @action.instance_of?(Proc)
 
       respond_method(request)
-    rescue NoMethodError
-      controller = default_controller_class.new(self)
-      controller.default_static_action(guess_view_path)
     end
 
     # String path, independent if {#path} is Regexp or String.
@@ -157,14 +154,28 @@ module LeanWeb
       Controller
     end
 
+    def default_static_action
+      default_controller_class.new(self).default_static_action(guess_view_path)
+    end
+
+    def controller_for_request(request)
+      require_relative("#{CONTROLLER_PATH}/#{@action.controller.to_s.snakeize}")
+      Object.const_get(@action.controller).new(self, request)
+    rescue LoadError
+      nil
+    end
+
     # @param request [Rack::Request]
     # @return [Array] a valid Rack response.
     def respond_method(request)
       params = action_params(request.path)
-      require_relative("#{CONTROLLER_PATH}/#{@action.controller.to_s.snakeize}")
-      controller = Object.const_get(@action.controller).new(self, request)
-      return controller.public_send(@action.action, **params) \
-        if params.instance_of?(Hash)
+      controller = controller_for_request(request)
+
+      return default_static_action unless
+        controller&.class&.method_defined?(@action.action)
+
+      return controller.public_send(@action.action, **params) if
+        params.instance_of?(Hash)
 
       controller.public_send(@action.action, *params)
     end

data/lib/leanweb/version.rb

@@ -9,5 +9,5 @@
 
 
 module LeanWeb
-  VERSION = '0.5.2'
+  VERSION = '0.5.4'
 end

data/lib/leanweb.rb

@@ -9,7 +9,6 @@
 
 # LeanWeb is a minimal hybrid static / dynamic web framework.
 module LeanWeb
-  require_relative 'leanweb/version'
 
   ROOT_PATH = ENV.fetch('LEANWEB_ROOT_PATH', Dir.pwd)
   CONTROLLER_PATH = "#{ROOT_PATH}/src/controllers"
@@ -31,6 +30,7 @@ module LeanWeb
   autoload :Route, 'leanweb/route.rb'
   autoload :Controller, 'leanweb/controller.rb'
   autoload :App, 'leanweb/app.rb'
-end
 
-require_relative 'leanweb/helpers'
+  require_relative 'leanweb/version'
+  require_relative 'leanweb/helpers'
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leanweb
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.4
 platform: ruby
 authors:
 - Felix Freeman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-23 00:00:00.000000000 Z
+date: 2023-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -222,7 +222,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: LeanWeb is a minimal hybrid static / dynamic web framework