paid_up 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da81f695f2094574cefed7cb6aaaffdd15bb9326
-  data.tar.gz: e3c4755cf8c29caea0bde253637001751d1d096a
+  metadata.gz: 2d49bea00e60ca17806304d426b58aef6baf161d
+  data.tar.gz: 7262d982ce4c8c2f5cba4b027d0b42e91886603b
 SHA512:
-  metadata.gz: 19f7b0cf4a1db0adc4f18272c5f32087887e95631a73986d501498f16ee7b8175749cdb8f37f22ed11e414cacc605f191dfbf0025289a4ff0a8252e3c764305d
-  data.tar.gz: 3f64aa28876b80c9623142b8efca71e0671be455e668aae14caf1eaeb6250d268ba1b11dcc0466abb2a975f6f7df03d70e9669e8ba28a5b0ffb0817e98a189b2
+  metadata.gz: 8bacd723841bf8192b60400fe68143591863c7626e58469beda266a52bdfffa19ab86b29ee32ac0f1d44c2b5281aa8b104bff004617258c04524fc6e83081756
+  data.tar.gz: 91f22ec84207fbe22565b17d865b4ae7762eb0e740b9967d1c64b05599a19d4b4913961f2f06818a4430c3d11ee1de0a00656f657b68b174a7647823fc735053

data/README.md

@@ -10,6 +10,7 @@ Paid Up is a start-to-finish Stripe subscription engine. You set up the plans yo
 * Authentication by Devise
 * Authorization by CanCan
 * Subscription by Stripe
+* Roles by Rolify
 * Assumes you will be using some variety of Bootstrap, and designed to be quite responsive out of the box, but included views can be overridden with custom views.
 
 ## Installation
@@ -43,7 +44,7 @@ Next, add a `Stripe::Customer` to serve as the Anonymous User, and subscribe tha
 
 ## Features Setup
 
-Set up each `PaidUp::Feature` using the config file. (A config file is used rather than using records in an `ActiveRecord::Base` model because relationships cannot be created at runtime.) Associate the features with the corresponding plans using the `PaidUp::FeaturesPlan` model. For an example, check out the seeds files in [`spec/dummy/db/seeds/`](spec/dummy/db/seeds/)
+Set up each `PaidUp::Feature` using the config file. (A config file is used rather than using records in an `ActiveRecord::Base` model because relationships cannot be created at runtime.) Associate the features with the corresponding plans using the `PaidUp::PlanFeatureSetting` model. For an example, check out the seeds files in [`spec/dummy/db/seeds/`](spec/dummy/db/seeds/)
 
 Possible `:setting_type` values are: `boolean`, `table_rows`, `rolify_rows`. The latter two require that a table corresponding to the feature's `:name` value. 
 
@@ -63,7 +64,7 @@ In order for PaidUp's AJAX functionality to work (which is required because Stri
     
 ## Abilities
 
-Abilities corresponding to features you have defined will be generated automatically, as an `:own` ability on the specified tables, if you include the PaidUp::Ability module and use the `initialize_paid_up(user)` command, like this:
+Abilities corresponding to features you have defined will be generated automatically, as an `:own` ability on the specified tables, plus rational defaults for `:manage` and `:read` permissions, if you include the `PaidUp::Ability` module and use the `initialize_paid_up(user)` command, like this:
 
     # /app/models/ability.rb
     class Ability
@@ -74,16 +75,12 @@ Abilities corresponding to features you have defined will be generated automatic
         user ||= User.new # anonymous user (not logged in)
     
         # Rails Application's initialization could go here.
-        can :manage, Group, user: user
     
         initialize_paid_up(user)
       end
     end
 
-Note that you will probably need to set up `:manage` and `:read` , according to your business rules.
-
 ## Contributing to Paid Up
-
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/app/models/paid_up/plan.rb

@@ -1,6 +1,6 @@
 class PaidUp::Plan < ActiveRecord::Base
-  has_many :features_plans, class_name: 'PaidUp::FeaturesPlan'
-  has_many :features, :through => :features_plans, class_name: 'PaidUp::Feature'
+  has_many :plan_feature_settings, class_name: 'PaidUp::PlanFeatureSetting'
+  has_many :features, :through => :plan_feature_settings, class_name: 'PaidUp::Feature'
   has_many :subscribers, :through => :subscriptions, :source => :subscriber, :source_type => 'User'
 
   after_initialize :load_stripe_data
@@ -21,7 +21,7 @@ class PaidUp::Plan < ActiveRecord::Base
 
   def feature_setting(feature_name)
     feature = PaidUp::Feature.find_by_slug(feature_name) || raise(:feature_not_found.l)
-    raw = features_plans.where(feature: feature_name)
+    raw = plan_feature_settings.where(feature: feature_name)
     case feature.setting_type
       when 'boolean'
         if raw.empty?

data/app/models/paid_up/{features_plan.rb → plan_feature_setting.rb}

@@ -1,4 +1,4 @@
-class PaidUp::FeaturesPlan < ActiveRecord::Base
+class PaidUp::PlanFeatureSetting < ActiveRecord::Base
   belongs_to :plan, class_name: 'PaidUp::Plan'
   validates_presence_of :setting, :plan, :feature
 

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

@@ -62,6 +62,7 @@
       if (response.error) {
         // Show the errors on the form
         $form.find('.payment-errors').text(response.error.message);
+        $form.find('.payment-errors').addClass('alert alert-danger')
         $('#submit-button').prop('disabled', false);
       } else {
         // response contains id and card, which contains additional card details

data/coverage/.last_run.json

@@ -1,5 +1,5 @@
 {
   "result": {
-    "covered_percent": 78.17
+    "covered_percent": 96.13
   }
 }