aweber 1.1.0 → 1.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aweber (1.1.0)
+    aweber (1.2.0)
       json_pure
       oauth
 
@@ -28,7 +28,5 @@ PLATFORMS
 DEPENDENCIES
   aweber!
   fakeweb
-  json_pure
-  oauth
   rspec (~> 2.1.0)
   yard (~> 0.6.0)

data/README.textile

@@ -4,46 +4,93 @@ Official AWeber API gem.
 
 h2. Installation
 
-* @gem install aweber@
+@gem install aweber@
 
-h2. Quick Start
+h2. Getting Started
 
-First, go to "http://labs.aweber.com":http://labs.aweber.com and sign up for a free AWeber Labs account. This is how you register apps and get OAuth keys.
+This guide assumes you have nothing previously setup to work with the AWeber API. It will walk through registering an account, creating an app and everything up to the point where you'll actually start working with data.
 
-bc.. # Register an app and use it's Consumer key and secret:
-oauth = AWeber::OAuth.new("consumer_key", "consumer_secret")
+If you don't want to bother with all the account setup stuff, you can look in the "examples":http://github.com/aweber/aweber-ruby/tree/master/examples/ directory for just example code.
 
-# Go to the URL the following outputs.
-oauth.request_token.authorize_url 
+*Requires a normal AWeber account (not a Labs account)*
 
-# Authorize your account and copy the verification code.
-oauth.authorize_with_verifier("verification_code")
+h3. 1. Register an AWeber Labs Account
 
-# Grab an AWeber::Base object and get movin'
-aweber = AWeber::Base.new(oauth)
-aweber.account.lists[123456].name
+Head to "http://labs.aweber.com":http://labs.aweber.com and sign up for a free AWeber Labs account. This is how you register apps and get OAuth keys.
 
-p. Take a look at "examples":http://github.com/aweber/aweber-ruby/tree/master/examples/ for more examples.
+h3. 2. Create an App
 
-h2. Getting Data
+Once logged in, _Create a New App_. Once created, it will show you the Consumer Key and Secret for that app.
 
-Every piece of data from AWeber's API stems from an Account object. From there you access associated resources in the same way you would an ActiveRecord accosication:
+h3. 3. Write Some Code
 
-bc. account.lists #=> #<AWeber::Collection(AWeber::Resource::List)>
-account.lists[1]  #=> #<AWeber::Resource::List>
+h4. The OAuth Handler
 
-h2. Modifying Subscribers
+bc. oauth = AWeber::OAuth.new('consumer_key', 'consumer_secret')
 
-Currently, only certain attributes of Subscribers are writable:
+h4. Authorize an Account
+
+Open, what the following outputs, in a browser and use your AWeber account credentials. This will give your app permission to work with your account's data:
+
+bc. oauth.request_token.verification_url
+
+h4. Verification Code
+
+After you do the above step, it will output a "Verification Code". Copy this and verify your @oauth@ object:
+
+bc. oauth.authorize_with_verifier('verification_code')
+
+h4. Grab an AWeber::Base
+
+bc. aweber = AWeber::Base.new(oauth)
+
+This object is how you access data from your account. @aweber.account@ is your account object which is the stem for all other resources. Take a look at the next section, "Usage", to find out how to work with different resources.
+
+h2. Usage
+
+h3. Resource Traversal
+
+Getting resource data is much like traversing associations in ActiveRecord. Everything starts with the @account@ object and goes from there:
+
+bc.. aweber.account.lists           #=> #<AWeber::Collection>
+aweber.account.lists[123]      #=> #<AWeber::Resource::List>
+aweber.account.lists[123].name #=> "WhateverList"
+
+h3. Collections
+
+@aweber.account.lists@ in the example above would be a Collection. Collections act like a normal Hash. Resources of a collection are accessed normally, using @[]@ with the key being the ID of the resource.
+
+h4. find_by_*
+
+Collections also support ActiveRecord style @find_by_*@ methods:
+
+bc. aweber.account.lists.find_by_name("testlist")
+
+h3. Resources
+
+Resources are elements of a Collection. A single list resource would be retrieved with:
+
+bc. aweber.account.lists[1234]
+
+h2. Updating Resources
+
+Currently, subscribers are the only resource you can update via the API. Everything else is read only for the time being.
+
+h3. Updateable Subscribers
 
 * name
 * misc_notes
-* email (yes email)
+* email
 * status
 * last_followup_message_number_sent
 * custom_fields (Hash of key/value pairs)
 * ad_tracking
 
+h3. Moving Subscriber From List to List
+
+bc. new_list = aweber.account.lists[1234]
+subscriber.list = new_list
+
 h3. Example
 
 bc. subscriber = account.lists[654321].subscribers[123456]

data/aweber.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name         = "aweber"
-  s.version      = "1.1.0"
+  s.version      = "1.2.0"
   s.platform     = Gem::Platform::RUBY
   s.summary      = "Ruby interface to AWeber's API"
   s.description  = "Ruby interface to AWeber's API"

data/lib/aweber.rb

@@ -13,6 +13,7 @@ module AWeber
     :clicks               => :Click,
     :links                => :Link,
     :lists                => :List,
+    :campaigns            => :Campaign,
     :messages             => :Message,
     :opens                => :Open,
     :subscribers          => :Subscriber,

data/lib/aweber/base.rb

@@ -19,9 +19,21 @@ module AWeber
       oauth.delete(expand(uri))
     end
     
+    def post(uri, body={})
+      oauth.post(uri, body)
+    end
+    
     def put(uri, body={})
       oauth.put(uri, body.to_json, {"Content-Type" => "application/json"})
     end
+    
+    def path
+      ""
+    end
+    
+    def inspect
+      "#<AWeber::Base />"
+    end
 
   private
     
@@ -34,7 +46,10 @@ module AWeber
     end
 
     def accounts
-      @accounts ||= Collection.new(self, Resources::Account, get("/accounts"))
+      return @accounts if @accounts
+
+      response  = get("/accounts").merge(:parent => self)
+      @accounts = Collection.new(self, Resources::Account, response)
     end
 
     def expand(uri)
@@ -42,8 +57,9 @@ module AWeber
       url = []
       url << AWeber.api_endpoint
       url << API_VERSION unless parsed.path.include? API_VERSION
-      url << parsed.path
-      File.join(*url)
+      url = [url.join("/"), parsed.path].join
+      url = [url, parsed.query].join("?") if parsed.query
+      url
     end
 
     def parse(response)

data/lib/aweber/collection.rb

@@ -27,11 +27,12 @@ module AWeber
   class Collection < Resource
     include Enumerable
 
-    attr_reader :entries
-    attr_reader :next_collection_link
-    attr_reader :prev_collection_link
-    attr_reader :resource_type_link
-    attr_reader :total_size
+    attr_accessor :entries
+    attr_reader   :next_collection_link
+    attr_reader   :prev_collection_link
+    attr_reader   :resource_type_link
+    attr_reader   :total_size
+    attr_reader   :parent
 
     alias_method :size,   :total_size
     alias_method :length, :total_size
@@ -45,13 +46,26 @@ module AWeber
       @client  = client
       @klass   = klass
       @entries = {}
-      create_entries(data["entries"])
+      create_entries(data["entries"]) if data.include?("entries")
       @_entries = @entries.to_a
     end
 
+    def search(params={})
+      params   = params.map { |k,v| "#{h(k)}=#{h(v)}" }.join("&")
+      uri      = "#{path}?ws.op=find&#{params}"
+      response = client.get(uri).merge(:parent => parent)
+      response["total_size"] ||= response["entries"].size
+
+      self.class.new(client, @klass, response)
+    end
+
     def [](id)
       @entries[id] ||= fetch_entry(id)
     end
+    
+    def []=(key, resource)
+      @entries[key] = resource
+    end
 
     def each
       (1..@total_size).each { |n| yield get_entry(n) }
@@ -60,11 +74,17 @@ module AWeber
     def inspect
       "#<AW::Collection(#{@klass.to_s}) size=\"#{size}\">"
     end
+    
+    def path
+      parent and parent.path.to_s + @klass.path.to_s or @klass.path.to_s
+    end
 
   private
 
     def create_entries(entries)
-      entries.each { |entry| @entries[entry["id"]] = @klass.new(client, entry) }
+      entries.each do |entry|
+        @entries[entry["id"]] = @klass.new(client, entry.merge(:parent => self))
+      end
     end
 
     def get_entry(n)
@@ -73,7 +93,7 @@ module AWeber
     end
 
     def fetch_entry(id)
-      @klass.new(client, get(File.join(base_path, id.to_s)))
+      @klass.new(client, get(path).merge(:parent => self))
     end
 
     def fetch_next_group(amount=20)
@@ -86,7 +106,7 @@ module AWeber
     end
 
     def base_path
-      URI.parse(@next_collection_link).path
+      URI.parse(@next_collection_link).path if @next_collection_link
     end
 
     def find_by(_attr, *args)
@@ -101,6 +121,10 @@ module AWeber
       end
       super
     end
+    
+    def h(str)
+      CGI.escape(str.to_s)
+    end
 
     def client
       @client

data/lib/aweber/resource.rb

@@ -16,6 +16,12 @@ module AWeber
 
     class << self
       attr_accessor :writable_attrs
+      attr_accessor :path
+      
+      def basepath(path)
+        @path = path
+      end
+      
       # Works the same as +alias_method+, but for attributes created via
       # +attr*+ methods.
       #
@@ -79,7 +85,8 @@ module AWeber
 
           resource_link = instance_variable_get("@#{name}_collection_link")
           klass         = AWeber.get_class(name)
-          collection    = Collection.new(client, klass, client.get(resource_link))
+          response      = client.get(resource_link).merge(:parent => self)
+          collection    = Collection.new(client, klass, response)
           instance_variable_set("@#{name}", collection)
         end
       end
@@ -93,6 +100,10 @@ module AWeber
     alias_attribute :etag, :http_etag
     alias_attribute :link, :self_link
     alias_attribute :resource_type, :resource_type_link
+    
+    def_delegators :client, :get, :post, :put
+
+    attr_reader :parent
 
     def initialize(client, data={})
       @client = client
@@ -120,6 +131,14 @@ module AWeber
     def <=>(other)
       @id <=> other.id
     end
+    
+    def path
+      parent and "#{parent.path}/#{id}" or id.to_s
+    end
+    
+    def inspect
+      %(#<AWeber::Resources::#{self.class} id="#{id}" />)
+    end
 
   private
 

data/lib/aweber/resources.rb

@@ -4,6 +4,7 @@ require "aweber/resources/click"
 require "aweber/resources/followup"
 require "aweber/resources/link"
 require "aweber/resources/list"
+require "aweber/resources/campaign"
 require "aweber/resources/message"
 require "aweber/resources/open"
 require "aweber/resources/subscriber"

data/lib/aweber/resources/account.rb

@@ -1,6 +1,8 @@
 module AWeber
   module Resources
     class Account < Resource
+      basepath "/accounts"
+      
       api_attr :lists_collection_link
       api_attr :integrations_collection_link
     

data/lib/aweber/resources/broadcast.rb

@@ -1,6 +1,8 @@
 module AWeber
   module Resources
     class Broadcast < Resource
+      basepath "/campaigns"
+      
       api_attr :click_tracking_enabled
       api_attr :content_type
       api_attr :is_archived

data/lib/aweber/resources/click.rb

@@ -1,6 +1,8 @@
 module AWeber
   module Resources
     class Click < Resource
+      basepath "/clicks"
+      
       api_attr :event_time
       api_attr :is_earliest
       api_attr :subscriber_link

data/lib/aweber/resources/followup.rb

@@ -1,6 +1,8 @@
 module AWeber
   module Resources
     class Followup < Resource
+      basepath "/campaigns"
+      
       api_attr :click_tracking_enabled
       api_attr :content_type
       api_attr :message_interval

data/lib/aweber/resources/integration.rb

@@ -1,6 +1,8 @@
 module AWeber
   module Resources
     class Integration < Resource
+      basepath "/integrations"
+      
       api_attr :login
       api_attr :service_name
     end

data/lib/aweber/resources/link.rb

@@ -1,6 +1,8 @@
 module AWeber
   module Resources
     class Link < Resource
+      basepath "/links"
+      
       api_attr :total_clicks
       api_attr :total_unique_clicks
       api_attr :url

data/lib/aweber/resources/list.rb

@@ -1,6 +1,8 @@
 module AWeber
   module Resources
     class List < Resource
+      basepath "/lists"
+      
       FOLLOWUP_TYPE_LINK  = File.join(AWeber.api_url, "#followup_campaign")
       BROADCAST_TYPE_LINK = File.join(AWeber.api_url, "#broadcast_campaign")
       
@@ -11,76 +13,32 @@ module AWeber
       api_attr :web_forms_collection_link
       api_attr :web_form_split_tests_collection_link
       
+      has_many :campaigns
       has_many :subscribers
       has_many :web_forms
       has_many :web_form_split_tests
       
       def initialize(*args)
         super(*args)
-        @campaigns  = {}
         @followups  = nil
         @broadcasts = nil
       end
       
-      def campaigns
-        return @campaigns unless @campaigns == {}
-        create_followups
-        create_broadcasts
-        populate_campaigns
-        @campaigns
-      end
-      
       def broadcasts
-        campaigns if @broadcasts.nil?
+        return @broadcasts if @broadcasts
+
+        @broadcasts = AWeber::Collection.new(client, Campaign, :parent => self)
+        @broadcasts.entries = Hash[campaigns.select { |id, c| c.is_broadcast? }]
         @broadcasts
       end
       
       def followups
-        campaigns if @followups.nil?
+        return @followups if @followups
+
+        @followups = AWeber::Collection.new(client, Campaign, :parent => self)
+        @followups.entries = Hash[campaigns.select { |id, c| c.is_followup? }]
         @followups
       end
-      
-    private
-      
-      def create_followups
-        followups  = _entries.select { |entry| is_followup? entry }
-        @followups = Collection.new(client, Followup, {
-          "entries"            => followups, 
-          "total_size"         => followups.length,
-          "resource_type_link" => FOLLOWUP_TYPE_LINK
-        })
-      end
-      
-      def create_broadcasts
-        broadcasts  = _entries.select { |entry| is_broadcast? entry }
-        @broadcasts = Collection.new(client, Broadcast, {
-          "entries"            => broadcasts, 
-          "total_size"         => broadcasts.length,
-          "resource_type_link" => BROADCAST_TYPE_LINK
-        })
-      end
-      
-      def populate_campaigns
-        @followups.each  { |id, followup|  @campaigns[id] = followup  }
-        @broadcasts.each { |id, broadcast| @campaigns[id] = broadcast }
-      end
-      
-      def is_followup?(entry)
-        entry["resource_type_link"].split("#").last =~ /^followup/
-      end
-      
-      def is_broadcast?(entry)
-        entry["resource_type_link"].split("#").last =~ /^broadcast/
-      end
-      
-      def _campaigns
-        @_campaigns ||= client.get(@campaigns_collection_link)
-      end
-      
-      def _entries
-        _campaigns["entries"]
-      end
-      
     end
   end
 end

data/lib/aweber/resources/message.rb

@@ -1,6 +1,8 @@
 module AWeber
   module Resources
     class Message < Resource
+      basepath "/messages"
+      
       api_attr :event_time
       api_attr :last_opened
       api_attr :total_opens

data/lib/aweber/resources/open.rb

@@ -1,6 +1,8 @@
 module AWeber
   module Resources
     class Open < Resource
+      basepath "/opens"
+      
       api_attr :event_time
       api_attr :subscriber_link
       

data/lib/aweber/resources/subscriber.rb

@@ -1,6 +1,8 @@
 module AWeber
   module Resources
     class Subscriber < Resource
+      basepath "/subscribers"
+      
       api_attr :name,          :writable => true
       api_attr :misc_notes,    :writable => true
       api_attr :email,         :writable => true
@@ -8,7 +10,7 @@ module AWeber
       api_attr :custom_fields, :writable => true
       api_attr :ad_tracking,   :writable => true
       api_attr :last_followup_message_number_sent, :writable => true
-      
+
       api_attr :ip_address
       api_attr :is_verified
       api_attr :last_followup_sent_at
@@ -18,11 +20,27 @@ module AWeber
       api_attr :unsubscribed_at
       api_attr :verified_at
       api_attr :last_followup_sent_link
-      
+
       has_one :last_followup_sent
-      
+
       alias_attribute :is_verified?, :is_verified
       alias_attribute :notes, :misc_notes
+
+      def list=(list)
+        client.post(self_link, {
+          "ws.op"     => "move",
+          "list_link" => list.self_link
+        })
+        move_to(list)
+      end
+
+    private
+
+      def move_to(list)
+        old_list = self_link.match(%r[lists/(\d+)/])[1]
+        client.account.lists[old_list.to_i].subscribers[id] = nil
+        list.subscribers[id] = self
+      end
     end
   end
 end

data/lib/aweber/resources/tracked_event.rb

@@ -1,6 +1,8 @@
 module AWeber
   module Resources
     class TrackedEvent < Resource
+      basepath "/tracked_events"
+      
       api_attr :event_time
       api_attr :type
       api_attr :subscriber_link

data/lib/aweber/resources/web_form.rb

@@ -1,6 +1,8 @@
 module AWeber
   module Resources
     class WebForm < Resource
+      basepath "/web_forms"
+      
       api_attr :conversion_percentage
       api_attr :is_active
       api_attr :name

data/lib/aweber/resources/web_form_split_test.rb

@@ -1,6 +1,8 @@
 module AWeber
   module Resources
     class WebFormSplitTest < Resource
+      basepath "/web_form_split_tests"
+      
       api_attr :components_collection_link
       api_attr :is_active
       api_attr :name

data/lib/aweber/resources/web_form_split_test_component.rb

@@ -1,6 +1,8 @@
 module AWeber
   module Resources
     class WebFormSplitTestComponent < Resource
+      basepath "/components"
+      
       api_attr :conversion_percentage
       api_attr :is_active
       api_attr :name

data/spec/collection_spec.rb

@@ -1,7 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe AWeber::Collection do
-  
   before :each do
     @oauth  = AWeber::OAuth.new("token", "secret")
     @aweber = AWeber::Base.new(@oauth)
@@ -37,4 +36,44 @@ describe AWeber::Collection do
     lists = @lists.find_by_resource_type_link("https://api.aweber.com/1.0/#list")
     lists.length.should == 3
   end
+  
+  it "should have a path to its collection alone" do
+    @lists.path.should == "/lists"
+  end
+  
+  it "should create resource with itself as a parent" do
+    collection = AWeber::Collection.new(@aweber, FakeParent)
+    @aweber.stub(:get).and_return({ :name => "Bob" })
+    collection[1].parent.should == collection
+  end
+  
+  it "should pass path request through its parent" do
+    root   = AWeber::Collection.new(@aweber, FakeParent)
+    leaf   = AWeber::Resource.new(@aweber, :id => 1, :parent => root)
+    branch = AWeber::Collection.new(@aweber, FakeChild, :parent => leaf)
+    leafy  = AWeber::Resource.new(@aweber, :id => 2, :parent => branch)
+    leafy.path.should == "/parents/1/children/2"
+  end
+  
+  context "when searching" do
+    before do
+      @root       = AWeber::Collection.new(@aweber, FakeParent)
+      @parent     = AWeber::Resource.new(@aweber, :id => 1, :parent => @root)
+      @collection = AWeber::Collection.new(@aweber, FakeChild, :parent => @parent)
+      path        = "/parents/1/children?ws.op=find&name=default123456"
+      @aweber.should_receive(:get).with(path).and_return({ "entries" => [] })
+    end
+    
+    it "should search the API" do
+      @collection.search(:name => "default123456")
+    end
+    
+    it "should return a new collection" do
+      @collection.search(:name => "default123456").should be_an AWeber::Collection
+    end
+    
+    it "should return a new collection with the same parent" do
+      @collection.search(:name => "default123456").parent.should be @collection.parent
+    end
+  end
 end

data/spec/fixtures/subscribers.json

@@ -1,5 +1,5 @@
 {
-    "total_size": 47,
+    "total_size": 4,
     "start": 0,
     "resource_type_link": "https://api.aweber.com/1.0/#subscriber-page-resource",
     "entries": [{
@@ -13,7 +13,7 @@
         "verified_at": "2010-11-22 09:24:54",
         "last_followup_sent_at": "2010-11-23 12:31:58.159050-05:00",
         "subscription_url": "https://www.aweber.com/users/leads/add",
-        "self_link": "https://api.aweber.com/1.0/accounts/1/lists/406860/subscribers/50723026",
+        "self_link": "https://api.aweber.com/1.0/accounts/1/lists/1/subscribers/50723026",
         "is_verified": true,
         "resource_type_link": "https://api.aweber.com/1.0/#subscriber",
         "id": 50723026

data/spec/resource_spec.rb

@@ -1,14 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-class FakeResource < AWeber::Resource
-  attr_accessor :foo
-  api_attr :name, :writable => true
-  alias_attribute :bar, :foo
-  has_many :lists
-end
-
 describe AWeber::Resource do
-  
   before :each do
     @oauth  = AWeber::OAuth.new("token", "secret")
     @aweber = AWeber::Base.new(@oauth)
@@ -72,9 +64,18 @@ describe AWeber::Resource do
   
   it "should send a JSON respresentation of the object on save" do
     resource = FakeResource.new(@aweber)
-    @oauth.should_receive(:put).with(resource.link, "{\"name\":\"Bob\"}")
+    @oauth.should_receive(:put).with(resource.link, "{\"name\":\"Bob\"}", anything)
     resource.name = "Bob"
     resource.save
   end
   
+  it "should return the id as path when no parent is supplied" do
+    FakeResource.new(@aweber, :id => 1).path.should == "1"
+  end
+  
+  it "should have a parent" do
+    parent = AWeber::Collection.new(@aweber, FakeParent)
+    child  = AWeber::Resource.new(@aweber, :id => 2, :parent => parent)
+    child.path.should == "/parents/2"
+  end
 end

data/spec/resources/account_spec.rb

@@ -4,6 +4,8 @@ describe AWeber::Resources::Account do
   include BaseObjects
   subject { aweber.account }
   
+  its(:path) { should == "/accounts/1" }
+  
   it { should respond_to :id }
   it { should respond_to :http_etag }
   it { should respond_to :self_link }

data/spec/resources/campaign_spec.rb

@@ -4,6 +4,8 @@ describe "AWeber::Resources::Campaign" do
   include BaseObjects
   subject { aweber.account.lists[1].campaigns[50000047] }
   
+  its(:path) { should == "/accounts/1/lists/1/campaigns/50000047" }
+  
   it { should respond_to :click_tracking_enabled }
   it { should respond_to :content_type }
   it { should respond_to :spam_assassin_score }

data/spec/resources/click_spec.rb

@@ -4,6 +4,8 @@ describe AWeber::Resources::Click do
   include BaseObjects
   subject { aweber.account.lists[1].campaigns[50000047].links[136340].clicks[129530] }
   
+  its(:path) { should == "/accounts/1/lists/1/campaigns/50000047/links/136340/clicks/129530" }
+  
   it { should respond_to :event_time }
   it { should respond_to :http_etag }
   it { should respond_to :id }

data/spec/resources/integration_spec.rb

@@ -4,6 +4,8 @@ describe AWeber::Resources::Integration do
   include BaseObjects
   subject { aweber.account.integrations[8076] }
   
+  its(:path) { should == "/accounts/1/integrations/8076" }
+  
   it { should respond_to :http_etag }
   it { should respond_to :id }
   it { should respond_to :login }

data/spec/resources/link_spec.rb

@@ -4,6 +4,8 @@ describe AWeber::Resources::Link do
   include BaseObjects
   subject { aweber.account.lists[1].campaigns[50000047].links[136340] }
   
+  its(:path) { should == "/accounts/1/lists/1/campaigns/50000047/links/136340" }
+  
   it { should respond_to :clicks_collection_link }
   it { should respond_to :http_etag }
   it { should respond_to :id }

data/spec/resources/list_spec.rb

@@ -1,9 +1,11 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
-describe AWeber::Resources::Message do
+describe AWeber::Resources::List do
   include BaseObjects
   subject { aweber.account.lists[1] }
   
+  its(:path) { should == "/accounts/1/lists/1" }
+  
   it { should respond_to :campaigns_collection_link }
   it { should respond_to :http_etag }
   it { should respond_to :id }
@@ -17,10 +19,12 @@ describe AWeber::Resources::Message do
   it { should respond_to :followups }
   
   it "should should have a collection of broadcasts" do
-    subject.broadcasts.map { |id, b| b.self_link }.all? { |b| b =~ /b\d+$/ }.should be_true
+    subject.broadcasts.should be_an AWeber::Collection
+    subject.broadcasts[1].should be_an AWeber::Resources::Campaign
   end
   
   it "should should have a collection of followups" do
-    subject.followups.map { |id, f| f.self_link }.all? { |f| f =~ /f\d+$/ }.should be_true
+    subject.followups.should be_an AWeber::Collection
+    subject.followups[1].should be_an AWeber::Resources::Campaign
   end
 end

data/spec/resources/message_spec.rb

@@ -4,6 +4,8 @@ describe AWeber::Resources::Message do
   include BaseObjects
   subject { aweber.account.lists[1].campaigns[50000047].messages[11839] }
   
+  its(:path) { should == "/accounts/1/lists/1/campaigns/50000047/messages/11839" }
+  
   it { should respond_to :event_time }
   it { should respond_to :http_etag }
   it { should respond_to :id }

data/spec/resources/open_spec.rb

@@ -4,6 +4,8 @@ describe AWeber::Resources::Open do
   include BaseObjects
   subject { aweber.account.lists[1].campaigns[50000047].messages[11839].opens[11721] }
   
+  its(:path) { should == "/accounts/1/lists/1/campaigns/50000047/messages/11839/opens/11721" }
+  
   it { should respond_to :event_time }
   it { should respond_to :http_etag }
   it { should respond_to :id }

data/spec/resources/subscriber_spec.rb

@@ -22,7 +22,9 @@ describe AWeber::Resources::Subscriber do
   it { should respond_to :subscription_url }
   it { should respond_to :unsubscribed_at }
   it { should respond_to :verified_at }
-  
+
+  its(:path)           { should == "/accounts/1/lists/1/subscribers/50723026" }
+
   its(:writable_attrs) { should include :name }
   its(:writable_attrs) { should include :misc_notes }
   its(:writable_attrs) { should include :email }
@@ -30,4 +32,19 @@ describe AWeber::Resources::Subscriber do
   its(:writable_attrs) { should include :custom_fields }
   its(:writable_attrs) { should include :ad_tracking }
   its(:writable_attrs) { should include :last_followup_message_number_sent }
+
+  it "should move lists" do
+    list = "http://api.aweber.com/1.0/accounts/1/lists/987654"
+    json = { "ws.op" => "move", "list_link" => list }
+
+    aweber.account.lists[1550685].stub(:self_link).and_return(list)
+    oauth.should_receive(:post).with(subject.self_link, json)
+    subject.list = aweber.account.lists[1550685]
+  end
+
+  it "should update list when moving" do
+    new_list     = aweber.account.lists[1550685]
+    subject.list = new_list
+    new_list.subscribers[subject.id].should == subject
+  end
 end

data/spec/resources/tracked_event_spec.rb

@@ -4,6 +4,8 @@ describe AWeber::Resources::TrackedEvent do
   include BaseObjects
   subject { aweber.account.lists[1].campaigns[50000047].messages[11839].tracked_events[11839] }
   
+  its(:path) { should == "/accounts/1/lists/1/campaigns/50000047/messages/11839/tracked_events/11839" }
+  
   it { should respond_to :event_time }
   it { should respond_to :http_etag }
   it { should respond_to :id }

data/spec/resources/web_form_spec.rb

@@ -4,6 +4,8 @@ describe AWeber::Resources::WebForm do
   include BaseObjects
   subject { aweber.account.lists[1].web_forms[1911952229] }
   
+  its(:path) { should == "/accounts/1/lists/1/web_forms/1911952229" }
+  
   it { should respond_to :conversion_percentage }
   it { should respond_to :http_etag }
   it { should respond_to :id }

data/spec/resources/web_form_split_test_component_spec.rb

@@ -4,6 +4,8 @@ describe AWeber::Resources::WebFormSplitTestComponent do
   include BaseObjects
   subject { aweber.account.lists[1].web_form_split_tests[1242668124].components["612763163-513600765"] }
   
+  its(:path) { should == "/accounts/1/lists/1/web_form_split_tests/1242668124/components/612763163-513600765" }
+  
   it { should respond_to :conversion_percentage }
   it { should respond_to :http_etag }
   it { should respond_to :id }

data/spec/resources/web_form_split_test_spec.rb

@@ -4,6 +4,8 @@ describe AWeber::Resources::WebFormSplitTest do
   include BaseObjects
   subject { aweber.account.lists[1].web_form_split_tests[1242668124] }
   
+  its(:path) { should == "/accounts/1/lists/1/web_form_split_tests/1242668124" }
+  
   it { should respond_to :components_collection_link }
   it { should respond_to :http_etag }
   it { should respond_to :id }

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 require "aweber"
+require "support/fake_classes"
 require "fakeweb"
 require 'rspec'
 
@@ -49,4 +50,6 @@ route :get, %r[/accounts/\d+/lists/\d+/campaigns/[\d\w]+/links\?], fixture("link
 route :get, %r[/accounts/\d+/lists/\d+/campaigns/[\d\w]+/links/\d+/clicks\?], fixture("clicks.json")
 route :get, %r[/accounts/\d+/lists/\d+/campaigns/[\d\w]+/messages\?], fixture("messages.json")
 route :get, %r[/accounts/\d+/lists/\d+/campaigns/[\d\w]+/messages/\d+/opens\?], fixture("opens.json")
-route :get, %r[/accounts/\d+/lists/\d+/campaigns/[\d\w]+/messages/\d+/tracked_events\?], fixture("tracked_events.json")
+route :get, %r[/accounts/\d+/lists/\d+/campaigns/[\d\w]+/messages/\d+/tracked_events\?], fixture("tracked_events.json")
+
+route :post, %r[/accounts/\d+/lists/\d+/subscribers/\d+], "201 Created"

data/spec/support/fake_classes.rb

@@ -0,0 +1,15 @@
+class FakeResource < AWeber::Resource
+  attr_accessor :foo
+  basepath "/fakes"
+  api_attr :name, :writable => true
+  alias_attribute :bar, :foo
+  has_many :lists
+end
+
+class FakeParent < AWeber::Resource
+  basepath "/parents"
+end
+
+class FakeChild < AWeber::Resource
+  basepath "/children"
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - AWeber Communications, Inc.
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 -05:00
+date: 2011-03-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -138,7 +138,6 @@ files:
 - spec/fixtures/links.json
 - spec/fixtures/list.json
 - spec/fixtures/lists.json
-- spec/fixtures/lists_page_2.json
 - spec/fixtures/message.json
 - spec/fixtures/messages.json
 - spec/fixtures/open.json
@@ -169,6 +168,7 @@ files:
 - spec/resources/web_form_split_test_component_spec.rb
 - spec/resources/web_form_split_test_spec.rb
 - spec/spec_helper.rb
+- spec/support/fake_classes.rb
 has_rdoc: true
 homepage: http://github.com/aweber/AWeber-API-Ruby-Library
 licenses: []
@@ -216,7 +216,6 @@ test_files:
 - spec/fixtures/links.json
 - spec/fixtures/list.json
 - spec/fixtures/lists.json
-- spec/fixtures/lists_page_2.json
 - spec/fixtures/message.json
 - spec/fixtures/messages.json
 - spec/fixtures/open.json
@@ -247,3 +246,4 @@ test_files:
 - spec/resources/web_form_split_test_component_spec.rb
 - spec/resources/web_form_split_test_spec.rb
 - spec/spec_helper.rb
+- spec/support/fake_classes.rb

data/spec/fixtures/lists_page_2.json

@@ -1,38 +0,0 @@
-{
-    "total_size": 6,
-    "start": 4,
-    "resource_type_link": "https://api.aweber.com/1.0/#list-page-resource",
-    "entries": [{
-        "campaigns_collection_link": "/accounts/1/lists/4565456/campaigns",
-        "name": "asdsa456464",
-        "web_form_split_tests_collection_link": "https://api.aweber.com/1.0/accounts/1/lists/4565456/web_form_split_tests",
-        "subscribers_collection_link": "https://api.aweber.com/1.0/accounts/1/lists/4565456/subscribers",
-        "id": 4565456,
-        "http_etag": "\"4ab41e60d14ea138a4522b3d2896942b7335c13c - ca5feee2b7fbb6febfca8af5541541ea960aaedb\"",
-        "self_link": "https://api.aweber.com/1.0/accounts/1/lists/4565456",
-        "resource_type_link": "https://api.aweber.com/1.0/#list",
-        "web_forms_collection_link": "https://api.aweber.com/1.0/accounts/1/lists/4565456/web_forms"
-    },
-    {
-        "campaigns_collection_link": "https://api.aweber.com/1.0/accounts/1/lists/8975612/campaigns",
-        "name": "default8975612",
-        "web_form_split_tests_collection_link": "https://api.aweber.com/1.0/accounts/1/lists/8975612/web_form_split_tests",
-        "subscribers_collection_link": "https://api.aweber.com/1.0/accounts/1/lists/8975612/subscribers",
-        "id": 8975612,
-        "http_etag": "\"685c00e3983add5e4efb5ca3bc7294e247f6e9fe - ca5feee2b7fbb6febfca8af5541541ea960aaedb\"",
-        "self_link": "https://api.aweber.com/1.0/accounts/1/lists/8975612",
-        "resource_type_link": "https://api.aweber.com/1.0/#list",
-        "web_forms_collection_link": "https://api.aweber.com/1.0/accounts/1/lists/8975612/web_forms"
-    },
-    {
-        "campaigns_collection_link": "https://api.aweber.com/1.0/accounts/1/lists/12357254/campaigns",
-        "name": "default123572549",
-        "web_form_split_tests_collection_link": "https://api.aweber.com/1.0/accounts/1/lists/12357254/web_form_split_tests",
-        "subscribers_collection_link": "https://api.aweber.com/1.0/accounts/1/lists/12357254/subscribers",
-        "id": 12357254,
-        "http_etag": "\"0aaa38a50287df08ccb74c7f13fca8679aab688a - ca5feee2b7fbb6febfca8af5541541ea960aaedb\"",
-        "self_link": "https://api.aweber.com/1.0/accounts/1/lists/12357254",
-        "resource_type_link": "https://api.aweber.com/1.0/#list",
-        "web_forms_collection_link": "https://api.aweber.com/1.0/accounts/1/lists/12357254/web_forms"
-    }]
-}