tramway-api 1.8.5 → 1.8.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a4acbd7817b429de6d718ee675810614a832cad7a9138c0f594cf603a5acc8c
-  data.tar.gz: fff87179a2ad5f22c4183b32af51fe38f0119426ffb4746316d6a72a30e42f19
+  metadata.gz: 28de923a74f0d7e402961d4a15e743c3644613c6916df046015f4dfef77b0022
+  data.tar.gz: d9e47c9f6a6272765e241082266ac45249dc91581e5348214d9d7e84d9869f29
 SHA512:
-  metadata.gz: 4f5e4e5362f56106305c71b38b21202b19f7b204434fd8f3df2a7722d7634606caf759513ae13fa975559eed995b4189df9c8c06289a97c502a7e8ef06f7744f
-  data.tar.gz: 51cb8206094060d4815eb4abb23b211ec0632f364f7718f8be3e2c3a346c1f3a0c7bba0b6da566b60584dfc9e09cd59b11a20d5ca4e5556010c96e4506b9a2dc
+  metadata.gz: f18ab5bec7ffc6f68239a22c03ed02ecdb8e14918a68c29faf18253d4dcda2c7491aaabc4fb89a6d8673bf3b4d2da998f19def3cb3e57a72c25acfc516356b04
+  data.tar.gz: 21cfd0df88415a40be0add47f7387243f9d3cba349a9bd8ad40a17de26139ff317ba206cf334e590e31a79ec1c52790be5eb289984336b52540de1df4274d993

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

@@ -24,8 +24,14 @@ 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].to_sym
+              @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

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.5'
+    VERSION = '1.8.6.4'
   end
 end

metadata

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