waxx 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 93fa484e47a0d9a2f46a2833d4a2a64b34275be8
-  data.tar.gz: 89279ba78c8d5c8927a2cd49c1c4fffe2fe556a6
+SHA256:
+  metadata.gz: 0f46260fb9e41a49af9eb045a81a88ef270e01100626d8b4458f8e6b9c633ebc
+  data.tar.gz: 5e0071cbe8095d8c084ca2089a4a69c8d46f397620f493ebf80f43f9e5b96192
 SHA512:
-  metadata.gz: cc81172fccb3147846eaf7912abce34616cb467c5fcadfd7c5fb24a473885effa55e643a93ae9c16dec3cf9d71f4f95690985f405b59599d43af4cc084e1afe6
-  data.tar.gz: 3d9df1ef5ac36f734ce4720a31657c0bd4791ef3f04e2b953f0b5904bcaf29b9c69142d96bbbad30e29a4785d24ee5b6160f2aa1b790462ecb8f39f729a8ef29
+  metadata.gz: bd026b73c6a231fb17d4edf1aa03810bec7760356b21697c352b1cce723efa2120f779ad1ac049c3ab364d5a273c37384b77f9bd03676b6d845636c1228ef533
+  data.tar.gz: 64b91a88da24468dc8735bf2b4c79686962a726ae71e2e06abc6c4e64dff3db4492f02250394e9670742857368ed7c22fcda0bf3e253de8a3e6600f3d1fc7e01

data/README.md

@@ -1,10 +1,6 @@
 # Waxx - Web Application X(x)
 
-**NOTICE: This is the first public release of Waxx and the APIs may change. Do not build large production apps with it yet!**
-
-**NOTICE: Waxx does not run on Windows yet. Working on it. Stay tuned.**
-
-The Waxx Framerwork is a high perfomance, functional-inspired (but not truly functional), web application development environment written in Ruby and inspired by Go and Haskel. 
+The Waxx Framework is a high perfomance, functional-inspired (but not truly functional), web application development environment written in Ruby and inspired by Go and Haskel.
 
 ## Goals
 
@@ -16,11 +12,11 @@ The Waxx Framerwork is a high perfomance, functional-inspired (but not truly fun
 
 ## Target Users
 
-The Waxx Framework was developed to build CRUD applications and REST and RPC services. It scales very well on multi-core machines and is [will be] suitable for very large deployments.
+The Waxx Framework was developed to build CRUD applications and REST and RPC services. It scales very well on multi-core machines and is suitable for very large deployments.
 
 ## Who's Behind This
 
-Waxx was developed by Dan Fitzpatrick at [ePark Labs](https://www.eparklabs.com/). 
+Waxx was developed by Dan Fitzpatrick at [ePark Labs](https://www.eparklabs.com/).
 
 ## Hello World
 
@@ -63,7 +59,7 @@ waxx on
 
 The Waxx gem is cryptographically signed to be sure the gem you install hasn't been tampered with.
 Because of this you need to add the public key to your list of trusted gem certs.
-Follow theese direction. (You only need step one the first time you install the gem.)
+Follow these direction. (You only need step one the first time you install the gem.)
 
 ```bash
 sudo gem cert --add <(curl -s https://www.waxx.io/waxx-gem-public-key.pem)
@@ -79,23 +75,23 @@ Then run `waxx buff` (waxx off && waxx on) or if you prefer `waxx restart`
 See [Install Waxx](https://www.waxx.io/doc/install) for complete details.
 
 ### High Performance
-Waxx is multi-threaded queue-based system. 
-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). 
-With additional libraries, Waxx also easily generates XML, XLSX, CSV, PDF, etc. 
-
-### Easy to Grok 
-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. 
-Consequently, it is very easy to understand what any method does and it is very easy to test methods. 
-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. 
+Waxx is multi-threaded queue-based system.
+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).
+With additional libraries, Waxx also easily generates XML, XLSX, CSV, PDF, etc.
+
+### Easy to Grok
+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.
+Consequently, it is very easy to understand what any method does and it is very easy to test methods.
+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.
 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.
@@ -103,7 +99,7 @@ So it does have this side effect by design.
 #### Waxx Terminology
 
 - Object: A database table or database object or a container for some specific functionality
-- Object `has` fields (an array of Hashes). A field is both a database field/column/attribute and a UI control (for HTML apps) 
+- Object `has` fields (an array of Hashes). A field is both a database field/column/attribute and a UI control (for HTML apps)
 - Field `is` (represents) a single object (INNER JOIN) or many related objects (LEFT JOIN)
 - Object `runs` a URL path - business logic (normally get from or post to a view)
 - View: Like a DB view -- fields from one or more tables/objects
@@ -146,26 +142,26 @@ Waxx was built with code maintainablity in mind. The following principles help i
 1. Simple to know where the code is located for any URI. A request to /person/list will start in the `app/person/person.rb` file and normally use the view defined in the file `app/person/list.rb`
 2. Fields are defined upfront. The fields you want to use in your app are defined in the Object file `app/person/person.rb`
 3. Field have attributes that make a lot of UI development simple (optional). has(email: {label: "Email Address" ...})`
-4. Views allow you to see exactly what is on an interface and all the business logic. Only the fields on a view can be updated so it is impossible to taint the database by passing in extra parameters. 
+4. Views allow you to see exactly what is on an interface and all the business logic. Only the fields on a view can be updated so it is impossible to taint the database by passing in extra parameters.
 5. Most rendering is automatic unless you want to do special stuff. You can use pure Ruby functions or your favorite template engine. The View file `app/person/list.rb` contains all of the fields, joined tables, and layout for a view.
 6. Full visibility into the external API and each endpoint's access control allows to immediate auditing of who can see and do what.
 
 There are no routes.
-All paths are `/:app/:act/:arg1/:arg2/...`. 
-The URL maps to an App and runs the act (method). 
-For example: `example.com/person/list` will execute the `list` method in the `App::Person` module. 
-This method is defined in `app/person/person.rb`. 
-Another example: A request to `/website_page/content/3` will execute the `content` method in the `App::WebsitePage` app and pass in `3` as the first parameter after 'x'. 
-There is a default app and a default method in each app. 
+All paths are `/:app/:act/:arg1/:arg2/...`.
+The URL maps to an App and runs the act (method).
+For example: `example.com/person/list` will execute the `list` method in the `App::Person` module.
+This method is defined in `app/person/person.rb`.
+Another example: A request to `/website_page/content/3` will execute the `content` method in the `App::WebsitePage` app and pass in `3` as the first parameter after 'x'.
+There is a default app and a default method in each app.
 So a request to `example.com/` will show the home page if the default app is `website` and the default method in website is `home`.
 
 
 ### File Structure
-Waxx places each module in it's own directory. This includes the Object, Runner, Views, Layouts, and Tests. 
-I normally place my app-specific javascript and css in this same folder as well. 
-In this way, all of the functionality and features of a specific App or Module are fully self-contained. 
-However, you can optionally put your files anywhere and require them in your code. 
-So if you like all the objects to be in one folder you can do that. 
+Waxx places each module in it's own directory. This includes the Object, Runner, Views, Layouts, and Tests.
+I normally place my app-specific javascript and css in this same folder as well.
+In this way, all of the functionality and features of a specific App or Module are fully self-contained.
+However, you can optionally put your files anywhere and require them in your code.
+So if you like all the objects to be in one folder you can do that.
 If you work with a large team where backend and frontend people do not overlap, then maybe that will work for you.
 
 This is a normal structure:
@@ -231,7 +227,7 @@ This is a normal structure:
 |       `-- deploy              # The script to deploy to stage (run on the production server(s))
 |-- private                     # A folder for private files (served by the file app if included)
 `-- public                      # The public folder (Web server should have this as the root)
-   
+
 ```
 
 The Waxx::Object has two purposes:
@@ -297,7 +293,7 @@ require_relative 'list'   # The List View is defined here
 require_relative 'record' # The Record View is defined here
 ```
 
-A view is like a database view (not like a Rails view). The view specifies what tables/objects and fields/properties are going to be displayed and potentially edited. The Html layout module is like a Rails view. Other layouts include: Json, Csv, Pdf, Xlsx. 
+A view is like a database view (not like a Rails view). The view specifies what tables/objects and fields/properties are going to be displayed and potentially edited. The Html layout module is like a Rails view. Other layouts include: Json, Csv, Pdf, Xlsx.
 
 **app/person/list.rb** *(This is the view that lists the users)*
 
@@ -305,7 +301,7 @@ A view is like a database view (not like a Rails view). The view specifies what
 module App::Person::List
   extend Waxx::View
   extend self
-  
+
   has(
     :id,
     :first_name,
@@ -313,28 +309,28 @@ module App::Person::List
     :email
     # This view does not include the bio field
   )
-  
+
   module Html
     extend Waxx::Html
     extend self
-    
+
     def get(x, data, message={})
-      # This method appends to x and includes your site layout and nav. 
+      # This method appends to x and includes your site layout and nav.
       # The content attribute is what goes in the content area of the page.
       App::Html.page(x,
         title: "People",
         content: content(x, data)
       )
     end
-    
+
     def content(x, data)
       # You put your HTML output here using:
       %(<p>HTHL or a template engine</p>)
     end
-    
+
   end
 end
-```  
+```
 
 **app/person/record.rb** *(This is the view to view, edit, update, and delete a record)*
 
@@ -342,7 +338,7 @@ end
 module App::Person::Record
   extend Waxx::View
   extend self
-  
+
   has(
     :id,
     :first_name,
@@ -350,23 +346,23 @@ module App::Person::Record
     :email,
     :bio
   )
-  
+
   module Html
     extend Waxx::Html
     extend self
-    
+
     def get(x, data, message={})
       App::Html.page(
         title: "#{data['first_name']} #{data['last_name']}",
         content: content(x, data)
       )
     end
-    
+
     def content(x, data)
       # You put your HTML output here using:
       %(<p>HTHL or a template engine</p>)
     end
-    
+
     def post(x)
       # Following a post, redirect to the list view
       x.res.redirect "/person/list"
@@ -425,7 +421,7 @@ Then in the list view, we can add the company that the person is associated with
 module App::Person::List
   extend Waxx::View
   extend self
-    
+
   has(
     :id,
     :first_name,
@@ -435,7 +431,7 @@ module App::Person::List
   )
 end
 ```
-    
+
 In this case the attribute "company_name" will be added to the view and is the value of the "name" field in the company table. The syntax for this is `<name>: <relationship_name (as defined in the object)>.<field>`.
 
 ### LEFT JOIN (is: name:table.field+)
@@ -462,10 +458,10 @@ end
 
 *Note: The + sign after the related attribute make this join a left join (Oracle style)*
 
-INNER JOIN (If you don't want to show invoices with no items): 
+INNER JOIN (If you don't want to show invoices with no items):
 
 `id: {pkey: true, is:"items: invoice_item.invoice_id"}`
-  
+
 LEFT JOIN (If you want to show invoices with no items):
 
 `id: {pkey: true, is:"items: invoice_item.invoice_id+"}`
@@ -496,7 +492,7 @@ This will show a list of all invoices and the items on the invoices:
 module App::Invoice::Items
   extend Waxx::View
   extend self
-  
+
   has(
     :id,
     :invoice_date,
@@ -509,14 +505,14 @@ module App::Invoice::Items
   )
 end
 ```
-  
+
 This will generate the following SQL:
 
 ```sql
-  SELECT   invoice.id, invoice.invoice_date, company.name as company, product.name as product, 
+  SELECT   invoice.id, invoice.invoice_date, company.name as company, product.name as product,
       items.description as desc, items.quantity as qty, items.unit_price as price,
       (items.quantity * items.unit_price) as total
-  FROM  invoice 
+  FROM  invoice
       LEFT JOIN invoice_item AS items ON invoice.id = invoice_item.invoice_id
       INNER JOIN company ON invoice.customer_id = company.id
       INNER JOIN product ON items.product_id = product.id
@@ -535,7 +531,7 @@ The join table is just another object in Waxx
   module App::Usr
     extend Waxx::Pg
     extend self
-    
+
     has({
       id: {pkey: true, is:"group_member: usr_grp.usr_id+"},
       email: {validate: "email"},
@@ -547,7 +543,7 @@ The join table is just another object in Waxx
   module App::Grp
     extend Waxx::Pg
     extend self
-    
+
     has({
       id: {pkey: true, is:"group_members: usr_grp.grp_id+"},
       name: {required: true}
@@ -558,19 +554,19 @@ The join table is just another object in Waxx
   module App::UsrGrp
     extend Waxx::Pg
     extend self
-    
+
     has({
       id: {pkey: true},
       usr_id: {required: true, is:"usr:usr.id"},
       grp_id: {required: true, is:"grp:grp.id"}
     })
   end
-  
+
   # View that joins all three tables (show all users and groups they are in)
   module App::Usr::Groups
     extend Waxx::View
     extend self
-    
+
     has(
       :id,
       :email,
@@ -616,7 +612,7 @@ Each slash-delimited argument after the first two are treated as arguments to th
 module App::Artist
   extend Waxx::Pg
   extend self
-  
+
   runs(
     in: {
       desc: "Show a list of artists in an area",
@@ -628,7 +624,7 @@ module App::Artist
 end
 ```
 
-In this case all three parameters are required. An error will be raised if the city is missing. 
+In this case all three parameters are required. An error will be raised if the city is missing.
 There are two options: Add default values or use a proc instead of a lambda:
 
 ```
@@ -643,10 +639,10 @@ get: -> (x, country="us", state_prov="", city="") { }
 ```
 
 NOTE: You can use `return` in `lambda` and `->` constructs, but you need to use `break` in `proc` constructs to stop processing.
-  
+
 ### Variable Act / not_found
 
-What if you want the act be a variable like `/artist/david-bowie` or `/artist/motorhead`? 
+What if you want the act be a variable like `/artist/david-bowie` or `/artist/motorhead`?
 
 You define **`not_found`** in your Object runs method:
 
@@ -654,7 +650,7 @@ You define **`not_found`** in your Object runs method:
 module App::Artist
   extend Waxx::Pg
   extend self
-  
+
   runs(
     default: "list",
     list: {
@@ -699,7 +695,7 @@ Waxx includes a full user and session management system. The following apps are
 Using these apps allow you to add users and groups and put users in groups. You define your access control lists for each method. There are several levels of permissions. The following seven code blocks are parts of the same file:
 
 ### Example ACLs
-ACLs are defined as a attribute (`acl: [nil|string|array|hash|lambda]`) of each method options hash. 
+ACLs are defined as a attribute (`acl: [nil|string|array|hash|lambda]`) of each method options hash.
 
 The following code blocks are different examples of the acl attribute in practice.
 
@@ -709,7 +705,7 @@ The following code blocks are different examples of the acl attribute in practic
   module App::Product
     extend Waxx::Pg
     extend self
-    
+
     runs(
       default: "list",
 ```
@@ -777,7 +773,7 @@ If the proc or lambda returns true, then the user is allowed to proceed, otherwi
 
 ```ruby
       special: {
-        desc: "View and edit a product from a specific IP 
+        desc: "View and edit a product from a specific IP
              or if the user has a secret key in their session",
         acl: -> (x) {
           x.req.env['X-REAL-IP'] == "10.10.10.10" or x.usr['secret'] == "let-me-in"
@@ -812,10 +808,10 @@ End the object file
 
 A fast JSON response for an autocomplete form field
 
-If you want to have a quick JSON response for an autocomplete -- Just use a Waxx::Object and bypass the Waxx::View and layout (Json, HTML, etc.). 
+If you want to have a quick JSON response for an autocomplete -- Just use a Waxx::Object and bypass the Waxx::View and layout (Json, HTML, etc.).
 Direct access is available to the database driver with `x.db.app` where `app` is the name of the database connection defined in your config.yaml file.
-In this case, as a user types in an autocomplete input box, the browser sends a request to: `/artist/autocomplete.json?q=da` 
-When the .json extension is used, the response content type will be application/json. 
+In this case, as a user types in an autocomplete input box, the browser sends a request to: `/artist/autocomplete.json?q=da`
+When the .json extension is used, the response content type will be application/json.
 What the user types would be in the `q` attribute.
 
 PostgreSQL DB:
@@ -834,8 +830,8 @@ module App::Artist
       desc: "Show a list of artists that match the 'q' param",
       get: -> (x) {
         x << x.db.app.exec("
-          SELECT id, name 
-          FROM artist 
+          SELECT id, name
+          FROM artist
           WHERE name ILIKE $1
           ORDER BY name
           LIMIT 20",
@@ -870,7 +866,7 @@ module App::Artist
 end
 ```
 
-Both of these should return a response in less than one millisecond (assuming your data is indexed and running on descent hardware).
+Both of these should return a response in less than one millisecond (assuming your data is indexed and running on decent hardware).
 
 That is the intro. Give it a whirl.
 

data/lib/waxx/app.rb

@@ -27,7 +27,7 @@ module Waxx::App
   # The layout of the error page (html) is defined in app/app/error/html.rb
   def not_found(x, title:"Not Found", message:nil)
     begin
-      if message.nil?
+      if message.nil? and @runs[:website] and @runs[:website][:page]
         return @runs[:website][:page][:get].call(x, *(x.args))
       end
     rescue => e
@@ -66,7 +66,7 @@ module Waxx::App
   # 5. args: The args to pass to the method (after x) (Array)
   #
   # Example: `App.run(x, :person, :record, :get, [1])` will call the get method with the parameter "1" of the record handler defined in App::Person 
-  def run(x, app, act, meth, args)
+  def run(x, app, act, meth, args=[])
     if @runs[app.to_sym][act][meth.to_sym]
       begin
         @runs[app.to_sym][act][meth.to_sym][x, *args]
@@ -100,7 +100,11 @@ 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
-    App[:app_error][type.to_sym][:get][x, title, message, *args]
+    if App[:app_error][type.to_sym]
+      App[:app_error][type.to_sym][:get][x, title, message, *args]
+    else
+      x << "ERROR: #{title} - #{message}"
+    end
   end
 
   ##
@@ -158,6 +162,8 @@ 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'}
     else
       App::Html.render(x,
         title: "Please Login",

data/lib/waxx/console.rb

@@ -112,16 +112,19 @@ module Waxx::Console
         require 'irb'
         puts "waxx console"
         #help = "Use the source, Luke"
-        x = Waxx::Console.x
-        binding.irb
-        #IRB.setup(nil)
-        #workspace = IRB::WorkSpace.new(self)
-        #irb = IRB::Irb.new(workspace)
-        #IRB.conf[:MAIN_CONTEXT] = irb.context
-        #irb.eval_input
-        #require 'lib/waxx/irb.rb'
-        #@x = Waxx::Console.x
-        #IRB.start_session(self) #"#{opts[:base]}/lib/waxx/irb_env.rb")
+        begin
+          x = Waxx::Console.x
+          binding.irb
+        rescue
+          IRB.setup(nil)
+          workspace = IRB::WorkSpace.new(self)
+          irb = IRB::Irb.new(workspace)
+          IRB.conf[:MAIN_CONTEXT] = irb.context
+          irb.eval_input
+          require 'lib/waxx/irb.rb'
+          @x = Waxx::Console.x
+          IRB.start_session(self) #"#{opts[:base]}/lib/waxx/irb_env.rb")
+        end
       else
         puts "Error: You need to call 'waxx console' from the root of a waxx installation."
         exit 1
@@ -159,7 +162,8 @@ module Waxx::Console
       File.open(m_file, "w"){|f|
         f.puts "BEGIN;\n\n\n\nCOMMIT;"
       }
-      system "/usr/bin/env #{ENV['EDITOR']} #{m_file}"
+      puts "Created #{m_file}"
+      system "/usr/bin/env #{ENV['EDITOR'] || 'vim'} #{m_file}"
     end
 
     def test(target, opts)

data/lib/waxx/database.rb

@@ -62,7 +62,7 @@ module Waxx::Database
   def migrate(db_only=nil, opts={})
     dbs = connections
     dbs.each{|name, db|
-      next if db_only and db_only != db
+      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']
@@ -77,4 +77,12 @@ module Waxx::Database
     puts "Migration complete"
   end
 
+  def [](name)
+    app[name]
+  end
+
+  def collection(name)
+    app[name]
+  end
+
 end

data/lib/waxx/encrypt.rb

@@ -12,7 +12,7 @@ module Waxx::Encrypt
       when :b64
         Base64.encode64(aes.update(str.to_s) + aes.final).chomp
       when :url
-        http_escape(Base64.encode64(aes.update(str.to_s) + aes.final).chomp)
+        Waxx::Http.escape(Base64.encode64(aes.update(str.to_s) + aes.final).chomp)
       when :bin
         aes.update(str.to_s) + aes.final
       else
@@ -28,7 +28,7 @@ module Waxx::Encrypt
       when :b64
         aes.update(Base64.decode64(str.to_s + "\n")) + aes.final
       when :url
-        aes.update(Base64.decode64(http_unescape(str.to_s) + "\n")) + aes.final
+        aes.update(Base64.decode64(Waxx::Http.unescape(str.to_s) + "\n")) + aes.final
       when :bin
         aes.update(str.to_s) + aes.final
       else

data/lib/waxx/http.rb

@@ -8,9 +8,10 @@ module Waxx::Http
     ContentTypes
   end
 
-  def ctype(t, default="application/octet-stream")
+  def content_type(t, default="application/octet-stream")
     ContentTypes[t.to_sym] || default
   end
+  alias ctype content_type
 
   def time(t=Time.new.utc)
     t.strftime('%a, %d %b %Y %H:%M:%S UTC')
@@ -116,15 +117,20 @@ module Waxx::Http
     if %w(PUT POST PATCH).include? meth
       data = io.read(env['Content-Length'].to_i)
       Waxx.debug "data.size: #{data.size} #{env['Content-Type']}"
-      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.freeze
+      if env['Content-Length'].to_i == 0
+        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/lib/waxx/mongodb.rb

@@ -2,6 +2,7 @@
 # Released under the Apache Version 2 License. See LICENSE.txt.
 
 module Waxx::Mongodb
+  extend self
 
   attr :db
   attr :table
@@ -20,6 +21,10 @@ module Waxx::Mongodb
     has(cols) if cols
   end
 
+  def connect(str)
+    Mongo::Client.new(str).database
+  end
+
   def has(opts=nil)
     init if @table.nil?
     return @columns if opts.nil?
@@ -45,6 +50,10 @@ module Waxx::Mongodb
     }
   end
 
+  def connect(conf)
+    ::Mongo::Client.new(conf).database
+  end
+
   def [](n)
     @columns[n.to_sym]
   end

data/lib/waxx/patch.rb

@@ -2,6 +2,11 @@
 # Released under the Apache Version 2 License. See LICENSE.txt.
 
 # Patches to Ruby Classes
+class BigDecimal
+  def to_json(*a)
+    to_f.to_json(*a)
+  end
+end
 class Date
   # HTML format for a date
   def h
@@ -45,7 +50,8 @@ end
 class Hash
   # Add an symbol/string indifferent access to a hash
   def /(k)
-    self[k.to_sym] || self[k.to_s]
+    return self[k.to_sym] if self.has_key?(k.to_sym)
+    self[k.to_s]
   end
 end
 class NilClass
@@ -64,6 +70,10 @@ class NilClass
   def to_sym
     "".to_sym
   end
+  # Nil is empty
+  def empty?
+    true
+  end
 end
 class Numeric
   # HTML format (self -- no escaping needed)
@@ -82,6 +92,18 @@ class Numeric
     return x if size == 0
     x << (d + (num_parts[1].to_s + "0000000")[0,size])
   end
+  def ordinal
+    case self % 100
+    when 11, 12, 13 then "#{self}th"
+    else
+      case self % 10
+      when 1 then "#{self}st"
+      when 2 then "#{self}nd"
+      when 3 then "#{self}rd"
+      else "#{self}th"
+      end
+    end
+  end
 end
 class String
   # Escape HTML entities
@@ -97,6 +119,10 @@ class String
     return x if size == 0
     x << (d + (num_parts[1].to_s + "0000000")[0,size])
   end
+  # Capitalize all words
+  def capitalize_all
+    split(/[ _]/).map{|l| l.capitalize}.join(' ')
+  end
 end
 class Time
   # HTML format
@@ -130,7 +156,6 @@ class TrueClass
         raise "Unknown format in TrueClass.f: #{format}. Needs to be :yn, :tf, :icon, or :num."
     end
   end
-
   # Show true as 1
   def to_i
     1

data/lib/waxx/pdf.rb

@@ -41,12 +41,12 @@ module Waxx::Pdf
     return_file(x)
   end
 
-  def render_file(x, pdf)
-    pdf.render_file file_path(x)
+  def render_file(x, pdf, path)
+    pdf.render_file path
   end
 
-  def return_file(x)
-    File.open(file_path(x), "rb"){|f| x << f.read}
+  def return_file(x, path)
+    File.open(path, "rb"){|f| x << f.read}
   end
 
   def show_grid(pdf)

data/lib/waxx/pg.rb

@@ -143,7 +143,16 @@ module Waxx::Pg
     #[sql.join(" "), vals.flatten]
     Waxx.debug sql
     Waxx.debug vals.join(", ")
-    x.db[@db].exec(sql.join(" "), vals.flatten)
+    begin
+      x.db[@db].exec(sql.join(" "), vals.flatten)
+    rescue => e
+      if e =~ /connection/
+        x.db[@db].reset
+        x.db[@db].exec(sql.join(" "), vals.flatten)
+      else
+        raise e
+      end
+    end
   end
 
   def get_by_id(x, id, select=nil, view:nil)
@@ -151,6 +160,11 @@ module Waxx::Pg
   end
   alias by_id get_by_id
 
+  def get_by_ulid(x, ulid, select=nil, view:nil)
+    get(x, select: select, view: view, where: ["ulid = $1", [ulid]]).first
+  end
+  alias by_ulid get_by_ulid
+
   def post(x, data, cols:nil, returning:nil, view:nil, &blk)
     if view
       cols = view.columns.select{|n,c| c[:table] == @table}
@@ -193,9 +207,7 @@ module Waxx::Pg
     vals = []
     ret = []
     i = 1
-    Waxx.debug "data: #{data}"
     cols.each{|n,v|
-      Waxx.debug "col: #{n}: #{v.inspect}"
       if data.has_key? n.to_s or data.has_key? n.to_sym
         set << "#{n} = $#{i}"
         vals << cast(v, data/n)
@@ -208,10 +220,10 @@ module Waxx::Pg
     vals << id
     Waxx.debug(sql)
     Waxx.debug(vals)
-    x.db[@db].exec(sql, vals).first 
+    x.db[@db].exec(sql, vals).first
   end
   alias patch put
-  
+
   def put_post(x, id, data, cols:nil, returning:nil, view: nil)
     q = nil
     q = get_by_id(x, id, @pkey) if id.to_i > 0
@@ -230,8 +242,8 @@ module Waxx::Pg
     end
   end
 
-  def delete(x, id)
-    x.db[@db].exec("DELETE FROM #{@table} WHERE #{@pkey} = $1", [id])
+  def delete(x, id, where: nil)
+    x.db[@db].exec("DELETE FROM #{@table} WHERE #{@pkey} = $1 #{where}", [id])
   end
 
   def order(req_order, default_order='')

data/lib/waxx/res.rb

@@ -84,8 +84,20 @@ module Waxx
     def complete
       re = out.join
       headers["Content-Length"] = re.bytesize
-      server.print head
-      server.print re
+      begin
+        server.print head
+        server.print re
+      # Connection reset by peer
+      rescue Errno::ECONNRESET => e
+        Waxx.debug(e.class)
+        Waxx.debug(e)
+        Waxx.debug(e.backtrace.join("\n"))
+      # Broken pipe
+      rescue Errno::EPIPE => e
+        Waxx.debug(e.class)
+        Waxx.debug(e)
+        Waxx.debug(e.backtrace.join("\n"))
+      end
     end
 
     def cookie(name:"", value:nil, domain:nil, expires:nil, path:"/", secure:true, http_only: false, same_site: "Lax")

data/lib/waxx/server.rb

@@ -17,18 +17,17 @@ module Waxx::Server
   attr :queue
 
   def parse_uri(r)
-    Waxx.debug "parse_uri"
+    Waxx.debug "parse_uri: #{r}", 7
     meth, uri, ver = r.split(" ")
     path, params = uri.split("?", 2)
-    _, app, act, arg = path.split(".").first.split("/", 4)
-    app = Waxx['default']['app'] if app.to_s == ''
-    act = App[app.to_sym][:default] if act.to_s == '' and App[app.to_sym]
-    act = Waxx['default']['act'] if act.to_s == ''
-    oid = arg.split("/").first.gsub(/[^0-9]/,"").to_i rescue 0
-    ext = path =~ /\./ ? path.split(".").last.downcase : Waxx['default']['ext']
-    args = arg.split("/") rescue []
+    parts = path.split('/')
+    ext = parts.last.include?('.') ? parts.last.split('.').last : Waxx['default']['ext'] rescue Waxx['default']['ext']
+    parts[parts.size - 1] = parts.last.to_s.sub(/.#{ext}$/,'') if parts.size > 0
+    app = parts[1].to_s.empty? ? Waxx['default']['app'] : parts[1]
+    act = parts[2].to_s.empty? ? (App[app.to_sym][:default] || Waxx['default']['act']) : parts[2] rescue Waxx['default']['act']
+    args = parts.slice(3,99) || []
+    oid = args.first.to_s.gsub(/[^0-9]/,"").to_i rescue 0
     get = Waxx::Http.query_string_to_hash(params).freeze
-    Waxx.debug "parse_uri.oid #{oid}"
     [meth, uri, app, act, oid, args, ext, get]
   end
 
@@ -90,6 +89,7 @@ module Waxx::Server
       end
       #Waxx.debug "no-file"
       env, head = Waxx::Http.parse_head(io)
+      Waxx.debug [Time.now.to_s, meth, uri].join(" "), 2
       #Waxx.debug head, 9
       cookie = Waxx::Http.parse_cookie(env['Cookie'])
       begin
@@ -104,7 +104,17 @@ module Waxx::Server
         Waxx.debug e.to_s, 1
         ua = {}
       end
-      post, data = Waxx::Http.parse_data(env, meth, io, head)
+      begin
+        post, data = Waxx::Http.parse_data(env, meth, io, head)
+      rescue => e
+        post = nil
+        req = Waxx::Req.new(env, data, meth, uri, get, post, cookie, start_time).freeze
+        res = Waxx::Res.new(io, 400, default_response_headers(req, ext), [], [], [])
+        jobs = []
+        x = Waxx::X.new(req, res, usr, ua, db, meth.downcase.to_sym, app, act, oid, args, ext, jobs).freeze
+        fatal_error(x, e)
+        return finish(x, io)
+      end
       req = Waxx::Req.new(env, data, meth, uri, get, post, cookie, start_time).freeze
       res = Waxx::Res.new(io, 200, default_response_headers(req, ext), [], [], [])
       jobs = []
@@ -171,7 +181,7 @@ module Waxx::Server
   def fatal_error(x, e)
     x.res.status = 503
     puts "FATAL ERROR: #{e}\n#{e.backtrace}"
-    report = "APPLICATION ERROR\n=================\n\nUSR:\n\n#{x.usr.map{|n,v| "#{n}: #{v}"}.join("\n")}\n\nERROR:\n\n#{e}\n#{e.backtrace.join("\n")}\n\nENV:\n\n#{x.req.env.map{|n,v| "#{n}: #{v}"}.join("\n")}\n\nGET:\n\n#{x.req.get.map{|n,v| "#{n}: #{v}"}.join("\n")}\n\nPOST:\n\n#{x.req.post.map{|n,v| "#{n}: #{v}"}.join("\n")}\n\n"
+    report = "APPLICATION ERROR\n=================\n\nUSR:\n\n#{x.usr.map{|n,v| "#{n}: #{v}"}.join("\n") rescue nil}\n\nERROR:\n\n#{e}\n#{e.backtrace.join("\n")}\n\nENV:\n\n#{x.req.env.map{|n,v| "#{n}: #{v}"}.join("\n") rescue nil}\n\nGET:\n\n#{x.req.get.map{|n,v| "#{n}: #{v}"}.join("\n") rescue nil}\n\nPOST:\n\n#{x.req.post.map{|n,v| "#{n}: #{v}"}.join("\n") rescue nil}\n\n"
     if Waxx['debug']['on_screen']
       x << "<pre>#{report.h}</pre>" 
     else
@@ -189,16 +199,16 @@ module Waxx::Server
         from_email = Waxx['site']['support_email']
         subject = "[Bug] #{Waxx['site']['name']} #{x.meth}:#{x.req.uri}"
         # Send email via DB
-        App::Email.post(x, d:{
+        App::Email.post(x,
           to_email: to_email,
           from_email: from_email,
           subject: subject,
           body_text: report
-        })
+        )
       rescue => e2
         begin
           # Send email directly
-          Mail.deliver do
+          ::Mail.deliver do
             from     from_email
             to       to_email
             subject  subject
@@ -249,7 +259,13 @@ module Waxx::Server
       Thread.current[:last_used] = Time.new.to_i
       Waxx.debug "Create thread #{Thread.current[:name]}"
       loop do
-        Waxx::Server.process_request(@@queue.pop, Thread.current[:db])
+        Waxx.debug "Thread loop start", 9
+        begin
+          Waxx::Server.process_request(@@queue.pop, Thread.current[:db])
+        rescue => e
+          Waxx.debug "Error: process_request loop: #{e} #{e.backtrace}", 1
+        end
+        Waxx.debug "Thread loop end", 9
       end
     end
   end
@@ -260,8 +276,13 @@ module Waxx::Server
     @@queue = Queue.new
     thread_count = Waxx['server']['min_threads'] || Waxx['server']['threads'] || 4
     1.upto(thread_count).each do |i|
-      create_thread(i)
+      begin
+        create_thread(i)
+      rescue => e
+        Waxx.debug "Error creating thread #{i}: #{e}", 1
+      end
     end
+    Waxx.debug "Created #{thread_count} threads", 7
     thread_count
   end
 

data/lib/waxx/version.rb

@@ -1,3 +1,3 @@
 module Waxx
-  Version = '0.1.2'
+  Version = '0.1.3'
 end

data/lib/waxx/view.rb

@@ -352,8 +352,8 @@ module Waxx::View
 
   ## 
   # Save data
-  def put_post(x, id, data, args:nil)
-    @object.put_post(x, id, data, view: self)
+  def put_post(x, id, data, args:nil, returning: nil)
+    @object.put_post(x, id, data, view: self, returning: returning)
   end
   alias post put_post
   alias put put_post

data/lib/waxx/waxx.rb

@@ -42,7 +42,7 @@ module Waxx
   #   )
   #   # Set the level in config.yaml (debug.level) of what level or lower to ouutput
   def debug(str, level=3)
-    puts str.to_s if level <= Waxx['debug']['level'].to_i
+    puts "#{Time.new} #{Thread.current[:name]} #{str}" if level <= Waxx['debug']['level'].to_i
   end
 
   ##

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waxx
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Dan Fitzpatrick
@@ -11,26 +11,30 @@ bindir:
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDVDCCAjygAwIBAgIBATANBgkqhkiG9w0BAQUFADA4MQwwCgYDVQQDDANkYW4x
-  FDASBgoJkiaJk/IsZAEZFgR3YXh4MRIwEAYKCZImiZPyLGQBGRYCaW8wHhcNMTcw
-  NDE3MTcxMzAwWhcNMTgwNDE3MTcxMzAwWjA4MQwwCgYDVQQDDANkYW4xFDASBgoJ
-  kiaJk/IsZAEZFgR3YXh4MRIwEAYKCZImiZPyLGQBGRYCaW8wggEiMA0GCSqGSIb3
-  DQEBAQUAA4IBDwAwggEKAoIBAQDGUoSrunsgtsd+jeXyX2CznhakmRdYI/50J+IS
-  E9mgVoC6TnsAQ4w9Z4JPMEKXxiso3WfqTQJo4d9rfdlFZ/84Wu6VPScH24A2Zxkt
-  QMha2DJVTUU1yN5aH+3+1AjcsG0jH7Yx/6H3ApGNyFnlmgXKYSZr7xOBV7KUM29J
-  GpKNLI9bXNnXuJ8jby0KlfBvbV7iRB+8pSysg89dp9ohnimCqBNnPimPBsT/U1kH
-  09nByG0nTB13LvvantQ+oCpGAKCJU7z7+q6yhvbNUgnc88maV1DunB3OTxW1vamF
-  YCtsMxAMAxeCOCyxw18FRDDN6DE6j8YRBsNbPpaah+SeJQ2nAgMBAAGjaTBnMAkG
-  A1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBSuu1nJ5bm0uqHpXvnxL9Zc
-  XBXadDAWBgNVHREEDzANgQtkYW5Ad2F4eC5pbzAWBgNVHRIEDzANgQtkYW5Ad2F4
-  eC5pbzANBgkqhkiG9w0BAQUFAAOCAQEAGcX2EJNHw2VBwnWG5YAp5XdrWrhzKtZw
-  vNussBnVJlyIg300JeS1fEuPeSXgEjWfzt6KrGJ4FhFjFAxV3JLDScEBbYxNr6ap
-  e5oZ89/eBo6YfvJlKMPokgjuHrbm7HKe1N1MODrkHNtg1qHyH743p687F7wj8cc/
-  ALdvb8FswIfCQYYx7sfoWzGEIFCeHXCbgMLX+1eJ89unt1u9rgh9FY0EW5qO2jeD
-  N9+NhUJ4uMfbynCLzKcMjcuPzoDWmDz0mg5SSmCS3h6oeTVXANBVEF8XCm+rT8qq
-  clYKdYNemzokmKaXfrURxBKOd95zfkg/IHiG1yqlVDxLM0o8Wis4vw==
+  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
   -----END CERTIFICATE-----
-date: 2017-07-27 00:00:00.000000000 Z
+date: 2019-07-27 00:00:00.000000000 Z
 dependencies: []
 description: Waxx is a high performace REST/RPC hybrid web application development
   framework.
@@ -132,8 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: A fast and flexible application development framework

metadata.gz.sig

@@ -1,3 +1,4 @@
-m8ŧj���D����K����(�,82��"�pܲ��E��!��=����^����5�U�cGY�tG#&���z��(��C\jr�U �x�� r�%��2�"��a
-�Y�����M��ŷ ��Po�$a���cm~���H�v��-��E��c�* �21p���W�^�.o�����=3���k��?zE��_p��}��i��H�5nP)(�U���15�����Y�����P
-h�7�/����I��0����a�[n�W�
+N�����r��£���x{}��ܾ-�b�2+�֢��QL��UQ	�$o@�ɽw�X@zy�L�z22�F�K&z|���]��{��6�W5��A��l����v�0�y��W�ѝa<�~��P�|�q2�bg�� �Й/Y�C� �ۭ]#�/,�f�̚�bU�P�V8���
++�q��
+(J�jސ��Hm^@d�G�e�pu?s�v��lG-��
+�a�0�dH��<lOK�t`&!?��[x��~�k�8���M!�.h�G�)SNM��a�i-��"3dڰ՝�M�F@