billingly 0.1.13 → 0.1.14

data/app/models/billingly/base_customer.rb

@@ -117,10 +117,7 @@ module Billingly
     def subscribe_to_plan(plan, is_trial_expiring_on = nil) 
       subscriptions.last.terminate_changed_subscription if subscriptions.last
 
-      self.deactivated_since = nil
-      self.deactivation_reason = nil
-      self.save!
-      subscriptions.build.tap do |new|
+      subscription = subscriptions.build.tap do |new|
         [:payable_upfront, :description, :periodicity,
          :amount, :grace_period, :signup_price].each do |k|
           new[k] = plan[k]
@@ -132,6 +129,10 @@ module Billingly
         new.generate_next_invoice  
         on_subscription_success
       end
+      self.deactivated_since = nil
+      self.deactivation_reason = nil
+      self.save!
+      return subscription
     end
     
     # Customers can subscribe to a plan using a special subscription code which would

data/lib/billingly/version.rb

@@ -1,3 +1,3 @@
 module Billingly
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: billingly
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.14
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70362446030540 !ruby/object:Gem::Requirement
+  requirement: &70362328538660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70362446030540
+  version_requirements: *70362328538660
 - !ruby/object:Gem::Dependency
   name: validates_email_format_of
-  requirement: &70362446029580 !ruby/object:Gem::Requirement
+  requirement: &70362328538180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70362446029580
+  version_requirements: *70362328538180
 - !ruby/object:Gem::Dependency
   name: has_duration
-  requirement: &70362446029080 !ruby/object:Gem::Requirement
+  requirement: &70362328537700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70362446029080
+  version_requirements: *70362328537700
 - !ruby/object:Gem::Dependency
   name: ean13
-  requirement: &70362446028560 !ruby/object:Gem::Requirement
+  requirement: &70362328537220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70362446028560
+  version_requirements: *70362328537220
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70362446027880 !ruby/object:Gem::Requirement
+  requirement: &70362328536780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362446027880
+  version_requirements: *70362328536780
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70362446027220 !ruby/object:Gem::Requirement
+  requirement: &70362328536320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362446027220
+  version_requirements: *70362328536320
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70362446026600 !ruby/object:Gem::Requirement
+  requirement: &70362328535880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362446026600
+  version_requirements: *70362328535880
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70362446026160 !ruby/object:Gem::Requirement
+  requirement: &70362328535420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362446026160
+  version_requirements: *70362328535420
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70362446025700 !ruby/object:Gem::Requirement
+  requirement: &70362328551340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70362446025700
+  version_requirements: *70362328551340
 description: Rails Engine for SaaS subscription management. Manage subscriptions,
   plan changes, free trials and more!!!
 email: