roda-rest_api 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c191d44a767a70a6ae9cb0c39e9efd7fc44cdec7
-  data.tar.gz: da767f27f394f69be08b126d85b2a4fda606fd76
+  metadata.gz: af55d203299440b1fdc7d6335ddeab64a6aeefd8
+  data.tar.gz: 8496c4b5081bced31212a7df915b2f63e0cb399a
 SHA512:
-  metadata.gz: baa4cd7ce2ef637e0593e8b150df1704838acfdf6db9a794f9259c4ce6a159706a4c87ec62d33588e5cf419a12e51298762692bd4b0b880f573a74653ce46b90
-  data.tar.gz: e31fe6ce5d13813f43d7d62327b86bdec434e83336f1711869fe3c84f373d51e44ca8b8e8ce2b37201bb4d271c067304b1ab1b0968b8b84ca56b4daf5f3f11ad
+  metadata.gz: 51b812a5f7c860fa7fcb49f4725d85114f43b6fdf42ef17b88a87a38e74859990467c1e02a498f78d2002c8cbb352dc32ee6af341eeb9cbe8b41b66d2f14e5d7
+  data.tar.gz: b5a781123357311c3e9060c67aa09bc84b01014fca83aa05f78a4469803091317f08162cc155e40e4eaaae861d8f2911c0a8f964ad341b21167046e28a678eb0

data/lib/roda/plugins/rest_api.rb

@@ -14,14 +14,22 @@ class Roda
 			
 			class Resource
 				
-
-				attr_reader :singleton, :content_type
+				attr_reader :request, :path, :singleton, :content_type, :parent, :captures
 				
-				def initialize(request, options={})
+				def initialize(path, request, parent, options={})
 					@request = request
+					@path = path.to_s
+					bare = options.delete(:bare) || false
 					@singleton = options.delete(:singleton) || false
 					@primary_key = options.delete(:primary_key) || "id"
+					@parent_key = options.delete(:parent_key) || "parent_id"
 					@content_type = options.delete(:content_type) || APPLICATION_JSON
+					if parent && !@request.script_name.empty?
+						@parent = parent
+						@parent.routes!
+						@captures = @request.captures.dup
+						@path = [':d', @path].join('/') unless bare
+					end
 				end
 								
 				def list(&block)
@@ -52,7 +60,7 @@ class Roda
 				def routes(*routes)
 					@routes = routes
 				end
-				
+								
 				def routes!
 					unless @routes
 						@routes = SINGLETON_ROUTES.dup
@@ -65,17 +73,17 @@ class Roda
 					begin
 						args = method === :save ? JSON.parse(@request.body) : @request.GET
 						args.merge!(@primary_key => id) if id
+						args.merge!(@parent_key => @captures[0]) if @parent && !@captures.empty?
 						self.send(method).call(args)
 					rescue StandardError => e
 						@request.response.status = method === :save ? 422 : 404
 					end
 				end
 
-
 			end
 			
 			module RequestMethods
-
+				
 				def api(options={}, &block)
 					path = options.delete(:path) || 'api'
 					subdomain = options.delete(:subdomain)
@@ -87,13 +95,14 @@ class Roda
 			  		on("v#{version}", &block)
 				end
 
-				def resource(name, options={})
-					@resource = Resource.new(self, options)
-					on(name.to_s, options) do
+				def resource(path, options={})
+					@resource = Resource.new(path, self, @resource, options)
+					on(@resource.path, options) do
 						yield @resource
-				  	@resource.routes!
-				  	response.status = 404
+				 		@resource.routes!
+						response.status = 404
 				  end
+				 	@resource = @resource.parent
 				end
 
 			  def index(options={}, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roda-rest_api
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Michel Benevento