tramway-api 0.2.1.1 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03fbedd30fa36978033c8708ebaeb33aa299d421d20579af7c79f5a93c7a45b2
-  data.tar.gz: 6ad47c29de3d35109b6a0be88ef265c1a8d805eb1044e8b4826b12ba3e178b5f
+  metadata.gz: ad4e0d429fcc05fb7951b00a8aedb0718024120f9b571da62a192a516620fd95
+  data.tar.gz: ccd377146811d086e240f75c7f0d1882241024fe866fcf85205a0d71fd04e48d
 SHA512:
-  metadata.gz: 6e7353971838d17ec2c0bb1dddbaa12afe1d5273ced54e1c663ca7e9039a70829fb01d0e1a5e343bdcf673ce8d7911e4d57db04a5b36834304c3e3d1fe483166
-  data.tar.gz: 35bc486bf678c29fba6d53c5bf9053e5c7bb591ff2bfdb48309864eac44cd058577f66c936c5f30ec22c843fae8ff69332849bbb654814271bfe1cf7c41c45cd
+  metadata.gz: 8ba680817e74595d11adcb2eeaf0b19e06aa6f124a7c813ed799ec7c0670b8d339b9ddc25f6f74ade19d9bf5cafc73bfd35709424b950f40efa277370e253914
+  data.tar.gz: 626d06a3a3dbc3937f0b2da410b7c45437c90da4a708480e44e3a2c2e735234f34f67e71eca5f0357230afae57014edaa88811170182a3b79105cfec86ccb7e9

data/app/controllers/tramway/api/application_controller.rb

@@ -1,10 +1,7 @@
-require 'tramway/api/authenticate_helper'
-
 module Tramway
   module Api
     class ApplicationController < ::Tramway::Core::ApplicationController
       include Knock::Authenticable
-      include ::Tramway::Api::AuthenticateHelper
       protect_from_forgery with: :null_session, if: proc { |c| c.request.format == 'application/json' }
       rescue_from ActiveRecord::RecordNotFound, with: :not_found
 
@@ -13,6 +10,33 @@ module Tramway
       def not_found
         render json: { data: [] }, status: :not_found
       end
+
+      protected
+
+      def authenticate
+        raise ActiveRecord::RecordNotFound unless entity.present? && entity.authenticate(auth_params[:password])
+      end
+
+      def auth_token
+        if entity.respond_to? :to_token_payload
+          Knock::AuthToken.new payload: entity.to_token_payload
+        else
+          Knock::AuthToken.new payload: { sub: entity.id }
+        end
+      end
+
+      def entity
+        @entity ||=
+          if Tramway::Api.user_based_model.respond_to? :from_token_request
+            Tramway::Api.user_based_model.from_token_request request
+          else
+            Tramway::Api.user_based_model.find_by email: auth_params[:email]
+          end
+      end
+
+      def auth_params
+        params.require(:auth).permit :email, :password
+      end
     end
   end
 end

data/app/controllers/tramway/api/v1/users_controller.rb

@@ -6,13 +6,12 @@ class Tramway::Api::V1::UsersController < ::Tramway::Api::V1::ApplicationControl
 
   def create
     user_form = form_class_name(Tramway::Api.user_based_model).new Tramway::Api.user_based_model.new
-    if user_form.validate params[Tramway::Api.user_based_model.name.underscore]
-      user_form.save
+    if user_form.submit params[Tramway::Api.user_based_model.name.underscore]
       token = ::Knock::AuthToken.new(payload: { sub: user_form.model.id }).token
       serialized_user = OpenStruct.new user_form.model.attributes.merge authentication_token: token
       render json: serialized_user, status: :created
     else
-      render json: user_form.errors.details, status: :unprocessable_entity
+      render json: user_form.errors.messages, status: :unprocessable_entity
     end
   end
 

data/config/routes.rb

@@ -1,6 +1,6 @@
 Tramway::Api::Engine.routes.draw do
   namespace :v1 do
     resource :user_token, only: [ :create ]
-    resources :users, only: [ :create ]
+    resource :user, only: [ :create, :show ]
   end
 end

data/lib/tramway/api/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Api
-    VERSION = '0.2.1.1'
+    VERSION = '0.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-api
 version: !ruby/object:Gem::Version
-  version: 0.2.1.1
+  version: '0.3'
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2019-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knock
@@ -62,7 +62,6 @@ files:
 - config/routes.rb
 - lib/tasks/tramway/api_tasks.rake
 - lib/tramway/api.rb
-- lib/tramway/api/authenticate_helper.rb
 - lib/tramway/api/engine.rb
 - lib/tramway/api/version.rb
 homepage: https://github.com/kalashnikovisme/tramway-dev

data/lib/tramway/api/authenticate_helper.rb

@@ -1,26 +0,0 @@
-module Tramway::Api::AuthenticateHelper
-  def authenticate
-    raise ActiveRecord::RecordNotFound unless entity.present? && entity.authenticate(auth_params[:password])
-  end
-
-  def auth_token
-    if entity.respond_to? :to_token_payload
-      Knock::AuthToken.new payload: entity.to_token_payload
-    else
-      Knock::AuthToken.new payload: { sub: entity.id }
-    end
-  end
-
-  def entity
-    @entity ||=
-      if Tramway::Api.user_based_model.respond_to? :from_token_request
-        Tramway::Api.user_based_model.from_token_request request
-      else
-        Tramway::Api.user_based_model.find_by email: auth_params[:email]
-      end
-  end
-
-  def auth_params
-    params.require(:auth).permit :email, :password
-  end
-end