acts_as_subscription 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/acts_as_subscription.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_subscription}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dave Perrett"]
-  s.date = %q{2011-02-01}
+  s.date = %q{2011-03-18}
   s.description = %q{With ActsAsSubscription, you can hook your model into several subscription services, such as CheddarGetter.}
   s.email = %q{mail@recursive-design.com}
   s.extra_rdoc_files = [

data/lib/acts_as_subscription/backend/chargify_client.rb

@@ -157,11 +157,13 @@ module ActsAsSubscription::Subscription::Backend
         attributes[:credit_card_attributes] = {
           :first_name            => subscription.first_name,
           :last_name             => subscription.last_name,
-          :full_number           => subscription.cc_number,
-          :expiration_month      => subscription.cc_expiration_month,
-          :expiration_year       => subscription.cc_expiration_year,
-          :billing_zip_code      => subscription.zip_code,
         }
+      
+        attributes[:credit_card_attributes][:full_number]       = subscription.cc_number              if subscription.cc_number
+        attributes[:credit_card_attributes][:expiration_month]  = subscription.cc_expiration_month    if subscription.cc_expiration_month
+        attributes[:credit_card_attributes][:expiration_year]   = subscription.cc_expiration_year     if subscription.cc_expiration_year
+        attributes[:credit_card_attributes][:cvv]               = subscription.cc_verification_value  if subscription.cc_verification_value
+        attributes[:credit_card_attributes][:billing_zip_code]  = subscription.zip_code               if subscription.zip_code
       end
       
       return attributes

data/lib/acts_as_subscription/subscription.rb

@@ -95,17 +95,18 @@ module ActsAsSubscription
     
         validates :cc_number,
           :presence => true,
-          :unless   => :is_free_plan? 
+          :if       => :require_cc_number?
   
         validates_associated :credit_card,
-          :unless => :is_free_plan? 
+          :if       => :require_cc_number?
 
         before_validation :update_credit_card
           
         before_validation :assign_customer_code,    
-          :on => :create
+          :on       => :create
     
-        validate :validate_credit_card
+        validate :validate_credit_card,
+          :if       => :require_cc_number?
         
         attr_accessible :cc_expiration_month,
                         :cc_expiration_year,
@@ -158,13 +159,15 @@ module ActsAsSubscription
       end
       
       def backend_save
-        p "+++++++++++++++++++++++ saving +++++++++++++++++++++++"
         if self.new_record?
           result = ActsAsSubscription::Subscription::Backend.instance.create_subscription(self)
         else
           result = ActsAsSubscription::Subscription::Backend.instance.update_subscription(self)
         end
         
+        # Decide whether payment has been recorded.
+        self.payment_details_recorded = (result and !self.is_free_plan?) unless self.payment_details_recorded
+          
         # No way of knowing what fields the errors are for for some backends - just add a top-level error.
         unless result == true
           self.errors.add :base, result
@@ -176,16 +179,20 @@ module ActsAsSubscription
       
       # This can be overridden in the implementing model, to turn off zip-code validation.
       def require_zip_code?
-        return self.is_free_plan? == false
+        return (self.is_free_plan? == false)
       end
       
       # This can be overridden in the implementing model, to turn off verification-value validation.
       def require_verification_value?
-        return self.is_free_plan? == false
+        return (self.is_free_plan? == false)
       end
 
       protected
       
+      def require_cc_number?
+        return ((self.is_free_plan? == false) and (self.payment_details_recorded == false))
+      end
+      
       # Assigns a unique UUID for the customer.
       def assign_customer_code
         self.customer_code ||= UUIDTools::UUID.random_create.to_s

data/spec/models/subscription_spec.rb

@@ -25,6 +25,11 @@ describe Subscription do
       subscription.credit_card.class.should == ActiveMerchant::Billing::CreditCard
     end
     
+    it 'should not have payment_details_recorded' do
+      subscription = Subscription.new(@free_attr)
+      subscription.payment_details_recorded.should == false
+    end
+    
   end
   
   describe 'validation' do
@@ -94,6 +99,18 @@ describe Subscription do
           subscription = Subscription.new(@free_attr)
           subscription.is_free_plan?.should == true
         end
+
+        it 'should not have payment_details_recorded' do
+          subscription = Subscription.create(@free_attr)
+          subscription.payment_details_recorded.should == false
+        end
+
+        it 'should have payment_details_recorded after update to paid plan' do
+          subscription = Subscription.create(@free_attr)
+          subscription.payment_details_recorded.should == false
+          subscription.update_attributes(@paid_attr)
+          subscription.payment_details_recorded.should == true
+        end
     
       end
   
@@ -136,11 +153,18 @@ describe Subscription do
         subscription.should_not be_valid
       end
   
-      it 'should require a cc_number' do
+      it 'should require a cc_number if none has been recorded' do
         subscription = Subscription.new(@paid_attr.merge(:cc_number => ''))
         subscription.should_not be_valid
       end
   
+      it 'should not require a cc_number if one has already been recorded' do
+        subscription = Subscription.new(@paid_attr)
+        subscription.cc_number = nil
+        subscription.payment_details_recorded = true
+        subscription.should be_valid
+      end
+  
       describe 'with valid parameters' do
     
         it 'should validate' do
@@ -182,6 +206,11 @@ describe Subscription do
           subscription.credit_card.verification_value.should  == @paid_attr[:cc_verification_value]
           subscription.credit_card.number.should              == @paid_attr[:cc_number]
         end
+
+        it 'should have payment_details_recorded' do
+          subscription = Subscription.create(@paid_attr)
+          subscription.payment_details_recorded.should == true
+        end
     
       end
   

data/spec/spec_helper.rb

@@ -95,6 +95,7 @@ def model_factory(params={})
 	class Subscription < ActiveRecord::Base
     include ActsAsSubscription::Subscription
     acts_as_subscription #{param_str}
+    before_save :backend_save
   end
 	RUBY_EVAL
 	klass

data/spec/support/models.rb

@@ -8,6 +8,8 @@ class Subscription < ActiveRecord::Base
                        :user         => 'user',
                        :password     => 'pass',
                        :product_code => 'DUMMY_TEST'
+                       
+  before_save :backend_save
   
 end
 

data/spec/support/schema.rb

@@ -12,6 +12,7 @@ ActiveRecord::Schema.define :version => 0 do
     t.integer     :cc_expiration_year
     t.string      :cc_last_digits
     t.string      :cc_verification_value
+    t.boolean     :payment_details_recorded, :null => false, :default => false
     t.datetime    :canceled_at
     t.datetime    :suspended_at
     t.timestamps

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts_as_subscription
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Dave Perrett
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 +10:00
+date: 2011-03-18 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency