apphtml_layer 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3aced5a8e6c3bf21bb153679c3714739adb87bc8361868c9cd0fc4796f6912c
-  data.tar.gz: ed25dc425646840ee82fdf23236d0665b72922465e07c2a1c18ab89010970311
+  metadata.gz: 895fab8f277c269d759859a4449cf9ed1f3ce395846239a0617a175f6392fb03
+  data.tar.gz: 0f50045c40962bc85b6455d737920f79835f58c41372c76bb7aa3af4c8702380
 SHA512:
-  metadata.gz: d2499af62de9fa482220ec1b0caa265b8e13158c982192ef9b0e30fc90763a66dedfaae1b0863d1d6c37396b48a18d757e41159c91392670472c82bc5b8cde2e
-  data.tar.gz: c36cda8d3b70376348cecf7861bd0a343be1e9ad80122bcaa7472053517d3e72c610e2adc3beb45c5b83ab0e0c5eeeff6c634ae126b03275cc75d52e1f9f6d33
+  metadata.gz: 81d2f12a0f3a86693a72d07d9e4824f9bfa79b62aa38b49eceb8ed30a776f1ffdcf6b49c4533d0004bcc2581c44808605446fb1dad988c399c0fb1bd747947a1
+  data.tar.gz: e8ae9e4c1c7be589843f1a753143c10722d311c3782123acbe8181cbf5b01ac6c68094069084b8cdb7542176a0c65a0707deceb8bb68a0021760e6f82f7607fb

data/lib/apphtml_layer.rb

@@ -3,33 +3,74 @@
 # file: apphtml_layer.rb
 
 require 'uri'
-require 'json'
 require 'c32'
+require 'json'
+require 'hpath'
 require 'kramdown'
 
+
+module HashPath
+
+  refine Hash do
+
+    def path(s)
+      Hpath.get(self, s)
+    end
+
+  end
+
+end
+
 class AppHtmlLayer
+  using HashPath
   using ColouredText
+  
+  attr_reader :apps
 
-  def initialize(app, filepath: '.', headings: false, debug: false)
-    @app, @filepath, @headings, @debug = app, filepath, headings, debug
+  def initialize(apps={}, filepath: '.', headings: false, debug: false)
+    
+    @apps = if apps.is_a? Hash
+      apps
+    else
+      {apps.class.to_s.downcase.to_sym => apps}
+    end
+    
+    @filepath, @headings, @debug = filepath, headings, debug
+    
   end
 
   def lookup(s)
 
-    if s == '/' then
+    if s[-1] == '/' then
       
       fp = File.join(@filepath, 'index.html')      
-      return (File.exists?(fp) ? File.read(fp) : default_index() )
+      
+      if File.exists?(fp) then
+        
+        return File.read(fp)
+        
+      else
+        
+        app = path(s)
+        
+        if app then
+          return default_index(app) 
+        else
+          return ['path not found', 'text/plain', '404']
+        end
+        
+      end
 
     end
    
     return [s.to_s, 'text/plain'] if s =~ /^\/\w+\.\w+/
 
-    uri = URI(s)
+    a2 = s.split('/')
+    basepath = a2[0..-2].join('/')
+    uri = URI(a2[-1])
 
-    a = uri.path.split('/')
-    a.shift
-    name, *args = a
+    name = a2[-1][-1] == '?' ? a2[-1] : uri.path
+    puts 'name: ' + name.inspect if @debug
 
     if uri.query then
 
@@ -39,14 +80,19 @@ class AppHtmlLayer
 
       puts ('h: ' + h.inspect).debug if @debug
       args = h[:arg] ? [h[:arg]] : h
-
+      puts 'args: ' + args.inspect if @debug
+      
     end  
 
-    if @app.respond_to? name.to_sym then
+    puts 's: ' + s.inspect if @debug
+    app = path(basepath)
+    puts 'app: ' + app.inspect if @debug
+    
+    if app and app.respond_to? name.to_sym then
 
       begin
         
-        method = @app.method(name.to_sym)
+        method = app.method(name.to_sym)
         
         if method.arity > 0 and  args.length <= 0 then
           
@@ -58,12 +104,23 @@ class AppHtmlLayer
         else
           
           puts ('args: ' + args.inspect).debug if @debug
-          r = args.is_a?(Array) ? method.call(*args) :  method.call(args)
+          
+          r = case args
+          when Array
+            method.call(*args) 
+          when Hash
+            args.empty? ? method.call : method.call(args)
+          else
+            method.call
+          end
           
         end
-
+        
+        puts ('name' + name.inspect) if @debug
+        
         fp = File.join(@filepath, File.basename(name) + '.html')
-
+        puts 'fp: ' + fp.inspect if @debug
+        
         content = if File.exists?(fp) then        
           render_html(fp, r)
         else
@@ -105,15 +162,17 @@ class AppHtmlLayer
 
   end
   
-  def default_index()
+  private
+  
+  def default_index(app)
     
-    a = (@app.public_methods - Object.public_methods).sort
+    a = (app.public_methods - Object.public_methods).sort
     s = a.map {|x| "* [%s](%s)" % [x,x]}.join("\n")
 
     markdown = "
 <html>
   <head>
-  <title>#{@app.class.to_s}</title>
+  <title>#{app.class.to_s}</title>
   <style>
 h1 {color: green}
 h2 {color: orange}
@@ -122,7 +181,7 @@ div {height: 60%; overflow-y: auto; width: 200px; float: left}
   </head>
 <body markdown='1'>
 
-# #{@app.class.to_s} Index
+# #{app.class.to_s} Index
 
 ## Public Methods
 
@@ -145,6 +204,16 @@ div {height: 60%; overflow-y: auto; width: 200px; float: left}
     [doc.xml(pretty: true), 'text/html']    
   end
   
+  def path(s)
+    
+    if @apps.length < 2 then      
+      @apps.path("/%s/%s" % [@apps.keys.first, s])
+    else
+      @apps.path(s)
+    end
+    
+  end
+  
   def render_html(fp, s)
     
     doc = Rexle.new(File.read fp)
@@ -156,4 +225,3 @@ div {height: 60%; overflow-y: auto; width: 200px; float: left}
   end
 
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apphtml_layer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   yoJvKaZL2qWoAZHs/MGOlsTMVHkz5YV3AaLaViO2SE/hVvFfFHJDX224xRsUHIHx
   za7UEBvPemTf/f9WiN5bG3dD
   -----END CERTIFICATE-----
-date: 2020-10-26 00:00:00.000000000 Z
+date: 2020-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: c32
@@ -57,6 +57,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: hpath
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -103,8 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Add a basic HTML wrapper to your Ruby object. Suitable for use with a web