restfulie 0.9.3 → 1.0.0.beta1

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

@@ -84,55 +84,56 @@ module Restfulie
         
           # Author have name, and optional uri and email, this describes a person
           def authors
-            unless @authors
-              @authors = TagCollection.new(@doc)
-              @doc.xpath("xmlns:author").each do |author|
-                @authors << Person.new("author", author)
-              end
+            return @authors if @authors
+
+            @authors = TagCollection.new(@doc)
+            @doc.xpath("xmlns:author").each do |author|
+              @authors << Person.new("author", author)
             end
+            @authors
             
-            return @authors
           end
         
           def contributors
-            unless @contributors
-              @contributors = TagCollection.new(@doc)
-              @doc.xpath("xmlns:author").each do |contributor|
-                @contributors << Person.new("contributor", contributor)
-              end
+            return @contributors if @contributors
+
+            @contributors = TagCollection.new(@doc)
+            @doc.xpath("xmlns:author").each do |contributor|
+              @contributors << Person.new("contributor", contributor)
             end
-            
-            return @contributor
+            @contributors
           end
         
+          include Restfulie::Common::Links
+
           # It has one required attribute, href, and five optional attributes: rel, type, hreflang, title, and length
           def links
-            unless @links
-              @links = TagCollection.new(@doc) do |array, symbol, *args|
-                linkset = array.select {|link| link.rel == symbol.to_s }
-                unless linkset.empty?
-                  linkset.size == 1 ? linkset.first : linkset
-                else
-                  nil
-                end          
-              end
-              @doc.xpath("xmlns:link").each do |link|
-                @links << Link.new(link)
-              end        
+            return @links if @links
+            
+            @links = TagCollection.new(@doc) do |array, symbol, *args|
+              linkset = array.select {|link| link.rel == symbol.to_s }
+              unless linkset.empty?
+                linkset.size == 1 ? linkset.first : linkset
+              else
+                nil
+              end          
             end
+            @doc.xpath("xmlns:link").each do |link|
+              @links << Link.new(link)
+            end        
+            @links
             
-            return @links
           end
         
           def categories
-            unless @categories
-              @categories = TagCollection.new(@doc)
-              @doc.xpath("xmlns:category").each do |category|
-                @categories << Link.new(category)
-              end        
-            end
+            return @categories if @categories
+            
+            @categories = TagCollection.new(@doc)
+            @doc.xpath("xmlns:category").each do |category|
+              @categories << Link.new(category)
+            end        
+            @categories
             
-            return @categories
           end
         end
       end

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

@@ -39,12 +39,7 @@ module Restfulie
           end
 
           def method_missing(method)
-            value = text(method)
-            unless value
-              super
-            else
-              value
-            end
+            text(method) || super
           end
 
         protected 
@@ -54,12 +49,12 @@ module Restfulie
           end
       
           def set_text(node_name, value)
-            unless (node = @doc.at_xpath("xmlns:#{node_name}"))
-              node = create_element(node_name, value)
-              node.parent = @doc
-            else
+            if (node = @doc.at_xpath("xmlns:#{node_name}"))
               value = value.xmlschema if value.kind_of?(Time) || value.kind_of?(DateTime)
               node.content = value
+            else
+              node = create_element(node_name, value)
+              node.parent = @doc
             end
           end
       

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

@@ -3,15 +3,6 @@ module Restfulie
     module Representation
       # Unknown representation's unmarshalling on the client side
       class Generic
-        def self.media_type_name
-          raise Error::RestfulieError.new("Generic representation does not have a specific media type")
-        end
-    
-        cattr_reader :headers
-        @@headers = { 
-          :get  => { },
-          :post => { }
-        }
     
         # Because there is no media type registered, return the content itself
         def unmarshal(content)
@@ -25,9 +16,6 @@ module Restfulie
           string
         end
     
-        def prepare_link_for(link)
-          link
-        end
       end
     end
   end

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

@@ -44,6 +44,8 @@ module Restfulie
             class << self; self; end
           end
           
+          include Restfulie::Common::Links
+
           # easy accessors to links
           def links
             some_links = self["link"]

data/lib/restfulie/common/representation.rb

@@ -1,10 +1,3 @@
-module Restfulie
-  module Common
-    module Representation
-      autoload :Atom, 'restfulie/common/representation/atom'
-      autoload :Generic, 'restfulie/common/representation/generic'
-      autoload :Json, 'restfulie/common/representation/json'
-      autoload :Links, 'restfulie/common/representation/links'
-    end
-  end
+module Restfulie::Common::Representation
+  Dir["#{File.dirname(__FILE__)}/representation/*.rb"].each {|f| autoload File.basename(f)[0..-4].camelize.to_sym, f }
 end

data/lib/restfulie/common.rb

@@ -4,14 +4,15 @@ require 'uri'
 require 'rubygems'
 require 'active_support'
 require 'action_controller'
-require 'restfulie/common/core_ext'
 
 module Restfulie
   module Common
     autoload :Error, 'restfulie/common/error'
+    autoload :Links, 'restfulie/common/links'
     autoload :Logger, 'restfulie/common/logger'
     autoload :Representation, 'restfulie/common/representation'
     autoload :Converter, 'restfulie/common/converter'
   end
 end
 
+require 'restfulie/common/core_ext'

data/lib/restfulie/server/action_controller/trait/cacheable.rb

@@ -0,0 +1,81 @@
+class Expires
+  def do_http_cache(responder, headers)
+    if responder.options[:expires_in]
+      headers << "max-age=#{responder.options[:expires_in]}"
+      true
+    else
+      false
+    end
+  end
+end
+
+class LastModifieds
+  # default implementation that will check whether caching can be applied
+  def accepts?(responder)
+    responder.resources.flatten.select do |resource|
+      resource.respond_to?(:updated_at)
+    end &&
+      responder.controller.response.last_modified.nil? &&
+      !new_record?(responder)
+  end
+
+  def do_http_cache(responder, headers)
+    return false unless accepts?(responder)
+    
+    timestamps = responder.resources.flatten.select do |resource|
+      resource.respond_to?(:updated_at)
+    end.map do |resource|
+      (resource.updated_at || Time.now).utc
+    end
+    
+    timestamp = timestamps.max
+
+    responder.controller.response.last_modified = timestamp if timestamp
+  end
+
+  def new_record?(responder)
+    responder.resource.respond_to?(:new_record?) && responder.resource.new_record?
+  end
+    
+end
+
+module Restfulie::Server::ActionController
+  module Trait
+    module Cacheable
+      
+      CACHES = [::Expires.new, ::LastModifieds.new]
+      
+      def to_format
+        headers = cache_control_headers
+        cached = CACHES.inject(false) do |cached, cache|
+          cached || cache.do_http_cache(self, headers)
+        end
+        if ::ActionController::Base.perform_caching && cached
+          set_public_cache_control(headers)
+          controller.response.headers["Cache-Control"] = headers.join(', ')
+          fresh = request.fresh?(controller.response)
+          if fresh
+            head :not_modified
+          else
+            super
+          end
+        else
+          super
+        end
+      end
+      
+      private
+        
+      def set_public_cache_control(headers)
+        headers.delete("private")
+        headers.delete("no-cache")
+        headers << "public"
+      end
+      
+      def cache_control_headers
+        (controller.response.headers["Cache-Control"] || "").split(",").map {|k| k.strip }
+      end
+
+    end
+  end
+end

data/lib/restfulie/server/action_controller/trait/created.rb

@@ -0,0 +1,17 @@
+module Restfulie::Server::ActionController
+  module Trait
+    
+    # Adds support to answering as a 201 when the resource has been just created
+    module Created
+
+      def to_format
+        if (options[:status] == 201) || (options[:status] == :created)
+          render :status => 201, :location => controller.url_for(resource), :text => ""
+        else
+          super
+        end
+      end
+
+    end
+  end
+end

data/lib/restfulie/server/action_controller/trait/save_prior_to_create.rb

@@ -0,0 +1,13 @@
+module Restfulie::Server::ActionController::Trait::SavePriorToCreate
+  def to_format
+    if (options[:status] == 201) || (options[:status] == :created)==201
+      if resource.save
+        super
+      else
+        render :action => "new"
+      end
+    else
+      super
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+module Restfulie
+  module Server
+    module ActionController #:nodoc:
+      module Trait #:nodoc:
+        Dir["#{File.dirname(__FILE__)}/trait/*.rb"].each {|f| autoload File.basename(f)[0..-4].camelize.to_sym, f }
+      end
+    end
+  end
+end

data/lib/restfulie/server/action_controller.rb

@@ -2,11 +2,7 @@ module Restfulie
   module Server
     module ActionController #:nodoc:
       if defined?(::ActionController) || defined?(::ApplicationController)
-        autoload :ParamsParser, 'restfulie/server/action_controller/params_parser'
-        autoload :CacheableResponder, 'restfulie/server/action_controller/cacheable_responder'
-        autoload :CreatedResponder, 'restfulie/server/action_controller/created_responder'
-        autoload :RestfulResponder, 'restfulie/server/action_controller/restful_responder'
-        autoload :Base, 'restfulie/server/action_controller/base'
+        Dir["#{File.dirname(__FILE__)}/action_controller/*.rb"].each {|f| autoload File.basename(f)[0..-4].camelize.to_sym, f }
       end
     end
   end

data/lib/restfulie/server/action_view/template_handlers/tokamak.rb

@@ -6,7 +6,7 @@ module Restfulie
           include ::ActionView::TemplateHandlers::Compilable
             
           def compile(template)
-            "@restfulie_type_helpers = Restfulie::Client::HTTP::RequestMarshaller.content_type_for(self.response.content_type).helper; " +
+            "@restfulie_type_helpers = Restfulie::Common::Converter.content_type_for(self.response.content_type).helper; " +
             "extend @restfulie_type_helpers; " +
             "extend Restfulie::Server::ActionView::Helpers; " +
             "code_block = lambda { #{template.source} };" + 

data/lib/restfulie/server.rb

@@ -1,3 +1,4 @@
+require 'respondie'
 require 'restfulie/common'
 
 module Restfulie
@@ -16,4 +17,9 @@ class ActionController::Base
   def self.restfulie
     include Restfulie::Server::ActionController::Base
   end
+  
+  def self.use_trait(&block)
+    Respondie::Builder.new("Restfulie::Server::ActionController::Trait::$trait$", self).instance_eval(&block)
+  end
+
 end

data/lib/restfulie/version.rb

@@ -1,10 +1,10 @@
 module Restfulie
   module VERSION #:nodoc:
-    MAJOR = 0
-    MINOR = 9
-    TINY  = 3
+    MAJOR = 1
+    MINOR = 0
+    TINY  = 0
 
-    STRING = [MAJOR, MINOR, TINY].join('.')
+    STRING = [MAJOR, MINOR, TINY].join('.') + ".beta1"
 
     # Restfulie's version
     def self.to_s

data/lib/restfulie.rb

@@ -5,12 +5,30 @@ require 'restfulie/common'
 require 'restfulie/client'
 require 'restfulie/server'
 
-# Shortcut to Restfulie::Client::EntryPoint
+# Shortcut to RestfulieDsl
 module Restfulie
-  extend Restfulie::Client::EntryPoint
 
   # creates a new entry point for executing requests
   def self.at(uri)
-    Object.new.send(:extend, Restfulie::Client::EntryPoint).at(uri)
+    Restfulie.use.at(uri)
+  end
+
+  def self.using(&block)
+    RestfulieUsing.new.instance_eval(&block)
+  end
+  
+  def self.use(&block)
+    if block_given?
+      Restfulie::Client::Dsl.new.instance_eval(&block)
+    else
+      Restfulie::Client::Dsl.new
+    end
+  end
+  
+end
+
+class RestfulieUsing
+  def method_missing(sym, *args)
+    @current = "Restfulie::Client::HTTP::#{sym.to_s.classify}".constantize.new(@current || Restfulie::Client::HTTP::RequestAdapter.new, *args)
   end
 end

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: restfulie
 version: !ruby/object:Gem::Version 
-  hash: 61
-  prerelease: false
+  hash: 299253597
+  prerelease: true
   segments: 
+  - 1
+  - 0
   - 0
-  - 9
-  - 3
-  version: 0.9.3
+  - beta1
+  version: 1.0.0.beta1
 platform: ruby
 authors: 
 - Guilherme Silveira, Caue Guerra, Luis Cipriani, Everton Ribeiro, George Guimaraes, Paulo Ahagon, Several contributors
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 -03:00
+date: 2010-10-31 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -98,28 +99,30 @@ files:
 - lib/restfulie/client/cache/restrictions.rb
 - lib/restfulie/client/cache.rb
 - lib/restfulie/client/configuration.rb
+- lib/restfulie/client/dsl.rb
 - lib/restfulie/client/entry_point.rb
 - lib/restfulie/client/ext/atom_ext.rb
 - lib/restfulie/client/ext/http_ext.rb
 - lib/restfulie/client/ext/json_ext.rb
-- lib/restfulie/client/ext/xml_ext.rb
+- lib/restfulie/client/feature/base.rb
+- lib/restfulie/client/feature/base_request.rb
+- lib/restfulie/client/feature/cache.rb
+- lib/restfulie/client/feature/enhance_response.rb
+- lib/restfulie/client/feature/follow_request.rb
+- lib/restfulie/client/feature/history.rb
+- lib/restfulie/client/feature/history_request.rb
+- lib/restfulie/client/feature/open_search/pattern_matcher.rb
+- lib/restfulie/client/feature/open_search.rb
+- lib/restfulie/client/feature/serialize_body.rb
+- lib/restfulie/client/feature/setup_header.rb
+- lib/restfulie/client/feature/throw_error.rb
+- lib/restfulie/client/feature/verb.rb
+- lib/restfulie/client/feature.rb
 - lib/restfulie/client/http/cache.rb
 - lib/restfulie/client/http/error.rb
-- lib/restfulie/client/http/link_request_builder.rb
-- lib/restfulie/client/http/request_adapter.rb
-- lib/restfulie/client/http/request_builder.rb
-- lib/restfulie/client/http/request_builder_executor.rb
-- lib/restfulie/client/http/request_executor.rb
-- lib/restfulie/client/http/request_follow.rb
-- lib/restfulie/client/http/request_follow_executor.rb
-- lib/restfulie/client/http/request_history.rb
-- lib/restfulie/client/http/request_history_executor.rb
-- lib/restfulie/client/http/request_marshaller.rb
-- lib/restfulie/client/http/request_marshaller_executor.rb
-- lib/restfulie/client/http/response.rb
-- lib/restfulie/client/http/response_handler.rb
 - lib/restfulie/client/http/response_holder.rb
 - lib/restfulie/client/http.rb
+- lib/restfulie/client/master_delegator.rb
 - lib/restfulie/client/mikyung/concatenator.rb
 - lib/restfulie/client/mikyung/core.rb
 - lib/restfulie/client/mikyung/languages/german.rb
@@ -135,10 +138,13 @@ files:
 - lib/restfulie/common/converter/atom/builder.rb
 - lib/restfulie/common/converter/atom/helpers.rb
 - lib/restfulie/common/converter/atom.rb
+- lib/restfulie/common/converter/form_url_encoded.rb
 - lib/restfulie/common/converter/json/base.rb
 - lib/restfulie/common/converter/json/builder.rb
 - lib/restfulie/common/converter/json/helpers.rb
 - lib/restfulie/common/converter/json.rb
+- lib/restfulie/common/converter/open_search/descriptor.rb
+- lib/restfulie/common/converter/open_search.rb
 - lib/restfulie/common/converter/values.rb
 - lib/restfulie/common/converter/xml/base.rb
 - lib/restfulie/common/converter/xml/builder.rb
@@ -150,6 +156,7 @@ files:
 - lib/restfulie/common/core_ext/hash.rb
 - lib/restfulie/common/core_ext.rb
 - lib/restfulie/common/error.rb
+- lib/restfulie/common/links.rb
 - lib/restfulie/common/logger.rb
 - lib/restfulie/common/representation/atom/base.rb
 - lib/restfulie/common/representation/atom/category.rb
@@ -172,11 +179,13 @@ files:
 - lib/restfulie/common/representation.rb
 - lib/restfulie/common.rb
 - lib/restfulie/server/action_controller/base.rb
-- lib/restfulie/server/action_controller/cacheable_responder.rb
-- lib/restfulie/server/action_controller/created_responder.rb
 - lib/restfulie/server/action_controller/params_parser.rb
 - lib/restfulie/server/action_controller/patch.rb
 - lib/restfulie/server/action_controller/restful_responder.rb
+- lib/restfulie/server/action_controller/trait/cacheable.rb
+- lib/restfulie/server/action_controller/trait/created.rb
+- lib/restfulie/server/action_controller/trait/save_prior_to_create.rb
+- lib/restfulie/server/action_controller/trait.rb
 - lib/restfulie/server/action_controller.rb
 - lib/restfulie/server/action_view/helpers.rb
 - lib/restfulie/server/action_view/template_handlers/tokamak.rb
@@ -216,12 +225,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 

data/lib/restfulie/client/ext/xml_ext.rb

@@ -1,4 +0,0 @@
-# inject new behavior in Atom instances to enable easily access to link relationships.
-class Hash
-  include Restfulie::Client::HTTP::LinkRequestBuilder
-end

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

@@ -1,16 +0,0 @@
-module Restfulie
-  module Client
-    module HTTP
-      module LinkRequestBuilder
-        include RequestMarshaller
-        include RequestFollow
-
-        def path#:nodoc:
-          at(href)
-          as(type) if type
-          super
-        end
-      end
-    end
-  end
-end