restfulie 0.7.0 → 0.7.1

data/README.textile

@@ -91,6 +91,7 @@ If you want to build the project and run its tests, remember to install all (cli
 <pre>
 gem install rack-conneg
 gem install responders_backport
+gem install json_pure
 </pre>
 
 <script type="text/javascript">

data/Rakefile

@@ -6,7 +6,7 @@ require 'spec/rake/spectask'
 require 'rake/rdoctask'
 
 GEM = "restfulie"
-GEM_VERSION = "0.7.0"
+GEM_VERSION = "0.7.1"
 SUMMARY  = "Hypermedia aware resource based library in ruby (client side) and ruby on rails (server side)."
 AUTHOR   = "Guilherme Silveira, Caue Guerra"
 EMAIL    = "guilherme.silveira@caelum.com.br"
@@ -22,6 +22,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency("actionpack", [">= 2.3.2"])
   s.add_dependency("activesupport", [">= 2.3.2"])
   s.add_dependency("responders_backport", ["~> 0.1.0"])
+  s.add_dependency("json_pure", [">= 1.2.4"])
 
   s.author = AUTHOR
   s.email = EMAIL

data/lib/restfulie/client/base.rb

@@ -22,6 +22,10 @@ module Restfulie::Client#:nodoc
     end
 
   end
+  class NilEntryPoint
+    include Restfulie::Client::EntryPoint
+    # extend self
+  end
 
   module Base
     include HTTP::RequestMarshaller
@@ -52,9 +56,11 @@ module Restfulie::Client#:nodoc
 
 end
 
+
 # Shortcut to Restfulie::Client::EntryPoint
 module Restfulie
-  include Client::EntryPoint
-  extend self
+  def self.at(uri)
+    Client::NilEntryPoint.new.at(uri)
+  end
 end
 

data/lib/restfulie/client/http/atom_ext.rb

@@ -1,22 +1,4 @@
 module Restfulie::Client::HTTP#:nodoc:
-
-  # Offer easy access to Atom link relationships, such as <tt>post.next</tt> for 
-  # <tt>&lt;link rel="next" href="http://resource.entrypoint.com/post/12" type="application/atom+xml" /&gt;</tt> relationships.
-  module AtomLinkShortcut
-    def method_missing(method_sym,*args)#:nodoc:
-      selected_links = links.select{ |l| l.rel == method_sym.to_s }
-      super if selected_links.empty?
-      link = (selected_links.size == 1) ? selected_links.first : selected_links
-      
-      return link unless link.instance_variable_defined?(:@type)
-      link.accepts(link.type)
-      
-      representation = Restfulie::Client::HTTP::RequestMarshaller.content_type_for(link.type)
-      return representation.prepare_link_for(link) if representation
-      link
-
-    end
-  end
   
   # Offers a way to access Atom entries element's in namespaced extensions.
   module AtomElementShortcut
@@ -64,24 +46,24 @@ module Restfulie::Client::HTTP#:nodoc:
     end
   end
 
-  # Gives to Atom::Link capabilities to fetch related resources.
-  module LinkRequestBuilder
-    include RequestMarshaller
-    def path#:nodoc:
-      at(href)
-      super
-    end
-  end
-
   # inject new behavior in rAtom instances to enable easily access to link relationships.
   ::Atom::Feed.instance_eval {
-    include AtomLinkShortcut
+    include Restfulie::Client::LinkShortcut
     include AtomElementShortcut
   }
   ::Atom::Entry.instance_eval {
-    include AtomLinkShortcut
+    include Restfulie::Client::LinkShortcut
     include AtomElementShortcut
   }
-  ::Atom::Link.instance_eval { include LinkRequestBuilder }
+  ::Atom::Link.instance_eval {
+    include Restfulie::Client::HTTP::LinkRequestBuilder
+  }
   
 end
+
+
+class Atom::Link
+  def content_type
+    type
+  end
+end

data/lib/restfulie/client/http/link.rb

@@ -0,0 +1,39 @@
+module Restfulie::Client
+
+  # Offer easy access to link relationships, such as <tt>post.next</tt> for 
+  # <tt>&lt;link rel="next" href="http://resource.entrypoint.com/post/12" type="application/atom+xml" /&gt;</tt> relationships.
+  module LinkShortcut
+    def method_missing(method_sym,*args)#:nodoc:
+      selected_links = links.select{ |l| l.rel == method_sym.to_s }
+      super if selected_links.empty?
+      link = (selected_links.size == 1) ? selected_links.first : selected_links
+    
+      return link unless link.instance_variable_defined?(:@type)
+      link.accepts(link.type)
+    
+      representation = Restfulie::Client::HTTP::RequestMarshaller.content_type_for(link.type)
+      return representation.prepare_link_for(link) if representation
+      link
+
+    end
+  end
+
+  class Link
+
+    include Restfulie::Client::HTTP::LinkRequestBuilder
+
+    def initialize(options = {})
+      @options = options
+    end
+    def href
+      @options["href"]
+    end
+    def rel
+      @options["rel"]
+    end
+    def content_type
+      @options["type"]
+    end
+  end
+
+end

data/lib/restfulie/client/http/marshal.rb

@@ -5,7 +5,7 @@ module Restfulie::Client::HTTP
     attr_accessor :response
     
     def respond_to?(symbol)
-      respond_to_rel?(symbol.to_s) || super(symbol)
+      super(symbol) || (super(:links) && respond_to_rel?(symbol.to_s))
     end
     
     private
@@ -21,18 +21,21 @@ module Restfulie::Client::HTTP
     
     # accepts a series of media types by default
     def initialize
-      @acceptable_mediatypes = "application/atom+xml"
     end
 
     @@representations = {
-      'application/atom+xml' => ::Restfulie::Common::Representation::Atom,
-      'application/xml' => ::Restfulie::Common::Representation::XmlD
+      'application/atom+xml' => ::Restfulie::Common::Representation::Atom
     }
     def self.register_representation(media_type,representation)
       @@representations[media_type] = representation
     end
 
+    RequestMarshaller.register_representation('application/xml', ::Restfulie::Common::Representation::XmlD)
+    RequestMarshaller.register_representation('text/xml', ::Restfulie::Common::Representation::XmlD)
+    RequestMarshaller.register_representation('application/json', ::Restfulie::Common::Representation::Json)
+
     def self.content_type_for(media_type)
+      return nil unless media_type
       content_type = media_type.split(';')[0] # [/(.*?);/, 1]
       type = @@representations[content_type]
       type ? type.new : nil
@@ -52,30 +55,39 @@ module Restfulie::Client::HTTP
 
     #Executes super and unmarshalls it
     def request!(method, path, *args)
-      representation = do_conneg_and_choose_representation(method, path, *args)
-      if representation
-        if has_payload?(method, path, *args)
-          payload = get_payload(method, path, *args)
-          rel = self.respond_to?(:rel) ? self.rel : ""
-          payload = representation.marshal(payload, rel)
-          args = set_marshalled_payload(method, path, payload, *args)
-        end
-        args = add_representation_headers(method, path, representation, *args)
+      
+      if has_payload?(method, path, *args)
+        payload = get_payload(method, path, *args)
+        rel = self.respond_to?(:rel) ? self.rel : ""
+        type = headers['Content-Type']
+        raise Restfulie::Common::Error::RestfulieError, "Missing content type related to the data to be submitted" unless type
+        marshaller = RequestMarshaller.content_type_for(type)
+        payload = marshaller.marshal(payload, rel)
+        args = set_marshalled_payload(method, path, payload, *args)
+        args = add_representation_headers(method, path, marshaller, *args)
+      end
+
+      if @acceptable_mediatypes
+        unmarshaller = RequestMarshaller.content_type_for(@acceptable_mediatypes)
+        args = add_representation_headers(method, path, unmarshaller, *args)
       end
+
       response = super(method, path, *args) 
-      parse_response(response, representation)
+      parse_response(response)
     end
 
     private
     
+        
     # parses the http response.
     # first checks if its a 201, redirecting to the resource location.
     # otherwise check if its a raw request, returning the content itself.
     # finally, tries to parse the content with a mediatype handler or returns the response itself.
-    def parse_response(response, representation)
+    def parse_response(response)
       if response.code == 201
-        location = response.headers['location']
-        Restfulie.at(location).accepts(@acceptable_mediatypes).get!
+        request = Restfulie.at(response.headers['location'])
+        request.accepts(@acceptable_mediatypes) if @acceptable_mediatypes
+        request.get!
       elsif @raw
         response
       elsif !response.body.empty?
@@ -89,16 +101,6 @@ module Restfulie::Client::HTTP
       end
     end
     
-    def content_type_for(media_type)
-      @@representations[media_type.split(';')[0]].new # [/(.*?);/, 1]
-    end
-
-    def do_conneg_and_choose_representation(method, path, *args)
-      #TODO make a request to server (conneg)
-      representation = @default_representation || @default_representation = @@representations['application/atom+xml']
-      representation.new
-    end
-
     def has_payload?(method, path, *args)
       [:put,:post].include?(method)
     end
@@ -117,12 +119,23 @@ module Restfulie::Client::HTTP
 
     def add_representation_headers(method, path, representation, *args)
       headers = args.extract_options!
-      args << representation.headers[method] 
+      headers = headers.merge(representation.headers[method] || {})
+      args << headers
       args
     end
 
   end
 
+  # Gives to Link capabilities to fetch related resources.
+  module LinkRequestBuilder
+    include Restfulie::Client::HTTP::RequestMarshaller
+    def path#:nodoc:
+      at(href)
+      as(content_type) if respond_to?(:content_type) && content_type
+      super
+    end
+  end
+
   #=This class includes RequestBuilder module.
   class RequestMarshallerExecutor
     include RequestMarshaller
@@ -144,4 +157,3 @@ module Restfulie::Client::HTTP
   end
 
 end
-

data/lib/restfulie/client/http/xml.rb

@@ -0,0 +1,4 @@
+::Hash.instance_eval {
+  include Restfulie::Client::LinkShortcut
+}
+

data/lib/restfulie/client/http.rb

@@ -6,7 +6,9 @@ end
   adapter
   cache
   marshal
+  link
   atom_ext
+  xml
 ).each do |file|
   require "restfulie/client/http/#{file}"
 end

data/lib/restfulie/common/representation/atom.rb

@@ -34,14 +34,6 @@ module Restfulie::Common::Representation
     def prepare_link_for(link)
       link
     end
-    
-    def prepare_link_for(link)
-      link
-    end
-    
-    def prepare_link_for(link)
-      link
-    end
   end
 
 end

data/lib/restfulie/common/representation/json.rb

@@ -0,0 +1,25 @@
+module Restfulie::Common::Representation
+
+  # Implements the interface for marshal Xml media type requests (application/xml)
+  class Json
+
+    cattr_reader :media_type_name
+    @@media_type_name = 'application/json'
+
+    cattr_reader :headers
+    @@headers = { 
+      :post => { 'Content-Type' => media_type_name }
+    }
+
+    def unmarshal(string)
+      JSON.parse(string)
+    end
+
+    def marshal(entity, rel)
+      return entity if entity.kind_of? String
+      entity.to_json
+    end
+
+  end
+
+end

data/lib/restfulie/common/representation/xml.rb

@@ -1,7 +1,32 @@
+class Hash
+  def links(*args)
+    links = fetch("link", [])
+    links = [links] unless links.kind_of? Array
+    links = [] unless links
+    links = links.map do |l|
+      Restfulie::Client::Link.new(l)
+    end
+    if args.empty?
+      links
+    else
+      found = links.find do |link|
+        link.rel == args[0].to_s
+      end
+      found
+    end
+  end
+  def method_missing(sym, *args)
+    self[sym.to_s].nil? ? super(sym, args) : self[sym.to_s]
+  end
+  def respond_to?(sym)
+    include?(sym.to_s) || super(sym)
+  end
+end
+
 module Restfulie::Common::Representation
+
   # Implements the interface for marshal Xml media type requests (application/xml)
   class XmlD
-
     cattr_reader :media_type_name
     @@media_type_name = 'application/xml'
 
@@ -11,7 +36,7 @@ module Restfulie::Common::Representation
     }
 
     def unmarshal(string)
-      raise "should never be invoked, xml to ruby objects should be handled by rails itself"
+      Hash.from_xml(string).values.first
     end
 
     def marshal(string, rel)
@@ -21,4 +46,3 @@ module Restfulie::Common::Representation
   end
 
 end
-

data/lib/restfulie/common/representation.rb

@@ -3,6 +3,8 @@ module Restfulie::Common::Representation; end
 
 %w(
   atom
+  generic
+  json
   xml
 ).each do |file|
   require File.join(File.dirname(__FILE__), 'representation', file)

data/lib/restfulie/server/action_controller/params_parser.rb

@@ -42,21 +42,21 @@ end
 # extensions are handled by the Rack stack
 #
 # TODO Change this when porting this code to Rails 3
-::ActionController::ParamsParser.class_eval do
-  def call(env)
-    begin
-      if params = parse_formatted_parameters(env)
-        env["action_controller.request.request_parameters"] = params
-      else
-        if env["CONTENT_LENGTH"] && (env["CONTENT_LENGTH"] != "0")
-          return [415, {'Content-Type' => 'text/html'}, "<html><body><h1>415 Unsupported Media Type</h1></body></html>"]
-        end
-      end
-    rescue
-      return [400, {'Content-Type' => 'text/html'}, "<html><body><h1>400 Bad Request</h1></body></html>"]
-    end
+#::ActionController::ParamsParser.class_eval do
+  #def call(env)
+    #begin
+      #if params = parse_formatted_parameters(env)
+        #env["action_controller.request.request_parameters"] = params
+      #else
+        #if env["CONTENT_LENGTH"] && (env["CONTENT_LENGTH"] != "0")
+          #return [415, {'Content-Type' => 'text/html'}, "<html><body><h1>415 Unsupported Media Type</h1></body></html>"]
+        #end
+      #end
+    #rescue
+      #return [400, {'Content-Type' => 'text/html'}, "<html><body><h1>400 Bad Request</h1></body></html>"]
+    #end
 
-    @app.call(env)
-  end
-end
+    #@app.call(env)
+  #end
+#end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Guilherme Silveira, Caue Guerra
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 -03:00
+date: 2010-04-21 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -59,6 +59,20 @@ dependencies:
         version: 0.1.0
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: json_pure
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 4
+        version: 1.2.4
+  type: :runtime
+  version_requirements: *id004
 description: 
 email: guilherme.silveira@caelum.com.br
 executables: []
@@ -74,7 +88,9 @@ files:
 - lib/restfulie/client/http/atom_ext.rb
 - lib/restfulie/client/http/cache.rb
 - lib/restfulie/client/http/error.rb
+- lib/restfulie/client/http/link.rb
 - lib/restfulie/client/http/marshal.rb
+- lib/restfulie/client/http/xml.rb
 - lib/restfulie/client/http.rb
 - lib/restfulie/client.rb
 - lib/restfulie/common/builder/builder_base.rb
@@ -94,6 +110,7 @@ files:
 - lib/restfulie/common/logger.rb
 - lib/restfulie/common/representation/atom.rb
 - lib/restfulie/common/representation/generic.rb
+- lib/restfulie/common/representation/json.rb
 - lib/restfulie/common/representation/xml.rb
 - lib/restfulie/common/representation.rb
 - lib/restfulie/common.rb