active_record_api-rest 1.0.18 → 1.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f01a0f12a269874db175d06644de1761506e5196aca5e56ea8ef75f47322173
-  data.tar.gz: 7b2ddf7670f178e15c3469131b7a03168861408c3fa61cb65af1138601fb5c01
+  metadata.gz: 9f7d5bdb3dba9f5d4da9bc806bfe5d3bce9d09149b419c74648481b18840621f
+  data.tar.gz: '09f75577ff7bc0275d4faea7ae57f9a7103582263702429073fd1217fb8e3636'
 SHA512:
-  metadata.gz: 311522ba4552b5a9fa5b48a0fdf844d66f1fa4d298db893327f4a3a58607448d8c25bfe81f930391764f9ee1a0632392d94ccd41edcbb679726e47252eb00f7a
-  data.tar.gz: c984599f0a0ea0d76b96e5528c878d593aef8d1a6e67e43cd655dd3ffd6b43d9d2a15158def15c32db02b84f1a2262aef9472e3ee242770abb92a875b7fd1337
+  metadata.gz: cdfd4c5a8f7b668dd78b24803aa2de4bcb69be77a3d23cf97a80e26b82b5385f779500f8c4a210a57d11716a7cec6901553d1e3054b25b64bc31cda2118779bb
+  data.tar.gz: af8af57d6ca48745d71cc4add6c32a272bdda6e24b63b34da7c3adec42a2ccfba8b0cb2dde90df0fe330b1777a08c244eeda3d7f7ed7afd4fe8ab3f1b7a92aee

data/README.md

@@ -35,3 +35,10 @@ The gem is available as open source under the terms of the [MIT License](https:/
 ## Code of Conduct
 
 Everyone interacting in the Swagger::Api project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/swagger-api/blob/master/CODE_OF_CONDUCT.md).
+
+## Reverse proxy from nginx
+
+add to nginx config this line
+```
+proxy_set_header X-Real-Path $request_uri;
+```

data/lib/active_record_api/rest/controller.rb

@@ -8,9 +8,9 @@ module ActiveRecordApi
       before_action :validate_params
 
       def index
-        response.headers['x-total'] = models.count
-        response.headers['x-link-next'] = next_url
-        render json: models, each_serializer: serializer
+        response.headers['x-total'] = @total
+        response.headers['x-link-next'] = next_url unless next_url.nil?
+        render json: models.limit(limit), each_serializer: serializer
       end
 
       def show
@@ -19,7 +19,7 @@ module ActiveRecordApi
 
       def create
         if model.save
-          render json: model
+          redirect_to_model
         else
           render json: model.errors, status: :unprocessable_entity
         end
@@ -27,7 +27,7 @@ module ActiveRecordApi
 
       def update
         if model.update(modifiable_params)
-          render json: model
+          redirect_to_model
         else
           render json: model.errors, status: :unprocessable_entity
         end
@@ -55,7 +55,8 @@ module ActiveRecordApi
 
       def models
         return @models unless @models.nil?
-        @models = authorized_models.where(queryable_params)
+        @models = authorized_models.where(queryable_params).order(pagination_param_name => pagination_param_direction)
+        @total = @models.count
         return @models unless pagination_param_value.present?
         @models = @models&.where("\"#{pagination_param_name}\" > ?", pagination_param_value)
       end
@@ -76,6 +77,10 @@ module ActiveRecordApi
         @pagination_param_name ||= :id
       end
 
+      def pagination_param_direction
+        @pagination_param_direction ||= :asc # from params
+      end
+
       def pagination_param_value
         @pagination_param_value = params[pagination_param_name]
       end
@@ -99,6 +104,8 @@ module ActiveRecordApi
           action_name: action_name,
           request: request,
           models: models,
+          parameters: parameters,
+          total: @total,
           pagination_param_name: pagination_param_name
         )
       end

data/lib/active_record_api/rest/request_url_generator.rb

@@ -7,19 +7,26 @@ module ActiveRecordApi
       attribute :action_name
       attribute :models
       attribute :pagination_param_name
-      delegate :host_with_port, :path, :query_params, to: :request
+      attribute :parameters
+      attribute :count
+      delegate :host_with_port, :path, :query_parameters, to: :request
+      delegate :limit, to: :parameters
 
       def next_url
-        return if models.count == 0
-        "#{current_url}?#{new_params}"
+        return if count == 0 || models.count <= limit
+        "#{current_url}?#{new_params.to_param}"
       end
 
       def new_params
-        request.query_parameters.dup.merge(pagination_param_name.to_s => models.last.send(pagination_param_name))
+        query_parameters.dup.merge(pagination_param_name.to_s => models.limit(limit).last.send(pagination_param_name))
       end
 
       def current_url
-        "#{protocol}#{host_with_port}#{path}"
+        "#{protocol}#{host_with_port}#{micro_service_prefix}#{path}"
+      end
+
+      def micro_service_prefix
+        request.headers['HTTP_X_REAL_PATH'].split(path).first if request.headers['HTTP_X_REAL_PATH'].present?
       end
 
       def protocol

data/lib/active_record_api/rest/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecordApi
   module Rest
-    VERSION = '1.0.18'.freeze
+    VERSION = '1.0.19'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_api-rest
 version: !ruby/object:Gem::Version
-  version: 1.0.18
+  version: 1.0.19
 platform: ruby
 authors:
 - Full Measure Education
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-16 00:00:00.000000000 Z
+date: 2019-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler