tramway-api 1.6.0.1 → 1.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f21707e10ef82a1c378250e9c82339400ee41739d7a6009001ecd1c8a17c4e0
-  data.tar.gz: 22732d5ad75036e1bf59831171f4d82af30f95805432900df283566b2b24619c
+  metadata.gz: c0ea77a64960468cd8a38627fe4400e78d591810d3123dd5b59672fcd1f37da3
+  data.tar.gz: 6e952b9555a2be85d5a0676ac527a7c8fff3027dfcb984a38fce99d2e145089b
 SHA512:
-  metadata.gz: 313b31746731d79afe528f6100daa910260707e03c4d68d5c0961b6a046591d485006a58e3438b9b3bf4c1dcb7b79009511834b7a58905e293834d679c47bb66
-  data.tar.gz: 6b9a2570cd6b8e68d039de8706d9923651081c010f0a4cebce5347a06f442033b2c3833b7c07194bd4eea3b9bb3a2b7b81d629078d18380df4488f35b90ba63f
+  metadata.gz: 3bdd5d17648fac5814452ff4d1873b6085cdff3f776a37b9ac73224a56189989876832d9ad841d082ca1b2cdb6acf05c51eb4fb2cd1ec87d0db84f64b1b5286e
+  data.tar.gz: 7004e9ade3569be69ad1ca94058533d425b9dea39e746ccc189034e95374be2553682658ff2768208f1f41e97f1e26f2c6937a7c12eb457c7f0413d3bc3d79ce

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 begin
   require 'bundler/setup'
 rescue LoadError
@@ -14,7 +16,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("spec/dummy/Rakefile", __dir__)
+APP_RAKEFILE = File.expand_path('spec/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
 
 load 'rails/tasks/statistics.rake'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Api
     class ApplicationController < ::Tramway::Core::ApplicationController
@@ -15,12 +17,13 @@ module Tramway
         head :unauthorized
       end
 
-      protected
-
       def authenticate
-        return unauthorized if current_user.nil? || !params[:user_based_model].in?(Tramway::Api.user_based_models)
+        return if current_user || params[:user_based_model].in?(Tramway::Api.user_based_models)
+        unauthorized
       end
 
+      protected
+
       def auth_token
         if entity.respond_to? :to_token_payload
           ::Knock::AuthToken.new payload: entity.to_token_payload

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Api
     module V1

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway::Api::V1
   class RecordsController < ::Tramway::Api::V1::ApplicationController
     before_action :check_available_model_class
@@ -8,18 +10,18 @@ module Tramway::Api::V1
       records = model_class.active.order(id: :desc).send params[:scope] || :all
       records = records.full_text_search params[:search] if params[:search]
       render json: records,
-        each_serializer: serializer_class,
-        include: '*',
-        status: :ok
+             each_serializer: serializer_class,
+             include: '*',
+             status: :ok
     end
 
     def create
       record_form = form_class.new model_class.new
       if record_form.submit snake_case params[:data][:attributes]
         render json: record_form.model,
-          serializer: serializer_class,
-          include: '*',
-          status: :created
+               serializer: serializer_class,
+               include: '*',
+               status: :created
       else
         render_errors_for record_form
       end
@@ -29,9 +31,9 @@ module Tramway::Api::V1
       record_form = form_class.new model_class.active.find params[:id]
       if record_form.submit snake_case params[:data][:attributes]
         render json: record_form.model,
-          serializer: serializer_class,
-          include: '*',
-          status: :ok
+               serializer: serializer_class,
+               include: '*',
+               status: :ok
       else
         render_errors_for record_form
       end
@@ -40,36 +42,34 @@ module Tramway::Api::V1
     def show
       record = model_class.active.find params[:id]
       render json: record,
-        serializer: serializer_class,
-        include: '*',
-        status: :ok
+             serializer: serializer_class,
+             include: '*',
+             status: :ok
     end
 
     def destroy
       record = model_class.active.find params[:id]
       record.remove
       render json: record,
-        serializer: serializer_class,
-        include: '*',
-        status: :no_content
+             serializer: serializer_class,
+             include: '*',
+             status: :no_content
     end
 
     private
 
     def check_available_model_class
-      head :unprocessable_entity and return unless model_class
+      head(:unprocessable_entity) && return unless model_class
     end
 
     def check_available_model_action
       open_actions = Tramway::Api.available_models[model_class.to_s][:open]&.map(&:to_s) || []
-      closed_actions =  Tramway::Api.available_models[model_class.to_s][:closed]&.map(&:to_s) || []
-      head :unprocessable_entity and return unless action_name.in? open_actions + closed_actions
+      closed_actions = Tramway::Api.available_models[model_class.to_s][:closed]&.map(&:to_s) || []
+      head(:unprocessable_entity) && return unless action_name.in? open_actions + closed_actions
     end
 
     def authenticate_user_if_needed
-      if action_name.in? Tramway::Api::available_models[model_class.to_s][:closed]&.map(&:to_s) || []
-        current_user
-      end
+      head :unauthorized and return if action_name.in?(Tramway::Api.available_models[model_class.to_s][:closed]&.map(&:to_s) || []) && !current_user
     end
 
     def model_class

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class Tramway::Api::V1::UserTokensController < ::Tramway::Api::V1::ApplicationController
   def create
     if entity.present? && entity.authenticate(auth_params[:password])
@@ -12,7 +13,7 @@ class Tramway::Api::V1::UserTokensController < ::Tramway::Api::V1::ApplicationCo
         }
       }, status: :created
     else
-      not_found
+      unauthorized
     end
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tramway/helpers/class_name_helpers'
 
 class Tramway::Api::V1::UsersController < ::Tramway::Api::V1::ApplicationController
@@ -7,13 +9,14 @@ class Tramway::Api::V1::UsersController < ::Tramway::Api::V1::ApplicationControl
   def create
     user_form = sign_up_form_class_name(user_based_model).new user_based_model.new
     # Implement JSON API spec here
-    if user_form.submit snake_case params[user_based_model.name.underscore]
+    if user_form.submit snake_case params[:data][:attributes]
       token = ::Knock::AuthToken.new(payload: { sub: user_form.model.uid }).token
-      # FIXME refactor this bullshit
+      # FIXME: refactor this bullshit
       serialized_user = OpenStruct.new(
         user_form.model.attributes.merge(
           authentication_token: token,
-          id: user_form.model.uid
+          uid: user_form.model.uid,
+          id: user_form.model.id
         )
       )
       render json: serialized_user, status: :created

data/app/forms/tramway/api/authentication_form.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tramway::Api::AuthenticationForm < Tramway::Core::ApplicationForm
   properties :email, :password
 end

data/app/helpers/tramway/api/application_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Api
     module ApplicationHelper

data/app/jobs/tramway/api/application_job.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Api
     class ApplicationJob < ActiveJob::Base

data/app/mailers/tramway/api/application_mailer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Api
     class ApplicationMailer < ActionMailer::Base

data/app/models/tramway/api/application_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Api
     class ApplicationRecord < ActiveRecord::Base

data/app/serializers/tramway/api/v1/error_serializer.rb

@@ -26,21 +26,19 @@ class Tramway::Api::V1::ErrorSerializer < ActiveModel::Serializer
       end
     end
 
-    if object.model
-      object.model.attributes.each do |attribute_key, attribute_value|
-        if attribute_value.is_a?(Reform::Form)
-          error_messages.merge!(error_messages(attribute_value, path + [attribute_key]))
-        elsif attribute_value.is_a?(Array)
-          attribute_value.each_with_index do |array_attribute_value, array_attribute_key|
-            next unless array_attribute_value.is_a?(Reform::Form)
-
-            error_messages.merge!(
-              error_messages(
-                array_attribute_value,
-                path + [attribute_key] + [array_attribute_key]
-              )
+    object.model&.attributes&.each do |attribute_key, attribute_value|
+      if attribute_value.is_a?(Reform::Form)
+        error_messages.merge!(error_messages(attribute_value, path + [attribute_key]))
+      elsif attribute_value.is_a?(Array)
+        attribute_value.each_with_index do |array_attribute_value, array_attribute_key|
+          next unless array_attribute_value.is_a?(Reform::Form)
+
+          error_messages.merge!(
+            error_messages(
+              array_attribute_value,
+              path + [attribute_key] + [array_attribute_key]
             )
-          end
+          )
         end
       end
     end

data/config/initializers/json_param_key_transform.rb

@@ -1,4 +1,6 @@
-ActionDispatch::Request.parameter_parsers[:json] = -> (raw_post) {
+# frozen_string_literal: true
+
+ActionDispatch::Request.parameter_parsers[:json] = lambda { |raw_post|
   data = ActiveSupport::JSON.decode(raw_post)
   data = { _json: data } unless data.is_a?(Hash)
 

data/config/routes.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 Tramway::Api::Engine.routes.draw do
   namespace :v1 do
-    resource :user_token, only: [ :create ]
-    resource :user, only: [ :create, :show ]
+    resource :user_token, only: [:create]
+    resource :user, only: %i[create show]
     resources :records
   end
 end

data/lib/tasks/tramway/api_tasks.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # desc "Explaining what the task does"
 # task :tramway_api do
 #   # Task goes here

data/lib/tramway/api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'tramway/api/engine'
 
 module Tramway

data/lib/tramway/api/engine.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Tramway
   module Api
     class Engine < ::Rails::Engine

data/lib/tramway/api/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Tramway
   module Api
-    VERSION = '1.6.0.1'
+    VERSION = '1.6.3'
   end
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: tramway-api
 version: !ruby/object:Gem::Version
-  version: 1.6.0.1
+  version: 1.6.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-11 00:00:00.000000000 Z
+date: 2019-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: knock
+  name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.5
 - !ruby/object:Gem::Dependency
-  name: tramway-core
+  name: knock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: active_model_serializers
+  name: tramway-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.5
+        version: 1.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.5
+        version: 1.9.2
 description: Engine for api
 email:
 - kalashnikovisme@gmail.com