leanweb 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4e80c5813858b838b39fea56bb96b2fb28f7749d22f02ab04694662a8595d96
-  data.tar.gz: c2fdc8ebf92d647516db11352e5a6cb7bc36f1489dfabe69c095e7090f1b7970
+  metadata.gz: 9c2c8b263119a2bfb7a4a812f4ffeb66bc9444bfc65a5ea0ab99d627d227e307
+  data.tar.gz: bbb016308a12268ee78694e378e931c016475ca8cf9ff4264d017f79664911f3
 SHA512:
-  metadata.gz: 1bed8458a93a2f0139609f17fe3402f69065182607b6b6664cc0c6d90ab3815f4dca7cd08c165dab17e5448d9c3f7d3c44ef8e1f28468cd3e4c42a66b096c8b8
-  data.tar.gz: 320c619aedd70c9bd0ed5e698ef456e293d3cf754bbe3ca939a7669b45ad117a371089db15737edf0c5c271ad638b84784e6ee3a730093a82a16843828a1074c
+  metadata.gz: 52c6e7bdd02a5c2797d20cd6979574cec8a4d8333ab659f3332fa6b4e3bce906a69f950124453621e12dee38c0c585ac3abace0a8041c54d444524c0a21bbba3
+  data.tar.gz: 64ec617d144264edce4922fa2258173f6cc139a20102a9ba4c4290adb6ec06d13be4b5f265af715fdcd82005ae03c66ac447c7dd79bc30dce0c3235d4a4f8e22

data/bin/leanweb

@@ -88,6 +88,12 @@ files = [
         %body
           %h1 It works!
     HAML
+  }, {
+    filename: '.gitignore'
+    content: <<~GITIGNORE
+      /.bundle
+      /public/**/*.html
+    GITIGNORE
   }
 ]
 

data/contrib/lib/hawese.rb

@@ -28,15 +28,19 @@ class Hawese
     end
     ORIGIN = ENV.fetch('HAWESE_ORIGIN')
 
-    def payment_methods
-      uri = URI("#{ENDPOINT}/gateways/payment-methods/purchase")
-      JSON.parse(Net::HTTP.get(uri))
+    def payment_methods(country = '*', currency = nil)
+      endpoint = String.new(
+        "#{ENDPOINT}/gateways/payment-methods/purchase?country=#{country}"
+      )
+      endpoint << "&currency=#{currency}" if currency
+      uri = URI(endpoint)
+      JSON.parse(Net::HTTP.get(uri), symbolize_names: true)
     end
 
     def gateway_schema(gateway, query_params, schema = 'purchase')
       uri = URI("#{ENDPOINT}/gateways/#{gateway}/schemas/#{schema}")
       uri.query = URI.encode_www_form(query_params)
-      JSON.parse(Net::HTTP.get(uri))
+      JSON.parse(Net::HTTP.get(uri), symbolize_names: true)
     end
 
     def purchase(gateway, fields)
@@ -48,15 +52,25 @@ class Hawese
         fields.to_json,
         'Content-Type' => 'application/json'
       )
-      JSON.parse(response.body)
+      JSON.parse(response.body, symbolize_names: true)
     end
 
     def purchase_from_schema(gateway, schema)
       fields = {}
-      schema['properties'].each do |property, contents|
-        fields[property] = contents['default'] if contents.include?('default')
+      schema[:properties].each do |property, contents|
+        fields[property] = contents[:default] if contents.include?(:default)
       end
       purchase(gateway, fields)
     end
+
+    def payment(uuid)
+      uri = URI("#{ENDPOINT}/payments/#{uuid}")
+      Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
+        req = Net::HTTP::Get.new(uri)
+        req['Authorization'] = "Bearer #{ENV.fetch('HAWESE_AUTH_TOKEN')}"
+        response = http.request(req)
+        JSON.parse(response.body, symbolize_names: true)
+      end
+    end
   end
 end

data/contrib/lib/leanweb/controller_mixins/render_with_layout.rb

@@ -12,7 +12,7 @@ module LeanWeb
   module ControllerMixins
     # {render_with_layout} for {Controller} with ERB, HAML, Tilt::EmacsOrg and
     # Redcarpet Markdown support.
-    module RenderWithLayout
+    module RenderWithLayout # rubocop:disable Metrics/ModuleLength
       # Render a response with a layout.
       #
       # Depending on the `path` file contents and options `@content_for` might
@@ -43,15 +43,21 @@ module LeanWeb
         head: nil,
         layout: 'layout.haml',
         sub_layout: nil,
-        options: {},
+        options: nil,
         &block
       )
         @content_for[:title] = title unless title.nil?
         content = render_by_extension(path, sub_layout, options, &block)
-        prepare_head(head) unless head.nil?
+        prepare_head(**head) unless head.nil?
         render_response(layout, 'text/html'){ content }
       end
 
+      # Render response for missing static action methods. Called from
+      # {Route#respond}.
+      def default_static_action(view_path)
+        render_with_layout(view_path)
+      end
+
       protected
 
       # @param path [String]
@@ -60,8 +66,8 @@ module LeanWeb
       # @option options [String] :setupfile can be absolute or relative to
       #   {VIEW_PATH}.
       def render_org(path, layout: nil, options: {})
-        options[:setupfile] = "#{VIEW_PATH}/#{options[:setupfile]}" \
-          if options.include?(:setupfile) && options[:setupfile][0] != '/'
+        options[:setupfile] = absolute_view_path(options[:setupfile]) \
+          if options.include?(:setupfile)
 
         org_template = create_template(path, options)
 
@@ -83,6 +89,10 @@ module LeanWeb
       def render_markdown(path, layout: nil, options: {})
         maybe_render_markdown_toc!(path, options)
         markdown_template = create_template(path, options)
+
+        @content_for[:title] = find_title('md', path) \
+          unless @content_for.include?(:title)
+
         if layout
           create_template(layout).render(self){ markdown_template.render(self) }
         else
@@ -104,6 +114,23 @@ module LeanWeb
         options[:with_toc_data] = true
       end
 
+      def find_title(ext, path)
+        regex = find_title_ext_regex(ext)
+        title = nil
+        File.foreach(absolute_view_path(path)) do |line|
+          matches = line.match(regex)
+          (title = matches[1]) && break if matches
+        end
+        title
+      end
+
+      def find_title_ext_regex(ext)
+        case ext
+        when 'md' then /#(?!#)\s?(.+)/
+        when 'haml' then /%h1[^\s]*\s(.+)/
+        end
+      end
+
       # @param path [String]
       # @param layout [String]
       # @param options [Hash] Check `Haml` options.
@@ -119,16 +146,24 @@ module LeanWeb
         end
       end
 
+      # rubocop:disable Metrics/MethodLength
       def render_by_extension(path, layout, options, &block)
-        case File.extname(path)
-        when '.org'
-          render_org(path, layout: layout, options: options)
-        when '.md'
-          render_markdown(path, layout: layout, options: options)
-        else
-          render_other(path, layout: layout, options: options, &block)
+        ext = File.extname(path)[1..]
+        options = options || template_defaults[ext] || {}
+
+        case ext
+        when 'org'
+          return render_org(path, layout: layout, options: options)
+        when 'md'
+          return render_markdown(path, layout: layout, options: options)
+        when 'haml'
+          @content_for[:title] = find_title('haml', path) \
+            unless @content_for.include?(:title)
         end
+
+        render_other(path, layout: layout, options: options, &block)
       end
+      # rubocop:enable Metrics/MethodLength
 
       def prepare_head(js: nil, jsm: nil, css: nil, raw: nil)
         head = String.new

data/lib/leanweb/controller.rb

@@ -59,6 +59,12 @@ module LeanWeb
       Tilt[ext].new(path, 1, options || template_defaults[ext] || {})
     end
 
+    # Render response for missing static action methods. Called from
+    # {Route#respond}.
+    def default_static_action(view_path)
+      render_response(view_path)
+    end
+
     # Relative route to path from public directory considering current route.
     #
     # @param path [String] path from public directory, never begins with `/`.
@@ -70,9 +76,28 @@ module LeanWeb
       @base_url + path
     end
 
+    # Get absolute path for a file within {VIEW_PATH}.
+    # @param path [String] Can be:
+    # - A full path, starts with `/`.
+    # - A path relative to {VIEW_PATH}.
+    # - A path relative to current @route.path directory, starts with `./`.
+    # @return [String] Absolute path.
+    def absolute_view_path(path)
+      return path if path.start_with?('/')
+
+      view_path = String.new(LeanWeb::VIEW_PATH)
+
+      if path.start_with?('./')
+        view_path << @route.path.sub(%r{/[^/]*$}, '')
+        path = path[2..]
+      end
+
+      path == '' ? view_path : "#{view_path}/#{path}"
+    end
+
     # Request params.
     def params
-      @request.params
+      @request&.params
     end
 
     protected
@@ -81,11 +106,5 @@ module LeanWeb
     def template_defaults
       {}
     end
-
-    # @param path [String]
-    # @return [String] Full path.
-    def absolute_view_path(path)
-      path[0] == '/' ? path : "#{LeanWeb::VIEW_PATH}/#{path}"
-    end
   end
 end

data/lib/leanweb/route.rb

@@ -63,12 +63,20 @@ module LeanWeb
       str_path[-1] == '/' ? 'index' : File.basename(str_path)
     end
 
+    # Respond with a proc, controller method, or in case of true static routes
+    # a rendering of {VIEW_PATH}/{path} with any file extension.
+    #
     # @param request [Rack::Request]
     # @return [Array] a valid rack response.
     def respond(request)
       return respond_proc(request) if @action.instance_of?(Proc)
 
       respond_method(request)
+    rescue NoMethodError
+      raise unless @static == true && (view_path = guess_view_path)
+
+      controller = default_controller_class.new(self)
+      controller.default_static_action(view_path)
     end
 
     # String path, independent if {#path} is Regexp or String.
@@ -141,7 +149,14 @@ module LeanWeb
     end
 
     def default_action_action
-      "#{path_basename.gsub('-', '_')}_#{@method.downcase}".to_sym
+      "#{path_basename.gsub(/[.-]/, '_')}_#{@method.downcase}".to_sym
+    end
+
+    def default_controller_class
+      require_relative("#{CONTROLLER_PATH}/#{DEFAULT_CONTROLLER.to_s.snakeize}")
+      Object.const_get(DEFAULT_CONTROLLER)
+    rescue LoadError
+      Controller
     end
 
     # @param request [Rack::Request]
@@ -160,8 +175,7 @@ module LeanWeb
     # @return [Array] a valid Rack response.
     def respond_proc(request)
       params = action_params(request.path)
-      require_relative("#{CONTROLLER_PATH}/#{DEFAULT_CONTROLLER.to_s.snakeize}")
-      controller = Object.const_get(DEFAULT_CONTROLLER).new(self, request)
+      controller = default_controller_class.new(self, request)
       return controller.instance_exec(**params, &@action) \
         if params.instance_of?(Hash)
 
@@ -188,7 +202,7 @@ module LeanWeb
     def output_path(path, content_type)
       out_path =
         if path[-1] == '/'
-          String.new("#{PUBLIC_PATH}#{path}/index")
+          String.new("#{PUBLIC_PATH}#{path}index")
         else
           String.new("#{PUBLIC_PATH}#{path}")
         end
@@ -199,5 +213,15 @@ module LeanWeb
 
       out_path
     end
+
+    def guess_view_path
+      return if @path.instance_of?(Regexp)
+
+      view_path = String.new("#{LeanWeb::VIEW_PATH}#{@path}")
+      view_path << 'index' if @path[-1] == '/' # add index if is index
+      view_path.sub!(%r{\.[^/]+$}, '') # drop static file extension if set
+
+      Dir["#{view_path}.*"].first # return first file match or nil
+    end
   end
 end

data/lib/leanweb/version.rb

@@ -9,5 +9,5 @@
 
 
 module LeanWeb
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leanweb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Felix Freeman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-14 00:00:00.000000000 Z
+date: 2022-11-09 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.3.21
+rubygems_version: 3.3.23
 signing_key:
 specification_version: 4
 summary: LeanWeb is a minimal hybrid static / dynamic web framework