waxx 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f46260fb9e41a49af9eb045a81a88ef270e01100626d8b4458f8e6b9c633ebc
-  data.tar.gz: 5e0071cbe8095d8c084ca2089a4a69c8d46f397620f493ebf80f43f9e5b96192
+  metadata.gz: d48f18168120d265fbad00f5c097e897fc2100475c2fc5c16ca2e0ac0fdd065a
+  data.tar.gz: 49cb992829fadcf39605e9052db7ff1d0ec10b06b0a76c1f84d7f9d6b5f85c5e
 SHA512:
-  metadata.gz: bd026b73c6a231fb17d4edf1aa03810bec7760356b21697c352b1cce723efa2120f779ad1ac049c3ab364d5a273c37384b77f9bd03676b6d845636c1228ef533
-  data.tar.gz: 64b91a88da24468dc8735bf2b4c79686962a726ae71e2e06abc6c4e64dff3db4492f02250394e9670742857368ed7c22fcda0bf3e253de8a3e6600f3d1fc7e01
+  metadata.gz: 84f8791ac7b156387e1a4780ad3bf05e5f5ddb7ee1d4735f47ddd75c714452a1ccb0f0994becd324a80ded687b080e2ed01bf6d17eaf21de6ec39f97ae9cf00a
+  data.tar.gz: 1163ef8ad6da886481ea0df6d02c32357ef49c380105f487e320a33822ac4e9f460b0a801707e386f5d127f15a560819c270f5047f96c04a8206bd2a3cb966d3

data/README.md

@@ -80,11 +80,11 @@ You specify the number of threads in the config file.
 Each thread is prespawned and each thread makes it's own database connection.
 Requests are received and put into a FIFO request queue.
 The threads work through the queue.
-Each request, including session management, a database query, access control, and rendering in HTML or JSON is approximately 1-2ms (on a modern Xeon server).
+Each request, including session management, a database query, access control, and rendering in HTML or JSON is approximately 1 ms (on a modern laptop or server).
 With additional libraries, Waxx also easily generates XML, XLSX, CSV, PDF, etc.
 
 ### Easy to Grok
-Waxx has no Classes.
+Waxx has no classes.
 It is Module-based and the Modules have methods (functions).
 Each method within a Module is given parameters and the method runs in isolation.
 There are no instance variables and no global variables.
@@ -92,7 +92,7 @@ Consequently, it is very easy to understand what any method does and it is very
 You can call any method in the whole system from the console using `waxx console`.
 Passing in the same variables to a function will always return the same result.
 Waxx does have `x.res.out` variable, which is appended to with `x << "text"`, that is passed into each method and any method can append to the response body or set response headers.
-So it is not truly functional because this is considered a side effect.
+So it is not truly functional because this is a side effect.
 My opinion is that when you are building a response, then copying the response on every method is a waste of resources.
 So it does have this side effect by design.
 
@@ -112,11 +112,11 @@ So it does have this side effect by design.
   - `x.req.get` is a hash of vars passed in the query string
   - `x.req.post` is a hash of vars passed in the body of the request
   - `x.req.env` is a hash of the environment
-  - `x.req['Header-Name']` is a shortcut to incoming headers / environment vars
+  - `x.req['header-name']` is a shortcut to incoming headers / environment vars - always lower-case
   - `x['param_name']` and `x/:param_name` are shortcuts to get and post vars (post vars override get vars)
 - `x.res` contains the status, response cookies, headers, and content body
   - `x << "some text"` appends to the body
-  - `x.res['Header-Name'] = "value"` to set a response header
+  - `x.res['header-name'] = "value"` to set a response header
   - `x.status = 404` set the status. Defaults to 200.
 - `x.usr` is the session cookie hash (set expiration params in opt/{env}/config.yaml)
   - `x.usr['name'] = 'Joe'` will set the name variable in the `x.usr` variable accross requests.
@@ -130,10 +130,10 @@ See [Waxx Docs](https://www.waxx.io/doc/code) for more info.
 1. HTTP request is received by Waxx (Use a reverse proxy/load balancer/https server like NGINX first for production)
 2. The request is placed in a queue: `Waxx::Server.queue`
 3. The request is popped off the queue by a Ruby green thread and parsed
-4. The variable `x` is created with the request `x.req` and response `x.res`.
+4. The variable `x` is created with the request `x.req` and response `x.res` and DB connections in `x.db`.
 5. The run method is called for the appropriate app (a namespaced RPC). All routes are: /app/act/[arg1/args2/arg3/...] => app is the module and act is the method to call with the args.
-6. You output to the response using `x << "output"` or using helper methods: `App::Html.page(...)`
-7. The response is returned to the client. Partial, chunked, and streamed responses are supported as well as you have direct access to the IO.
+6. You output to the response using `x << "output"` or using helper methods: `App::Html.render(...)`
+7. The response is returned to the client. Partial, chunked, and streamed responses are supported as well. You have direct access to the IO.
 
 ## Fast to Develop
 

data/bin/waxx

@@ -3,7 +3,7 @@
 require 'optparse'
 
 command = ARGV[0]    
-commands = %w(on off buff start stop restart console get put post delete patch config migrate migration deploy test init help)
+commands = %w(on off buff start stop restart console get put post delete patch config migrate migration deploy test init gen generate help)
 if not commands.include? command
   puts "Enter a command: #{commands.join(", ")}"
   puts "waxx --help for all options"
@@ -110,7 +110,9 @@ end
 if Waxx::Console::Command.respond_to? command
   if %w(migration).include? command
     Waxx::Console::Command.send(command, ARGV[1], ARGV[2], opts)
-  elsif %w(get post put delete patch test deploy migration migrate).include? command
+  elsif %w(gen generate).include? command
+    Waxx::Console::Command.send(command, *ARGV.slice(1..))
+  elsif %w(get post put delete patch test deploy migrate).include? command
     Waxx::Console::Command.send(command, ARGV[1], opts)
   else
     Waxx::Console::Command.send(command, opts)

data/lib/.yardoc/checksums

@@ -0,0 +1,30 @@
+waxx/app.rb 44dff36d6d504ad141ef0db05796356117533858
+waxx/conf.rb ffecdb880e8a57bc1aeb1f6806cee120803fc3e3
+waxx/console.rb 6d2072ee1c426ade3d7f69aa1c7a7c34f56115d4
+waxx/csrf.rb 5ed5af0e892a25421bcb604b3bb527b3ecb4f016
+waxx/database.rb 65c27b3b5819498e400b9d76996bf4d0c814b42e
+waxx/encrypt.rb 13ba4c1eeedae72cc7b84cda96f93281f8bca51a
+waxx/error.rb 86e9fa4c33e381b88234393d01f88882e609a164
+waxx/html.rb 57cbca81c7e3175b090e1ec4159f3c5dd13624b8
+waxx/http.rb 7ead01576646c232dadba35858612d46aa2a1762
+waxx/init.rb ab6cff9000bb848f173d8bb9fd7a9ccc5337a678
+waxx/irb.rb 3a68cbfffefcbd7f9bc1377f3e6778aa62ea48d5
+waxx/irb_env.rb 403613b5b1b269df90ae02049c3584dfa9c253f8
+waxx/json.rb ca90d0f0f8179a6c30d58c69024af6316e2c9e1b
+waxx/mongodb.rb e08957a8d225418541265e6a278fa8667ce79b30
+waxx/mysql2.rb 0bd1d416d7a91cd1e20fc3d785907ee86e18eb69
+waxx/object.rb 2c2aa5f86fd66c24a0522a6734aa69a2285a3a58
+waxx/patch.rb 6795d921bf481dbe72269aa3f3d8156ef27c00cc
+waxx/pdf.rb eb7b7d5c06dd65930303dd003aee2c8ba28fab94
+waxx/pg.rb 74ed59fb57ce4e3a1adfdf43429d7be3bbd1725f
+waxx/process.rb a6d97846c5c2b55181a67e88a112e885b941eede
+waxx/req.rb 512961f28140e2f984943141d49ba6a1b3bb8368
+waxx/res.rb c35d377fe31e0af1de8f3edc833d4e90e6d88c7d
+waxx/server.rb 3142a3cf6d974c2f2ffe7bfa0e40b2899c4afd14
+waxx/sqlite3.rb f3a9a566ffbeb82625f8aaaf96f375c6b49cef75
+waxx/supervisor.rb dbe5fd12f2308c765b72f88e620a06deed7b06ba
+waxx/test.rb fd7b41fcca24e09fd58270c4fd56745d9d346f38
+waxx/util.rb aca719489717efb31e7c5d219a04f95457b30534
+waxx/view.rb 0a9d4e4d4154dea45217bc093801b98c3571be68
+waxx/waxx.rb 6df4053942c329088b71e6c33e63cc4012ee80fb
+waxx/x.rb 9309f97e707660bd91c840b7c43af3a17b0e2577

data/lib/waxx/app.rb

@@ -100,9 +100,13 @@ module Waxx::App
   # Layouts in app/app/error/*
   def error(x, status:200, type:"request", title:"An error occurred", message:"", args: [])
     x.res.status = status
-    if App[:app_error][type.to_sym]
-      App[:app_error][type.to_sym][:get][x, title, message, *args]
-    else
+    begin
+      if App[:app_error][type.to_sym]
+        App[:app_error][type.to_sym][:get][x, title, message, *args]
+      else
+        x << "ERROR: #{title} - #{message}"
+      end
+    rescue
       x << "ERROR: #{title} - #{message}"
     end
   end
@@ -141,7 +145,7 @@ module Waxx::App
       end
       return false if g.nil?
       return true if %w(* all any public).include? g.to_s
-      return access?(x, g)
+      return access?(x, acl: g)
     when Proc
       return acl.call(x)
     else
@@ -163,7 +167,7 @@ module Waxx::App
   def login_needed(x)
     if x.ext == "json"
       x.res.status = 400
-      x << {ok: false, msg: 'Login needed: Session did not pass ACL'}
+      x << {ok: false, msg: 'Login needed: Session did not pass ACL'}.to_json
     else
       App::Html.render(x,
         title: "Please Login",

data/lib/waxx/conf.rb

@@ -35,19 +35,19 @@ module Waxx::Conf
   ##
   # Get a Waxx variable
   def [](n)
-    @data[n]
+    @data[n.to_s]
   end
 
   ##
   # Set a conf variable
   def []=(n, v)
-    @data[n] = v
+    @data[n.to_s] = v
   end
 
   ##
   # Get a Waxx variable
   def /(n)
-    @data[n.to_s] || @data[n.to_sym]
+    @data[n.to_s]
   end
 
 end

data/lib/waxx/console.rb

@@ -103,7 +103,7 @@ module Waxx::Console
       App.put(ARGV[1], opts)
     end
 
-    def delete(opts)
+    def del(opts)
       App.delete(ARGV[1], opts)
     end
 
@@ -114,7 +114,7 @@ module Waxx::Console
         #help = "Use the source, Luke"
         begin
           x = Waxx::Console.x
-          binding.irb
+          binding.irb(show_code: false)
         rescue
           IRB.setup(nil)
           workspace = IRB::WorkSpace.new(self)
@@ -175,7 +175,7 @@ module Waxx::Console
       if target == "waxx"
         tests = []
         Dir.entries(opts[:base] + '/test').each{|f|
-          next if f =~ /^\./
+          next if f =~ /^\./ or not f =~ /\.rb$/
           tests << f.sub(/\.rb$/,"")
           path = opts[:base] + '/test/' + f
           puts path
@@ -203,6 +203,16 @@ module Waxx::Console
       puts re.send("to_#{opts[:format]}")
     end
 
+    def generate(scope, app, act=nil, type='record')
+      unless File.exist? 'app/app.rb'
+        puts "Error: You need to call 'waxx generate' from the root of a waxx installation."
+        return
+      end
+      x = Waxx::Console.x
+      Waxx::Generate.gen(x, scope, app, act, type)
+    end
+    alias gen generate
+
   end
 
 end

data/lib/waxx/database.rb

@@ -65,14 +65,18 @@ module Waxx::Database
       next if db_only and db_only.to_sym != name
       puts "Migrating: db.#{name}"
       # get the latest version
-      latest = db.exec("SELECT value FROM waxx WHERE name = 'db.#{name}.migration.last'").first['value']
-      Dir.entries("#{opts[:base]}/db/#{name}/").sort.each{|f|
-        if f =~ /\.sql$/ and f > latest
-          puts "  #{f}"
-          db.exec(File.read("#{opts[:base]}/db/#{name}/#{f}"))
-          db.exec("UPDATE waxx SET value = $1 WHERE name = 'db.#{name}.migration.last'",[f])
-        end
-      }
+      latest = db.exec("SELECT value FROM waxx WHERE name = 'db.migration.last'").first['value'] rescue nil
+      if latest.nil?
+        puts "WARNING: No db.migration.last key in waxx table for #{name}"
+      else
+        Dir.entries("#{opts[:base]}/db/#{name}/").sort.each{|f|
+          if f =~ /\.sql$/ and f > latest
+            puts "  #{f}"
+            db.exec(File.read("#{opts[:base]}/db/#{name}/#{f}"))
+            db.exec("UPDATE waxx SET value = $1 WHERE name = 'db.migration.last'",[f])
+          end
+        }
+      end
     }
     puts "Migration complete"
   end

data/lib/waxx/generate.rb

@@ -0,0 +1,189 @@
+module Waxx::Generate
+  extend self
+
+  def gen(x, scope, app, act=nil, type='record')
+    folder = app_folder(app)
+    columns = Waxx::Pg.columns_for(x, app)
+    if %w(app object obj).include? scope.to_s
+      obj(folder, app, columns)
+    end
+    if %w(view).include? scope.to_s
+      view(folder, app, act, type, columns)
+    end
+    if %w(app).include? scope.to_s
+      view(folder, app, 'list', 'list', columns)
+      view(folder, app, 'record', 'record', columns)
+    end
+  end
+
+  def app_folder(app)
+    folder = "app/#{app.to_s.strip.gsub("_","/")}"
+    begin
+      FileUtils.mkdir_p folder
+      puts "Created folder #{folder}"
+    rescue => e
+      puts "Could not make app folder. Skipping."
+    end
+    folder
+  end
+
+  def obj(folder, app, columns)
+    file = "#{folder}/#{app.strip}.rb"
+    if File.exist? file
+      puts "#{file} already exists. Skipping."
+      return
+    end
+    # Build the object file
+    re = [
+      "module App::#{Waxx::Util.camel_case(app.strip)}",
+      "  extend Waxx::Pg",
+      "  extend self",
+      "",
+      "  has(",
+    ]
+    columns.each{|rec|
+      primary = rec['pkey'] ? ", pkey: true" : ""
+      re << %(    #{rec['column_name']}: {type: '#{rec['data_type'].split(' ').first  }'#{primary}},) 
+    }
+    re << [
+      "  )",
+      "",
+      "  runs(",
+      "    default: 'list',",
+      "    list: {",
+      "      desc: 'List #{app} records',",
+      "      acl: %w(user),",
+      "      get: -> (x) {",
+      "        #{app}s = List.get(x)",
+      "        List.render(x, #{app}s)",
+      "      }",
+      "    },",
+      "    record: {",
+      "      desc: 'CRUD #{app} records',",
+      "      acl: %w(user),",
+      "      get: -> (x, id=0) {",
+      "        #{app} = id.to_i == 0 ? {id: 0} : Record.by_id(x, id)",
+      "        Record.render(x, #{app})",
+      "      },",
+      "      post: -> (x, id=0) {",
+      "        #{app} = id.to_i == 0 ? Record.post(x, x.req.post) : Record.put(x, id, x.req.post)",
+      "        return x << #{app}.to_json if x.ext == 'json'",
+      "        x.res.redirect('/#{app}/list')",
+      "      },",
+      "      put: -> (x, id) {",
+      "        #{app} = Record.put(x, id, x.req.post)",
+      "        return x << #{app}.to_json if x.ext == 'json'",
+      "        x.res.redirect('/#{app}/list')",
+      "      },",
+      "      delete: -> (x, id) {",
+      "        Record.delete(x, id)",
+      "        return x << {ok: true, id: id}.to_json if x.ext == 'json'",
+      "        x.res.redirect('/#{app}/list')",
+      "      },",
+      "    },",
+      "  )",
+      "",
+      "end",
+      "",
+    ]
+    File.open(file, 'w'){|f| f.puts re.join("\n") }
+    puts "Created object file: #{file}"
+  end
+
+  def view(folder, app, act, type, columns)
+    file = "#{folder}/#{act.strip}.rb"
+    if File.exist? file
+      puts "#{file} already exists. Skipping."
+      return
+    end
+    # Build the object file
+    re = [
+      "module App::#{Waxx::Util.camel_case(app.strip)}::#{Waxx::Util.camel_case(act.strip)}",
+      "  extend Waxx::View",
+      "  extend self",
+      "",
+      "  # Specify what formats this view will render automatically",
+      "  as :json",
+      "",
+      "  # Specify what fields are on this view (only these fields will be rendered and updated)",
+      "  has(",
+      columns.map{|rec| %(    :#{rec['column_name']},) },
+      "  )",
+      "",
+    ]
+    if type.to_s == 'list'
+      re << [
+      "  # Add the fields that can be matched with get(x, args: x.req.get)",
+      "  match_in(:#{columns[0]['column_name']})",
+      "  # Add the fields that can be searched using the 'q' parameter in args",
+      "  search_in(:#{columns[1]['column_name']})",
+      "",
+      ]
+    end
+    re << [
+      "  # This is the HTML view. Delete this module if you are not rendering HTML.",
+      "  module Html",
+      "    extend Waxx::Html",
+      "    extend self",
+      "",
+      "    def get(x, #{type == 'record' ? app : 'data'}, message: {})",
+      "      title = #{type == 'record' ? "#{app}/:id == 0 ? 'New #{app.capitalize}' : #{app}/:name" : "'#{app.capitalize}s'"}",
+      "      App::Html.page(x, title: title, content: #{type}(x, #{type == 'record' ? app: 'data'}), message: message)",
+      "    end",
+      "",
+    ]
+    if type.to_s == 'record'
+      re << [
+      "    def record(x, #{app})",
+      "    %(",
+      %(      <form action="/#{app}/#{act}/#{'#{'}#{app}/:id}" method="post">),
+      columns.map{|c|
+        next if c['pkey']
+        %(
+        <label for="#{c/:column_name}" class="fssr mt-m">#{c['column_name'].title_case}</label>
+        <input id="#{c['column_name']}" name="#{c['column_name']}" class="form" value="#{'#{h '}#{app}/:#{c['column_name']}}">)
+      },
+      %(        <div class="df g-s">),
+      %(          <button type="submit" class="btn btn-primary">Save</button>),
+      %(          <a href="/#{app}/list" class="btn">Cancel</a>),
+      %(        </div>),
+      %(      </form>),
+      "    )",
+      "    end",
+      ]
+    else
+      re << [
+      "    def list(x, data)",
+      "    %(",
+      %(      <a href="/#{app}/record/0" class="fr btn btn-primary">New #{app.title_case}</a>),
+      %(      <table class="mt-m data">),
+      %(        <thead>),
+      %(          <tr>),
+      columns.map{|c| %(          <th>#{c['column_name'].title_case}</th>) },
+      %(          </tr>),
+      %(        </thead>),
+      %(        <tbody>),
+      '          #{data.map{|rec|',
+      '            %(',
+      '            <tr>',
+      columns.map{|c| %(              <td>#{'#{h rec/:'}#{c['column_name']}}</td>) },
+      %(              <td><a href="/#{app}/record/#{'#{'}rec/:id}">edit</a></td>),
+      '            </tr>',
+      '            )',
+      '          }.join("\n")}',
+      %(        </tbody>),
+      %(      </table>),
+      "    )",
+      "    end",
+      ]
+    end
+    re << "  end"
+    re << "end"
+    # Write the view file
+    File.open(file, 'w'){|f| f.puts re.join("\n") }
+    # Require the view file from the object file
+    File.open("#{folder}/#{app}.rb", 'a'){|f| f.puts %(require_relative "#{act}") }
+    puts "Created view file: #{file}"
+  end
+
+end

data/lib/waxx/http.rb

@@ -25,9 +25,10 @@ module Waxx::Http
   alias qs escape
 
   def unescape(str)
-    str.to_s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/) do |m|
+    s = str.to_s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/) do |m|
       [m.delete('%')].pack('H*')
-    end
+    end.force_encoding('UTF-8')
+	  s.valid_encoding? ? s : s.force_encoding(str.encoding)
   end
 
   def parse_head(io)
@@ -38,7 +39,7 @@ module Waxx::Http
       break if e.strip == ""
       head << e
       n, v = e.split(":", 2)
-      env[n] = v.strip
+      env[n.downcase] = v.strip
     end
     Waxx.debug "env.size: #{env.size}", 9
     [env, head]
@@ -46,7 +47,7 @@ module Waxx::Http
 
   def query_string_to_hash(str, base={})
     return base if str.nil? or str.strip == ""
-    str.strip.split(/[;&]/).each{|nv|
+    str.force_encoding('UTF-8').strip.split(/[;&]/).each{|nv|
       n, v = nv.split("=",2).map{|s| unescape(s)}
       if n =~ /\[\]$/
         n = n.sub(/\[\]$/,"")
@@ -59,25 +60,55 @@ module Waxx::Http
     base
   end
 
+  def file_object(boundary, filename, body, headers)
+    {
+      filename: filename,
+      data: body.sub(/\r\n--#{boundary}--\r\n$/,"").sub(/\r\n$/,""),
+      content_type: headers['content-type'] || headers['Content-Type'],
+      headers: headers
+    }
+  end
+
   def parse_multipart(env, data)
-    boundary = env['Content-Type'].match(/boundary=(.*)$/)[1]
+    boundary = env['content-type'].match(/boundary=(.*)$/)[1]
     parts = data.split("--"+boundary+"\r\n")
     post = {}
     parts.each{|part|
       next if part.strip == ""
       begin
         head, body = part.split("\r\n\r\n",2)
-        headers = Hash[*(head.split("\r\n").map{|hp| hp.split(":",2).map{|i| i.strip}}.flatten)]
-        cd = Hash[*("_=#{headers['Content-Disposition']}".split(";").map{|da| da.strip.gsub('"',"").split("=",2)}.flatten)]
+        headers = Hash[*(head.split("\r\n").map{|hp|
+          hp.split(":",2).map{|i| i.strip}
+        }.flatten)]
+        cd = Hash[*("_=#{headers['Content-Disposition'] || headers['content-disposition']}".split(";").map{|da| da.strip.gsub('"',"").split("=",2)}.flatten)]
+        name = cd['name']
+        # If field name ends with [], make result an array
+        if name.include?('[]')
+          # Strip the square backets off the name for the post key
+          name = name.sub(/\[\]$/,'')
+          post[name] ||= []
+        end
         if cd['filename']
-          post[cd['name']] = {
-            filename: cd['filename'],
-            data: body.sub(/\r\n--#{boundary}--\r\n$/,"").sub(/\r\n$/,""),
-            content_type: headers['Content-Type'],
-            headers: headers
-          }
+          # Handle multiple files
+          if post.has_key?(name)
+            if Array === post[name]
+              post[name].push file_object(boundary, cd['filename'], body, headers)
+            else
+              post[name] = [post[name], file_object(boundary, cd['filename'], body, headers)]
+            end
+          else
+            post[name] = file_object(boundary, cd['filename'], body, headers)
+          end
         else
-          post[cd['name']] = body.sub(/\r\n--#{boundary}--\r\n$/,"").sub(/\r\n$/,"")
+          if post.has_key?(name)
+            if Array === post[name]
+              post[name].push body.sub(/\r\n--#{boundary}--\r\n$/,"").sub(/\r\n$/,"")
+            else
+              post[name] = [post[name], body.sub(/\r\n--#{boundary}--\r\n$/,"").sub(/\r\n$/,"")]
+            end
+          else
+            post[name] = body.sub(/\r\n--#{boundary}--\r\n$/,"").sub(/\r\n$/,"")
+          end
         end
       rescue => e
         Waxx.debug "Error parse_multipart: #{e}"
@@ -113,30 +144,41 @@ module Waxx::Http
   end
 
   def parse_data(env, meth, io, head)
-    Waxx.debug "parse_data"
-    if %w(PUT POST PATCH).include? meth
-      data = io.read(env['Content-Length'].to_i)
-      Waxx.debug "data.size: #{data.size} #{env['Content-Type']}"
-      if env['Content-Length'].to_i == 0
+    begin
+      Waxx.debug "parse_data"
+      if %w(PUT POST PATCH).include? meth
+        data = io.read(env['content-length'].to_i)
+        Waxx.debug "data.size: #{data.size} #{env['content-type']}"
+        # No content
+        if env['content-length'].to_i == 0
+          post = {}.freeze
+          data = nil
+        # Raw file saved by nginx with path in header
+        elsif env['x-file-path']
+          post = {}.freeze
+          data = {"file_path" => env['x-file-path']}
+        # Parse based on content type
+        else
+          case env['content-type']
+            when /x-www-form-urlencoded/
+              post = query_string_to_hash(data).freeze
+            when /multipart/
+              post = parse_multipart(env, data).freeze
+            when /json/
+              post = (JSON.parse(data)).freeze
+            else
+              post = {"data" => data}.freeze
+          end
+        end
+      else
         post = {}.freeze
         data = nil
-      else
-        case (env['Content-Type'] || env['content-type'] || env['Content-type'])
-          when /x-www-form-urlencoded/
-            post = query_string_to_hash(data).freeze
-          when /multipart/
-            post = parse_multipart(env, data).freeze
-          when /json/
-            post = (JSON.parse(data)).freeze
-          else
-            post = data.freeze
-        end
       end
-    else
-      post = {}.freeze
-      data = nil
+      [post, data]
+    rescue => e
+      Waxx.debug("ERROR: Parsing POST data: #{e}")
+      [{error: e.to_s}.freeze, nil]
     end
-    [post, data]
   end
 
   Status = {
@@ -169,6 +211,7 @@ module Waxx::Http
     js:      "application/javascript; charset=utf-8",
     json:    "application/json; charset=utf-8",
     tab:     "text/tab-separated-values; charset=utf-8",
+    tsv:     "text/tab-separated-values; charset=utf-8",
     txt:     "text/plain; charset=utf-8",
     xml:     "text/xml",                              
     gif:     "image/gif",                             

data/lib/waxx/init.rb

@@ -182,7 +182,7 @@ init:
       puts "The databse must already exist and the user must have create table privileges."
       print "  Create waxx table (y|n) [y]:"
       initdb = $stdin.gets.chomp
-      initdb = initdb == '' or not (initdb =~ /[Yy]/).nil?
+      initdb = initdb == '' or not (initdb =~ /[Yy]/).nil? rescue false
       input['init']['db'] = initdb
     end
     input
@@ -235,6 +235,7 @@ init:
     puts ""
     puts "Waxx installed successfully."
     puts "cd into #{install_folder} and run `waxx on` to get your waxx on"
+    puts "Optionally run `waxx gen app TABLE_NAME` where TABLE_NAME is the name of a table in your database."
   end
 
   def create_waxx_table(x, input)
@@ -254,7 +255,7 @@ init:
         CONSTRAINT waxx_uniq UNIQUE(name)
       )
     )
-    insert_sql = %(INSERT INTO waxx (name, value) VALUES ('db.app.migration.last', '0'))
+    insert_sql = %(INSERT INTO waxx (name, value) VALUES ('db.migration.last', '0'))
     puts "  Connecting to: #{input/:databases/:app}"
     begin
       db = Waxx::Database.connect(input/:databases/:app)

data/lib/waxx/object.rb

@@ -59,11 +59,11 @@ module Waxx::Object
   # # A proc that return boolean (true = access granted, false = access denied)
   # # The x variable is passed in.
   # acl: -> (x) { 
-  #   x.req.env['X-Key'] == "Secret Key"
+  #   x.req.env['x-key'] == "Secret Key"
   # }
   # # Another example based on the client IP set by the proxy server
   # acl: -> (x) { 
-  #   [x.req.env['X-Forwarded-For']].flatten.first == "10.20.40.80"
+  #   [x.req.env['x-forwarded-for']].flatten.first == "10.20.40.80"
   # }
   # # Require a user to be in two groups
   # acl: -> (x) {