hactor 0.0.1 → 0.0.2

data/README.md

@@ -1,6 +1,61 @@
 # Hactor
 
-TODO: Write a gem description
+Here's an example of how to use Hactor:
+
+
+```ruby
+require 'hactor'
+
+class UserListActor
+  include Hactor::Actor
+
+  def on_200(response)
+    user_links = response.body.links.select { |link| link.rel == 'ht:user' }
+    user_links.each do |link|
+      puts "#{link.title} (#{link.href})"
+    end
+  end
+end
+
+class LatestPostActor
+  include Hactor::Actor
+
+  def on_200(response)
+    puts response.body.embedded_resources.first.links.all
+  end
+end
+
+class HomeActor
+  include Hactor::Actor
+
+  def on_200(response)
+    response.follow 'ht:users', actor: UserListActor.new
+    response.follow 'ht:latest-posts', actor: LatestPostActor.new
+  end
+end
+
+Hactor.start url: 'http://haltalk.herokuapp.com/', actor: HomeActor.new
+```
+
+The following demonstrates the various things an actor can do with a response:
+
+```ruby
+class SomeActor
+  include Hactor::Actor
+
+  def on_200(response)
+    # Follow the rel_name link
+    response.follow rel_name, actor: some_actor
+    # Expand link's URI template with query_vars and follow that
+    response.follow rel_name, expand_with: query_vars , actor: some_actor
+    # Traverse the link with some_method, some_headers, and some_body
+    response.traverse rel_name, method: some_method, headers: some_headers,  body: some_string, actor: some_actor
+    # In each case, the response produce will be handled by some_actor
+  end
+end
+
+Hactor.start url: some_entry_point_url, actor: SomeActor.new
+```
 
 ## Installation
 

data/example.rb

@@ -0,0 +1,49 @@
+require 'hactor'
+
+def start
+  Hactor.start url: 'http://haltalk.herokuapp.com/', actor: HomeActor.new
+end
+
+class HomeActor
+  include Hactor::Actor
+
+  def on_200(response)
+    name = 'CHANGE ME'
+    user_name = 'PLEASE_CHANGE_ME'
+
+    response.follow 'ht:latest-posts', actor: LatestPostActor.new
+
+    response.traverse('ht:signup', method: 'POST',
+                      body: { username: user_name, real_name: name, password: 'blarb' },
+                      actor: SignedUpActor.new)
+
+    response.follow('ht:me', expand_with: { name: user_name },
+                    actor: ->(res) { puts res.properties })
+  end
+end
+
+class LatestPostActor
+  include Hactor::Actor
+
+  def on_200(response)
+    response.embedded_resources.each do |resource|
+      puts resource.link('self').href
+      puts resource.properties
+    end
+  end
+end
+
+class SignedUpActor
+  include Hactor::Actor
+
+  def on_200(response)
+    puts "Created an account"
+  end
+
+  def on_400(response)
+    puts "Failed to create account"
+  end
+end
+
+
+start()

data/hactor.gemspec

@@ -18,4 +18,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.add_development_dependency 'rspec'
   gem.add_dependency 'faraday'
+  gem.add_dependency 'addressable'
 end

data/lib/hactor.rb

@@ -1,12 +1,15 @@
 require 'hactor/version'
 require 'hactor/http/client'
+require 'hactor/null_actor'
 require 'hactor/actor'
 
 module Hactor
   def self.start(options)
     url = options.fetch :url
-    actor = options.fetch :actor
-    http_client = options.fetch(:http_client) { Hactor::HTTP::Client.new }
-    http_client.get(url: url, actor: actor)
+
+    actor = options[:actor] || NullActor.new
+    http_client = options[:http_client] || Hactor::HTTP::Client.new
+
+    http_client.get(url, actor: actor)
   end
 end

data/lib/hactor/hal/document.rb

@@ -1,22 +1,35 @@
-require 'delegate'
 require 'json'
+require 'delegate'
+require 'forwardable'
 require 'hactor/hal/resource'
 
 module Hactor
   module HAL
-    class Document < SimpleDelegator
-      attr_reader :body, :resource_class
+    class Document < Delegator
+      extend Forwardable
+
+      attr_reader :body, :response, :resource_class
+
+      def_delegators :response, :http_client
 
       def initialize(body, options={})
-        @resource_class = options.fetch(:resource_class) { Resource }
+        @response = options.fetch(:response)
+        @resource_class = options[:resource_class] || Hactor::HAL::Resource
+        body = '{}' if body == 'null'
         @body = JSON.parse(body)
-        super(root_resource)
+      end
+
+      def __getobj__
+        root_resource
       end
 
       def root_resource
-        @root_resource ||= resource_class.new(body)
+        @root_resource ||= resource_class.new(body, rel: 'self', context: self)
+      end
+
+      def base_url
+        response.env[:url]
       end
     end
   end
 end
-

data/lib/hactor/hal/embedded_collection.rb

@@ -9,21 +9,25 @@ module Hactor
       extend Forwardable
       include Enumerable
 
-      attr_reader :hash, :embedded_class, :flat_collection_class
-      def_delegators :each
+      attr_reader :hash, :parent, :embedded_class, :flat_collection_class
 
-      def initialize(hash, options={})
+      def_delegators :all, :each
+
+      def initialize(hash, options)
         #TODO: throw/log parsing error if not hash
-        @embedded_class = options.fetch(:embedded_class) { Resource }
-        @flat_collection_class = options.fetch(:flat_collection_class) { FlatCollection }
         @hash = hash
+        @parent = options.fetch(:parent)
+        @embedded_class = options[:embedded_class] || Resource
+        @flat_collection_class = options[:flat_collection_class] || FlatCollection
       end
 
       def all
-        @all ||= flat_collection_class.new(hash, item_class: embedded_class)
+        @all ||= flat_collection_class.new hash,
+                                           parent: parent,
+                                           item_class: embedded_class
       end
 
-      def find_by_rel(rel)
+      def find(rel)
         all.find(->{ NullResource.new }) { |resource| resource.rel == rel }
       end
     end

data/lib/hactor/hal/flat_collection.rb

@@ -1,23 +1,27 @@
 module Hactor
   module HAL
     class FlatCollection < Array
-      attr_reader :item_class
+      attr_reader :parent, :item_class
 
-      def initialize(hash, options={})
+      def initialize(hash, options)
+        @parent = options.fetch(:parent)
         @item_class = options.fetch(:item_class)
         super flatten(hash)
       end
 
       private
       def flatten(hash)
+        hash ||= {}
         arr = []
-          hash.each do |rel, value|
-            if value.is_a? Array
-              arr += value.map { |link| item_class.new(link.merge(rel: rel)) }
-            else
-              arr.push item_class.new(value.merge(rel: rel))
-            end
+
+        hash.each do |rel, value|
+          if value.is_a? Array
+            arr += value.map { |obj| item_class.new(obj, rel: rel, context: parent) }
+          else
+            arr.push item_class.new(value, rel: rel, context: parent)
           end
+        end
+
         arr
       end
     end

data/lib/hactor/hal/link.rb

@@ -1,7 +1,31 @@
 require 'ostruct'
+require 'addressable/template'
 
 module Hactor
   module HAL
-    class Link < OpenStruct;end
+    class Link < OpenStruct
+      attr_reader :rel, :parent_resource, :template_class
+
+      def initialize(obj, options)
+        @href = obj['href']
+        @rel = options.fetch(:rel)
+        @parent_resource = options.fetch(:context)
+        @template_class = options[:template_class] || Addressable::Template
+        super(obj)
+      end
+
+      def href(variables=nil)
+        if templated?
+          variables ||= {}
+          template_class.new(@href).expand(variables).to_s
+        else
+          @href
+        end
+      end
+
+      def templated?
+        !!templated
+      end
+    end
   end
 end

data/lib/hactor/hal/link_collection.rb

@@ -1,7 +1,7 @@
 require 'forwardable'
 require 'hactor/hal/flat_collection'
 require 'hactor/hal/link'
-#require 'hactor/hal/null_link'
+require 'hactor/hal/null_link'
 
 module Hactor
   module HAL
@@ -9,23 +9,31 @@ module Hactor
       extend Forwardable
       include Enumerable
 
-      attr_reader :hash, :link_class, :flat_collection_class
+      attr_reader :hash, :parent, :link_class, :flat_collection_class
       def_delegators :all, :each
 
       def initialize(hash, options={})
         #TODO: throw/log parsing error if not hash
-        @link_class = options.fetch(:link_class) { Link }
-        @flat_collection_class = options.fetch(:flat_collection_class) { FlatCollection }
         @hash = hash
+        @parent = options.fetch(:parent)
+        @link_class = options[:link_class] || Link
+        @flat_collection_class = options[:flat_collection_class] || FlatCollection
       end
 
       def all
-        @all ||= flat_collection_class.new(hash, item_class: link_class)
+        @all ||= flat_collection_class.new hash,
+                                           item_class: link_class,
+                                           parent: parent
+
       end
 
-      def find_by_rel(rel)
+      def find(rel)
         all.find(->{ NullLink.new }) { |link| link.rel == rel }
       end
+
+      def with_rel(rel)
+        all.select { |link| link.rel == rel }
+      end
     end
   end
 end

data/lib/hactor/hal/null_link.rb

@@ -0,0 +1,8 @@
+module Hactor
+  module HAL
+    class NullLink
+      def initialize(obj={}, options={});end
+      def href;end
+    end
+  end
+end

data/lib/hactor/hal/resource.rb

@@ -1,19 +1,33 @@
+require 'forwardable'
 require 'hactor/hal/link_collection'
 require 'hactor/hal/embedded_collection'
 
 module Hactor
   module HAL
     class Resource
+      extend Forwardable
+
       RESERVED_PROPERTIES = ['_links', '_embedded']
 
-      attr_reader :state, :link_collection_class, :embedded_collection_class
+      attr_reader :rel, :state, :http_client, :context
+      attr_accessor :link_collection_class, :embedded_collection_class
+
+      def_delegators :context, :http_client, :base_url
 
-      def initialize(state, options={})
-        @link_collection_class = options.fetch(:link_collection_class) { LinkCollection }
-        @embedded_collection_class = options.fetch(:embedded_collection_class) { EmbeddedCollection }
+      def initialize(state, options)
+        @rel = options.fetch(:rel)
+        @context = options.fetch(:context)
         @state = state
       end
 
+      def follow(rel, options={})
+        http_client.follow link(rel), options_in_context(options)
+      end
+
+      def traverse(rel, options={})
+        http_client.traverse link(rel), options_in_context(options)
+      end
+
       def properties
         @properties ||= state.reject { |k,v|
           RESERVED_PROPERTIES.include? k
@@ -21,11 +35,12 @@ module Hactor
       end
 
       def link(rel, options={})
-        links.find_by_rel(rel)
+        links.find(rel)
       end
 
       def links
-        @links ||= link_collection_class.new(state['_links'])
+        @links ||= link_collection_class.new state['_links'],
+                                             parent: self
       end
 
       def embedded_resource(rel)
@@ -33,7 +48,22 @@ module Hactor
       end
 
       def embedded_resources
-        @embedded_resources ||= embedded_collection_class.new(state['_embedded'])
+        @embedded_resources ||= embedded_collection_class.new state['_embedded'],
+                                                              parent: self
+      end
+
+      def embedded_collection_class
+        @embedded_collection_class ||= EmbeddedCollection
+      end
+
+      def link_collection_class
+        @link_collection_class ||= LinkCollection
+      end
+
+      private
+
+      def options_in_context(options)
+        options.merge context_url: context.base_url
       end
     end
   end

data/lib/hactor/http/client.rb

@@ -1,33 +1,49 @@
-require 'hactor/http/response'
 require 'faraday'
+require 'hactor/null_actor'
+require 'hactor/http/response'
 
 module Hactor
   module HTTP
-    class Client < SimpleDelegator
+    class Client < Delegator
       attr_reader :response_class, :backend
 
       def initialize(options={})
-        @response_class = options.fetch(:response_class) { Hactor::HTTP::Response }
-        @backend = options.fetch(:backend) { Faraday.new }
-        super(@backend)
+        @response_class = options[:response_class] || Hactor::HTTP::Response
+        @backend = options[:backend] || Faraday.new
       end
 
-      def follow(link, options = {})
-        actor = options.fetch(:actor)
+      def follow(link, options)
         context_url = options.fetch(:context_url)
 
-        url = context_url.merge(link.href)
-        get(url: url, actor: actor)
+        url = context_url.merge(link.href(options[:expand_with]))
+        get(url, options)
       end
 
-      def get(options)
-        url = options.fetch :url
-        actor = options.fetch :actor
+      def traverse(link, options)
+        context_url = options.fetch(:context_url)
+        method = options.fetch(:method).to_s.downcase
 
-        response = response_class.new(backend.get(url),
-                                      http_client: self)
+        actor = options[:actor] || Hactor::NullActor.new
+        headers = options[:headers]
+        body = options[:body]
+
+        url = context_url.merge link.href(options[:expand_with])
+        response = response_class.new backend.send(method, url, body, headers),
+                                      http_client: self
         actor.call response
       end
+
+      def get(url, options)
+        actor = options[:actor] || Hactor::NullActor.new
+        headers = options[:headers]
+        response = response_class.new backend.get(url, nil, headers),
+                                      http_client: self
+        actor.call response
+      end
+
+      def __getobj__
+        backend
+      end
     end
   end
 end

data/lib/hactor/http/response.rb

@@ -1,28 +1,35 @@
 require 'delegate'
+require 'forwardable'
 require 'hactor/hal/document'
 
 module Hactor
   module HTTP
-    class Response < SimpleDelegator
-      attr_reader :request_client, :codec
+    class Response < Delegator
+      extend Forwardable
+
+      attr_reader :codec, :response
+      attr_accessor :http_client
+
+      def_delegators :body, :follow,
+                            :traverse,
+                            :properties,
+                            :embedded_resources,
+                            :links
 
       def initialize(response, options={})
-        @request_client = options.fetch(:http_client)
+        @http_client = options.fetch(:http_client)
         @codec = options.fetch(:codec) { Hactor::HAL::Document }
         @body = options[:body]
-        super(response)
+        @response = response
       end
 
-      def follow(rel, options={})
-        actor = options.fetch(:actor) { Hactor::NullActor.new }
-        client = options.fetch(:http_client) { request_client }
-
-        link = body.link(rel)
-        client.follow(link, context_url: env[:url], actor: actor)
+      def body
+        @body ||= codec.new __getobj__.body,
+                            response: self
       end
 
-      def body
-        @body ||= codec.new(__getobj__.body)
+      def __getobj__
+        response
       end
     end
   end

data/lib/hactor/null_actor.rb

@@ -0,0 +1,7 @@
+module Hactor
+  class NullActor
+    def call(response)
+      raise "Response had no actor"
+    end
+  end
+end

data/lib/hactor/version.rb

@@ -1,3 +1,3 @@
 module Hactor
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/hactor/hal/document_spec.rb

@@ -2,21 +2,31 @@ require 'spec_helper'
 require 'hactor/hal/document'
 
 describe Hactor::HAL::Document do
-  describe "#root_resource" do
-    let(:resource_class) { mock }
-    let(:sentinel) { stub }
-    let(:body) { '{}' }
-    let(:doc) do
-      Hactor::HAL::Document.new(body,
-                                resource_class: resource_class)
-    end
+  let(:resource_class) { mock }
+  let(:response) { mock }
+  let(:sentinel) { stub }
+  let(:body) { '{}' }
+
+  let(:doc) do
+    Hactor::HAL::Document.new body,
+      response: response,
+      resource_class: resource_class
+  end
 
+  describe "#root_resource" do
     it "returns new Resource object" do
       resource_class.should_receive(:new)
-        .with(JSON.parse(body))
+        .with(JSON.parse(body), { rel: 'self', context: doc })
         .and_return(sentinel)
 
       doc.root_resource.should == sentinel
     end
   end
+
+  describe "#base_url" do
+    it "returns the url via the response object" do
+      response.should_receive(:env).and_return url: sentinel
+      doc.base_url.should == sentinel
+    end
+  end
 end

data/spec/hactor/hal/link_collection_spec.rb

@@ -11,8 +11,10 @@ describe Hactor::HAL::LinkCollection do
   let(:flat_collection_class) { mock }
   let(:flat_collection) { mock }
   let(:link) { stub }
+  let(:parent) { stub }
   let(:collection) do
     Hactor::HAL::LinkCollection.new(simple_link_hash,
+                                    parent: parent,
                                     link_class: link_class,
                                     flat_collection_class: flat_collection_class)
   end
@@ -20,11 +22,11 @@ describe Hactor::HAL::LinkCollection do
   describe "#find" do
     it "finds a link with the supplied rel" do
       flat_collection_class.should_receive(:new)
-        .with(simple_link_hash, item_class: link_class)
+        .with(simple_link_hash, parent: parent, item_class: link_class)
         .and_return(flat_collection)
       flat_collection.should_receive(:find).and_return(link)
 
-      collection.find_by_rel(:self).should == link
+      collection.find(:self).should == link
     end
   end
 end

data/spec/hactor/hal/link_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+require 'hactor/hal/link'
+
+describe Hactor::HAL::Link do
+  context "templated link" do
+    let(:template_class) { mock('templ_class') }
+    let(:template) { mock('template') }
+    let(:href) { stub }
+
+    let(:state) do
+      {
+        'href' => href,
+        'templated' => true
+      }
+    end
+
+    let(:link) do
+      Hactor::HAL::Link.new(state,{
+        rel: stub,
+        context: stub,
+        template_class: template_class
+      })
+    end
+
+    describe "#href" do
+      it "expands using the variables passed in" do
+        sentinel, variables = stub, stub
+
+        template_class.should_receive(:new).with(href).
+          and_return(template)
+        template.should_receive(:expand).with(variables).
+          and_return(stub(to_s: sentinel))
+
+        link.href(variables).should == sentinel
+      end
+    end
+  end
+end

data/spec/hactor/hal/resource_spec.rb

@@ -15,17 +15,53 @@ describe Hactor::HAL::Resource do
     }
   end
 
-  let(:resource) do
-    Hactor::HAL::Resource.new(json,
-                              link_collection_class: link_collection_class,
-                              embedded_collection_class: embedded_collection_class)
-  end
-
   let(:link_collection_class) { mock }
-  let(:embedded_collection_class) { mock }
   let(:link_collection) { mock }
+  let(:embedded_collection_class) { mock }
   let(:embedded_collection) { mock }
+  let(:http_client) { mock }
+
   let(:rel) { stub }
+  let(:link) { stub }
+  let(:base_url) { stub }
+  let(:document) { stub(http_client: http_client, base_url: base_url) }
+
+  let(:resource) do
+    Hactor::HAL::Resource.new json,
+                              rel: rel,
+                              context: document
+                                            
+  end
+
+  before :each do
+    resource.link_collection_class = link_collection_class
+    resource.embedded_collection_class = embedded_collection_class
+  end
+
+  context "http transition methods" do
+    before :each do
+      link_collection_class.should_receive(:new).and_return(link_collection)
+      link_collection.should_receive(:find).with(rel).and_return(link)
+    end
+
+    describe "#follow" do
+      it "tells the http client to follow the link and also supplies the context URL" do
+        http_client.should_receive(:follow).with(link, { context_url: base_url })
+
+        resource.follow(rel)
+      end
+    end
+
+    describe "#traverse" do
+      it "tells the http client to traverse the link using the supplied method and also supplies the context URL" do
+        method = stub
+        http_client.should_receive(:traverse).
+          with(link, { method: method, context_url: base_url })
+
+        resource.traverse(rel, method: method)
+      end
+    end
+  end
 
   describe "#properties" do
     it "returns a Hash containing the json with the reserved properties removed" do
@@ -35,13 +71,13 @@ describe Hactor::HAL::Resource do
 
   context "links" do
     before :each do
-      link_collection_class.should_receive(:new).with(json['_links']).and_return(link_collection)
+      link_collection_class.should_receive(:new).
+        with(json['_links'], parent: resource).and_return(link_collection)
     end
 
     describe "#link" do
       it "finds a link with the given rel" do
-        link = stub
-        link_collection.should_receive(:find_by_rel).with(rel).and_return(link)
+        link_collection.should_receive(:find).with(rel).and_return(link)
         resource.link(rel).should == link
       end
     end
@@ -55,7 +91,8 @@ describe Hactor::HAL::Resource do
 
   context "embedded resources" do
     before :each do
-      embedded_collection_class.should_receive(:new).with(json['_embedded']).and_return(embedded_collection)
+      embedded_collection_class.should_receive(:new).
+        with(json['_embedded'], parent: resource).and_return(embedded_collection)
     end
 
     describe "#embedded_resource" do

data/spec/hactor/http/client_spec.rb

@@ -5,48 +5,83 @@ describe Hactor::HTTP::Client do
   let(:response_class) { mock }
   let(:backend) { mock }
   let(:actor) { mock }
+  let(:link) { mock }
+  let(:context_url) { mock }
+
+  let(:variables) { stub }
+  let(:uri) { stub }
+  let(:resolved_uri) { stub }
+  let(:response) { stub }
+  let(:headers) { stub }
+  let(:hactor_response) { stub }
+  let(:url) { 'http://example.com/' }
+
   let(:client) do
-    Hactor::HTTP::Client.new(response_class: response_class,
-                             backend: backend)
+    Hactor::HTTP::Client.new response_class: response_class,
+                             backend: backend
   end
 
-  describe "#get" do
-    context "a valid URL is supplied" do
-      let(:url) { 'http://example.com/' }
-      let(:response) { stub }
-      let(:hactor_response) { stub }
-
-      it "GETs from URL and passes Response object to the actor" do
-        backend.should_receive(:get)
-          .with(url)
-          .and_return(response)
-        response_class.should_receive(:new)
-          .with(response, http_client: client)
-          .and_return(hactor_response)
-        actor.should_receive(:call)
-          .with(hactor_response)
-
-        client.get(url: url, actor: actor)
-      end
-    end
+  describe "#follow" do
+    before :each do
+      context_url.should_receive(:merge).with(uri).
+        and_return(resolved_uri)
 
-    describe "#follow" do
-      let(:link) { mock }
-      let(:uri) { stub }
-      let(:context_url) { mock }
-      let(:resolved_uri) { stub }
+      response_class.should_receive(:new).with(response, http_client: backend).
+        and_return(hactor_response)
 
+      actor.should_receive(:call).with(hactor_response)
+    end
+
+    context "plain url (no expand_with in option)" do
       it "should use the context url to resolve link href" do
-        Delegator.class_eval { include RSpec::Mocks::Methods }
-        client.stub!(:get).with(url: resolved_uri, actor: actor)
-        link.should_receive(:href)
+        link.should_receive(:href).with(nil)
           .and_return(uri)
-        context_url.should_receive(:merge)
-          .with(uri)
-          .and_return(resolved_uri)
+        backend.should_receive(:get).with(resolved_uri, nil, headers).
+          and_return(response)
 
-        client.follow(link, context_url: context_url, actor: actor)
+        client.follow link,
+                      context_url: context_url,
+                      actor: actor,
+                      headers: headers
       end
     end
+
+    context "URI template (expand_with in option)" do
+      it "should apply the variables to the template and follow resulting URI" do
+        link.should_receive(:href).with(variables).and_return(uri)
+        backend.should_receive(:get).with(resolved_uri, nil, headers).
+          and_return(response)
+
+        client.follow link,
+                      context_url: context_url,
+                      actor: actor,
+                      expand_with: variables,
+                      headers: headers
+      end
+    end
+  end
+
+  describe "#traverse" do
+    let(:method) { 'POST' }
+    let(:body) { stub 'body' }
+
+    it "should send a message of the given method to the http backend" do
+      link.should_receive(:href).with(variables).and_return(uri)
+      context_url.should_receive(:merge).with(uri).
+        and_return(resolved_uri)
+      backend.should_receive('post').with(resolved_uri, body, headers).
+        and_return(response)
+      response_class.should_receive(:new).with(response, http_client: backend).
+        and_return(hactor_response)
+      actor.should_receive(:call).with(hactor_response)
+
+      client.traverse link,
+                      context_url: context_url,
+                      method: method,
+                      headers: headers,
+                      body: body,
+                      actor: actor,
+                      expand_with: variables
+    end
   end
 end

data/spec/hactor/http/response_spec.rb

@@ -2,16 +2,13 @@ require 'spec_helper'
 require 'hactor/http/response'
 
 describe Hactor::HTTP::Response do
-  let(:codec) { mock }
-  let(:body) { mock }
-  let(:wrapped_response) { mock }
-  let(:http_client) { mock }
+  let(:codec) { mock 'codec' }
+  let(:body) { mock 'body' }
+  let(:wrapped_response) { mock 'wrapped_response' }
+  let(:http_client) { stub }
 
   describe "#follow" do
     let(:rel) { stub }
-    let(:link) { stub }
-    let(:actor) { stub }
-    let(:context_url) { stub }
     let(:response) do
       Hactor::HTTP::Response.new(wrapped_response,
                                  http_client: http_client,
@@ -19,14 +16,12 @@ describe Hactor::HTTP::Response do
                                  body: body)
     end
 
-    it "follows the link with supplied rel" do
-      body.should_receive(:link).with(rel).and_return(link)
-      http_client.should_receive(:follow)
-        .with(link, context_url: context_url, actor: actor)
-      wrapped_response.should_receive(:env)
-        .and_return({ url: context_url })
+    it "delegates to the body" do
+      options = stub
 
-      response.follow(rel, actor: actor, http_client: http_client)
+      body.should_receive(:follow).with(rel, options)
+
+      response.follow(rel, options)
     end
   end
 
@@ -41,7 +36,9 @@ describe Hactor::HTTP::Response do
 
     it "passes itself into the codec" do
       wrapped_response.should_receive(:body).and_return(body)
-      codec.should_receive(:new).with(body).and_return(sentinel)
+      codec.should_receive(:new).
+        with(body, response: response).
+        and_return(sentinel)
 
       response.body.should == sentinel
     end

data/spec/hactor/null_actor_spec.rb

@@ -0,0 +1,12 @@
+require 'hactor/null_actor'
+
+describe Hactor::NullActor do
+  let(:response) { mock }
+  describe "#call" do
+    it "should raise an exception when called" do
+      expect {
+        subject.call(response)
+      }.to raise_exception(RuntimeError)
+    end
+  end
+end

data/spec/hactor_spec.rb

@@ -8,7 +8,7 @@ describe Hactor do
       let(:actor) { mock }
       let(:http_client) { mock }
       it "GETs from the URL and passes a response object to an actor" do
-        http_client.should_receive(:get).with(url: url, actor: actor)
+        http_client.should_receive(:get).with(url, actor: actor)
         Hactor.start(url: url, actor: actor, http_client: http_client)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hactor
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2013-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A framework for building hypermedia clients
 email:
 - mikekelly321@gmail.com
@@ -56,6 +72,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- example.rb
 - hactor.gemspec
 - lib/hactor.rb
 - lib/hactor/actor.rb
@@ -64,19 +81,22 @@ files:
 - lib/hactor/hal/flat_collection.rb
 - lib/hactor/hal/link.rb
 - lib/hactor/hal/link_collection.rb
+- lib/hactor/hal/null_link.rb
 - lib/hactor/hal/resource.rb
 - lib/hactor/http/client.rb
 - lib/hactor/http/response.rb
+- lib/hactor/null_actor.rb
 - lib/hactor/version.rb
 - spec/hactor/hal/document_spec.rb
 - spec/hactor/hal/embedded_collection_spec.rb
 - spec/hactor/hal/flat_collection_spec.rb
 - spec/hactor/hal/link_collection_spec.rb
+- spec/hactor/hal/link_spec.rb
 - spec/hactor/hal/resource_spec.rb
 - spec/hactor/http/client_spec.rb
 - spec/hactor/http/response_spec.rb
+- spec/hactor/null_actor_spec.rb
 - spec/hactor_spec.rb
-- spec/integration.rb
 - spec/spec_helper.rb
 homepage: https://github.com/mikekelly/hactor
 licenses: []
@@ -90,15 +110,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4470173572118963512
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4470173572118963512
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A framework for building hypermedia clients
@@ -107,9 +133,10 @@ test_files:
 - spec/hactor/hal/embedded_collection_spec.rb
 - spec/hactor/hal/flat_collection_spec.rb
 - spec/hactor/hal/link_collection_spec.rb
+- spec/hactor/hal/link_spec.rb
 - spec/hactor/hal/resource_spec.rb
 - spec/hactor/http/client_spec.rb
 - spec/hactor/http/response_spec.rb
+- spec/hactor/null_actor_spec.rb
 - spec/hactor_spec.rb
-- spec/integration.rb
 - spec/spec_helper.rb

data/spec/integration.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-require 'hactor'
-require 'hactor/actor'
-
-class UserListActor
-  include Hactor::Actor
-
-  def on_200(response)
-    user_links = response.body.links.select { |link| link.rel == 'ht:user' }
-    user_links.each do |link|
-      puts "#{link.title} (#{link.href})"
-    end
-  end
-end
-
-class LatestPostActor
-  include Hactor::Actor
-
-  def on_200(response)
-    puts response.body.embedded_resources.all.first.links.all
-  end
-end
-
-class HomeActor
-  include Hactor::Actor
-
-  def on_200(response)
-    response.follow 'ht:users', actor: UserListActor.new
-    response.follow 'ht:latest-posts', actor: LatestPostActor.new
-  end
-end
-
-describe Hactor do
-  it "should work as expected :)" do
-    Hactor.start url: 'http://haltalk.herokuapp.com/', actor: HomeActor.new
-  end
-end