goserv-user 0.0.1.alpha.19 → 0.0.1.alpha.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a269321a429f9bc97be300776f8a286828e75c24
-  data.tar.gz: 049f51c4a822669709ba8dbb44aa3a4e7061fe9d
+  metadata.gz: 581f86525666abff4caa8bf3e0a951f8691618c3
+  data.tar.gz: dae58c5be97f67a710778e09a56c3b9572981cae
 SHA512:
-  metadata.gz: a3f7a1442b2a93acc8e95fe7f55a411b4570979249e7194f3e201704c7fba7bc76740be97117443e5be19bc8dac756669c10eea056a888f36285d30cdebf4dc4
-  data.tar.gz: 368632c6b242c3ba2c19ef3fd9281797968dc9b9f2dd88749cddd9d6ecb7cae87110d9ad8c36455d669e7d97dc5fa0351f1e2d53864a3c84750048e589f990a2
+  metadata.gz: bb4d427cf73e8cd01c1fa1af741242855dcfc93b59a7c815449c8ff1acd2fe5d72289ce57927ddce9e2b749a54a07362ba057cb608945516ab12dcd1658a5bbe
+  data.tar.gz: 3dff8dc7da57a342b1ca497b0126eabb80454674f8377efa11f4ea9624b2a4b9dc4f7d3240dbfba7db9ae6fd545687d29e5673df690a79c4bebc86d7efd0aea6

data/app.rb

@@ -6,17 +6,28 @@ require 'goserv-util'
 
 # GoServApp: Main controller for the API
 class GoServApp < Sinatra::Base
+  configure do
+    puts "THE CURRENT RACK ENV IS #{ENV['RACK_ENV']}"
+    set(:raise_errors, true) if ENV['RACK_ENV'] = 'test'
+    set(:dump_errors, true)
+    set(:show_exceptions, false)
+  end
+
   include GoUtil::Log
 
   register Sinatra::ActiveRecordExtension
 
+  not_found do
+    status '404 Not Found'
+  end
+
   before '/*' do
-    log.begin_request(request)
+    GoUtil::Log.begin_request(request)
   end
 
   post '/login' do
-    body = Prehandlers::Login.prehandle(request)
-    user = Users.authenticate(body)
+    body = GoUser::Prehandlers::Login.prehandle(request)
+    user = GoUser.authenticate(body)
     JSON.pretty_generate(
       code: 'SUCCESS',
       token: user.token
@@ -24,15 +35,15 @@ class GoServApp < Sinatra::Base
   end
 
   post '/signup' do
-    body = Prehandlers::Signup.prehandle(request)
-    Users.create_user(body)
+    body = GoUser::Prehandlers::Signup.prehandle(request)
+    GoUser.create_user(body)
     JSON.pretty_generate(code: 'SUCCESS')
   end
 
   def self.register_error(*codes, err_status:, err_code:, err_reasons: [])
     error(*codes) do
       err = env['sinatra.error']
-      log.request_error err, err_status
+      GoUtil::Log.request_error err, err_status
       status err_status
 
       err_reasons = err.full_messages if err.respond_to? :full_messages

data/config.ru

@@ -1,10 +1,16 @@
 require './app'
-require 'go_util'
+require 'goserv-util'
 
-config = YAML.load_file('config/environment.yml')
+begin
+  config = YAML.load_file('config/environment.yml')
+rescue Errno::ENOENT
+  config = {}
+end
 
-log_dir = ENV.key?('GOSERV_LOG_DIR') ? ENV['GOSERV_LOG_DIR'] : config[:log_dir]
+log_dir = '.'
+log_dir = ENV['GOSERV_LOG_DIR'] if ENV.key('GOSERV_LOG_DIR')
+log_dir = config[:log_dir] if config[:log_dir]
 
-Log.init(log_dir, 'user')
+GoUtil::Log.init(log_dir, 'user')
 
 run GoServApp

data/lib/goserv-user/prehandlers.rb

@@ -1,18 +1,20 @@
 require 'goserv-util'
 require_relative 'schema'
 
-module Prehandlers
-  # user creation request prehandling.
-  class Signup
-    include GoUtil::Request::Prehandler
-    has_json_body
-    self.schema = Schema.signin
-  end
+module GoUser
+  module Prehandlers
+    # user creation request prehandling.
+    class Signup
+      include GoUtil::Request::Prehandler
+      has_json_body
+      self.schema = Schema.signin
+    end
 
-  # user login request prehandling
-  class LoginHandler
-    include GoUtil::Request::Prehandler
-    has_json_body
-    self.schema = Schema.login
+    # user login request prehandling
+    class Login
+      include GoUtil::Request::Prehandler
+      has_json_body
+      self.schema = Schema.login
+    end
   end
 end

data/lib/goserv-user/schema/signin.rb

@@ -1,30 +1,57 @@
-module Schema
-  def self.signin
-    {
-      type: 'object',
-      required: %w(username password email),
-      properties: {
-        username: {
-          type: 'string',
-          maxLength: 16,
-          minLength: 3
-        },
-        password: {
-          type: 'string',
-          maxLength: 16,
-          minLength: 8
-        },
-        email: {
-          type: 'string',
-          pattern: '/\A([\w+\-].?)+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z/i'
+
+module GoUser
+  module Schema
+    def self.signin
+      {
+        type: 'object',
+        required: %w(username password email),
+        properties: {
+          username: {
+            type: 'string',
+            maxLength: 16,
+            minLength: 3
+          },
+          password: {
+            type: 'string',
+            maxLength: 16,
+            minLength: 8
+          },
+          email: {
+            type: 'string',
+            pattern: '\A([\w+\-].?)+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z'
+          }
         }
       }
-    }
-  end
+    end
 
-  def self.login
-    {
-      type: 'object'
-    }
+    def self.login
+      {
+        type: 'object',
+        oneOf: [
+          {
+            required: %w(username password),
+            properties: {
+              username: {
+                type: 'string'
+              },
+              password: {
+                type: 'string'
+              }
+            }
+          },
+          {
+            required: %w(email password),
+            properties: {
+              email: {
+                type: 'string'
+              },
+              password: {
+                type: 'string'
+              }
+            }
+          }
+        ]
+      }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goserv-user
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha.19
+  version: 0.0.1.alpha.22
 platform: ruby
 authors:
 - Ben C Lewis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-01 00:00:00.000000000 Z
+date: 2017-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,34 +66,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.3
 - !ruby/object:Gem::Dependency
   name: passenger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.25
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.25
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.5
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement