wabur 0.5.0 → 0.6.0

data/lib/wab/impl/exprs/regex.rb

@@ -14,13 +14,13 @@ module WAB
       end
 
       def eval(data)
-        value = data.get(@path)
+        value = data.get(path)
         return @rx === value if value.is_a?(String)
         false
       end
 
       def native()
-        ['REGEX', @path, @rx.source]
+        ['REGEX', path, @rx.source]
       end
 
     end # Regex

data/lib/wab/impl/handler.rb

@@ -52,7 +52,7 @@ module WAB
       end
 
       def log_request_with_body(caller, path, query, body)
-        @shell.logger.info("#{caller}(#{path.join('/')}#{query}, #{body.json})")
+        @shell.logger.info("#{caller} #{path.join('/')}#{query}\n#{body.json(@shell.indent)}")
       end
 
       # Pulls and converts the request path, query, and body. Also returns the
@@ -61,11 +61,13 @@ module WAB
         path = req.path.split('/')[1..-1]
         query = {}
         req.query.each { |k,v| query[k.to_sym] = v }
-        if req.body.nil?
+        request_body = req.body
+        if request_body.nil?
           body = nil
         else
-          body = Oj.strict_load(req.body, symbol_keys: true)
-          body = Data.new(body, false)
+          body = Data.new(
+            Oj.strict_load(request_body, symbol_keys: true)
+          )
           body.detect
         end
         [@shell.path_controller(path), path, query, body]
@@ -74,10 +76,11 @@ module WAB
       # Sends the results from a controller request.
       def send_result(result, res, path, query)
         result = @shell.data(result) unless result.is_a?(WAB::Data)
+        response_body = result.json(@shell.indent)
         res.status = 200
         res['Content-Type'] = 'application/json'
-        @shell.logger.debug("reply to #{path.join('/')}#{query}: #{result.json(@shell.indent)}") if @shell.logger.debug?
-        res.body = result.json(@shell.indent)
+        @shell.logger.debug("reply to #{path.join('/')}#{query}: #{response_body}") if @shell.logger.debug?
+        res.body = response_body
       end
 
       # Sends an error from a rescued call.
@@ -87,7 +90,7 @@ module WAB
         body = { code: -1, error: "#{e.class}: #{e.message}" }
         body[:backtrace] = e.backtrace
         res.body = @shell.data(body).json(@shell.indent)
-        @shell.logger.warn(%|*-*-* #{e.class}: #{e.message}\n      #{e.backtrace.join("\n      ")}|)
+        @shell.logger.warn(Impl.format_error(e))
       end
 
     end # Handler

data/lib/wab/impl/init.rb

@@ -10,99 +10,161 @@ module WAB
     # - config/opo.conf
     # - config/opo-rub.conf
     # - lib/uicontroller.rb
+    #
+    # If the site option was set then all the export files are used to
+    # populate a site directory as well.
     class Init
 
-      class << self
-        def setup(path, config)
-          exist_check(path)
+      def self.setup(path, config)
+        self.new(path, config)
+      end
 
-          types      = config[:rest]
-          config_dir = "#{path}/config"
-          lib_dir    = "#{path}/lib"
+      private
 
-          FileUtils.mkdir_p([config_dir,lib_dir])
+      def initialize(path, config)
+        @types     = config[:rest] || []
 
-          write_ui_controllers(lib_dir, types)
-          write_spawn(lib_dir, types)
+        if (@types.nil? || @types.empty?) && !init_site
+          raise WAB::Error.new("At least one record type is required for 'new' or 'init'.")
+        end
+        check_dup_type
 
-          write_wabur_conf(config_dir, types)
-          write_opo_conf(config_dir, types)
-          write_opo_rub_conf(config_dir, types)
+        @verbose = config[:verbosity]
+        @verbose = 'INFO' == @verbose || 'DEBUG' == @verbose || Logger::INFO == @verbose || Logger::DEBUG == @verbose
+        @write_cnt = 0
+        @exist_cnt = 0
+        @base_len = path.length + 1
 
-        rescue StandardError => e
-          # TBD: Issue more helpful error message
-          puts %|*-*-* #{e.class}: #{e.message}\n      #{e.backtrace.join("\n      ")}|
-          abort
-        end
+        config_dir = "#{path}/config"
+        lib_dir    = "#{path}/lib"
+        init_site  = config[:site]
 
-        private
-
-        def exist_check(path)
-          [
-           'config/wabur.conf',
-           'config/opo.conf',
-           'config/opo-rub.conf',
-           'lib/ui_controller.rb',
-          ].each { |filename|
-            fullpath = "#{path}/#{filename}"
-            raise WAB::DuplicateError.new(fullpath) if File.exist?(fullpath)
-          }
-        end
-        
-        def write_ui_controllers(dir, types)
-          rest_flows = ''
-          types.each { |type|
-            rest_flows << %|
+        FileUtils.mkdir_p([config_dir, lib_dir])
+
+        write_ui_controllers(lib_dir)
+        write_spawn(lib_dir)
+
+        write_wabur_conf(config_dir)
+        write_opo_conf(config_dir)
+        write_opo_rub_conf(config_dir)
+
+        copy_site(File.expand_path("#{__dir__}/../../../export"), "#{path}/site") if init_site
+
+        puts "\nSuccessfully initialized a WAB workspace at #{path}."
+        puts "  Wrote #{@write_cnt} files." unless @write_cnt.zero?
+        puts "  Skipped #{@exist_cnt} files that already existed" unless @exist_cnt.zero?
+
+      rescue StandardError => e
+        # TBD: Issue more helpful error message
+        puts WAB::Impl.format_error(e)
+        abort
+      end
+
+      def check_dup_type
+        type_map = {}
+        @types.each { |type|
+          key = type.downcase
+          raise DuplicateError.new(key) if type_map.has_key?(key)
+          type_map[key] = true
+        }
+      end
+      
+      def write_ui_controllers(dir)
+        rest_flows = ''
+        @types.each { |type|
+          rest_flows << %|
     add_flow(WAB::UI::RestFlow.new(shell,
                                    {
                                      kind: '#{type}',
                                    }, ['$ref']))|
-          }
-          write_file(dir, 'ui_controller.rb', { rest_flows: rest_flows })
-        end
-        
-        def write_spawn(dir, types)
-          controllers = ''
-          types.each { |type|
-            controllers << %|
+        }
+        write_file(dir, 'ui_controller.rb', { rest_flows: rest_flows })
+      end
+
+      def write_spawn(dir)
+        controllers = ''
+        @types.each { |type|
+          controllers << %|
 shell.register_controller('#{type}', WAB::OpenController.new(shell))|
-          }
-          write_file(dir, 'spawn.rb', { controllers: controllers })
-        end
+        }
+        write_file(dir, 'spawn.rb', { controllers: controllers })
+      end
 
-        def write_wabur_conf(dir, types)
-          handlers = ''
-          types.each_index { |index|
-            handlers << %|
-handler.#{index + 1}.type = #{types[index]}
-handler.#{index + 1}.handler = WAB::OpenController|
-          }
-          write_file(dir, 'wabur.conf', { handlers: handlers })
-        end
-        
-        def write_opo_conf(dir, _types)
-          write_file(dir, 'opo.conf')
-        end
-        
-        def write_opo_rub_conf(dir, types)
-          handlers = ''
-          types.each_index { |index|
-            type = types[index]
-            handlers << %|
-handler.#{type.downcase}.path = /v1/#{type}/**
-handler.#{type.downcase}.class = WAB::OpenController
+      def write_wabur_conf(dir)
+        handlers = ''
+        @types.each_index { |index|
+          natural_index = index + 1
+          handlers << %|
+handler.#{natural_index}.type = #{@types[index]}
+handler.#{natural_index}.handler = WAB::OpenController|
+        }
+        write_file(dir, 'wabur.conf', { handlers: handlers })
+      end
+
+      def write_opo_conf(dir)
+        write_file(dir, 'opo.conf')
+      end
+
+      def write_opo_rub_conf(dir)
+        handlers = ''
+        @types.each_index { |index|
+          type = @types[index]
+          slug = type.downcase
+          handlers << %|
+handler.#{slug}.path = /v1/#{type}/**
+handler.#{slug}.class = WAB::OpenController
 |
-          }
-          write_file(dir, 'opo-rub.conf', { handlers: handlers })
-        end
+        }
+        write_file(dir, 'opo-rub.conf', { handlers: handlers })
+      end
+
+      def copy_site(src, dest)
+        FileUtils.mkdir_p(dest)
+        Dir.foreach(src) { |filename|
+          next if filename.start_with?('.')
+          src_path = "#{src}/#{filename}"
+          dest_path = "#{dest}/#{filename}"
 
-        def write_file(dir, filename, gsub_data=nil)
+          if File.directory?(src_path)
+            copy_site(src_path, dest_path)
+          elsif File.file?(src_path)
+            rel_path = dest_path[@base_len..-1] if @verbose
+            if File.exist?(dest_path)
+              verbose_log('exists', rel_path)
+              @exist_cnt += 1
+              next
+            end
+            out = `cp #{src_path} #{dest_path}`
+            @write_cnt += 1
+            if out.empty?
+              verbose_log('wrote', rel_path)
+            else
+              # the error message from the OS
+              puts out
+            end
+          end
+        }
+      end
+
+      def write_file(dir, filename, gsub_data=nil)
+        filepath = "#{dir}/#{filename}"
+        if File.exist?(filepath)
+          verbose_log('exists', filepath[@base_len..-1])
+          @exist_cnt += 1
+        else
           template = File.open("#{__dir__}/templates/#{filename}.template", 'rb') { |f| f.read }
           content  = gsub_data.nil? ? template : template % gsub_data
-          File.open("#{dir}/#{filename}", 'wb') { |f| f.write(content) }
+          File.open(filepath, 'wb') { |f| f.write(content) }
+          verbose_log('wrote', filepath[@base_len..-1])
+          @write_cnt += 1
         end
+      end
+
+      def verbose_log(topic, message)
+        return unless @verbose
+        puts "#{topic.to_s.rjust(10)}: #{message}"
+      end
 
-      end # self
     end # Init
   end # Impl
 end # WAB

data/lib/wab/impl/path_expr.rb

@@ -9,6 +9,9 @@ module WAB
         @path = path
       end
 
+      private
+      attr_reader :path
+
     end # PathExpr
   end # Impl
 end # WAB

data/lib/wab/impl/shell.rb

@@ -58,6 +58,7 @@ module WAB
         server = WEBrick::HTTPServer.new(Port: @http_port,
                                          DocumentRoot: @http_dir,
                                          MimeTypes: mime_types)
+        server.logger.level = 5 - @logger.level unless @logger.nil?
         server.mount(@pre_path, Handler, self)
         server.mount('/', ExportProxy, @http_dir) if @export_proxy
 
@@ -96,16 +97,16 @@ module WAB
         return path_controller(path) unless path.nil? || (path.length <= @path_pos)
 
         content = data.get(:content)
-        return @controllers[content.get(@type_key)] || @controllers[nil] unless content.nil?
+        return @controllers[content.get(@type_key)] || default_controller unless content.nil?
 
-        @controllers[nil]
+        default_controller
       end
 
       # Returns the controller according to the type in the path.
       #
       # path: path Array such as from a URL
       def path_controller(path)
-        @controllers[path[@path_pos]] || @controllers[nil]
+        @controllers[path[@path_pos]] || default_controller
       end
 
       # Create and return a new data instance with the provided initial value.
@@ -123,6 +124,12 @@ module WAB
         Data.new(value, repair)
       end
 
+      private
+
+      def default_controller
+        @default_controller ||= @controllers[nil]
+      end
+
     end # Shell
   end # Impl
 end # WAB

data/lib/wab/impl/templates/wabur.conf.template

@@ -36,5 +36,4 @@ indent = 0
 # Handlers for each type of record and for the UI shich are Ruby generated UI
 # configuration records.
 handler.0.type = ui
-handler.0.handler = UIController
-%{handlers}
+handler.0.handler = UIController%{handlers}

data/lib/wab/io/engine.rb

@@ -29,7 +29,7 @@ module WAB
               begin
                 break unless process_msg(@queue.pop)
               rescue Exception => e
-                $stderr.puts %|*-*-* #{e.class}: #{e.message}\n#{e.backtrace.join("\n  ")}|
+                $stderr.puts WAB::Impl.format_error(e)
               end
             end
           }
@@ -60,7 +60,7 @@ module WAB
             proc_threads.each { |t| Thread.kill(t) }
             Process.exit(0)
           else
-            $stderr.puts "*-*-* Invalid api value (#{api}) in message."
+            $stderr.puts WAB::Impl.format_error("Invalid api value (#{api}) in message.")
           end
         }
       end

data/lib/wab/io/shell.rb

@@ -59,16 +59,16 @@ module WAB
         return path_controller(path) unless path.nil? || (path.length <= @path_pos)
 
         content = data.get(:content)
-        return @controllers[content.get(@type_key)] || @controllers[nil] unless content.nil?
+        return @controllers[content.get(@type_key)] || default_controller unless content.nil?
 
-        @controllers[nil]
+        default_controller
       end
 
       # Returns the controller according to the type in the path.
       #
       # path: path Array such as from a URL
       def path_controller(path)
-        @controllers[path[@path_pos]] || @controllers[nil]
+        @controllers[path[@path_pos]] || default_controller
       end
 
       # Create and return a new data instance with the provided initial value.
@@ -133,6 +133,12 @@ module WAB
         raise NotImplementedError.new
       end
 
+      private
+
+      def default_controller
+        @default_controller ||= @controllers[nil]
+      end
+
     end # Shell
   end # IO
 end # WAB

data/lib/wab/ui/flow.rb

@@ -32,9 +32,10 @@ module WAB
       # path:: array of tokens in the path.
       def read(path, _query)
         results = []
-        if @shell.path_pos + 2 == path.length
+        path_pos = @shell.path_pos
+        if path_pos + 2 == path.length
           # Return the description of the named display.
-          name = path[@shell.path_pos + 1]
+          name = path[path_pos + 1]
           display = get_display(name)
           display[:entry] = true if !display.nil? && display.name == @entry
           results << {id: name, data: display.spec} unless display.nil?

data/lib/wab/version.rb

@@ -1,5 +1,5 @@
 
 module WAB
   # Current version of the module.
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/test/bench_io_shell.rb

@@ -37,10 +37,10 @@ else
   reply = nil
   start = Time.now
   n.times { |i|
-    to_w.puts(WAB::Impl::Data.new({rid: 'rid-read-id', api: 1, body: {op: 'GET', path: ['sample', '12345']}}, false).json)
+    to_w.puts(WAB::Impl::Data.new({rid: 'rid-read-id', api: 1, body: {op: 'GET', path: ['sample', '12345']}}).json)
     to_w.flush
     Oj.strict_load(from_r, symbol_keys: true) { |msg| reply = msg; break }
-    to_w.puts(WAB::Impl::Data.new({rid: "#{i+1}", api: 4, body: {code: 0, results:[{kind: 'sample', id: 12345, num: 7}]}}, false).json)
+    to_w.puts(WAB::Impl::Data.new({rid: "#{i+1}", api: 4, body: {code: 0, results:[{kind: 'sample', id: 12345, num: 7}]}}).json)
     to_w.flush
     Oj.strict_load(from_r, symbol_keys: true) { |msg| reply = msg; break }
   }