aweber 1.6.0 → 1.6.1

data/README.textile

@@ -67,6 +67,24 @@ oauth = AWeber::OAuth.new('consumer_key', 'consumer_secret')
 oauth.authorize_with_access(YOUR_ACCESS_TOKEN, YOUR_ACCESS_TOKEN_SECRET)
 aweber = AWeber::Base.new(oauth)
 
+h3. I want to distribute my app as a public app
+
+If you intend to distribute your app to many AWeber customers via source code ("See here for more info":https://labs.aweber.com/getting_started/main#app_type), you will want to use the app id to authenticate your app as follows.
+
+h4. Build the authorize_app url:
+
+bc. require 'aweber'
+app_id = '1XXXXXXX8' #paste you app id from labs.aweber.com here
+auth_url = 'https://auth.aweber.com/1.0/oauth/authorize_app/' + app_id
+puts "please go to " + auth_url
+
+h4. Verification Code
+
+After you do the above step, it will output a “Verification Code”. Copy this into @authorize_with_authorization_code@
+
+bc. aweber = AWeber::Base.authorize_with_authorization_code('My|Authcode|Pasted|Here')
+
+You can now use the aweber object to access data from the account that authorized your app!
 
 h2. Usage
 
@@ -131,6 +149,8 @@ new_subscriber["name"] = "My New Subscriber"
 aweber.account.lists.find_by_name("mylistname").subscribers.create(new_subscriber)
 #Or alternatively: aweber.account.lists[list_id].subscribers.create(new_subscriber)
 
+
+
 h2. Note on Patches/Pull Requests
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/aweber.gemspec

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

data/lib/aweber/base.rb

@@ -35,6 +35,24 @@ module AWeber
       "#<AWeber::Base />"
     end
 
+    # Authorize an app with an auth code from 1.0/oauth/authorize_app/app_id
+    #
+    # @param [string] auth_code The authorization code received from 
+    # /authorize_app to be used for authorization.
+    #
+    def self.authorize_with_authorization_code(auth_code)
+      consumer_token, consumer_secret, request_token, request_secret, verifier =
+          auth_code.split('|')
+      oauth = AWeber::OAuth.new(consumer_token, consumer_secret)
+
+      request_hash = {:oauth_token => request_token, :oauth_token_secret => request_secret}
+      request = ::OAuth::RequestToken.from_hash(oauth.consumer, request_hash)
+
+      oauth.request_token = request
+      oauth.authorize_with_verifier(verifier)
+      self.new(oauth)
+    end
+
   private
     
     def handle_errors(response, uri)

data/lib/aweber/oauth.rb

@@ -27,6 +27,14 @@ module AWeber
       @request_token ||= consumer.get_request_token(options)
     end
 
+    # Set a Request Token
+    #
+    #  @param [Request Token] request_token the oauth request token to be set.
+    #
+    def request_token=(request_token)
+      @request_token = request_token
+    end
+
     # Get an Access Token from a Request Token using the 
     # +verifier+ code.
     #

data/lib/aweber/resources/web_form.rb

@@ -11,6 +11,9 @@ module AWeber
       api_attr :total_unique_displays
       api_attr :type
       api_attr :unique_conversion_percentage
+      api_attr :html_source_link
+      api_attr :javascript_source_link
+
     end
   end
 end

data/spec/base_spec.rb

@@ -20,4 +20,45 @@ describe AWeber::Base do
     @oauth.should_receive(:get).with("https://api.aweber.com/1.0/foo")
     @aweber.send(:get, "/foo")
   end
+
+  it "should set oauth request token" do
+    oauth_stub = double('oauth consumer')
+    oauth_stub.stub(:consumer) { 'consumer' }
+    oauth_stub.stub(:request_token=)
+    oauth_stub.stub(:authorize_with_verifier) { 'oauth' }
+
+    rtoken = double('request token')
+    rtoken.stub(:params=)
+
+    oauth_stub.should_receive(:request_token=).with(rtoken)
+    AWeber::OAuth.stub(:new) { oauth_stub }
+    OAuth::RequestToken.stub(:new)     { rtoken }
+
+    aweber = AWeber::Base.authorize_with_authorization_code('a|b|c|d|verifier')
+  end
+
+  it "should delegate authorization to oauth object" do
+    oauth_stub = double('oauth consumer')
+    oauth_stub.stub(:consumer) { 'consumer' }
+    oauth_stub.stub(:request_token=)
+    oauth_stub.stub(:authorize_with_verifier) { 'oauth' }
+
+    oauth_stub.should_receive(:authorize_with_verifier).with('verifier')
+    AWeber::OAuth.stub(:new) { oauth_stub }
+    aweber = AWeber::Base.authorize_with_authorization_code('a|b|c|d|verifier')
+  end
+
+  it "should return new aweber base instance" do
+    oauth_stub = double('oauth consumer')
+    oauth_stub.stub(:consumer) { 'consumer' }
+    oauth_stub.stub(:request_token=)
+    oauth_stub.stub(:authorize_with_verifier) { 'oauth' }
+
+    base_stub = double('aweber base')
+    AWeber::Base.stub(:new) { base_stub }
+
+    AWeber::OAuth.stub(:new) { oauth_stub }
+    aweber = AWeber::Base.authorize_with_authorization_code('a|b|c|d|verifier')
+    aweber.should == base_stub
+  end
 end

data/spec/fixtures/web_form.json

@@ -10,5 +10,7 @@
     "http_etag": "\"be17a3eae7a396181c523ef2709acf2be037f0d8-ca5feee2b7fbb6febfca8af5541541ea960aaedb\"",
     "total_displays": 33,
     "resource_type_link": "https://api.aweber.com/1.0/#web_form",
+    "javascript_source_link": "http://forms.aweber.com/form/71/208918171.js",
+    "html_source_link": "http://forms.aweber.com/form/71/208918171.htm",
     "id": 208918171
 }

data/spec/oauth_spec.rb

@@ -44,7 +44,7 @@ describe AWeber::OAuth do
     aweber = AWeber::OAuth.new('token', 'secret')
     aweber.request_token.should == rtoken
   end
-  
+
   it "should be able to authorize with a verifier code" do
     consumer = double('oauth consumer')
     rtoken   = double('request token')
@@ -88,4 +88,10 @@ describe AWeber::OAuth do
     aweber.post("/foo")
   end
 
+  it "should be able to set a request token" do
+    rtoken   = double('request token')
+    oauth = AWeber::OAuth.new('token', 'secret')
+    oauth.request_token = rtoken
+    oauth.request_token.should == rtoken
+  end
 end

data/spec/resources/web_form_spec.rb

@@ -18,4 +18,7 @@ describe AWeber::Resources::WebForm do
   it { should respond_to :total_unique_displays }
   it { should respond_to :type }
   it { should respond_to :unique_conversion_percentage }
+  it { should respond_to :html_source_link }
+  it { should respond_to :javascript_source_link }
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aweber
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth