aweber 1.5.0 → 1.6.0

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2012, AWeber Communications, Inc.
+Copyright (c) 2010-2013, AWeber Communications, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

data/README.textile

@@ -143,4 +143,4 @@ h2. Note on Patches/Pull Requests
 
 h2. Copyright
 
-Copyright (c) 2010-2012 AWeber Communications, Inc. See LICENSE for more detail.
+Copyright (c) 2010-2013 AWeber Communications, Inc. See LICENSE for more detail.

data/aweber.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name         = "aweber"
-  s.version      = "1.5.0"
+  s.version      = "1.6.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

@@ -17,6 +17,7 @@ module AWeber
     :campaigns            => :Campaign,
     :messages             => :Message,
     :opens                => :Open,
+    :stats                => :Stat,
     :subscribers          => :Subscriber,
     :tracked_events       => :TrackedEvent,
     :integrations         => :Integration,

data/lib/aweber/resources.rb

@@ -9,8 +9,9 @@ require "aweber/resources/campaign"
 require "aweber/resources/message"
 require "aweber/resources/open"
 require "aweber/resources/subscriber"
+require "aweber/resources/stat"
 require "aweber/resources/tracked_event"
 require "aweber/resources/integration"
 require "aweber/resources/web_form"
 require "aweber/resources/web_form_split_test"
-require "aweber/resources/web_form_split_test_component"
+require "aweber/resources/web_form_split_test_component"

data/lib/aweber/resources/broadcast.rb

@@ -18,9 +18,11 @@ module AWeber
       api_attr :total_unsubscribes
       api_attr :twitter_account_link
 
+      api_attr :stats_collection_link
       api_attr :links_collection_link
       api_attr :messages_collection_link
 
+      has_many :stats
       has_many :links
       has_many :messages
 
@@ -28,4 +30,4 @@ module AWeber
       alias_attribute :is_click_tracking_enabled?, :click_tracking_enabled
     end
   end
-end
+end

data/lib/aweber/resources/campaign.rb

@@ -3,14 +3,18 @@ module AWeber
     class Campaign < Resource
       basepath "/campaigns"
       
+      api_attr :campaign_type
       api_attr :click_tracking_enabled
       api_attr :content_type
       api_attr :is_archived
+      api_attr :links_collection_link
       api_attr :message_interval
       api_attr :message_number
+      api_attr :messages_collection_link
       api_attr :scheduled_at
       api_attr :sent_at
       api_attr :spam_assassin_score
+      api_attr :stats_collection_link
       api_attr :subject
       api_attr :total_clicked
       api_attr :total_clicks
@@ -21,22 +25,21 @@ module AWeber
       api_attr :total_undelivered
       api_attr :total_unsubscribes
       api_attr :twitter_account_link
-      api_attr :links_collection_link
-      api_attr :messages_collection_link
-      
+
       has_many :links
       has_many :messages
-      
+      has_many :stats
+
       alias_attribute :is_archived?, :is_archived
       alias_attribute :is_click_tracking_enabled?, :click_tracking_enabled
       
       def is_followup?
-        resource_type_link.split("#").last =~ /^followup/
+        campaign_type == "f"
       end
       
       def is_broadcast?
-        resource_type_link.split("#").last =~ /^broadcast/
+        campaign_type == "b"
       end
     end
   end
-end
+end

data/lib/aweber/resources/followup.rb

@@ -18,9 +18,11 @@ module AWeber
 
       api_attr :links_collection_link
       api_attr :messages_collection_link
+      api_attr :stats_collection_link
       
       has_many :links
       has_many :messages
+      has_many :stats
     end
   end
-end
+end

data/lib/aweber/resources/stat.rb

@@ -0,0 +1,12 @@
+module AWeber
+  module Resources
+    class Stat < Resource
+      basepath "/stats"
+      
+      api_attr :description
+      api_attr :value
+      
+    end
+  end
+end
+

data/lib/aweber/resources/subscriber.rb

@@ -34,6 +34,20 @@ module AWeber
         move_to(list)
       end
 
+      def move(list, last_followup_sent=nil)
+        move_args = {
+                      "ws.op"     => "move",
+                      "list_link" => list.self_link
+                    }
+
+        if last_followup_sent
+          move_args['last_followup_message_number_sent'] = last_followup_sent
+        end
+
+        r = client.post(self_link, move_args)
+        move_to(list)
+      end
+
     private
 
       def move_to(list)
@@ -43,4 +57,4 @@ module AWeber
       end
     end
   end
-end
+end

data/spec/fixtures/campaign.json

@@ -13,6 +13,7 @@
     "messages_collection_link": "http://api.apitest.lab/1.0/accounts/1/lists/1/campaigns/b2/messages",
     "send_date": "2010-22-12T22:15:00-07:00",
     "content_type": "HTML",
+    "stats_collection_link": "https://api.aweber.com/1.0/accounts/1/lists/1/campaigns/b1234/stats",
     "total_sent": 0,
     "self_link": "http://api.apitest.lab/1.0/accounts/1/lists/1/campaigns/b2",
     "subject": "Something about stuff.",
@@ -20,4 +21,4 @@
     "id": 2,
     "total_unsubscribes": 0,
     "total_spam_complaints": null
-}
+}

data/spec/fixtures/campaigns.json

@@ -15,6 +15,7 @@
         "id": 50000047,
         "http_etag": "\"5b89a250c79f444d5d8b0a33333569cb7ba5bf12-e3f601ab748eb9ac953ad5fe426f204f460b721e\"",
         "messages_collection_link": "https://api.aweber.com/1.0/accounts/1/lists/1/campaigns/f4125891/messages",
+        "stats_collection_link": "https://api.aweber.com/1.0/accounts/1/lists/1/campaigns/b1234/stats",
         "content_type": "Text",
         "total_unsubscribes": 0,
         "self_link": "https://api.aweber.com/1.0/accounts/1/lists/1/campaigns/f4125891",
@@ -35,6 +36,7 @@
         "id": 1967848,
         "http_etag": "\"783551829f8c707d634ffdc642c4d27a98fd40f2-731c9d0c70ef77f5919d7ad4ec7a26b1c53eef50\"",
         "messages_collection_link": "https://api.aweber.com/1.0/accounts/1/lists/406860/campaigns/f1967848/messages",
+        "stats_collection_link": "https://api.aweber.com/1.0/accounts/1/lists/1/campaigns/b1234/stats",
         "content_type": "Text/HTML",
         "total_unsubscribes": 0,
         "self_link": "https://api.aweber.com/1.0/accounts/1/lists/406860/campaigns/f1967848",
@@ -55,6 +57,7 @@
         "id": 664656,
         "http_etag": "\"c98b377b2455745c2c2e54b7540dcabbea5b119d-90db636542d1250b74d31c9eee656f44a9ace3e0\"",
         "messages_collection_link": "https://api.aweber.com/1.0/accounts/1/lists/406860/campaigns/f664656/messages",
+        "stats_collection_link": "https://api.aweber.com/1.0/accounts/1/lists/1/campaigns/b1234/stats",
         "content_type": "HTML",
         "total_unsubscribes": 0,
         "self_link": "https://api.aweber.com/1.0/accounts/1/lists/406860/campaigns/f664656",
@@ -76,6 +79,7 @@
         "http_etag": "\"e36ea7ee44a4b3df8eeb97168a665592ab90d1e9-8ce8a07752e3f7e39b01b646fa0309a11333b8aa\"",
         "messages_collection_link": "https://api.aweber.com/1.0/accounts/1/lists/406860/campaigns/f1967845/messages",
         "content_type": "Text",
+        "stats_collection_link": "https://api.aweber.com/1.0/accounts/1/lists/1/campaigns/b1234/stats",
         "total_unsubscribes": 0,
         "self_link": "https://api.aweber.com/1.0/accounts/1/lists/406860/campaigns/f1967845",
         "total_undelivered": null,
@@ -98,9 +102,10 @@
         "content_type": "Text/HTML",
         "total_unsubscribes": 1,
         "self_link": "https://api.aweber.com/1.0/accounts/1/lists/406860/campaigns/f1967847",
+        "stats_collection_link": "https://api.aweber.com/1.0/accounts/1/lists/1/campaigns/b1234/stats",
         "total_undelivered": null,
         "resource_type_link": "https://api.aweber.com/1.0/#followup_campaign",
         "message_number": 5,
         "subject": "{!firstname_fix}, Followup Test #4"
     }]
-}
+}

data/spec/fixtures/stat.json

@@ -0,0 +1,8 @@
+{
+   "id": "total_clicks",
+    "http_etag": "\"4ab41e60d14ea138a4522b3d2896942b7335c13c - ca5feee2b7fbb6febfca8af5541541ea960aaedb\"",
+    "self_link": "https://api.aweber.com/1.0/accounts/1/lists/1/campaigns/b1234/stats/total_clicks",
+    "resource_type_link": "https://api.aweber.com/1.0/#integer-stat",
+    "description": "total clicks",
+    "value": 1234
+}

data/spec/fixtures/stats.json

@@ -0,0 +1,13 @@
+{
+    "total_size": 1,
+    "start": 0,
+    "resource_type_link": "https://api.aweber.com/1.0/#stats-page-resource",
+    "entries": [{
+        "id": "total_clicks",
+        "http_etag": "\"4ab41e60d14ea138a4522b3d2896942b7335c13c - ca5feee2b7fbb6febfca8af5541541ea960aaedb\"",
+        "self_link": "https://api.aweber.com/1.0/accounts/1/lists/1/campaigns/b1234/stats/total_clicks",
+        "resource_type_link": "https://api.aweber.com/1.0/#integer-stat",
+        "description": "total clicks",
+        "value": 1234
+    }]
+}

data/spec/resources/campaign_spec.rb

@@ -6,11 +6,21 @@ describe "AWeber::Resources::Campaign" do
   
   its(:path) { should == "/accounts/1/lists/1/campaigns/50000047" }
   
+  it { should respond_to :campaign_type }
   it { should respond_to :click_tracking_enabled }
   it { should respond_to :content_type }
+  it { should respond_to :links }
+  it { should respond_to :messages }
   it { should respond_to :spam_assassin_score }
+  it { should respond_to :stats }
   it { should respond_to :subject }
   it { should respond_to :total_spam_complaints }
   it { should respond_to :total_undelivered }
   it { should respond_to :total_unsubscribes }
+
+  it "should should have a collection of stats" do
+    subject.stats.should be_an AWeber::Collection
+    subject.stats['total_clicks'].should be_an AWeber::Resources::Stat
+  end
+
 end

data/spec/resources/stat_spec.rb

@@ -0,0 +1,15 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe AWeber::Resources::Link do
+  include BaseObjects
+  subject { aweber.account.lists[1].campaigns[50000047].stats['total_clicks'] }
+  
+  its(:path) { should == "/accounts/1/lists/1/campaigns/50000047/stats/total_clicks" }
+  
+  it { should respond_to :description }
+  it { should respond_to :http_etag }
+  it { should respond_to :id }
+  it { should respond_to :resource_type_link }
+  it { should respond_to :self_link }
+  it { should respond_to :value }
+end

data/spec/resources/subscriber_spec.rb

@@ -42,6 +42,16 @@ describe AWeber::Resources::Subscriber do
     subject.list = aweber.account.lists[1550685]
   end
 
+
+  it "should move lists with followup" do
+    list = "http://api.aweber.com/1.0/accounts/1/lists/987654"
+    json = { "ws.op" => "move", "list_link" => list, "last_followup_message_number_sent" => 1}
+
+    aweber.account.lists[1550685].stub(:self_link).and_return(list)
+    oauth.should_receive(:post).with(subject.self_link, json)
+    subject.move(aweber.account.lists[1550685], 1)
+  end
+
   it "should update list when moving" do
     new_list     = aweber.account.lists[1550685]
     subject.list = new_list

data/spec/spec_helper.rb

@@ -50,6 +50,8 @@ route :get, %r[/accounts/\d+/lists/\d+/web_form_split_tests/\d+/components\?], f
 route :get, %r[/accounts/\d+/integrations\?], fixture("integrations.json")
 route :get, %r[/accounts/\d+/lists/\d+/campaigns\?], fixture("campaigns.json")
 route :get, %r[/accounts/\d+/lists/\d+/campaigns/[\d\w]+/links\?], fixture("links.json")
+route :get, %r[/accounts/\d+/lists/\d+/campaigns/[\d\w]+/stats\?], fixture("stats.json")
+route :get, %r[/accounts/\d+/lists/\d+/campaigns/[\d\w]+/stats/\d+/total_clicks\?], fixture("stat.json")
 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")

metadata

@@ -1,108 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: aweber
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 5
-  - 0
-  version: 1.5.0
+version: !ruby/object:Gem::Version
+  version: 1.6.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - AWeber Communications, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-09 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-01-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: oauth
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 11
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.11.0
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 6
-        - 0
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 description: Ruby interface to AWeber's API
 email: help@aweber.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.textile
-files: 
+files:
 - .document
 - .gitignore
 - .travis.yml
@@ -130,6 +142,7 @@ files:
 - lib/aweber/resources/list.rb
 - lib/aweber/resources/message.rb
 - lib/aweber/resources/open.rb
+- lib/aweber/resources/stat.rb
 - lib/aweber/resources/subscriber.rb
 - lib/aweber/resources/tracked_event.rb
 - lib/aweber/resources/web_form.rb
@@ -158,6 +171,8 @@ files:
 - spec/fixtures/messages.json
 - spec/fixtures/open.json
 - spec/fixtures/opens.json
+- spec/fixtures/stat.json
+- spec/fixtures/stats.json
 - spec/fixtures/subscriber.json
 - spec/fixtures/subscribers.json
 - spec/fixtures/tracked_event.json
@@ -179,6 +194,7 @@ files:
 - spec/resources/list_spec.rb
 - spec/resources/message_spec.rb
 - spec/resources/open_spec.rb
+- spec/resources/stat_spec.rb
 - spec/resources/subscriber_spec.rb
 - spec/resources/tracked_event_spec.rb
 - spec/resources/web_form_spec.rb
@@ -186,37 +202,31 @@ files:
 - 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: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby interface to AWeber's API
-test_files: 
+test_files:
 - spec/base_spec.rb
 - spec/collection_spec.rb
 - spec/fixtures/account.json
@@ -240,6 +250,8 @@ test_files:
 - spec/fixtures/messages.json
 - spec/fixtures/open.json
 - spec/fixtures/opens.json
+- spec/fixtures/stat.json
+- spec/fixtures/stats.json
 - spec/fixtures/subscriber.json
 - spec/fixtures/subscribers.json
 - spec/fixtures/tracked_event.json
@@ -261,6 +273,7 @@ test_files:
 - spec/resources/list_spec.rb
 - spec/resources/message_spec.rb
 - spec/resources/open_spec.rb
+- spec/resources/stat_spec.rb
 - spec/resources/subscriber_spec.rb
 - spec/resources/tracked_event_spec.rb
 - spec/resources/web_form_spec.rb