grid_rest 0.0.2 → 0.0.3

data/CHANGELOG.rdoc

@@ -1,4 +1,7 @@
 = CHANGELOG
+== v0.0.3
+* Transform empty RestClient false to empty string
+* Serialize parameters for delete request
 
 == 2011-06-08 v0.0.2
 * Initialization fixes

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/grid_rest.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{grid_rest}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Benjamin ter Kuile"]
-  s.date = %q{2011-06-08}
+  s.date = %q{2011-06-15}
   s.description = %q{grid_rest is a gem that makes your rails application interact with other backends through a REST interface. It is build in a situation where one rails application was talking to 2 java backends. 
     The main development focus is JSON communication, but XML should be just as easy}
   s.email = %q{bterkuile@gmail.com}

data/lib/grid_rest.rb

@@ -2,6 +2,7 @@ require 'rest_client'
 require 'active_support/all'
 require 'grid_rest/engine'
 module GridRest 
+  RESERVED_REQUEST_PARAMETERS = %w[accept content_type headers method url payload timeout open_timeout raw_response verify_ssl ssl_client_cert ssl_client_key ssl_ca_file cookie cookies accept_encoding]
   mattr_accessor :grid_config, :log_file, :additional_parameters
   self.additional_parameters = { :default => {:global => {}, :get => {}, :post => {}, :put => {}, :delete => {}} }
   class GridConfig < HashWithIndifferentAccess
@@ -23,6 +24,10 @@ module GridRest
     end
   end
 
+  def self.default_parameters(params, type = :global, namespace = :default)
+    additional_parameters[namespace][type].update(params)
+  end
+
   def self.extend_class(klass)
     klass.send(:extend, GridRestExtensions)
     self.grid_config.namespaces.keys.each do |k|
@@ -200,20 +205,10 @@ module GridRest
                 RestClient.put rest_url, rparams.update(additional_put_parameters)
               end
             when :delete then
-              if rparams[:json_data]
-                rparams[:json_data] = rparams[:json_data].merge(additional_delete_parameters).to_json if rparams[:json_data].is_a?(Hash)
-                RestClient.delete rest_url, rparams[:json_data], :content_type => :json, :accept => :json
-              elsif rparams[:xml_data]
-                rparams[:xml_data] = rparams[:xml_data].merge(additional_delete_parameters).to_xml if rparams[:xml_data].is_a?(Hash)
-                RestClient.delete rest_url, rparams[:xml_data], :content_type => :xml, :accept => :xml
-              elsif rparams[:binary]
-                RestClient.delete rest_url, rparams[:binary], :content_type => 'binary/octet-stream'
-              else
-                rparams[:headers] ||= {}
-                rparams[:headers][:accept] = accept
-                rparams[:multipart] = true
-                RestClient.delete rest_url, rparams.update(additional_delete_parameters)
-              end
+              rparams[:headers] ||= {}
+              rparams[:headers][:accept] = accept
+              new_uri = add_parameters_to_uri(rest_url, rparams.update(additional_delete_parameters))
+              RestClient.delete(new_uri, rparams)
             else
               raise "No proper method (#{method}) for a grid_rest_request call"
             end
@@ -224,6 +219,7 @@ module GridRest
           r = benchmark("decoding response JSON", :level => :debug ){ JSON.parse(r.body) rescue r }
         end
         # Singleton class extensions
+        r = "" if r == false # RestClient problem giving false on empty 204
         def r.valid?
           true
         end
@@ -240,6 +236,15 @@ module GridRest
       r
     end
 
+    def add_parameters_to_uri(uri, params)
+      uri << '?' unless uri.include?('?')
+      uri << '&' unless ['?', '&'].include?(uri.last)
+      uri_params = params.reject{|k, v| RESERVED_REQUEST_PARAMETERS.include?(k.to_s)}
+      uri << uri_params.map{|k, v| URI.encode("#{k}=#{v}")}.join('&')
+      uri_params.each{|k, v| params.delete(k)} # Remove added get parameters from the header params
+      uri
+    end
+
     def generate_url(url, rparams = {})
       host = GridRest.grid_config.namespaces[rparams[:grid_rest_namespace]].try('[]', 'host') || GridRest.grid_config['host']
       port = GridRest.grid_config.namespaces[rparams[:grid_rest_namespace]].try('[]', 'port') || GridRest.grid_config['port'] || 80

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Benjamin ter Kuile
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-08 00:00:00 +02:00
+date: 2011-06-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency