tramway-api 1.8.4 → 1.8.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c007eb42b91d7a7b138884b5ce40739a7f90b63254c223c6a82a16b652e9e47
-  data.tar.gz: 5634bf604e6984e540fdfa1bcab1b4a93aca5e0a3e140756711b6e1f3c993f25
+  metadata.gz: e7f1b8dfe3e44248a5689bd7a38f15457cfdb51a5e86c57ced95eff20b177310
+  data.tar.gz: 6fd69e46c891249e0f9177b596b17242f209c4d2fc38eab9419dd208b64b1de2
 SHA512:
-  metadata.gz: 9af7275766df2240504ae8c258ccc0f0e278855890ccf2fdb03ab735f90aa9252dd2ab462f1adb8e8ede509b3ec0e508b1c2db746932e34196c2fdc67253639c
-  data.tar.gz: ebe525f69af40b34e0f8f12bf70205dcc7d1072462eda9ffadf04858137faeec96b42556e71e30f66724011245f595021deb3a5240a223e734012a5da8e6feb0
+  metadata.gz: 0addb5574a3f3dd5308d94c2a7e023c41d864bf909119e34d258b0339245f94155105ea9605b406e32f9edb85ce2c9e15d0e30f7dfca2f6a401378a4314c020d
+  data.tar.gz: 23d22cdb67d958d36c39a80c1794b202eae925931553f4910637074024bb601429d516d0f498911be45d605454cf5879039ef72ddfbf8432ba57e5cdf6aa1a77

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

@@ -24,14 +24,21 @@ module Tramway
         private
 
         def record
-          id_method = Tramway::Api.id_method_of(model: model_class) || :uuid
-          @record = model_class.find_by! id_method => params[:id] if params[:id].present?
+          if params[:key].present?
+            if Tramway::Api.other_id_methods_of(model: model_class).include? params[:key]
+              @record = model_class.find_by! params[:key] => params[:id] if params[:id].present?
+            end
+          else
+            default_id_method = Tramway::Api.default_id_method_of(model: model_class) || :uuid
+            @record = model_class.find_by! default_id_method => params[:id] if params[:id].present?
+          end
         end
 
         def records
           active_records = model_class.respond_to?(:active) ? model_class.active : model_class.all
           collection = active_records.order(id: :desc).send params[:scope] || :all
-          collection = collection.full_text_search params[:search] if params[:search]
+          collection = collection.page(params[:page]).per(params[:per]) if params[:page].present?
+          collection = collection.full_text_search params[:search] if params[:search].present?
           collection
         end
 

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

@@ -6,7 +6,7 @@ class Tramway::Api::V1::ApplicationSerializer < ActiveModel::Serializer
   attribute :id
 
   def id
-    id_method = Tramway::Api.id_method_of(model: object.class) || :uuid
+    id_method = Tramway::Api.default_id_method_of(model: object.class) || :uuid
     object.send(id_method)
   end
 

data/lib/tramway/api.rb

@@ -91,8 +91,12 @@ module Tramway
         end)
       end
 
-      def id_method_of(model:)
-        @@id_methods[model.to_s]
+      def other_id_methods_of(model:)
+        @@id_methods[model.to_s][:other]
+      end
+
+      def default_id_method_of(model:)
+        @@id_methods[model.to_s][:default]
       end
     end
   end

data/lib/tramway/api/version.rb

@@ -2,6 +2,6 @@
 
 module Tramway
   module Api
-    VERSION = '1.8.4'
+    VERSION = '1.8.6.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tramway-api
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.6.3
 platform: ruby
 authors:
 - Pavel Kalashnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2020-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers