paid_up 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc5d130a48c0b113e33404421ba00542550e229c
-  data.tar.gz: ec101d5ce97160d3ea070f4d3c10235709c5da06
+  metadata.gz: 335fab8dafdbcbe809d161bb38022878df8db297
+  data.tar.gz: a9b3666398fdc7294d684cc0eaf8dc6ad2004aec
 SHA512:
-  metadata.gz: b11cacc6c27e57e35eb2758a16f8219b32e0772a2cd48f6a184b659b4baab5c9a7499ba794d00fbdc69d491c08f98e3d1f31e100cc7e369b20431f1a805c9fde
-  data.tar.gz: d80227e7af8967037b02e31c7bd5e6083da8a5d81578807ac5d529ea306830f3336a85383497a3f84280d650134ed7a59f82d836382603349a839e23f86244a8
+  metadata.gz: 005b35eed037a4782e448a36b059d09e23be1cf8ce641f8814ae0727e368e5a3a490267691a377b07a1cbe0fb92c324ae2832999dc10cedd9ed1ef8f5a7f7db6
+  data.tar.gz: 3996a7ea5cc9658a376d2e3f64fedaff54ae56fe91f6780a7399179c0e7a5d9448d785f5e46a7c7e202d0cbac2a1003fa1d3988f57c5b798d0cdb0656ee40971

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.6.0

data/app/controllers/paid_up/subscriptions_controller.rb

@@ -17,9 +17,9 @@ module PaidUp
     def create
       # @plan set by #set_plan
       if current_user.subscribe_to_plan(@plan, params[:stripeToken])
-        redirect_to subscriptions_path, flash: { notice: :you_are_now_subscribed_to_the_plan.l(plan_name: current_user.plan.name) }
+        redirect_to subscriptions_path, flash: { notice: :you_are_now_subscribed_to_the_plan.l(plan_name: current_user.plan.title) }
       else
-        redirect_to new_plan_subscription_path @plan, flash: { error: current_user.errors.full_messages || :could_not_subscribe_to_plan.l(plan: @plan.name) }
+        redirect_to new_plan_subscription_path @plan, flash: { error: current_user.errors.full_messages || :could_not_subscribe_to_plan.l(plan: @plan.title) }
       end
     rescue Stripe::InvalidRequestError => e
       flash[:error] = e.message

data/app/models/paid_up/plan.rb

@@ -1,12 +1,11 @@
 class PaidUp::Plan < ActiveRecord::Base
-  has_many :plan_feature_settings, class_name: 'PaidUp::PlanFeatureSetting'
-  has_many :subscribers, :through => :subscriptions, :source => :subscriber, :source_type => 'User'
+  has_many :plan_feature_settings, class_name: 'PaidUp::PlanFeatureSetting', foreign_key: 'plan_id', inverse_of: :plan
 
   after_initialize :load_stripe_data
 
   attr_accessor :stripe_data
 
-  validates_presence_of :name, :stripe_id
+  validates_presence_of :title, :stripe_id
 
   default_scope { order('sort_order ASC') }
   scope :subscribable, -> { where('sort_order >=  ?', 0) }

data/app/models/paid_up/plan_feature_setting.rb

@@ -1,5 +1,5 @@
 class PaidUp::PlanFeatureSetting < ActiveRecord::Base
-  belongs_to :plan, class_name: 'PaidUp::Plan'
+  belongs_to :plan, class_name: 'PaidUp::Plan', foreign_key: 'plan_id', inverse_of: :plan_feature_settings
   validates_presence_of :setting, :plan, :feature
 
   after_initialize :catch_unlimited_in_setting

data/app/views/paid_up/features/_table.html.haml

@@ -8,7 +8,7 @@
       %th= :subscribe.l
   - for plan in plans
     %tr{ class: highlight_plan == plan ? 'info' : ''}
-      %td= plan.name
+      %td= plan.title
       %td= plan_charge_human plan
       - for feature in features
         %td= feature_display feature, plan

data/app/views/paid_up/plans/index.html.haml

@@ -5,10 +5,10 @@
     .plan.col-md-3
       .well
         %h2
-          = plan.name
+          = plan.title
           .small= plan_charge_human plan
         %p= plan.description.html_safe
-        %div{class:plan.name.gsub(' ',"_").downcase+'_subscribe_button'}
+        %div{class:plan.title.gsub(' ',"_").downcase+'_subscribe_button'}
           = plan_button plan
 %h2= :features.l
 .table-responsive

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

@@ -1,7 +1,7 @@
 - add_title :my_subscription_information.l
 
 %h2
-  = current_user.plan.name
+  = current_user.plan.title
   .small= plan_charge_human current_user.plan
 
 = subscription_dl current_user.subscription

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

@@ -1,4 +1,4 @@
-- add_title :subscribe_to_plan.l plan_name: @plan.name
+- add_title :subscribe_to_plan.l plan_name: @plan.title
 
 %p= @plan.description
 = features_table only: @plan, should_add_buttons: false

data/coverage/.last_run.json

@@ -1,5 +1,5 @@
 {
   "result": {
-    "covered_percent": 89.31
+    "covered_percent": 74.41
   }
 }