sinatra-rest-api 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b449f17fd838cc016b11e27e87b1d208fcccfa5
-  data.tar.gz: 4b73597dc2f025d98bd0c0b63e677264cf7c4709
+  metadata.gz: f5318060016a3ab26172ab885d655e3a25d2b11b
+  data.tar.gz: '0648b121a0a9ee2cb83b7231569f937e16a0f19f'
 SHA512:
-  metadata.gz: 3c11c07343c40019f11ff08cec601e02dc088ff6db0616dd369e71032bdcb13605cf9d10522ca320225c116e04d1ee5ca5dc929955bcc0898a8e8d37f785d091
-  data.tar.gz: 826c896b9d4282ffd748d1c5d1c484f9e5b1865cf8b5a4d5bcf3488c99a44223039d1999b352d5c24bbabd2a8782ab363d9fb08d69220cbc97a3292dfb05d5b2
+  metadata.gz: a0909bde8929319bada54ed5a0c3ef42860be4177873cb183a1ed22895c455ade3d5c5ff14ad61bfe65b95be7262fdc229d26e32c1e88eaa3d63f1e1f72b3fe2
+  data.tar.gz: c3acb32b5312c06dc8ee91a85f9dae4779649fd317b719e88fb249a15be31480ee0ffe7961ce117f4665b0588543aebcae1974947732748d10f4c7c272138cea

data/lib/sinatra-rest-api/actions.rb

@@ -51,7 +51,7 @@ module Sinatra
         # params[:_where] = '1=1' unless params[:_where].present?
         route_args[:response].headers['X-Total-Count'] = mapping[:count].call( params ).to_s
         result = mapping[:list].call( params, route_args[:fields] )
-        [ 200, result.to_json( include: mapping[:relations].call( nil ) ) ]
+        [ 200, result.to_json( include: route_args[:options].include?( :include ) ? route_args[:options][:include] : mapping[:relations].call( nil ) ) ]
       end
 
       def self.other( _route_args, params, mapping )
@@ -61,9 +61,9 @@ module Sinatra
         [ 200, ret.nil? ? DONE.to_json : ret.to_json ]
       end
 
-      def self.read( _route_args, params, mapping )
+      def self.read( route_args, params, mapping )
         result = mapping[:read].call( params )
-        [ 200, result.to_json( include: mapping[:relations].call( nil ) ) ]
+        [ 200, result.to_json( include: route_args[:options].include?( :include ) ? route_args[:options][:include] : mapping[:relations].call( nil ) ) ]
       end
 
       def self.update( route_args, params, mapping )

data/lib/sinatra-rest-api/provider.rb

@@ -2,7 +2,7 @@ module Sinatra
   module RestApi
     # Prodiver
     class Provider
-      OPTIONS = [ :actions, :plural, :singular ].freeze
+      OPTIONS = [ :actions, :include, :plural, :singular ].freeze
       REQUEST = {
         # content_types: [ :formdata, :json, :multipart, :www_form ]
         content_types: [ :json, :www_form ]

data/lib/sinatra-rest-api/router.rb

@@ -33,10 +33,10 @@ module Sinatra
           path = "/#{@plural}#{data[:path]}"
           if data[:verb].is_a?( Array )
             data[:verb].each do |verb|
-              prepare_route( route: route, resource: @path_singular, verb: verb, path: path, fields: data[:fields], mapping: @provider.adapter.mapping )
+              prepare_route( route: route, resource: @path_singular, verb: verb, path: path, fields: data[:fields], mapping: @provider.adapter.mapping, options: @provider.options )
             end
           else
-            prepare_route( route: route, resource: @path_singular, verb: data[:verb], path: path, fields: data[:fields], mapping: @provider.adapter.mapping )
+            prepare_route( route: route, resource: @path_singular, verb: data[:verb], path: path, fields: data[:fields], mapping: @provider.adapter.mapping, options: @provider.options )
           end
         end
         @routes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-rest-api
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-30 00:00:00.000000000 Z
+date: 2017-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra