tramway-api 1.4.1 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec1302e6c87545200be1aafc619be2179f680ba24cbfa80b7876cbb66062411b
-  data.tar.gz: ef2806fab92a090ee0524a855b6ece6960a349ec5952e7c4e76feb3b4c3f0469
+  metadata.gz: eed51b344d38bb111854f4e32d985856ea3504b76fbf901fee56735183eae415
+  data.tar.gz: d430ca30613c117aed36db0493885b4399d4015d53d12f34470fd8bf60fe7d71
 SHA512:
-  metadata.gz: 9016f340db67e2c4a05a3ec3f13d57cc104c4354980c5f09111bc70b1c9cecd778e108998482e8b049c8a356490bb5170f27583554fd910216385d8847425408
-  data.tar.gz: 23dd222a388b24c3d01ef0c27004ef3478ec8e7c9f82bf1462ae07ec3f027ac333df69d602c1259295f57f2f6d0a8314f918f7b38e6e754053725df6c67fcf9e
+  metadata.gz: f84dd206d408c41f1d3c230079418445ff4b7fffbb4808637297695c3f033dec031e3e7f3f29f699a58d865e950d1afac1d1f8a3f6116c1ea40469fabc06bf0d
+  data.tar.gz: c746cad5ecbce016799e6337ea9f23a38287bd2cbee543a9460a5750e301238e10459bd0f4da0cb0e9bb3f3fd885665daa998b4e59982f2cb014034a48297ed1

data/README.md

@@ -89,7 +89,7 @@ Create file `config/initializers/tramway.rb`
 
 ```ruby
 ::Tramway::Api.auth_config = { user_model: User, auth_attributes: %i[email username] }
-::Tramway::Api.set_available_models user: %i[create update]
+::Tramway::Api.set_available_models user: { open: %i[create], closed: %i[update] }
 ```
 
 Run `rails g tramway:core:install`
@@ -271,7 +271,10 @@ this model must have field `password_digest`, because we use `bcrypt` gem for au
 
 Sets ActiveRecord models which will be used in API
 
-Argument is a hash. Keys are underscored models names, values are arrays of available methods for every model.
+Argument is a hash. Keys are underscored models names, values are hashes with actions of available methods for every model.
+* `open` key means that this action will be used without authentication
+* `closed` key means that this action will be used with authentication
+
 
 Enabled methods:
 

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

@@ -6,8 +6,10 @@ module Tramway::Api::V1
 
     def index
       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
     end
 
@@ -16,6 +18,7 @@ module Tramway::Api::V1
       if record_form.submit params[:data][:attributes]
         render json: record_form.model,
           serializer: serializer_class,
+          include: '*',
           status: :created
       else
         render_errors_for record_form
@@ -27,6 +30,7 @@ module Tramway::Api::V1
       if record_form.submit params[:data][:attributes]
         render json: record_form.model,
           serializer: serializer_class,
+          include: '*',
           status: :ok
       else
         render_errors_for record_form
@@ -37,6 +41,7 @@ module Tramway::Api::V1
       record = model_class.active.find params[:id]
       render json: record,
         serializer: serializer_class,
+        include: '*',
         status: :ok
     end
 
@@ -45,6 +50,7 @@ module Tramway::Api::V1
       record.remove
       render json: record,
         serializer: serializer_class,
+        include: '*',
         status: :no_content
     end
 
@@ -55,8 +61,9 @@ module Tramway::Api::V1
     end
 
     def check_available_model_action
-      actions = Tramway::Api.available_models[model_class.to_s][:open]&.map(&:to_s) || [] + Tramway::Api.available_models[model_class.to_s][:closed]&.map(&:to_s) || []
-      head :unprocessable_entity and return unless action_name.in? actions
+      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
     end
 
     def authenticate_user_if_needed
@@ -67,7 +74,11 @@ module Tramway::Api::V1
 
     def model_class
       if params[:model].to_s.in? ::Tramway::Api.available_models.keys.map(&:to_s)
-        params[:model].constantize
+        begin
+          params[:model].constantize
+        rescue ActiveSupport::Concern::MultipleIncludedBlocks => e
+          raise "#{e}. Maybe #{params[:model]} model doesn't exists or there is naming conflicts with it"
+        end
       end
     end
 

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

@@ -8,7 +8,7 @@ class Tramway::Api::V1::UsersController < ::Tramway::Api::V1::ApplicationControl
     user_form = sign_up_form_class_name(Tramway::Api.user_based_model).new Tramway::Api.user_based_model.new
     # Implement JSON API spec here
     if user_form.submit params[Tramway::Api.user_based_model.name.underscore]
-      token = ::Knock::AuthToken.new(payload: { sub: user_form.model.id }).token
+      token = ::Knock::AuthToken.new(payload: { sub: user_form.model.uid }).token
       # FIXME refactor this bullshit
       serialized_user = OpenStruct.new(
         user_form.model.attributes.merge(

data/lib/tramway/api/version.rb

@@ -1,5 +1,5 @@
 module Tramway
   module Api
-    VERSION = '1.4.1'
+    VERSION = '1.4.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-api
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.4
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-09 00:00:00.000000000 Z
+date: 2019-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knock