spreedly 1.3.6 → 1.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmY0Y2RmODFjNWRiNDNmNGIzNjAzZWE0YWQ3N2Q5ZDZkZDU1MjVmMA==
+    NWQ5NjM1NzgyZTBkYWJjY2I1MDM0ZDExMzJiMjIyNTExNjg2ODQ5MA==
   data.tar.gz: !binary |-
-    MjA0YTNmMzM0MDFhZDliZDE1NDU3ZGIxYzI3MDM3ZTk5ZjFlZmFiZg==
+    NmMyNjUyZTIxNDNiYzAwZjVjNzgwZDRkYzk0MjRkMWNiODkzNmZjOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTk1ZDQ5MjRkN2NjZDBjMWQyNzYzOGRkZTI4M2Y2ZTBjZTA1YzA1M2ExYmNl
-    NDc4OWNhNDg0NWMwY2QzZDEwN2Q0MTI5NjIwYzRjZDU4ZTZmZTBjZTU0MmJj
-    MzRiNmQ5OGQyOThmNjczMTI0M2NlMmQ0MzY1ZGI0ZGYyYWJkOWM=
+    YmExNTYxMDhlYjdlZGZjZDYxOGE2Y2Q4MTcwNjlmN2M3NWYxYzE2N2FiMGI3
+    YWQ4NjY0OTRhYmViN2IxNWJhNmU4M2ZkYjJlM2I2ODRhMmZlYzM0ZGRhMzU2
+    NzhiMzc4NzUzOGI4MzNhYmIyNmZiYTFkYzgzOTk4YTdjYTcyYTk=
   data.tar.gz: !binary |-
-    NDBjYzFmN2IxYTA5NmNmNDIzY2FkYzBiNTM3MDkyYTFlZWIxZjhhZmQzYzI0
-    YjljYzYyMDQzODI5ZmQ5M2Q4YjlmZTQwYmUxZDU2MWM1OWUxNTY1ZjQ4NDdk
-    N2VmMTkxM2E4ZDFlOWUxYmE3NmMwNmI2YTQ1NmZlZmE2NjU4ODE=
+    YzZmMDVlYjNhOWQ4NTg3ZTAzNjJjMTE3ZTgzNzViZTYwYTVmYmUzMTZmMzFi
+    NWZlZWY0NjJmYjllZDI5YTJhMzMyMmYzMjdlYTNkZjYxNTk5YTIxM2U5ODkw
+    NmVjMmI3YzU3OGE4NDkwOWRhNzAxYWNjMzhiZjQ2ODc3OTQyMjA=

data/HISTORY.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.4.0
+
+* Add accessor for invoices
+* Add accessor for last successful invoice
+
 ## 1.3.6
 
 * Modernize packaging

data/lib/spreedly.rb

@@ -83,7 +83,6 @@ module Spreedly
   end
 
   class Subscriber < Resource
-
     # This will DELETE all the subscribers from the site.
     #
     # Only works for test sites (enforced on the Spreedly side).
@@ -219,7 +218,7 @@ module Spreedly
       end
     end
 
-    #  Allow Another Free Trial
+    # Allow Another Free Trial
     # usage: @subscriber.allow_free_trial
     def allow_free_trial
       result = Spreedly.post("/subscribers/#{id}/allow_free_trial.xml")
@@ -246,6 +245,21 @@ module Spreedly
         raise "Could not add fee to subscriber: result code #{result.code}."
       end
     end
+
+    # Get the invoices for the subscriber
+    def invoices
+      @invoices ||= @data["invoices"].collect{|i| Invoice.new(i)}
+    end
+
+    # Get the last successful invoice
+    def last_successful_invoice
+      invoices.detect do |invoice|
+        invoice.closed?
+      end
+    end
+  end
+
+  class Invoice < Resource
   end
 
   class SubscriptionPlan < Resource

data/lib/spreedly/mock.rb

@@ -4,15 +4,15 @@ raise "Real Spreedly already required!" if defined?(Spreedly::REAL)
 
 module Spreedly
   MOCK = "mock"
-  
+
   def self.configure(name, token)
     @site_name = name
   end
-  
+
   def self.site_name
     @site_name
   end
-  
+
   class Resource
     def self.attributes
       @attributes ||= {}
@@ -21,12 +21,13 @@ module Spreedly
     def self.attributes=(value)
       @attributes = value
     end
-    
+
+    attr_reader :attributes
     def initialize(params={})
       @attributes = self.class.attributes.inject({}){|a,(k,v)| a[k.to_sym] = v.call; a}
       params.each {|k,v| @attributes[k.to_sym] = v }
     end
-    
+
     def id
       @attributes[:id]
     end
@@ -41,7 +42,7 @@ module Spreedly
       end
     end
   end
-  
+
   class Subscriber < Resource
     self.attributes = {
       :created_at => proc{Time.now},
@@ -58,7 +59,7 @@ module Spreedly
     def self.wipe! # :nodoc: all
       @subscribers = nil
     end
-    
+
     def self.create!(id, *args) # :nodoc: all
       optional_attrs = args.last.is_a?(::Hash) ? args.pop : {}
       email, screen_name = args
@@ -71,34 +72,35 @@ module Spreedly
       subscribers[sub.id] = sub
       sub
     end
-    
+
     def self.delete!(id)
       subscribers.delete(id)
     end
-    
+
     def self.find(id)
       subscribers[id]
     end
-    
+
     def self.subscribers
       @subscribers ||= {}
     end
-    
+
     def self.all
       @subscribers.values
     end
-    
+
     def initialize(params={})
       super
       if !id || id == ''
         raise "Could not create subscriber: Customer ID can't be blank."
       end
+      @invoices ||= []
     end
-    
+
     def id
       @attributes[:customer_id]
     end
-    
+
     def update(args)
       args.each_pair do |key, value|
         if @attributes.has_key?(key)
@@ -106,7 +108,7 @@ module Spreedly
         end
       end
     end
-    
+
     def comp(quantity, units, feature_level=nil)
       raise "Could not comp subscriber: no longer exists." unless self.class.find(id)
       raise "Could not comp subscriber: validation failed." unless units && quantity
@@ -129,53 +131,91 @@ module Spreedly
       plan = SubscriptionPlan.find(plan_id)
       comp(plan.duration_quantity, plan.duration_units, plan.feature_level)
     end
-    
+
     def allow_free_trial
-      @attributes[:eligible_for_free_trial] = true  
+      @attributes[:eligible_for_free_trial] = true
     end
 
     def stop_auto_renew
       raise "Could not stop auto renew for subscriber: subscriber does not exist." unless self.class.find(id)
       @attributes[:recurring] = false
     end
-    
-    def subscribe(plan_id)
-      @attributes[:recurring] = true
+
+    def subscribe(plan_id, card_number="4222222222222")
       plan = SubscriptionPlan.find(plan_id)
+      @invoices.unshift(Invoice.new(
+        amount: (@invoices.select{|invoice| invoice.closed?}.size > 0 ? 0 : plan.amount),
+        closed: false
+      ))
+
+      return unless card_number == "4222222222222"
+
+      @invoices.first.attributes[:closed] = true
+      @attributes[:recurring] = true
       comp(plan.duration_quantity, plan.duration_units, plan.feature_level)
     end
-    
+
     def add_fee(args)
       raise "Unprocessable Entity" unless (args.keys & [:amount, :group, :name]).size == 3
       raise "Unprocessable Entity" unless active?
       nil
     end
+
+    def invoices
+      @invoices
+    end
+
+    def last_successful_invoice
+      @invoices.detect{|invoice| invoice.closed?}
+    end
+  end
+
+  class Invoice < Resource
   end
-  
+
   class SubscriptionPlan < Resource
     self.attributes = {
       :plan_type => proc{'regular'},
       :feature_level => proc{''}
     }
-    
+
     def self.all
       plans.values
     end
-    
+
     def self.find(id)
       plans[id.to_i]
     end
-    
+
     def self.plans
       @plans ||= {
-        1 => new(:id => 1, :name => 'Default mock plan', :duration_quantity => 1, :duration_units => 'days'),
-        2 => new(:id => 2, :name => 'Test Free Trial Plan', :plan_type => 'free_trial', :duration_quantity => 1, :duration_units => 'days'),
-        3 => new(:id => 3, :name => 'Test Regular Plan', :duration_quantity => 1, :duration_units => 'days'),
+        1 => new(
+          :id => 1,
+          :name => 'Default mock plan',
+          :duration_quantity => 1,
+          :duration_units => 'days',
+          :amount => 6
+        ),
+        2 => new(
+          :id => 2,
+          :name => 'Test Free Trial Plan',
+          :plan_type => 'free_trial',
+          :duration_quantity => 1,
+          :duration_units => 'days',
+          :amount => 11
+        ),
+        3 => new(
+          :id => 3,
+          :name => 'Test Regular Plan',
+          :duration_quantity => 1,
+          :duration_units => 'days',
+          :amount => 17
+        )
       }
     end
-    
+
     def trial?
       (plan_type == "free_trial")
     end
   end
-end
+end

data/lib/spreedly/test_hacks.rb

@@ -4,7 +4,7 @@ module Spreedly
   class Subscriber
     # This method is *strictly* for use when testing, and will
     # probably only work against a test Spreedly site anyhow.
-    def subscribe(plan_id)
+    def subscribe(plan_id, card_number="4222222222222")
       agent = Mechanize.new
       page = agent.get(Spreedly.subscribe_url(id, plan_id))
       page = page.forms.first.submit
@@ -12,13 +12,16 @@ module Spreedly
       form['credit_card[first_name]'] = 'Joe'
       form['credit_card[last_name]'] = 'Bob'
       form['subscriber[email]'] = 'joe@example.com'
-      form['credit_card[number]'] = '4222222222222'
+      form['credit_card[number]'] = card_number
       form['credit_card[card_type]'] = 'visa'
       form['credit_card[verification_value]'] = '234'
       form['credit_card[month]'] = '1'
       form['credit_card[year]'] = '2024'
       page = form.click_button
-      raise "Subscription didn't got through" unless page.title == "Thank you!"
+
+      if card_number == "4222222222222"
+        raise "Subscription didn't go through" unless page.title == "Thank you!"
+      end
     end
   end
 end

data/lib/spreedly/version.rb

@@ -1,3 +1,3 @@
 module Spreedly
-  VERSION = "1.3.6"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spreedly
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.4.0
 platform: ruby
 authors:
 - Spreedly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false