spreedly 1.3.2 → 1.3.3

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.3.3
+* Add support for return_url in Spreedly.edit_subscriber_url [jjthrash]
+* Add support for return_url in Spreedly.subscribe_url [jjthrash]
+
 === 1.3.2
 
 * Added methods on subscriber: update, allow_free_trial, 

data/lib/spreedly/common.rb

@@ -16,12 +16,12 @@ module Spreedly
   #   :first_name => pre-populate the first name field
   #   :last_name => pre-populate the last name field
   def self.subscribe_url(id, plan, options={})
-    %w(screen_name email first_name last_name).each do |option|
+    %w(screen_name email first_name last_name return_url).each do |option|
       options[option.to_sym] &&= URI.escape(options[option.to_sym])
     end
 
     screen_name = options.delete(:screen_name)
-    params = %w(email first_name last_name).select{|e| options[e.to_sym]}.collect{|e| "#{e}=#{options[e.to_sym]}"}.join('&')
+    params = %w(email first_name last_name return_url).select{|e| options[e.to_sym]}.collect{|e| "#{e}=#{options[e.to_sym]}"}.join('&')
 
     url = "https://spreedly.com/#{site_name}/subscribers/#{id}/subscribe/#{plan}"
     url << "/#{screen_name}" if screen_name
@@ -33,7 +33,12 @@ module Spreedly
   # Generates an edit subscriber for the given subscriber token. The
   # token is returned with the subscriber info (i.e. by
   # Subscriber.find).
-  def self.edit_subscriber_url(token)
-    "https://spreedly.com/#{site_name}/subscriber_accounts/#{token}"
+  def self.edit_subscriber_url(token, return_url = nil)
+    "https://spreedly.com/#{site_name}/subscriber_accounts/#{token}" +
+        if return_url
+            "?return_url=#{URI.escape(return_url)}"
+        else
+            ''
+        end
   end
 end

data/lib/spreedly/version.rb

@@ -1,3 +1,3 @@
 module Spreedly
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
 end

data/test/spreedly_gem_test.rb

@@ -126,11 +126,15 @@ class SpreedlyGemTest < Test::Unit::TestCase
         Spreedly.subscribe_url('joe', '1', :email => "joe.bob@test.com", :first_name => "Joe", :last_name => "Bob")
       assert_equal "https://spreedly.com/#{Spreedly.site_name}/subscribers/joe/subscribe/1?first_name=Joe&last_name=Bob",
         Spreedly.subscribe_url('joe', '1', :first_name => "Joe", :last_name => "Bob")
+      assert_equal "https://spreedly.com/#{Spreedly.site_name}/subscribers/joe/subscribe/1?return_url=http://stuffo.example.com",
+        Spreedly.subscribe_url('joe', '1', :return_url => 'http://stuffo.example.com')
     end
     
     should "generate an edit subscriber url" do
       assert_equal "https://spreedly.com/#{Spreedly.site_name}/subscriber_accounts/zetoken",
         Spreedly.edit_subscriber_url('zetoken')
+      assert_equal "https://spreedly.com/#{Spreedly.site_name}/subscriber_accounts/zetoken?return_url=http://stuffo.example.com",
+        Spreedly.edit_subscriber_url('zetoken', 'http://stuffo.example.com')
     end
     
     should "comp an inactive subscriber" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spreedly
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 3
-  - 2
-  version: 1.3.2
+  - 3
+  version: 1.3.3
 platform: ruby
 authors: 
 - Nathaniel Talbott
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-04 00:00:00 -04:00
+date: 2010-10-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -70,12 +70,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 2
         - 6
-        - 0
-        version: 2.6.0
+        - 2
+        version: 2.6.2
   type: :development
   version_requirements: *id004
 description: |-