qm 1.1.13 → 1.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16cc41b763071acd523aeadbf511b2054b452bce
-  data.tar.gz: d5b066cb5971393d93e19bb4a42e5de03b4646a6
+  metadata.gz: 08ab22eda9dec9701dbc4c3cb219dd9e2dfc58a0
+  data.tar.gz: 846e5cb34d8302e4b06cc5ab6641861332fe60fd
 SHA512:
-  metadata.gz: b87e6b7b61d278ab706c7f158309855c5e113bad1c30e2b4665235cdb1ac5a5622d0d98764eede6f632b56e0c503efec85f963a19eeb6e8b987d8579d9c022bb
-  data.tar.gz: 488d67da2bdb009e35926b921e59cd621db873ade71d3727af2a9914eb6796a8ac57236fdc2050890c47b9b7dc7d518f51f7650c6f6d2e41dea57501727f2619
+  metadata.gz: 026fdf8527b0ffbcad0f0b75c9f2091ba7771e93d8b90a769c1d65c4f73778202b0744cbeac67025428f12c8c3fb873ef906a0bdba63a44354aa6c8c0c4b7a9b
+  data.tar.gz: b012f21b8b4f514ff7963fc4a22c128cdfede019384edec03e51ce04c6eb0ed3636c7b8fc0a600e3e6e2db7586d587b17cdbea3f0eaef91fccec508a5174c6e6

data/README.md

@@ -1,18 +1,21 @@
 # qm
 
-The `qm` gem for [Ruby](http://www.ruby-lang.org/) implements both the API
-server and web server components of [QMachine](https://www.qmachine.org) (QM).
-It uses [MongoDB](http://www.mongodb.org/) for persistent storage, and it can
+The `qm` gem for [Ruby](http://www.ruby-lang.org/) includes a
+[QMachine](https://www.qmachine.org) API server and a web server. It uses
+[MongoDB](http://www.mongodb.org/) for persistent storage, and it can
 optionally log traffic data into a different MongoDB collection instead of
-logging to stdout. The repository still contains working definitions for using
-[SQLite](https://www.sqlite.org/) as persistent storage, however.
+logging to stdout. A client is planned.
 
-Install
--------
+The repository contains vestigial definitions for using
+[SQLite](https://www.sqlite.org/), but these may "evolve away" in the future,
+primarily due to the
+[obstacle it poses](https://devcenter.heroku.com/articles/sqlite3)
+to deploying on [Heroku](https://www.heroku.com). If you are absolutely in love
+with SQLite (or just hate MongoDB), consider trying the
+[Node.js version](https://github.com/qmachine/qm-nodejs) instead.
 
-To install the latest release, run
-
-    $ gem install qm
+For more information, please see the
+[manual](https://docs.qmachine.org/en/latest/ruby.html).
 
 ===
 

data/lib/defs-mongo.rb

@@ -2,7 +2,7 @@
 
 #-  defs-mongo.rb ~~
 #                                                       ~~ (c) SRW, 16 Jul 2014
-#                                                   ~~ last updated 28 Jul 2014
+#                                                   ~~ last updated 02 Aug 2014
 
 require 'json'
 require 'mongo'
@@ -27,7 +27,7 @@ module Sinatra
                 sparse: true
             })
             settings.api_db['avars'].ensure_index('exp_date', {
-                expireAfterSeconds: settings.avar_ttl
+                expireAfterSeconds: 0
             })
             return
         end
@@ -50,8 +50,12 @@ module Sinatra
 
         def get_avar(params)
           # This helper function needs documentation.
-            bk, db = "#{params[0]}&#{params[1]}", settings.api_db
-            x = db['avars'].find_one({_id: bk})
+            db = settings.api_db
+            x = db['avars'].find_and_modify({
+                query: {_id: "#{params[0]}&#{params[1]}"},
+                update: {'$set' => {exp_date: Time.now + settings.avar_ttl}},
+                fields: {body: 1}
+            })
             y = (x.nil?) ? '{}' : x['body']
             return y
         end
@@ -73,7 +77,7 @@ module Sinatra
             doc = {
                 _id: "#{params[0]}&#{params[1]}",
                 body: params[2],
-                exp_date: Time.now,
+                exp_date: Time.now + settings.avar_ttl,
                 key: params[1]
             }
             options = {upsert: true}#, w: 1}

data/lib/qm.rb

@@ -2,7 +2,7 @@
 
 #-  qm.rb ~~
 #                                                       ~~ (c) SRW, 12 Apr 2013
-#                                                   ~~ last updated 31 Jul 2014
+#                                                   ~~ last updated 04 Aug 2014
 
 module QM
 
@@ -15,12 +15,10 @@ module QM
     def self::launch_service(options = {})
       # This function creates, configures, and launches a fresh Sinatra app
       # that inherits from the original "teaching version".
-        require 'service'
         require 'defs-mongo'
-        #require 'defs-sqlite'
+        require 'service'
         app = Sinatra.new(QMachineService) do
             register Sinatra::MongoConnect
-            #register Sinatra::SQLiteConnect
             configure do
                 convert = lambda do |x|
                   # This converts all keys in a hash to symbols recursively.
@@ -34,24 +32,15 @@ module QM
                 end
                 options = convert.call(options)
                 set options
-
-              # I'm not sure if the next three lines are necessary or not ...
-                set bind: settings.hostname,
-                    run: false,
-                    static: settings.enable_web_server
-
                 if (settings.persistent_storage.has_key?(:mongo)) then
                     helpers Sinatra::MongoAPIDefs
                     mongo_api_connect
-                #elsif (settings.persistent_storage.has_key?(:sqlite)) then
-                #    helpers Sinatra::SQLiteDefs
-                #    sqlite_connect
                 end
                 if (settings.trafficlog_storage.has_key?(:mongo)) then
                     helpers Sinatra::MongoLogDefs
                     mongo_log_connect
                     after do
-                        log_to_db
+                        log_to_db unless response.status == 444
                     end
                 end
             end

data/lib/service.rb

@@ -16,7 +16,7 @@
 #   of a 'box', 'key', or 'status' value.
 #
 #                                                       ~~ (c) SRW, 24 Apr 2013
-#                                                   ~~ last updated 31 Jul 2014
+#                                                   ~~ last updated 03 Aug 2014
 
 require 'sinatra'
 require 'sinatra/cross_origin'
@@ -34,7 +34,6 @@ class QMachineService < Sinatra::Base
             enable_CORS:            false,
             enable_web_server:      false,
             hostname:               '0.0.0.0',
-            logging:                true,
             persistent_storage:     {},
             port:                   8177,
             public_folder:          'public',
@@ -44,9 +43,10 @@ class QMachineService < Sinatra::Base
 
         mime_type webapp: 'application/x-web-app-manifest+json'
 
-        set bind: settings.hostname,            # Actually, I am not sure if
-            run: false,                         # these lines are actually
-            static: settings.enable_web_server  # necessary anymore ...
+        set bind: lambda { settings.hostname },
+            logging: true,
+            run: false,
+            static: lambda { settings.enable_web_server }
 
       # See also: http://www.sinatrarb.com/configuration.html
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qm
 version: !ruby/object:Gem::Version
-  version: 1.1.13
+  version: 1.1.14
 platform: ruby
 authors:
 - Sean Wilkinson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: A platform for World Wide Computing