roda-rest_api 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af55d203299440b1fdc7d6335ddeab64a6aeefd8
-  data.tar.gz: 8496c4b5081bced31212a7df915b2f63e0cb399a
+  metadata.gz: 80e8b5e484fe53a1f4fb788f1b626588dd4267d6
+  data.tar.gz: 330493a7f67ce9f21f23622c9e7f6959d5ba68f3
 SHA512:
-  metadata.gz: 51b812a5f7c860fa7fcb49f4725d85114f43b6fdf42ef17b88a87a38e74859990467c1e02a498f78d2002c8cbb352dc32ee6af341eeb9cbe8b41b66d2f14e5d7
-  data.tar.gz: b5a781123357311c3e9060c67aa09bc84b01014fca83aa05f78a4469803091317f08162cc155e40e4eaaae861d8f2911c0a8f964ad341b21167046e28a678eb0
+  metadata.gz: b131711f5a1d500221c2830f63eba6b2c79a0494a3ed365a4ec4fa1c0453115fa7bd58d153a48c4f91d17009eeb23fce675b4062b3c1618bd04ec3e638cb3c07
+  data.tar.gz: 526075155bf5c1662de80353a5826df7a44bf99e1a4dcf5cc82b0168150d554069d50dd098ad7ee67470cb5736fd35a02fd5a08b524ec38382e42e1a1062dee3

data/lib/roda/plugins/rest_api.rb

@@ -14,7 +14,8 @@ class Roda
 			
 			class Resource
 				
-				attr_reader :request, :path, :singleton, :content_type, :parent, :captures
+				attr_reader :request, :path, :singleton, :content_type, :parent
+				attr_accessor :captures
 				
 				def initialize(path, request, parent, options={})
 					@request = request
@@ -24,10 +25,9 @@ class Roda
 					@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?
+					if parent
 						@parent = parent
 						@parent.routes!
-						@captures = @request.captures.dup
 						@path = [':d', @path].join('/') unless bare
 					end
 				end
@@ -73,9 +73,10 @@ 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?
+						args.merge!(@parent_key => @captures[0]) if @captures
 						self.send(method).call(args)
 					rescue StandardError => e
+						raise if ENV['RACK_ENV'] == 'development'
 						@request.response.status = method === :save ? 422 : 404
 					end
 				end
@@ -98,6 +99,7 @@ class Roda
 				def resource(path, options={})
 					@resource = Resource.new(path, self, @resource, options)
 					on(@resource.path, options) do
+						@resource.captures = captures.dup unless captures.empty?
 						yield @resource
 				 		@resource.routes!
 						response.status = 404

data/lib/roda/rest_api.rb

@@ -1,6 +1,2 @@
 require 'roda'
 require 'roda/plugins/rest_api'
-
-class Roda
-	plugin :rest_api
-end

metadata

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