tramway-api 1.8.3.1 → 1.8.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ea920d1d95b5d0879e4761b50d32a53ae9cd09425fd7ce6f3c35cc6173821cf
-  data.tar.gz: 248fc9efe23a6b44db5ce5065fc4e15500c3c387f5c39380b83e677cb750434c
+  metadata.gz: 6979a107b8db6db6b03df5744632f5c2c137e65006518dd06dcc6f6d63724971
+  data.tar.gz: 46e8a150611e423e37b626cb6a35f16253e5190b38539825eefa260883f261fd
 SHA512:
-  metadata.gz: 949028808784d424710d0a72e602eefe85144ef46ffd1cba3a1671ad787fb91c527ae2b52002a5c60ada7c4225c9b853c3ee0f944ccda9ac7d224d086d029402
-  data.tar.gz: 5ca4783d217ee96ab1aef6be3368dd1a8c0a71233a5b129b30147b34d77f74b868933986bddcb0a12229fc4f9d6454332c7a7a1351f4c883b2be8269223c0023
+  metadata.gz: e94d128902e6bd42a59041dc1da3fdc49d968b5abdfad66a3421d515ada393f9de75819413da2ad07f86506a425cf55fa12d98492be42afcaf927937a75f2029
+  data.tar.gz: 8d73a6a246a6ce4478dd110e480a7a6394cccc22908a97db136adb1dec2cad0faa7f7670bf840b896ad47e97a4a03f904e7547343f1b09da09e75e660017ceec

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

@@ -24,13 +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 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
-          collection = model_class.active.order(id: :desc).send params[:scope] || :all
-          collection = collection.full_text_search params[:search] if params[:search]
+          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.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.3.1'
+    VERSION = '1.8.6.2'
   end
 end

metadata

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