jeffrafter-resource_party 0.1.2 → 0.2.0

data/Rakefile

@@ -12,6 +12,7 @@ begin
     s.description = "Simple wrapper for HTTParty for basic operations with a restful resource"
     s.authors = ["Jeff Rafter"]
     s.add_dependency "jnunemaker-httparty"
+    s.add_dependency "htmlentities"
     s.files =  FileList["[A-Z]*", "{lib,test}/**/*"] 
   end
 rescue LoadError

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 1
-:patch: 2
+:minor: 2
+:patch: 0
 :major: 0

data/lib/resource_party.rb

@@ -1,4 +1,5 @@
 require 'httparty'
+require 'htmlentities'
 
 module ResourceParty
   class ServerError < RuntimeError; end
@@ -19,33 +20,30 @@ module ResourceParty
     def initialize(params = {}, query = {}, no_defaults = false) 
       return self if no_defaults
       response = self.class.get("/#{self.class.route}/new.xml")
-      raise ServerError.new(response.body) if response.code != "200"
+      handle_errors(response)
       hash = Hash.from_xml(response.body).values.first
       hash.merge! params
       self.class.from_xml hash, self
     end
 
-    def self.find(id, query = {})
-      response = self.get("/#{self.route}/#{id}.xml", :query => query) 
-      raise RecordNotFound.new(response.body) if response.code == "404"
-      raise ServerError.new(response.body) if response.code != "200"
-      hash = Hash.from_xml(response.body).values.first
-      self.from_xml hash
+    def self.find(param, query = {})
+      response = self.get("/#{self.route}/#{param}.xml", :query => query) 
+      handle_not_found(response)
+      handle_errors(response)
+      handle_response(response)
     end
     
     def self.create(params = {}, query = {})
       response = self.post("/#{self.route}.xml", :body => body_for(params), :query => query) 
-      raise ServerError.new(response.body) if response.code != "200"
-      hash = Hash.from_xml(response.body).values.first
-      self.from_xml hash    
+      handle_errors(response)
+      handle_response(response)
     end
     
-    def self.update(id, params = {}, query = {})
-      response = self.put("/#{self.route}/#{id}.xml", :body => body_for(params), :query => query) 
-      raise RecordNotFound.new(response.body) if response.code == "404"
-      raise ServerError.new(response.body) if response.code != "200"
-      hash = Hash.from_xml(response.body).values.first
-      self.from_xml hash    
+    def self.update(param, params = {}, query = {})
+      response = self.put("/#{self.route}/#{param}.xml", :body => body_for(params), :query => query) 
+      handle_not_found(response)
+      handle_errors(response)
+      handle_response(response)
     end
     
     def update(params = {}, query = {})
@@ -53,10 +51,10 @@ module ResourceParty
     end
 
     def self.destroy(id, query = {}) 
-      response = self.delete("/#{self.route}/#{id}.xml", :query => query, :format => :text) 
-      raise RecordNotFound.new(response.body) if response.code == "404"
-      raise ServerError.new(response.body) if response.code != "200"
-      true
+      response = self.delete("/#{self.route}/#{id}.xml", :query => query) 
+      handle_not_found(response)
+      handle_errors(response)
+      handle_response(response)
     end
     
     def destroy(query = {})
@@ -65,22 +63,40 @@ module ResourceParty
 
     def self.all(query = {})
       response = self.get("/#{self.route}.xml", :query => query) 
-      raise ServerError.new(response.body) if response.code != "200"
+      handle_errors(response)
       items = response.values.first
       items.map{|hash| self.from_xml hash }        
     end
 
   private
 
+    def self.handle_not_found(response)
+      raise RecordNotFound.new(response.body) if response.code == "404"
+    end    
+
+    def self.handle_errors(response)
+      raise ServerError.new(response.body) if response.code != "200"
+    end
+    
+    def self.handle_response(response)
+      # Rails will return ' ' when you render :nothing => true
+      return nil if response.body.blank? || response.body == ' '
+      hash = Hash.from_xml(response.body).values.first
+      self.from_xml hash    
+    end  
+
     def self.body_for(params)
+      require 'cgi' unless defined?(CGI) && defined?(CGI::escape)
       body = {}
       params.each{|n,v| body["#{self.resource}[#{n}]"] = v }
-      body.to_query
+      body.map{|n,v| "#{CGI.escape(n.to_s)}=#{CGI.escape(v.to_s)}"} * "&"
     end
     
     def self.from_xml(params, obj = nil)
       obj ||= self.new({}, {}, true)
-      obj.attributes = params
+      decoded_params = params.dup
+      params.each{|n,v| decoded_params[n] = HTMLEntities.new.decode(v) if v && v.is_a?(String) }
+      obj.attributes = decoded_params
       mod = Module.new do
         obj.attributes.keys.each do |k|
           define_method(k) do
@@ -88,7 +104,7 @@ module ResourceParty
           end
         
           define_method("#{k}=") do |val|
-            self.attributes[k] = val
+            self.attributes[k] = HTMLEntities.new.decode(val)
           end
         end
       end    

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jeffrafter-resource_party
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - Jeff Rafter
@@ -9,11 +9,22 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-10 00:00:00 -08:00
+date: 2009-03-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jnunemaker-httparty
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: htmlentities
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: