resterl 0.0.6 → 0.0.7

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/resterl/base_object.rb

@@ -3,7 +3,8 @@ require 'hashie'
 class Resterl::BaseObject #< Hashie::Mash
 
   include ClassLevelInheritableAttributes
-  cattr_inheritable :resterl_client, :parser, :complete_mime_type, :mapper
+  cattr_inheritable :resterl_client, :parser, :composer, :complete_mime_type,
+                    :mapper
   attr_reader :response
 
   #self.resterl_client = nil
@@ -30,14 +31,30 @@ class Resterl::BaseObject #< Hashie::Mash
     doc = mapper.map(doc) if @mapper
     new(doc, response)
   end
+  
+  def self.post_to_object url, params = {}, data = {}
+    headers = {
+      'Accept' => complete_mime_type,
+      'Content-Type' => complete_mime_type
+    }
+    data = composer.call(data)
+    response = resterl_client.post(url, params, data, headers)
+  end
 
   def self.mime_type= t
-    self.parser, self.complete_mime_type = case t
+    self.parser, self.composer, self.complete_mime_type = case t
     when :json
-      [proc {|str| JSON.parse(str)}, 'application/json']
+      # TODO prio 2: Only works when Rails is loaded?
+      [ proc {|str| JSON.parse(str)},
+        proc(&:to_json),
+        'application/json'
+      ]
     when :xml
-      # TODO: Only works when Rails is loaded?
-      [proc {|str| Hash.from_xml(str)}, 'application/xml']
+      # TODO prio 2: Only works when Rails is loaded?
+      [ proc {|str| Hash.from_xml(str)},
+        proc(&:to_xml),
+        'application/xml'
+      ]
     end
   end
 

data/lib/resterl/client.rb

@@ -32,6 +32,15 @@ class Resterl::Client
       new_get_request url, cache_key, params, headers, old_response
     end
   end
+  
+  def post url, params, data, headers
+    # Caching nicht notwendig
+    url = setup_url url
+    request = Resterl::PostRequest.new(self, url, params, data, headers)
+    response = request.perform.response
+
+    response
+  end
 
   private
 
@@ -47,7 +56,7 @@ class Resterl::Client
     end
 
     # Anfrage stellen, ggf. ETag mit übergeben
-    request = Resterl::Request.new(self, url, params, headers)
+    request = Resterl::GetRequest.new(self, url, params, headers)
     new_response = request.perform.response
 
     response, max_age_seconds = case new_response
@@ -84,8 +93,12 @@ class Resterl::Client
   end
 
   def setup_url url
-    bu = options[:base_uri]
-    bu ? "#{bu}#{url}" : url
+    if url =~ /^http/
+      url
+    else
+      bu = options[:base_uri]
+      bu ? "#{bu}#{url}" : url
+    end
   end
 
   def data_to_cache_key *args

data/lib/resterl/generic_request.rb

@@ -0,0 +1,45 @@
+class Resterl::GenericRequest
+  attr_accessor :rest_client, :url, :body, :response
+  DEFAULT_HEADERS = {}
+  
+  def initialize client, url, query_params, headers
+    @rest_client = client
+    @url = url
+    @query_params = query_params
+    @headers = DEFAULT_HEADERS.merge headers
+  end
+    
+  private
+  
+  def get_http_object_and_query_path
+    uri = URI.parse(url)
+    http = Net::HTTP.new(uri.host, uri.port)
+    apply_ssl http, uri
+    
+    path_with_query = uri.path
+    path_with_query << "?#{query_param_string}" unless query_param_string.blank?
+    
+    [http, path_with_query]
+  end
+  
+  def query_param_string
+    @query_param_string ||= begin
+      @query_params.collect do |key, value|
+        "#{URI.escape(key.to_s)}=#{URI.escape(value.to_s)}"
+      end.join('&')
+    end
+  end
+  def apply_basic_auth request
+    ba = rest_client.options[:basic_auth]
+    request.basic_auth(ba[:username], ba[:password]) if ba
+  end
+  def apply_ssl http, uri
+    if uri.is_a? URI::HTTPS
+      http.use_ssl = true
+      http.verify_mode = rest_client.options[:ssl_verify_mode]
+    end
+  end
+  def redirect_url
+    response['location'] || response.body.match(/<a href=\"([^>]+)\">/i)[1]
+  end  
+end

data/lib/resterl/get_request.rb

@@ -0,0 +1,29 @@
+# Redirect code from:
+# http://railstips.org/blog/archives/2009/03/04/following-redirects-with-nethttp/
+class Resterl::GetRequest < Resterl::GenericRequest
+  attr_accessor :redirect_limit
+
+  def initialize client, url, query_params, headers
+    super client, url, query_params, headers
+    @redirect_limit = @rest_client.options[:max_redirect_depth]
+  end
+
+  def perform
+    raise TooManyRedirects if redirect_limit < 0
+
+    http, path = get_http_object_and_query_path
+    request = Net::HTTP::Get.new path, @headers
+    apply_basic_auth request
+    self.response = http.request(request)
+
+    # Follow redirects
+    if response.is_a?(Net::HTTPRedirection) &&
+       !response.is_a?(Net::HTTPNotModified)
+      self.url = redirect_url
+      self.redirect_limit -= 1
+      perform
+    end
+    self
+  end
+
+end

data/lib/resterl/post_request.rb

@@ -0,0 +1,16 @@
+class Resterl::PostRequest < Resterl::GenericRequest
+  def initialize client, url, query_params, data, headers
+    super client, url, query_params, headers
+    @data = data
+  end
+  def perform
+    http, path = get_http_object_and_query_path
+    request = Net::HTTP::Post.new path, @headers
+    apply_basic_auth request
+    request.body = @data
+    self.response = http.request(request)
+
+    self
+  end
+
+end

data/lib/resterl.rb

@@ -15,7 +15,9 @@ require 'resterl/caches/rails_memcached_cache'
 require 'resterl/caches/key_prefix_decorator'
 
 require 'resterl/client'
-require 'resterl/request'
+require 'resterl/generic_request'
+require 'resterl/get_request'
+require 'resterl/post_request'
 require 'resterl/response'
 require 'resterl/base_object'
 

data/resterl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{resterl}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian D\303\274tsch"]
-  s.date = %q{2011-01-26}
+  s.date = %q{2011-02-08}
   s.email = %q{florian.duetsch@nix-wie-weg.de}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -31,7 +31,9 @@ Gem::Specification.new do |s|
     "lib/resterl/caches/simple_cache.rb",
     "lib/resterl/class_level_inheritable_attributes.rb",
     "lib/resterl/client.rb",
-    "lib/resterl/request.rb",
+    "lib/resterl/generic_request.rb",
+    "lib/resterl/get_request.rb",
+    "lib/resterl/post_request.rb",
     "lib/resterl/response.rb",
     "resterl.gemspec",
     "test/helper.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resterl
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - "Florian D\xC3\xBCtsch"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 +01:00
+date: 2011-02-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,7 +89,9 @@ files:
 - lib/resterl/caches/simple_cache.rb
 - lib/resterl/class_level_inheritable_attributes.rb
 - lib/resterl/client.rb
-- lib/resterl/request.rb
+- lib/resterl/generic_request.rb
+- lib/resterl/get_request.rb
+- lib/resterl/post_request.rb
 - lib/resterl/response.rb
 - resterl.gemspec
 - test/helper.rb

data/lib/resterl/request.rb

@@ -1,72 +0,0 @@
-# Redirect code from:
-# http://railstips.org/blog/archives/2009/03/04/following-redirects-with-nethttp/
-class Resterl::Request
-  attr_accessor :rest_client, :url, :body, :redirect_limit, :response
-  DEFAULT_HEADERS = {}
-
-  def initialize client, url, query_params, headers
-    @rest_client = client
-    @url = url
-    @query_params = query_params
-    @redirect_limit = @rest_client.options[:max_redirect_depth]
-    @headers = DEFAULT_HEADERS.merge headers
-  end
-  def perform
-    raise TooManyRedirects if redirect_limit < 0
-
-    # build URL
-    #complete_url = url.dup
-    #complete_url << "?#{query_param_string}" unless query_param_string.blank?
-    #puts complete_url
-    uri = URI.parse(url)#complete_url)
-    #puts uri.path
-
-
-    http = Net::HTTP.new(uri.host, uri.port)
-    apply_ssl http, uri
-
-    path_with_query = uri.path
-    path_with_query << "?#{query_param_string}" unless query_param_string.blank?
-    request = Net::HTTP::Get.new path_with_query, @headers
-    apply_basic_auth request
-    self.response = http.request(request)
-
-    # Follow redirects
-    if response.is_a?(Net::HTTPRedirection) &&
-       !response.is_a?(Net::HTTPNotModified)
-      self.url = redirect_url
-      self.redirect_limit -= 1
-      perform
-    end
-    self
-  end
-
-  private
-
-  def query_param_string
-    @query_param_string ||= begin
-      @query_params.collect do |key, value|
-        "#{URI.escape(key.to_s)}=#{URI.escape(value.to_s)}"
-      end.join('&')
-    end
-  end
-
-  def redirect_url
-    if response['location'].nil?
-      response.body.match(/<a href=\"([^>]+)\">/i)[1]
-    else
-      response['location']
-    end
-  end
-
-  def apply_ssl http, uri
-    if uri.is_a? URI::HTTPS
-      http.use_ssl = true
-      http.verify_mode = rest_client.options[:ssl_verify_mode]
-    end
-  end
-  def apply_basic_auth request
-    ba = rest_client.options[:basic_auth]
-    request.basic_auth(ba[:username], ba[:password]) if ba
-  end
-end