paid_up 0.9.1 → 0.9.2

data/lib/paid_up.rb

@@ -39,8 +39,7 @@ end
 
 Integer.send(:include, PaidUp::Extensions::Integer)
 
-Stripe::Customer.send(:include, PaidUp::Extensions::Stripe)
-Stripe::Plan.send(:include, PaidUp::Extensions::Stripe)
+Stripe::APIResource.send(:include, PaidUp::Extensions::Stripe)
 
 ActiveRecord::Base.send(:include, PaidUp::Mixins::Subscriber)
 ActiveRecord::Base.send(:include, PaidUp::Mixins::PaidFor)

data/lib/paid_up/extensions/stripe.rb

@@ -6,6 +6,7 @@ module PaidUp::Extensions
         begin
           self.retrieve(id)
         rescue
+          item[:id] ||= id
           self.create(item)
         end
       end

data/lib/paid_up/mixins/subscriber.rb

@@ -28,10 +28,10 @@ module PaidUp::Mixins
             nil
           end
         }
-        self.send(:define_method, :subscribe_to_plan) { |plan_to_set, stripeToken = nil|
+        self.send(:define_method, :subscribe_to_plan) { |plan_to_set, stripe_token = nil, trial_end = nil|
           if stripe_id.present? && !subscription.nil? # There is an existing subscription
-            if stripeToken.present? # The customer has entered a new card
-              subscription.source = stripeToken
+            if stripe_token.present? # The customer has entered a new card
+              subscription.source = stripe_token
               subscription.save
               reload
             end
@@ -39,13 +39,18 @@ module PaidUp::Mixins
               stripe_data.coupon = coupon_code
               stripe_data.save
             end
+            if trial_end.present?
+              stripe_data.subscription.trial_end = trial_end
+              stripe_data.subscription.save
+            end
             subscription.plan = plan_to_set.stripe_id
             result = subscription.save || ( raise(:could_not_update_subscription.l) && false )
           else # Totally new subscription
             args = {
-              source: stripeToken,
+              source: stripe_token,
               plan: plan_to_set.stripe_id,
-              email: email
+              email: email,
+              trial_end: trial_end
             }
             if coupon_code.present?
               args[:coupon] = coupon_code
@@ -70,7 +75,11 @@ module PaidUp::Mixins
           subscribe_to_plan PaidUp::Plan.free
         }
         self.send(:define_method, :plan) {
-          PaidUp::Plan.find_by_stripe_id(subscription.plan.id)
+          if subscription.present?
+            PaidUp::Plan.find_by_stripe_id(subscription.plan.id)
+          else
+            PaidUp::Plan.free
+          end
         }
         self.send(:define_method, :table_rows_unlimited?) { |table_name|
           table_rows_allowed(table_name) == PaidUp::Unlimited.to_i
@@ -110,16 +119,24 @@ module PaidUp::Mixins
           stripe_data.subscriptions.data.first
         }
         self.send(:define_method, :is_subscribed_to?) { |plan_to_check|
-          plan.id == plan_to_check.id
+          plan.present? && plan.id == plan_to_check.id
         }
         self.send(:define_method, :can_upgrade_to?) { |plan_to_check|
-          !is_subscribed_to?(plan_to_check) && (plan_to_check.sort_order.to_i > plan.sort_order.to_i)
+          plan.nil? || (
+            !is_subscribed_to?(plan_to_check) &&
+            (plan_to_check.sort_order.to_i > plan.sort_order.to_i)
+          )
         }
         self.send(:define_method, :can_downgrade_to?) { |plan_to_check|
-          !is_subscribed_to?(plan_to_check) && (plan_to_check.sort_order.to_i < plan.sort_order.to_i)
+          !plan.nil? && (
+            !is_subscribed_to?(plan_to_check) &&
+            (plan_to_check.sort_order.to_i < plan.sort_order.to_i)
+          )
         }
         self.send(:define_method, :using_free_plan?) {
-          plan.stripe_id == PaidUp.configuration.free_plan_stripe_id || stripe_data.delinquent
+          plan.nil? ||
+            stripe_data.delinquent ||
+            (plan.stripe_id == PaidUp.configuration.free_plan_stripe_id)
         }
         self.send(:define_method, :set_default_attributes) {
           if new_record?

data/paid_up.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: paid_up 0.9.1 ruby lib
+# stub: paid_up 0.9.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "paid_up"
-  s.version = "0.9.1"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Karen Lundgren"]
-  s.date = "2016-02-14"
+  s.date = "2016-02-16"
   s.description = "Allows a model of your choosing (such as users) to subscribe to a plan, which enables features."
   s.email = "karen.e.lundgren@gmail.com"
   s.extra_rdoc_files = [
@@ -34,6 +34,8 @@ Gem::Specification.new do |s|
     "app/helpers/paid_up/paid_up_helper.rb",
     "app/helpers/paid_up/plans_helper.rb",
     "app/helpers/paid_up/subscriptions_helper.rb",
+    "app/mailers/paid_up/paid_up_mailer.rb",
+    "app/mailers/paid_up/subscription_mailer.rb",
     "app/models/paid_up/ability.rb",
     "app/models/paid_up/plan.rb",
     "app/models/paid_up/plan_feature_setting.rb",
@@ -48,9 +50,13 @@ Gem::Specification.new do |s|
     "app/views/devise/sessions/new.html.haml",
     "app/views/devise/shared/_links.html.haml",
     "app/views/devise/unlocks/new.html.haml",
+    "app/views/layouts/mailer.html.haml",
+    "app/views/layouts/mailer.text.haml",
     "app/views/paid_up/features/_abilities_table.html.haml",
     "app/views/paid_up/features/_table.html.haml",
     "app/views/paid_up/plans/index.html.haml",
+    "app/views/paid_up/subscription_mailer/payment_failed_email.html.haml",
+    "app/views/paid_up/subscription_mailer/payment_failed_email.text.haml",
     "app/views/paid_up/subscriptions/index.html.haml",
     "app/views/paid_up/subscriptions/new.html.haml",
     "config/initializers/stripe.rb",
@@ -139,6 +145,7 @@ Gem::Specification.new do |s|
     "spec/dummy/db/seeds.rb",
     "spec/dummy/db/test.sqlite3",
     "spec/dummy/lib/assets/.keep",
+    "spec/dummy/lib/tasks/system.rake",
     "spec/dummy/log/.keep",
     "spec/dummy/log/development.log",
     "spec/dummy/public/404.html",
@@ -157,6 +164,8 @@ Gem::Specification.new do |s|
     "spec/factories/plan.rb",
     "spec/factories/plan_feature_setting.rb",
     "spec/factories/user.rb",
+    "spec/mailers/paid_up/subscription_mailer_spec.rb",
+    "spec/mailers/previews/paid_up/subscription_mailer_preview.rb",
     "spec/models/group_spec.rb",
     "spec/models/paid_up/feature_spec.rb",
     "spec/models/paid_up/plan_feature_setting_spec.rb",
@@ -201,6 +210,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<stripe>, ["~> 1.21"])
       s.add_development_dependency(%q<jeweler>, ["~> 2"])
       s.add_development_dependency(%q<bundler>, ["~> 1"])
+      s.add_development_dependency(%q<web-console>, ["~> 3.0"])
       s.add_development_dependency(%q<sqlite3>, ["~> 1.3"])
       s.add_development_dependency(%q<forgery>, ["~> 0.6"])
       s.add_development_dependency(%q<bootstrap-sass>, ["~> 3.3"])
@@ -223,6 +233,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<stripe>, ["~> 1.21"])
       s.add_dependency(%q<jeweler>, ["~> 2"])
       s.add_dependency(%q<bundler>, ["~> 1"])
+      s.add_dependency(%q<web-console>, ["~> 3.0"])
       s.add_dependency(%q<sqlite3>, ["~> 1.3"])
       s.add_dependency(%q<forgery>, ["~> 0.6"])
       s.add_dependency(%q<bootstrap-sass>, ["~> 3.3"])
@@ -246,6 +257,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<stripe>, ["~> 1.21"])
     s.add_dependency(%q<jeweler>, ["~> 2"])
     s.add_dependency(%q<bundler>, ["~> 1"])
+    s.add_dependency(%q<web-console>, ["~> 3.0"])
     s.add_dependency(%q<sqlite3>, ["~> 1.3"])
     s.add_dependency(%q<forgery>, ["~> 0.6"])
     s.add_dependency(%q<bootstrap-sass>, ["~> 3.3"])

data/spec/dummy/config/routes.rb

@@ -1,17 +1,4 @@
 Rails.application.routes.draw do
-  
-  
-  
-  mount PaidUp::Engine => '/', :as => 'paid_up'
   devise_for :users
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-end
+  mount PaidUp::Engine => '/', :as => 'paid_up'
+end

data/spec/dummy/db/seeds.rb

@@ -1,99 +1,114 @@
-# Dir[Rails.root.join("spec/factories/*.rb")].each {|f| require f}
-
 ###############
-# Plans       #
+# Plans     #
 ###############
 
 Stripe::Plan.find_or_create_by_id(
-    'anonymous-plan',
-    {
-        :amount => 0,
-        :interval => 'month',
-        :name => 'Anonymous Plan',
-        :currency => 'usd',
-        :id => 'anonymous-plan'
-    }
+  'anonymous-plan',
+  {
+    amount: 0,
+    interval: 'month',
+    name: 'Anonymous Plan',
+    currency: 'usd'
+  }
 )
 anonymous_plan = PaidUp::Plan.create(
-    title: 'Anonymous',
-    stripe_id: 'anonymous-plan',
-    description: "What you can do without logging in.",
-    sort_order: -1
+  title: 'Anonymous',
+  stripe_id: 'anonymous-plan',
+  description: "What you can do without logging in.",
+  sort_order: -1
 )
 Stripe::Plan.find_or_create_by_id(
-    'free-plan',
-    {
-        :amount => 0,
-        :interval => 'month',
-        :name => 'Free Plan',
-        :currency => 'usd',
-        :id => 'free-plan'
-    }
+  'free-plan',
+  {
+    amount: 0,
+    interval: 'month',
+    name: 'Free Plan',
+    currency: 'usd'
+  }
 )
 free_plan = PaidUp::Plan.create(
-    title: 'Free',
-    stripe_id: 'free-plan',
-    description: "Can't beat the price!",
-    sort_order: 0
+  title: 'Free',
+  stripe_id: 'free-plan',
+  description: "Can't beat the price!",
+  sort_order: 0
 )
 Stripe::Plan.find_or_create_by_id(
-    'no-ads-plan',
-    {
-        :amount => 100,
-        :interval => 'month',
-        :name => 'No Ads Plan',
-        :currency => 'usd',
-        :id => 'no-ads-plan'
-    }
+  'no-ads-plan',
+  {
+    amount: 100,
+    interval: 'month',
+    name: 'No Ads Plan',
+    currency: 'usd'
+  }
 )
 no_ads_plan = PaidUp::Plan.create(
-    title: 'No Ads',
-    stripe_id: 'no-ads-plan',
-    description: "No frills, just removes the ads.",
-    sort_order: 1
+  title: 'No Ads',
+  stripe_id: 'no-ads-plan',
+  description: "No frills, just removes the ads.",
+  sort_order: 1
 )
 Stripe::Plan.find_or_create_by_id(
-    'group-leader-plan',
-    {
-        :amount => 500,
-        :interval => 'month',
-        :name => 'Group Leader Plan',
-        :currency => 'usd',
-        :id => 'group-leader-plan'
-    }
+  'group-leader-plan',
+  {
+    amount: 500,
+    interval: 'month',
+    name: 'Group Leader Plan',
+    currency: 'usd'
+  }
 )
 group_leader_plan = PaidUp::Plan.create(
-    title: 'Group Leader',
-    stripe_id: 'group-leader-plan',
-    description: "For leaders of single groups, with configuration.",
-    sort_order: 2
+  title: 'Group Leader',
+  stripe_id: 'group-leader-plan',
+  description: "For leaders of single groups, with configuration.",
+  sort_order: 2
 )
 Stripe::Plan.find_or_create_by_id(
-    'professional-plan',
+  'professional-plan',
+  {
+    amount: 1000,
+    interval: 'month',
+    name: 'Professional Plan',
+    currency: 'usd'
+  }
+)
+professional_plan = PaidUp::Plan.create(
+  title: 'Professional',
+  stripe_id: 'professional-plan',
+  description: "Designed for professionals with unlimited groups, a calendar and configuration.",
+  sort_order: 3
+)
+
+###############
+# Coupons     #
+###############
+
+Stripe::Coupon.find_or_create_by_id(
+    '25OFF',
     {
-        :amount => 1000,
-        :interval => 'month',
-        :name => 'Professional Plan',
-        :currency => 'usd',
-        :id => 'professional-plan'
+        percent_off: 25,
+        currency: 'usd',
+        duration: 'forever'
     }
 )
-professional_plan = PaidUp::Plan.create(
-    title: 'Professional',
-    stripe_id: 'professional-plan',
-    description: "Designed for professionals with unlimited groups, a calendar and configuration.",
-    sort_order: 3
+
+Stripe::Coupon.find_or_create_by_id(
+    'MINUS25',
+    {
+        amount_off: 25,
+        currency: 'usd',
+        duration: 'forever'
+    }
 )
+
 ######################
 # Anonymous Customer #
 ######################
 Stripe::Customer.find_or_create_by_id(
-    'anonymous-customer',
-    {
-        id: 'anonymous-customer',
-        description: 'Anonymous Customer',
-        plan: 'anonymous-plan'
-    }
+  'anonymous-customer',
+  {
+    description: 'Anonymous Customer',
+    plan: 'anonymous-plan'
+  }
 )
 #######################
 # PlanFeatureSettings #
@@ -101,105 +116,112 @@ Stripe::Customer.find_or_create_by_id(
 
 # Ad Free
 PaidUp::PlanFeatureSetting.create(
-    feature: 'ad_free',
-    plan: no_ads_plan,
-    setting: 1
+  feature: 'ad_free',
+  plan: no_ads_plan,
+  setting: 1
 )
 
 # Group Leader
 PaidUp::PlanFeatureSetting.create(
-    feature: 'ad_free',
-    plan: group_leader_plan,
-    setting: 1
+  feature: 'ad_free',
+  plan: group_leader_plan,
+  setting: 1
 )
 PaidUp::PlanFeatureSetting.create(
-    feature: 'groups',
-    plan: group_leader_plan,
-    setting: 5
+  feature: 'groups',
+  plan: group_leader_plan,
+  setting: 5
 )
 PaidUp::PlanFeatureSetting.create(
-    feature: 'doodads',
-    plan: group_leader_plan,
-    setting: 10
+  feature: 'doodads',
+  plan: group_leader_plan,
+  setting: 10
 )
 
 # Professional
 PaidUp::PlanFeatureSetting.create(
-    feature: 'ad_free',
-    plan: professional_plan,
-    setting: 1
+  feature: 'ad_free',
+  plan: professional_plan,
+  setting: 1
 )
 PaidUp::PlanFeatureSetting.create(
-    feature: 'groups',
-    plan: professional_plan,
-    setting: PaidUp::Unlimited.to_i(:db)
+  feature: 'groups',
+  plan: professional_plan,
+  setting: PaidUp::Unlimited.to_i(:db)
 )
 PaidUp::PlanFeatureSetting.create(
-    feature: 'doodads',
-    plan: professional_plan,
-    setting: PaidUp::Unlimited.to_i(:db)
+  feature: 'doodads',
+  plan: professional_plan,
+  setting: PaidUp::Unlimited.to_i(:db)
 )
 
 ###############
-# Users       #
+# Users     #
 ###############
 
 free_subscriber = FactoryGirl.create(
-    :user,
-    name: 'Free Subscriber',
-    plan: free_plan
+  :user,
+  name: 'Free Subscriber',
+  plan: free_plan
 )
 
 no_ads_subscriber = FactoryGirl.create(
-    :user,
-    name: 'No Ads Subscriber',
-    plan: no_ads_plan
+  :user,
+  name: 'No Ads Subscriber',
+  plan: no_ads_plan
 )
 
 group_leader_subscriber = FactoryGirl.create(
-    :user,
-    name: 'Group Leader Subscriber',
-    plan: group_leader_plan
+  :user,
+  name: 'Group Leader Subscriber',
+  plan: group_leader_plan
 )
 
 disabling_subscriber = FactoryGirl.create(
-    :user,
-    name: 'Disabling Subscriber',
-    plan: group_leader_plan
+  :user,
+  name: 'Disabling Subscriber',
+  plan: group_leader_plan
 )
 
 professional_subscriber = FactoryGirl.create(
-    :user,
-    name: 'Professional Subscriber',
-    plan: professional_plan
+  :user,
+  name: 'Professional Subscriber',
+  plan: professional_plan
 )
 
 blank_subscriber = FactoryGirl.create(
-    :user,
-    name: 'Blank Subscriber',
-    plan: professional_plan
+  :user,
+  name: 'Blank Subscriber',
+  plan: professional_plan
+)
+
+past_due_subscriber = FactoryGirl.create(
+  :user,
+  name: 'Past Due Subscriber',
+  plan: professional_plan,
+  past_due: true
 )
 
 ###############
-# Groups      #
+# Groups    #
 ###############
 
 FactoryGirl.create(
-    :group,
-    title: 'First Group',
-    owner: group_leader_subscriber
+  :group,
+  title: 'First Group',
+  owner: group_leader_subscriber
 )
 
 FactoryGirl.create(
-    :group,
-    title: 'Second Group',
-    owner: professional_subscriber
+  :group,
+  title: 'Second Group',
+  owner: professional_subscriber
 )
 
 FactoryGirl.create(
-    :group,
-    title: 'Third Group',
-    owner: professional_subscriber
+  :group,
+  title: 'Third Group',
+  owner: professional_subscriber
 )
 
 5.times do
@@ -207,7 +229,13 @@ FactoryGirl.create(
 end
 
 FactoryGirl.create(
-    :group,
-    title: 'Disabled Group',
-    owner: disabling_subscriber
+  :group,
+  title: 'Disabled Group',
+  owner: disabling_subscriber
+)
+
+FactoryGirl.create(
+  :group,
+  title: 'Past Due Group',
+  owner: past_due_subscriber
 )