restfulie 0.8.0 → 0.8.1

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

@@ -0,0 +1,29 @@
+module Restfulie
+  module Common
+    module Representation
+      class Json
+        class Link
+          def initialize(obj)
+            @obj = obj
+          end
+          
+          def type
+            @obj.type
+          end
+          
+          def href
+            @obj.href
+          end
+          
+          def rel
+            @obj.rel
+          end
+              
+          def method_missing(symbol, *args, &block)
+            @obj.send(symbol, *args, &block)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,23 @@
+module Restfulie
+  module Common
+    module Representation
+      class Json
+        class LinkCollection
+          def initialize(parent_node)
+            @node = parent_node
+          end
+          
+          def method_missing(symbol, *args, &block)
+            linkset = @node.select {|link| link.rel == symbol.to_s }
+            linkset.map! { |link| Link.new(link) }
+            unless linkset.empty?
+              linkset.size == 1 ? linkset.first : linkset
+            else
+              nil
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,235 +1,26 @@
-module Restfulie::Common::Converter
-end
-module Restfulie::Common::Converter::Xml
-end
-
-class Hash
-  def links(*args)
-    links = fetch("link", [])
-    Restfulie::Common::Converter::Xml::Links.new(links)
-  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
-
-class Restfulie::Common::Converter::Xml::Links
-
-  def initialize(links)
-    links = [links] unless links.kind_of? Array
-    links = [] unless links
-    @links = links.map do |l|
-      link = Restfulie::Common::Converter::Xml::Link.new(l)
-      link.instance_eval { self.class.send :include, ::Restfulie::Client::HTTP::LinkRequestBuilder }
-      link
-    end
-  end
-  
-  def method_missing(sym, *args)
-    @links.find do |link|
-      link.rel == sym.to_s
-    end
-  end
-  
-end
-
-class Restfulie::Common::Converter::Xml::Link
-
-  def initialize(options = {})
-    @options = options
-  end
-  def href
-    @options["href"]
-  end
-  def rel
-    @options["rel"]
-  end
-  def content_type
-    @options["type"]
-  end
-  def type
-    content_type
-  end
-end
-
-# Implements the interface for marshal Xml media type requests (application/xml)
-module Restfulie::Common::Converter::Xml
-
-    mattr_reader :media_type_name
-    @@media_type_name = 'application/xml'
-
-    mattr_reader :headers
-    @@headers = { 
-      :post => { 'Content-Type' => media_type_name }
-    }
-
-    def self.marshal(entity, options = {})
-      to_xml(entity, options)
-    end
-
-    def self.unmarshal(string)
-      Hash.from_xml string
-    end
-
-    mattr_reader :recipes
-    @@recipes = {}
-
-    def self.describe_recipe(recipe_name, options={}, &block)
-      raise 'Undefined recipe' unless block_given?
-      raise 'Undefined recipe_name'   unless recipe_name
-      @@recipes[recipe_name] = block
-    end
-
-    def self.to_xml(obj, options = {}, &block)
-      return obj if obj.kind_of?(String)
-      
-      if block_given?
-        recipe = block 
-      elsif options[:recipe]
-        recipe = @@recipes[options[:recipe]]
-      else
-        return obj.values.first.to_xml(:root => obj.keys.first) if obj.kind_of?(Hash) && obj.size==1
-        return obj.to_xml
-      end
-      
-      # Create representation and proxy
-      builder = Builder.new(obj)
-
-      # Check recipe arity size before calling it
-      recipe.call(*[builder, obj, options][0,recipe.arity])
-      builder.doc.to_xml
-    end
-    
-    def self.helper
-      Restfulie::Common::Converter::Xml::Helpers
-    end
-
-end
-class Restfulie::Common::Converter::Xml::Builder
-  attr_reader :doc
-  def initialize(obj, options = {})
-    @doc    = Nokogiri::XML::Document.new
-    @obj    = obj
-    if options[:root]
-      root = options[:root]
-    else
-      root = root_element_for(obj)
-    end
-    @parent = @doc.create_element(root)
-    @parent.parent = @doc
-  end
-  
-  def values(options = nil, &block)
-    options.each do |key,value|
-      attr = key.to_s
-      if attr =~ /^xmlns(:\w+)?$/
-        ns = attr.split(":", 2)[1]
-        @parent.add_namespace_definition(ns, value)
-      end
-    end if options
+module Restfulie
+  module Common
+    module Representation
+      # Implements the interface for marshal Xml media type requests (application/xml)
+      class XmlD
+        cattr_reader :media_type_name
+        @@media_type_name = 'application/xml'
     
-    yield Restfulie::Common::Converter::Components::Values.new(self)
-  end
-
-  def insert_value(name, prefix, *args, &block)
-    node = create_element(name.to_s, prefix, *args)
-    node.parent = @parent
+        cattr_reader :headers
+        @@headers = { 
+          :post => { 'Content-Type' => media_type_name }
+        }
     
-    if block_given?
-      @parent = node
-      block.call
-      @parent = node.parent
-    end
-  end
-  
-  def link(relationship, uri, options = {})
-    options["rel"] = relationship.to_s
-    options["href"] = uri
-    options["type"] ||= "application/xml"
-    insert_value("link", nil, options)
-  end
-  
-  def members(a_collection = nil, &block)
-    collection = a_collection || @obj 
-    raise Restfulie::Common::Error::BuilderError("Members method require a collection to execute") unless collection.respond_to?(:each)
-    collection.each do |member|
-      entry = @doc.create_element(root_element_for(member))
-      entry.parent = @parent
-      @parent = entry
-      block.call(self, member)
-      @parent = entry.parent
-    end
-  end
-  
-  private
-
-  def root_element_for(obj)
-    if obj.kind_of?(Hash) && obj.size==1
-      obj.keys.first.to_s
-    elsif obj.kind_of?(Array) && !obj.empty?
-      root_element_for(obj.first).underscore.pluralize
-    else
-      obj.class.to_s.underscore
-    end
-  end
-  
-  def create_element(node, prefix, *args)
-    node = @doc.create_element(node) do |n|
-      if prefix
-        if namespace = prefix_valid?(prefix)
-          # Adding namespace prefix
-          n.namespace = namespace
-          namespace = nil
+        def unmarshal(string)
+          Hash.from_xml(string)
         end
-      end
-
-      args.each do |arg|
-        case arg
-        # Adding XML attributes
-        when Hash
-          arg.each { |k,v|
-            key = k.to_s
-            if key =~ /^xmlns(:\w+)?$/
-              ns_name = key.split(":", 2)[1]
-              n.add_namespace_definition(ns_name, v)
-              next
-            end
-            n[k.to_s] = v.to_s
-          }
-        # Adding XML node content
-        else            
-          arg.kind_of?(Time) || arg.kind_of?(DateTime) ? content = arg.xmlschema : content = arg
-          n.content = content
+    
+        def marshal(entity, rel)
+          return entity if entity.kind_of? String
+          return entity.values.first.to_xml(:root => entity.keys.first) if entity.kind_of?(Hash) && entity.size==1
+          entity.to_xml
         end
       end
     end
   end
-  
-  def prefix_valid?(prefix)
-    ns = @parent.namespace_definitions.find { |x| x.prefix == prefix.to_s }
-    
-    unless ns
-      @parent.ancestors.each do |a|
-        next if a == @doc
-        ns = a.namespace_definitions.find { |x| x.prefix == prefix.to_s }
-        break if ns
-      end      
-    end
-    
-    return ns
-  end
-    
-end
-
-module Restfulie::Common::Converter::Xml::Helpers
-  def collection(obj, *args, &block)
-    Restfulie::Common::Converter::Xml.to_xml(obj, {}, &block)
-  end
-
-  def member(obj, *args, &block)
-    Restfulie::Common::Converter::Xml.to_xml(obj, {}, &block)
-  end
 end

data/lib/restfulie/server.rb

@@ -1,15 +1,14 @@
 require 'restfulie/common'
 require 'responders_backport'
 
-module Restfulie::Server; end
-
-%w(
-  configuration
-  action_controller
-  action_view
-  core_ext
-  restfulie_controller
-).each do |file|
-  require "restfulie/server/#{file}"
+module Restfulie
+  module Server
+    autoload :Configuration, 'restfulie/server/configuration'
+    autoload :ActionController, 'restfulie/server/action_controller'
+    autoload :ActionView, 'restfulie/server/action_view'
+    autoload :Controller, 'restfulie/server/controller'
+  end
 end
 
+require 'restfulie/server/core_ext'
+Restfulie::Server::ActionView::TemplateHandlers.activate!

data/lib/restfulie/server/action_controller.rb

@@ -1,15 +1,13 @@
-module Restfulie::Server::ActionController#:nodoc:
-
-  if defined?(::ActionController) || defined?(::ApplicationController)
-
-    %w(
-      params_parser
-      restful_responder
-      base
-      routing
-    ).each do |file|
-      autoload file.camelize.to_sym, "restfulie/server/action_controller/#{file}"
+module Restfulie
+  module Server
+    module ActionController #:nodoc:
+      if defined?(::ActionController) || defined?(::ApplicationController)
+        autoload :ParamsParser, 'restfulie/server/action_controller/params_parser'
+        autoload :RestfulResponder, 'restfulie/server/action_controller/restful_responder'
+        autoload :Base, 'restfulie/server/action_controller/base'
+      end
     end
-
   end
 end
+
+require 'restfulie/server/action_controller/patch'

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

@@ -1,16 +1,14 @@
 module Restfulie
   module Server
     module ActionController
-
       module Base
-
         def self.included(base)
           # Sets a default responder for this controller. 
           # Needs to require responder_legacy.rb
           base.responder = Restfulie::Server::ActionController::RestfulResponder
           base.extend(Restfulie::Server::ActionController::Base::ClassMethods)
           # Atom representation is added by default
-          ParamsParser.register('application/atom+xml', Restfulie::Common::Converter::Atom)
+          Restfulie::Server::ActionController::ParamsParser.register('application/atom+xml', Restfulie::Common::Converter::Atom)
         end
 
         module ClassMethods
@@ -31,20 +29,25 @@ module Restfulie
           end
         end
 
-      protected
-      
-        # If your controller inherits from Restfulie::Server::Controller::Base,
-        # it will have an :atom option, very similar to render :xml
-        def render(options = {}, extra_options = {}, &block)
-          if options && atom = options[:atom]
-            response.content_type ||= Mime::ATOM
-            render_for_text(atom.respond_to?(:to_atom) ? atom.to_atom.to_xml : atom.to_xml, options[:status])
-          else
-            super
-          end
-        end
+        protected
         
+          # If your controller inherits from Restfulie::Server::Controller::Base,
+          # it will have an :atom option, very similar to render :xml
+          def render(options = nil, extra_options = {}, &block)
+            if options && atom = options[:atom]
+              response.content_type ||= Mime::ATOM
+              render_for_text(atom.respond_to?(:to_atom) ? atom.to_atom.to_xml : atom.to_xml, options[:status])
+            else
+              super
+            end
+          end
       end
     end
   end
 end
+
+class ActionController::Base
+  def self.acts_as_restfulie
+    include Restfulie::Server::ActionController::Base
+  end
+end

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

@@ -1,39 +1,47 @@
-module Restfulie::Server::ActionController
-  class RestfulResponder < ActionController::Responder
-    
-    def to_format
-      return if do_http_cache? && do_http_cache!
-      super
-    end
+module Restfulie
+  module Server
+    module ActionController
+      class RestfulResponder < ::ActionController::Responder
+        def to_format
+          return if do_http_cache? && do_http_cache!
+          super
+        end
+          
+        protected
+          def do_http_cache!
+            timestamp = resources.flatten.select do |resource|
+              resource.respond_to?(:updated_at)
+            end.map do |resource|
+              (resource.updated_at || Time.now).utc
+            end.max
       
-  protected
-    def do_http_cache!
-      timestamp = resources.flatten.map do |resource|
-        (resource.updated_at || Time.now).utc if resource.respond_to?(:updated_at)
-      end.compact.max
-
-      controller.response.last_modified = timestamp if timestamp
-      set_public_cache_control!
-
-      head :not_modified if fresh = request.fresh?(controller.response)
-      fresh
-    end
-
-    def do_http_cache?
-      get? && @http_cache != false && ActionController::Base.perform_caching &&
-        !new_record? && controller.response.last_modified.nil?
-    end
-
-    def new_record?
-      resource.respond_to?(:new_record?) && resource.new_record?
-    end
-    
-    def set_public_cache_control!
-      cache_control = controller.response.headers["Cache-Control"].split(",").map {|k| k.strip }
-      cache_control.delete("private")
-      cache_control.delete("no-cache")
-      cache_control << "public"
-      controller.response.headers["Cache-Control"] = cache_control.join(', ')
+            controller.response.last_modified = timestamp if timestamp
+            set_public_cache_control!
+      
+            head :not_modified if fresh = request.fresh?(controller.response)
+            fresh
+          end
+      
+          def do_http_cache?
+            get? && 
+              @http_cache != false && 
+              ::ActionController::Base.perform_caching &&
+              !new_record? && 
+              controller.response.last_modified.nil?
+          end
+      
+          def new_record?
+            resource.respond_to?(:new_record?) && resource.new_record?
+          end
+          
+          def set_public_cache_control!
+            cache_control = controller.response.headers["Cache-Control"].split(",").map {|k| k.strip }
+            cache_control.delete("private")
+            cache_control.delete("no-cache")
+            cache_control << "public"
+            controller.response.headers["Cache-Control"] = cache_control.join(', ')
+        end
+      end
     end
   end
 end