restfulie 1.0.0.beta1 → 1.0.0.beta4

data/lib/restfulie/client/feature/throw_error.rb

@@ -1,6 +1,6 @@
 class Restfulie::Client::Feature::ThrowError
-  def execute(flow, request, result_so_far, env)
-    result = flow.continue(request, result_so_far, env)
+  def execute(flow, request, env)
+    result = flow.continue(request, env)
     if result.kind_of? Exception
       Restfulie::Common::Logger.logger.error(result)
       raise Restfulie::Client::HTTP::Error::ServerNotAvailableError.new(request, Restfulie::Client::HTTP::Response.new(request.verb, request.path, 503, nil, {}), result )

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

@@ -0,0 +1,39 @@
+module Restfulie::Client::HTTP
+  
+  # Adds support to extracting and navigating through a link in the representation header.
+  module LinkHeader
+    
+    def links
+      r = link_header_to_array
+      Medie::Xml::Links.new(r)
+    end
+    
+    def link(rel)
+      links[rel]
+    end
+        
+    private
+
+    def link_header_to_array
+      links = self["link"][0].split(",")
+      links.map do |link|
+        string_to_hash(link)
+      end
+    end
+
+    def string_to_hash(l)
+      c = l[/<[^>]*/]
+      uri = c[1..c.size]
+      rest = l[/;.*/]
+      rel = extract(rest, "rel")
+      type = extract(rest, "type")
+      { "href" => uri, "rel" => rel, "type" => type }
+    end
+    
+    def extract(from, what)
+      found = Regexp.new("#{what}=\"([^\"]*)\"").match(from)
+      found ? found[1] : nil
+    end
+
+  end
+end

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

@@ -4,7 +4,7 @@ module Restfulie::Client::HTTP
     
     def resource
       type = headers['content-type'] || response['Content-Type']
-      representation = Restfulie::Common::Converter.content_type_for(type[0]) || Restfulie::Common::Representation::Generic.new
+      representation = Medie.registry.for(type[0])
       representation.unmarshal(response.body)
     end
     
@@ -13,7 +13,7 @@ module Restfulie::Client::HTTP
     end
     
     def headers
-      response.to_hash
+      response.to_hash.extend(::Restfulie::Client::HTTP::LinkHeader)
     end
     
     def results_from(request, response)

data/lib/restfulie/client/stack_navigator.rb

@@ -0,0 +1,39 @@
+module Restfulie
+  module Client
+    class StackNavigator
+  
+      def initialize(stack)
+        @stack = stack.dup
+      end
+
+      def continue(request, env)
+        current = @stack.pop
+        if current.nil?
+          return nil
+        end
+        filter = instantiator.new(current[:type], current[:args])
+        Restfulie::Common::Logger.logger.debug "invoking filter #{filter.class.name} with #{request} at #{env}"
+        filter.execute(self.dup, request, env)
+      end
+  
+      def instantiator
+        BasicInstantiator.new
+      end
+    
+      def dup
+        StackNavigator.new(@stack)
+      end
+  
+    end
+
+    class BasicInstantiator
+      def new(type, args)
+        if type.instance_method(:initialize).arity==1
+          type.new(args)
+        else
+          type.new
+        end
+      end
+    end
+  end
+end

data/lib/restfulie/client.rb

@@ -11,16 +11,14 @@ module Restfulie
     autoload :Cache, 'restfulie/client/cache'
     autoload :Feature, 'restfulie/client/feature'
     autoload :Dsl, 'restfulie/client/dsl'
+    autoload :StackNavigator, 'restfulie/client/stack_navigator'
     
     mattr_accessor :cache_provider, :cache_store
 
     Restfulie::Client.cache_store = ActiveSupport::Cache::MemoryStore.new
-    Restfulie::Client.cache_provider = Restfulie::Client::Cache::Basic.new
+    Restfulie::Client.cache_provider = Restfulie::Client::Cache::Fake.new
 
   end
 end
 
-require 'restfulie/client/ext/http_ext'
-require 'restfulie/client/ext/atom_ext'
-require 'restfulie/client/ext/json_ext'
-
+require 'restfulie/client/ext'

data/lib/restfulie/common.rb

@@ -2,17 +2,16 @@ require 'net/http'
 require 'uri'
 
 require 'rubygems'
-require 'active_support'
-require 'action_controller'
+require 'tokamak'
+require 'medie'
 
 module Restfulie
+  
+  # Code common to both client and server side is contained in the common module.
   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/base.rb

@@ -8,7 +8,7 @@ module Restfulie
           base.responder = Restfulie::Server::ActionController::RestfulResponder
           base.extend(Restfulie::Server::ActionController::Base::ClassMethods)
           # Atom representation is added by default
-          Restfulie::Server::ActionController::ParamsParser.register('application/atom+xml', Restfulie::Common::Converter::Atom)
+          Restfulie::Server::ActionController::ParamsParser.register('application/atom+xml', Tokamak::Atom)
         end
 
         module ClassMethods

data/lib/restfulie/server/core_ext/array.rb

@@ -1,32 +1,6 @@
 # Introspective methods to assist in the conversion of collections in other formats.
 class Array
-  def to_atom(options={}, &block)
-    raise "Not all elements respond to to_atom" unless all? { |e| e.respond_to? :to_atom }
-    options = options.dup
-    
-    if options.delete :only_self_link
-      options[:skip_associations_links] = true
-      options[:skip_attributes]         = true      
-    end
-    
-    feed = Restfulie::Common::Representation::Atom::Feed.new
-    # TODO: Define better feed attributes
-    # Array#to_s can return a very long string
-    feed.title      = "Collection of #{map {|i| i.class.name }.uniq.to_sentence}"
-    feed.updated    = updated_at
-    feed.published  = published_at
-    # TODO: this id does not comply with Rest standards yet
-    feed.id = hash
-    
-    each do |element|
-      feed.entries << element.to_atom(options)
-    end
-    
-    yield feed if block_given?
-    
-    feed
-  end
-  
+
   # Return max update date for items in collection, for it uses the updated_at of items.
   # 
   #==Example:

data/lib/restfulie/server/tokamak.rb

@@ -0,0 +1,6 @@
+if defined? ::ActionView and ::ActionController
+  require 'tokamak/hook/rails'
+  # TODO autoloading, should be optional
+  Tokamak::Builder::Xml
+  Tokamak::Builder::Json
+end

data/lib/restfulie/server.rb

@@ -5,21 +5,22 @@ 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/tokamak'
 require 'restfulie/server/core_ext'
-Restfulie::Server::ActionView::TemplateHandlers.activate!
 
-class ActionController::Base
-  def self.restfulie
-    include Restfulie::Server::ActionController::Base
-  end
+if defined? ::ActionController
+  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
+    def self.use_trait(&block)
+      Respondie::Builder.new("Restfulie::Server::ActionController::Trait::$trait$", self).instance_eval(&block)
+    end
 
-end
+  end
+end

data/lib/restfulie/version.rb

@@ -4,7 +4,7 @@ module Restfulie
     MINOR = 0
     TINY  = 0
 
-    STRING = [MAJOR, MINOR, TINY].join('.') + ".beta1"
+    STRING = [MAJOR, MINOR, TINY].join('.') + ".beta4"
 
     # Restfulie's version
     def self.to_s

metadata

@@ -1,28 +1,28 @@
 --- !ruby/object:Gem::Specification 
 name: restfulie
 version: !ruby/object:Gem::Version 
-  hash: 299253597
-  prerelease: true
+  hash: 62196363
+  prerelease: 6
   segments: 
   - 1
   - 0
   - 0
-  - beta1
-  version: 1.0.0.beta1
+  - beta
+  - 4
+  version: 1.0.0.beta4
 platform: ruby
 authors: 
-- Guilherme Silveira, Caue Guerra, Luis Cipriani, Everton Ribeiro, George Guimaraes, Paulo Ahagon, Several contributors
+- Guilherme Silveira, Caue Guerra, Luis Cipriani, Everton Ribeiro, George Guimaraes, Paulo Ahagon, and many more!
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-10-31 00:00:00 -02:00
+date: 2011-01-06 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -33,44 +33,12 @@ dependencies:
         - 4
         - 2
         version: 1.4.2
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: actionpack
+  requirement: *id001
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 3
-        - 2
-        version: 2.3.2
-  type: :runtime
-  version_requirements: *id002
+  name: nokogiri
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 3
-        - 2
-        version: 2.3.2
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: json_pure
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -81,8 +49,9 @@ dependencies:
         - 2
         - 4
         version: 1.2.4
-  type: :runtime
-  version_requirements: *id004
+  requirement: *id002
+  prerelease: false
+  name: json_pure
 description: 
 email: guilherme.silveira@caelum.com.br
 executables: []
@@ -101,18 +70,21 @@ files:
 - 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/link_ext.rb
+- lib/restfulie/client/ext/open_search_ext.rb
+- lib/restfulie/client/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/conneg_when_unaccepted.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/retry_when_unavailable.rb
 - lib/restfulie/client/feature/serialize_body.rb
 - lib/restfulie/client/feature/setup_header.rb
 - lib/restfulie/client/feature/throw_error.rb
@@ -120,6 +92,7 @@ files:
 - lib/restfulie/client/feature.rb
 - lib/restfulie/client/http/cache.rb
 - lib/restfulie/client/http/error.rb
+- lib/restfulie/client/http/link_header.rb
 - lib/restfulie/client/http/response_holder.rb
 - lib/restfulie/client/http.rb
 - lib/restfulie/client/master_delegator.rb
@@ -133,50 +106,10 @@ files:
 - lib/restfulie/client/mikyung/then_condition.rb
 - lib/restfulie/client/mikyung/when_condition.rb
 - lib/restfulie/client/mikyung.rb
+- lib/restfulie/client/stack_navigator.rb
 - lib/restfulie/client.rb
-- lib/restfulie/common/converter/atom/base.rb
-- 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
-- lib/restfulie/common/converter/xml/helpers.rb
-- lib/restfulie/common/converter/xml/link.rb
-- lib/restfulie/common/converter/xml/links.rb
-- lib/restfulie/common/converter/xml.rb
-- lib/restfulie/common/converter.rb
-- 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
-- lib/restfulie/common/representation/atom/entry.rb
-- lib/restfulie/common/representation/atom/factory.rb
-- lib/restfulie/common/representation/atom/feed.rb
-- lib/restfulie/common/representation/atom/link.rb
-- lib/restfulie/common/representation/atom/person.rb
-- lib/restfulie/common/representation/atom/source.rb
-- lib/restfulie/common/representation/atom/tag_collection.rb
-- lib/restfulie/common/representation/atom/xml.rb
-- lib/restfulie/common/representation/atom.rb
-- lib/restfulie/common/representation/generic.rb
-- lib/restfulie/common/representation/json/base.rb
-- lib/restfulie/common/representation/json/keys_as_methods.rb
-- lib/restfulie/common/representation/json/link.rb
-- lib/restfulie/common/representation/json/link_collection.rb
-- lib/restfulie/common/representation/json.rb
-- lib/restfulie/common/representation/links.rb
-- lib/restfulie/common/representation.rb
 - lib/restfulie/common.rb
 - lib/restfulie/server/action_controller/base.rb
 - lib/restfulie/server/action_controller/params_parser.rb
@@ -187,14 +120,11 @@ files:
 - 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
-- lib/restfulie/server/action_view/template_handlers.rb
-- lib/restfulie/server/action_view.rb
 - lib/restfulie/server/configuration.rb
 - lib/restfulie/server/controller.rb
 - lib/restfulie/server/core_ext/array.rb
 - lib/restfulie/server/core_ext.rb
+- lib/restfulie/server/tokamak.rb
 - lib/restfulie/server.rb
 - lib/restfulie/version.rb
 - lib/restfulie.rb
@@ -203,7 +133,6 @@ files:
 - LICENSE
 - Rakefile
 - README.textile
-- lib/restfulie/common/representation/atom/atom.rng
 has_rdoc: true
 homepage: http://restfulie.caelumobjects.com
 licenses: []
@@ -236,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Hypermedia aware resource based library in ruby (client side) and ruby on rails (server side).

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

@@ -1,14 +0,0 @@
-# Atom links now can be followed
-module Restfulie
-  module Common
-    module Representation
-      module Atom
-        class Link
-          def follow
-            Restfulie.at(href).as(type)
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,16 +0,0 @@
-# inject new behavior in Atom instances to enable easily access to link relationships.
-module Restfulie
-  module Common
-    module Representation
-      class Json
-        class Link
-          def follow
-            r = Restfulie.at(href)
-            r = r.as(type) if type
-            r
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,91 +0,0 @@
-require 'active_support/core_ext/hash/conversions'
-
-module Restfulie
-  module Common
-    module Converter
-      module Atom
-        module Base
-          module ClassMethods 
-            mattr_reader :media_type_name
-            @@media_type_name = 'application/atom+xml'
-        
-            mattr_reader :headers
-            @@headers = { 
-              :get  => { 'Accept'       => media_type_name },
-              :post => { 'Content-Type' => media_type_name }
-            }
-        
-            mattr_reader :recipes
-            @@recipes = {}
-        
-            def helper
-              Restfulie::Common::Converter::Atom::Helpers
-            end
-      
-            def 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 to_atom(obj = nil, options = {}, &block)
-              # just instantiate the string with the atom factory
-              return Restfulie::Common::Representation::Atom::Factory.create(obj) if obj.kind_of?(String)
-              
-              if block_given?
-                recipe = block
-              elsif options[:recipe]          
-                recipe = @@recipes[options[:recipe]]
-              else
-                return obj if obj.respond_to?(:atom_type) && (obj.atom_type == "feed" || obj.atom_type == "entry")
-                raise Restfulie::Common::Error::ConverterError.new("Recipe required")
-              end
-              
-              # execute with the builder if a recipe is set (even if the obj is an atom)
-              options[:atom_type] ||= obj.respond_to?(:each) ? :feed : :entry
-              raise Restfulie::Common::Error::ConverterError.new("Undefined atom type #{options[:atom_type]}") unless [:entry,:feed].include?(options[:atom_type])
-      
-              # Create representation and proxy
-              builder = Builder.new(options[:atom_type], obj)
-      
-              # Check recipe arity size before calling it
-              recipe.call(*[builder, obj, options][0,recipe.arity])
-      
-              builder.representation
-            end
-            
-            alias_method :unmarshal, :to_atom
-      
-            def to_hash(obj)
-              return obj if obj.kind_of?(Hash)
-      
-              xml = nil
-              
-              if obj.kind_of?(::String)
-                 xml = obj
-              elsif obj.respond_to?(:to_xml)
-                 xml = obj.to_xml
-              end
-      
-              Hash.from_xml(xml).with_indifferent_access unless xml.nil?
-            end
-      
-      
-            def to_s(obj)
-              return obj if obj.kind_of?(String)
-              if obj.respond_to?(:to_xml)
-                obj.to_xml.to_s
-              else
-                obj.to_s
-              end
-            end
-      
-            def marshal(obj, options = nil)
-              to_atom(obj, options).to_xml
-            end
-          end
-        end
-      end
-    end
-  end
-end