paid_up 0.10.3 → 0.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30b0ff598fff8ffddbd2f08e09c1a893e92eaa1d
-  data.tar.gz: ab24a8c889af500ce68db3d91a34ff06ea3e62de
+  metadata.gz: d2adf066309b30ac306cdf822693eaf2dc6e3584
+  data.tar.gz: cc70e9755ea608963b06ebde8b6b9fa6faa1b494
 SHA512:
-  metadata.gz: 258d82afa25422ece9bb5f1d222bf9cab7c471588f33392245a1843cfeff7c628d3ace3defdce5fb8fa63448ff29dabf6ac6d76924784c9ae172fc71b252606b
-  data.tar.gz: fda0bce71f4a5338cff33ceb4ae1112aa2e3bcddab995682c43cda85bab516e96555122a372c7da5d59fedda6f0f68d9f6d662d10c034c57bbd64069ebdb04cb
+  metadata.gz: 5186bfa8079e7fa90c7bb51070925ec6cb88613ba2f15ecedfd93df29b0fb8d6d64ef53fe9b798a270e076eef070e6a7f96b3b906ad95b4a610245a3f9294516
+  data.tar.gz: 6516dcd2d65b3183d4b8b1b9d3ae5bd93a0595a996134605bce776a44aa148b26ad288324abc4bcd8a085262e584bdedd389298106bdbc1f8e5045fb5ad90496

data/VERSION

@@ -1 +1 @@
-0.10.3
+0.10.4

data/app/models/paid_up/plan.rb

@@ -100,7 +100,7 @@ module PaidUp
     def load_stripe_data
       if stripe_id.present?
         self.stripe_data = Rails.cache.fetch(
-          "#{stripe_id}/stripe_data", expires_in: 12.hours
+          "#{stripe_id}/stripe_data", expires_in: 1.second
         ) do
           Stripe::Plan.retrieve stripe_id
         end

data/app/views/paid_up/subscriptions/new.html.haml

@@ -4,7 +4,11 @@
 = features_table only: @plan, should_add_buttons: false
 
 %h2= :select_payment_info.l
-%p= :you_will_be_charged.l charge_amount: plan_charge_human(@plan, current_user.stripe_data.discount)
+%p.lead
+  - if @plan.stripe_data.trial_period_days.present?
+    = :after_trial_period_you_will_be_charged.l trial_period: @plan.stripe_data.trial_period_days, charge_amount: plan_charge_human(@plan, current_user.stripe_data.discount)
+  - else
+    = :you_will_be_charged.l charge_amount: plan_charge_human(@plan, current_user.stripe_data.discount)
 .row
   .col-md-6
     = form_tag paid_up.plan_subscriptions_path(@plan), class: 'form-horizontal', id: 'payment-form' do

data/config/locales/en.yml

@@ -22,6 +22,7 @@
 en:
   abilities: 'Abilities'
   account_is_delinquent: 'The paid features associated with your account have been disabled pending payment.'
+  after_trial_period_you_will_be_charged: "After a trial period of %{trial_period} days, you will be charged %{charge_amount}."
   allowed: 'Allowed'
   already_subscribed: 'Already Subscribed'
   are_you_sure: 'Are you sure?'

data/coverage/.last_run.json

@@ -1,5 +1,5 @@
 {
   "result": {
-    "covered_percent": 95.26
+    "covered_percent": 95.25
   }
 }

data/coverage/.resultset.json

@@ -1500,7 +1500,6 @@
         20,
         20,
         20,
-        20,
         null,
         0,
         0,
@@ -1512,7 +1511,6 @@
         null,
         160,
         160,
-        160,
         null,
         null,
         null
@@ -2227,7 +2225,7 @@
         2239,
         null,
         null,
-        6,
+        1005,
         null,
         null,
         null,
@@ -3187,6 +3185,6 @@
         null
       ]
     },
-    "timestamp": 1458155056
+    "timestamp": 1459882500
   }
 }

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.10.3 ruby lib
+# stub: paid_up 0.10.4 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "paid_up"
-  s.version = "0.10.3"
+  s.version = "0.10.4"
 
   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-03-20"
+  s.date = "2016-04-06"
   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 = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paid_up
 version: !ruby/object:Gem::Version
-  version: 0.10.3
+  version: 0.10.4
 platform: ruby
 authors:
 - Karen Lundgren
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-20 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails