roda-rest_api 1.3 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21df76a3e9ee8bb54ae50ad5b35f6d1731f8a235
-  data.tar.gz: a12ad2291415d7ef2e29f00d467dc5b16c3214d5
+  metadata.gz: 994564104a483693d384aa356c2d5992162b9da8
+  data.tar.gz: ec7b09f05da6ccfbec6a407a38d76ff659c483b8
 SHA512:
-  metadata.gz: af5bac9086c6c6de7d0a94a78769615820624166dd1f2d3c82bfaa7a38f87354037e0598424253b932adacbca7a457cc2a192b334238c756f23650664c6c2ddb
-  data.tar.gz: 949761e444322abd461c95cc21f7f7d28d19b41531dca6155699bc7adb31d061b14cb5974db0b190b5455f1347640dc3396e797789551ad79b8123d9f2bc4c88
+  metadata.gz: 96f63bc502a54ceec8550f7816ccfafd78fef29eb26b3cd828af7538e74e4e2702670a91785302275a7ebc77ef5780086b08ad8d73ba2ef520c987f056978a2c
+  data.tar.gz: 17e0be87930991a02cb2790221a8d55e7fe19eca862ced3d0615777df445ff1b7e4cd0ed97a5c9e1e9696467e729356d817f3f4cc6f203ea4d29826d39b421bb

data/lib/roda/plugins/rest_api.rb

@@ -49,6 +49,7 @@ class Roda
 				
 				def delete(&block)
 					@delete = block if block
+					@content_type = nil
 					@delete || ->(_){raise NotImplementedError, "delete"}
 				end
 				
@@ -93,21 +94,28 @@ class Roda
 				protected
 				
 				def arguments(method)
-					args = if method === :save
-						if @request.media_type == "application/x-www-form-urlencoded"
+					if method === :save
+						args = if @request.media_type == "application/x-www-form-urlencoded"
 							@request.POST
 						else
-							JSON.parse(@request.body.read)
+							JSON.parse(@request.body.string)
 						end
+						permitted_args args
 					else
-						@request.GET
+						symbolize_keys @request.GET
 					end
-					args = permitted_args(args)
 				end
 
-
 				private
 				
+				def symbolize_keys(args)
+					_args = {}
+					args.each do |k,v|
+						v = symbolize_keys(v) if v.is_a?(Hash)
+						_args[k.to_sym] = v
+					end
+					_args
+				end
 				
 				def permitted_args(args, keypath = [])
 					permitted = nil
@@ -156,7 +164,8 @@ class Roda
 					path = options.delete(:path) || 'api'
 					subdomain = options.delete(:subdomain)
 					options.merge!(host: /\A#{Regexp.escape(subdomain)}\./) if subdomain
-					on([path, true], options, &block)
+					path = true if path.nil? or path.empty?
+					on(path, options, &block)
 				end
 
 				def version(version, &block)
@@ -181,7 +190,7 @@ class Roda
 
 			  def show(options={}, &block)
 				  block ||= default_block(:one)
-					get(path, options, &block)
+					get(_path, options, &block)
 			  end
 
 			  def create(options={}, &block)
@@ -195,12 +204,12 @@ class Roda
 			  def update(options={}, &block)
 					block ||= default_block(:save)
 				  options.merge!(method: [:put, :patch])
-					is(path, options, &block)
+					is(_path, options, &block)
 			  end
 
 			  def destroy(options={}, &block)
 					block ||= default_block(:delete)
-					delete(path, options) do
+					delete(_path, options) do
 						response.status = 204
 						block.call(*captures) if block
 					end
@@ -208,7 +217,7 @@ class Roda
 
 			  def edit(options={}, &block)
 					block ||= default_block(:one)
-					get(path("edit"), options, &block)
+					get(_path("edit"), options, &block)
 			  end
 
 			  def new(options={}, &block)
@@ -218,8 +227,8 @@ class Roda
 				
 			  private
 			  
-			  def path(path=nil)
-				  if @resource.singleton
+			  def _path(path=nil)
+				  if @resource and @resource.singleton
 						path = ["", true] unless path
 					else
 						path = [":d", path].compact.join("/")

metadata

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